diff options
| author | Tom Rini <trini@ti.com> | 2014-12-11 18:40:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-11 18:40:49 -0500 |
| commit | fc9b0b80435cda721fbdbe507c9e4f388b0ea62b (patch) | |
| tree | e50527455a67f1fc9f793f42d9672b237ac806f7 /arch/arm | |
| parent | 2c49323d5de38e119f102fa3f5fb291c4bc4e8a0 (diff) | |
| parent | 0c6de8853b2571251fdefe34598e0c344fe1372b (diff) | |
| download | blackbird-obmc-uboot-fc9b0b80435cda721fbdbe507c9e4f388b0ea62b.tar.gz blackbird-obmc-uboot-fc9b0b80435cda721fbdbe507c9e4f388b0ea62b.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Conflicts:
board/freescale/mx6sxsabresd/mx6sxsabresd.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/mx6sl_pins.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-mx6/mx6sl_pins.h b/arch/arm/include/asm/arch-mx6/mx6sl_pins.h index d9db58c9a3..9ded3d851c 100644 --- a/arch/arm/include/asm/arch-mx6/mx6sl_pins.h +++ b/arch/arm/include/asm/arch-mx6/mx6sl_pins.h @@ -53,5 +53,10 @@ enum { MX6_PAD_FEC_REF_CLK__FEC_REF_OUT = IOMUX_PAD(0x424, 0x134, 0x10, 0x000, 0, 0), MX6_PAD_FEC_RX_ER__GPIO_4_19 = IOMUX_PAD(0x0428, 0x0138, 5, 0x0000, 0, 0), MX6_PAD_FEC_TX_CLK__GPIO_4_21 = IOMUX_PAD(0x0434, 0x0144, 5, 0x0000, 0, 0), + + MX6_PAD_EPDC_PWRCOM__ANATOP_USBOTG1_ID = IOMUX_PAD(0x03D0, 0x00E0, 4, 0x05DC, 0, 0), + + MX6_PAD_KEY_COL4__USB_USBOTG1_PWR = IOMUX_PAD(0x0484, 0x017C, 6, 0x0000, 0, 0), + MX6_PAD_KEY_COL5__USB_USBOTG2_PWR = IOMUX_PAD(0x0488, 0x0180, 6, 0x0000, 0, 0), }; #endif /* __ASM_ARCH_MX6_MX6SL_PINS_H__ */ |
