diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-23 22:50:43 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-23 22:50:43 +0200 |
| commit | 3eb5e198632dcc3e03b5742d1e0ebced0ef2f551 (patch) | |
| tree | a27aa4cd22cd672e2a0730f4fa06b0f633411539 /arch/arm/cpu | |
| parent | c534d2fdcf7aa80230a0f1ed54d5e3164ba595eb (diff) | |
| parent | 358d6ef32ebddb58f074e1cb2042b910a5738b92 (diff) | |
| download | u-boot-imx-3eb5e198632dcc3e03b5742d1e0ebced0ef2f551.zip u-boot-imx-3eb5e198632dcc3e03b5742d1e0ebced0ef2f551.tar.gz u-boot-imx-3eb5e198632dcc3e03b5742d1e0ebced0ef2f551.tar.bz2 | |
Merge branch 'u-boot-sh/rmobile' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c b/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c index f49f990..46d6e60 100644 --- a/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c +++ b/arch/arm/cpu/armv7/rmobile/pfc-r8a7791.c @@ -913,7 +913,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = { /* SEL_SCIF3 [2] */ FN_SEL_SCIF3_0, FN_SEL_SCIF3_1, FN_SEL_SCIF3_2, FN_SEL_SCIF3_3, /* SEL_IEB [2] */ - FN_SEL_IEB_0, FN_SEL_IEB_1, FN_SEL_IEB_2, + FN_SEL_IEB_0, FN_SEL_IEB_1, FN_SEL_IEB_2, 0, /* SEL_MMC [1] */ FN_SEL_MMC_0, FN_SEL_MMC_1, /* SEL_SCIF5 [1] */ |