diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-09-11 20:17:48 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-09-25 00:27:53 +0900 |
| commit | 9628afa7f5cd6d752adc7bb77ea14fd639a66d03 (patch) | |
| tree | c11963a6f3ff278887b38b109a500cf2b4a6912d /arch/arm/mach-uniphier/ph1-sld3/early_pinctrl.c | |
| parent | d5ed8c5727f6985505ceb6e8640528e7e08e9670 (diff) | |
| download | talos-obmc-uboot-9628afa7f5cd6d752adc7bb77ea14fd639a66d03.tar.gz talos-obmc-uboot-9628afa7f5cd6d752adc7bb77ea14fd639a66d03.zip | |
ARM: uniphier: remove ifdef CONFIG_{SOC} conditionals from sg-regs.h
To achieve the complete run-time configuration by device trees, ifdef
conditionals in header files are not preferable.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/ph1-sld3/early_pinctrl.c')
| -rw-r--r-- | arch/arm/mach-uniphier/ph1-sld3/early_pinctrl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-uniphier/ph1-sld3/early_pinctrl.c b/arch/arm/mach-uniphier/ph1-sld3/early_pinctrl.c index f113e658d8..f6ceef5f1c 100644 --- a/arch/arm/mach-uniphier/ph1-sld3/early_pinctrl.c +++ b/arch/arm/mach-uniphier/ph1-sld3/early_pinctrl.c @@ -11,13 +11,13 @@ void early_pin_init(void) /* Comment format: PAD Name -> Function Name */ #ifdef CONFIG_UNIPHIER_SERIAL - sg_set_pinsel(63, 0); /* RXD0 */ - sg_set_pinsel(64, 1); /* TXD0 */ + sg_set_pinsel(63, 0, 4, 4); /* RXD0 */ + sg_set_pinsel(64, 1, 4, 4); /* TXD0 */ - sg_set_pinsel(65, 0); /* RXD1 */ - sg_set_pinsel(66, 1); /* TXD1 */ + sg_set_pinsel(65, 0, 4, 4); /* RXD1 */ + sg_set_pinsel(66, 1, 4, 4); /* TXD1 */ - sg_set_pinsel(96, 2); /* RXD2 */ - sg_set_pinsel(102, 2); /* TXD2 */ + sg_set_pinsel(96, 2, 4, 4); /* RXD2 */ + sg_set_pinsel(102, 2, 4, 4); /* TXD2 */ #endif } |
