diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-09-17 03:33:07 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-09-18 23:47:27 +0900 |
| commit | b78ffc53c58431cf8b710304676f9404f2fb9dd5 (patch) | |
| tree | ede84cd2771e3b21ac25f633e74f4ebadb4bc505 /arch/arm/mach-uniphier/board_init.c | |
| parent | 68557ec37e815d4be18f16f10770d15a6f63b807 (diff) | |
| download | u-boot-imx-b78ffc53c58431cf8b710304676f9404f2fb9dd5.zip u-boot-imx-b78ffc53c58431cf8b710304676f9404f2fb9dd5.tar.gz u-boot-imx-b78ffc53c58431cf8b710304676f9404f2fb9dd5.tar.bz2 | |
ARM: uniphier: move XIRQ pin-mux settings of LD11/LD20
This is the last code in the mach-uniphier/pinctrl/ directory.
Push the remaining code out to delete the directory entirely.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch/arm/mach-uniphier/board_init.c')
| -rw-r--r-- | arch/arm/mach-uniphier/board_init.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c index 228092c..c9d3f28 100644 --- a/arch/arm/mach-uniphier/board_init.c +++ b/arch/arm/mach-uniphier/board_init.c @@ -12,6 +12,7 @@ #include "init.h" #include "micro-support-card.h" +#include "sg-regs.h" #include "soc-info.h" DECLARE_GLOBAL_DATA_PTR; @@ -112,7 +113,10 @@ int board_init(void) #if defined(CONFIG_ARCH_UNIPHIER_LD11) case SOC_UNIPHIER_LD11: uniphier_nand_pin_init(false); - uniphier_ld20_pin_init(); + sg_set_pinsel(149, 14, 8, 4); /* XIRQ0 -> XIRQ0 */ + sg_set_iectrl(149); + sg_set_pinsel(153, 14, 8, 4); /* XIRQ4 -> XIRQ4 */ + sg_set_iectrl(153); led_puts("U1"); uniphier_ld11_clk_init(); break; @@ -120,7 +124,10 @@ int board_init(void) #if defined(CONFIG_ARCH_UNIPHIER_LD20) case SOC_UNIPHIER_LD20: uniphier_nand_pin_init(false); - uniphier_ld20_pin_init(); + sg_set_pinsel(149, 14, 8, 4); /* XIRQ0 -> XIRQ0 */ + sg_set_iectrl(149); + sg_set_pinsel(153, 14, 8, 4); /* XIRQ4 -> XIRQ4 */ + sg_set_iectrl(153); led_puts("U1"); uniphier_ld20_clk_init(); cci500_init(2); |