diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-09 16:57:03 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-09 16:57:03 +0100 |
| commit | ea33fb1a32e8e3f408b311823cabbb7453148f80 (patch) | |
| tree | a81f26a32a32e33c2a25a82423d0bcc8ad48973a /arch/arm | |
| parent | 61bdb9133593f0f881a57232039296f64bd662ed (diff) | |
| parent | bfbfab94fd0b38ca780e6dda99657b0c848c9bb9 (diff) | |
| download | u-boot-imx-ea33fb1a32e8e3f408b311823cabbb7453148f80.zip u-boot-imx-ea33fb1a32e8e3f408b311823cabbb7453148f80.tar.gz u-boot-imx-ea33fb1a32e8e3f408b311823cabbb7453148f80.tar.bz2 | |
Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-kirkwood/cpu.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-kirkwood/mpp.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c index 03eb2de..0ba6f09 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c @@ -31,7 +31,7 @@ static u32 kirkwood_variant(void) #define MPP_CTRL(i) (KW_MPP_BASE + (i* 4)) #define MPP_NR_REGS (1 + MPP_MAX/8) -void kirkwood_mpp_conf(u32 *mpp_list, u32 *mpp_save) +void kirkwood_mpp_conf(const u32 *mpp_list, u32 *mpp_save) { u32 mpp_ctrl[MPP_NR_REGS]; unsigned int variant_mask; diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h b/arch/arm/include/asm/arch-kirkwood/cpu.h index 57bfe8e..009a6bb 100644 --- a/arch/arm/include/asm/arch-kirkwood/cpu.h +++ b/arch/arm/include/asm/arch-kirkwood/cpu.h @@ -33,7 +33,7 @@ | (attr << 8) | (kw_winctrl_calcsize(size) << 16)) #define KWGBE_PORT_SERIAL_CONTROL1_REG(_x) \ - ((_x ? KW_EGIGA0_BASE : KW_EGIGA1_BASE) + 0x44c) + ((_x ? KW_EGIGA1_BASE : KW_EGIGA0_BASE) + 0x44c) #define KW_REG_PCIE_DEVID (KW_REG_PCIE_BASE + 0x00) #define KW_REG_PCIE_REVID (KW_REG_PCIE_BASE + 0x08) diff --git a/arch/arm/include/asm/arch-kirkwood/mpp.h b/arch/arm/include/asm/arch-kirkwood/mpp.h index 8ceea7b..48d1477 100644 --- a/arch/arm/include/asm/arch-kirkwood/mpp.h +++ b/arch/arm/include/asm/arch-kirkwood/mpp.h @@ -312,6 +312,6 @@ #define MPP_MAX 49 -void kirkwood_mpp_conf(u32 *mpp_list, u32 *mpp_save); +void kirkwood_mpp_conf(const u32 *mpp_list, u32 *mpp_save); #endif |