diff options
| author | Stefano Babic <sbabic@denx.de> | 2013-04-21 11:32:19 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2013-04-21 11:32:19 +0200 |
| commit | cd53034613d7bf4a38b673f5c7c0dc2dfe0519c4 (patch) | |
| tree | 3fd9296d1c1b42ec0df3a02fa916c84729378a00 /arch/arm/cpu | |
| parent | f2e8a87305a55652488af140adcf65b1e688f287 (diff) | |
| parent | e9fd66defd7ed23e7847c418b684f42b9d427493 (diff) | |
| download | blackbird-obmc-uboot-cd53034613d7bf4a38b673f5c7c0dc2dfe0519c4.tar.gz blackbird-obmc-uboot-cd53034613d7bf4a38b673f5c7c0dc2dfe0519c4.zip | |
Merge branch 'next'
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/arm1136/mx35/iomux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/arm1136/mx35/iomux.c b/arch/arm/cpu/arm1136/mx35/iomux.c index a302575eda..698909e4a4 100644 --- a/arch/arm/cpu/arm1136/mx35/iomux.c +++ b/arch/arm/cpu/arm1136/mx35/iomux.c @@ -34,8 +34,8 @@ enum iomux_reg_addr { IOMUXSW_MUX_CTL = IOMUXC_BASE_ADDR + 4, /* MUX control */ IOMUXSW_MUX_END = IOMUXC_BASE_ADDR + 0x324, /* last MUX control */ IOMUXSW_PAD_CTL = IOMUXC_BASE_ADDR + 0x328, /* Pad control */ - IOMUXSW_PAD_END = IOMUXC_BASE_ADDR + 0x794, /* last Pad control */ - IOMUXSW_INPUT_CTL = IOMUXC_BASE_ADDR + 0x7AC, /* input select */ + IOMUXSW_PAD_END = IOMUXC_BASE_ADDR + 0x7A4, /* last Pad control */ + IOMUXSW_INPUT_CTL = IOMUXC_BASE_ADDR + 0x7A8, /* input select */ IOMUXSW_INPUT_END = IOMUXC_BASE_ADDR + 0x9F4, /* last input select */ }; |
