diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-11-25 00:25:35 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-11-29 00:29:00 +0900 |
| commit | b443fb4210cb760594ebb46899344cdda2dbb616 (patch) | |
| tree | 4762c8002257782e6337ec10617be7052b9ce2dc /arch/arm/mach-uniphier | |
| parent | e9986a4fa772f1d129725c5712e60298ee14f5b2 (diff) | |
ARM: dts: uniphier: Sync with Linux 4.15-rc1
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier')
| -rw-r--r-- | arch/arm/mach-uniphier/sbc/sbc-ld11.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-uniphier/sbc/sbc-pxs2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/sbc/sbc-ld11.c b/arch/arm/mach-uniphier/sbc/sbc-ld11.c index e6b83ff75b..d075c47d61 100644 --- a/arch/arm/mach-uniphier/sbc/sbc-ld11.c +++ b/arch/arm/mach-uniphier/sbc/sbc-ld11.c @@ -21,5 +21,5 @@ void uniphier_ld11_sbc_init(void) /* pins for NAND and System Bus are multiplexed */ if (spl_boot_device() != BOOT_DEVICE_NAND) - uniphier_pin_init("system_bus_grp"); + uniphier_pin_init("system-bus"); } diff --git a/arch/arm/mach-uniphier/sbc/sbc-pxs2.c b/arch/arm/mach-uniphier/sbc/sbc-pxs2.c index 0e0ba27bd9..9ee264628b 100644 --- a/arch/arm/mach-uniphier/sbc/sbc-pxs2.c +++ b/arch/arm/mach-uniphier/sbc/sbc-pxs2.c @@ -17,5 +17,5 @@ void uniphier_pxs2_sbc_init(void) /* system bus output enable */ writel(0x17, PC0CTRL); - uniphier_pin_init("system_bus_grp"); /* PXs3 */ + uniphier_pin_init("system-bus"); /* PXs3 */ } |