diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2013-09-25 18:41:16 -0700 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2013-10-20 23:42:40 +0200 |
| commit | 7132869d4c9e03180226146b27c8c4266ceab351 (patch) | |
| tree | 35e02e35b6daf88d5845843bc457cd5d155d3fd3 | |
| parent | b065eb7fd7f9c7364dbfc117ed4705f4dd932474 (diff) | |
| download | talos-obmc-uboot-7132869d4c9e03180226146b27c8c4266ceab351.tar.gz talos-obmc-uboot-7132869d4c9e03180226146b27c8c4266ceab351.zip | |
mx6: iomux: add GPR1 defines for use with nitrogen6x
Select GPIO1 as the USB OTG ID pin for Nitrogen6x
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/iomux.h | 6 | ||||
| -rw-r--r-- | board/boundary/nitrogen6x/nitrogen6x.c | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-mx6/iomux.h b/arch/arm/include/asm/arch-mx6/iomux.h index ff13a1ea9f..fe4675e0b7 100644 --- a/arch/arm/include/asm/arch-mx6/iomux.h +++ b/arch/arm/include/asm/arch-mx6/iomux.h @@ -10,6 +10,12 @@ #define MX6_IOMUXC_GPR7 0x020e001c /* + * IOMUXC_GPR1 bit fields + */ +#define IOMUXC_GPR1_OTG_ID_ENET_RX_ERR (0<<13) +#define IOMUXC_GPR1_OTG_ID_GPIO1 (1<<13) +#define IOMUXC_GPR1_OTG_ID_MASK (1<<13) +/* * IOMUXC_GPR13 bit fields */ #define IOMUXC_GPR13_SDMA_STOP_REQ (1<<30) diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index 17129081b7..daa3fc8478 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -706,6 +706,13 @@ int overwrite_console(void) int board_init(void) { + struct iomuxc_base_regs *const iomuxc_regs + = (struct iomuxc_base_regs *)IOMUXC_BASE_ADDR; + + clrsetbits_le32(&iomuxc_regs->gpr[1], + IOMUXC_GPR1_OTG_ID_MASK, + IOMUXC_GPR1_OTG_ID_GPIO1); + /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; |
