diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-11-25 00:25:32 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-11-29 00:28:59 +0900 |
| commit | eadd95a97e60cca6165142a8774d7840f015a5d7 (patch) | |
| tree | d1910a7f488c5265fa8918faf6d388b4b9ccc472 | |
| parent | 53c149c3a517b6054b0936cfa2b97876b6ff0058 (diff) | |
| download | u-boot-eadd95a97e60cca6165142a8774d7840f015a5d7.zip u-boot-eadd95a97e60cca6165142a8774d7840f015a5d7.tar.gz u-boot-eadd95a97e60cca6165142a8774d7840f015a5d7.tar.bz2 | |
ARM: uniphier: remove IRQ settings
This work-around has been here in U-Boot because the AIDET and GPIO
drivers were missing in the upstream Linux. Both are now available
in Linus' tree:
- drivers/irqchip/irq-uniphier-aidet.c
- drivers/gpio/gpio-uniphier.c
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| -rw-r--r-- | arch/arm/mach-uniphier/board_init.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c index a6ee22e..28784ea 100644 --- a/arch/arm/mach-uniphier/board_init.c +++ b/arch/arm/mach-uniphier/board_init.c @@ -17,37 +17,6 @@ DECLARE_GLOBAL_DATA_PTR; -static void uniphier_setup_xirq(void) -{ - const void *fdt = gd->fdt_blob; - int soc_node, aidet_node; - const fdt32_t *val; - unsigned long aidet_base; - u32 tmp; - - soc_node = fdt_path_offset(fdt, "/soc"); - if (soc_node < 0) - return; - - aidet_node = fdt_subnode_offset_namelen(fdt, soc_node, "aidet", 5); - if (aidet_node < 0) - return; - - val = fdt_getprop(fdt, aidet_node, "reg", NULL); - if (!val) - return; - - aidet_base = fdt32_to_cpu(*val); - - tmp = readl(aidet_base + 8); /* AIDET DETCONFR2 */ - tmp |= 0x00ff0000; /* Set XIRQ0-7 low active */ - writel(tmp, aidet_base + 8); - - tmp = readl(0x55000090); /* IRQCTL */ - tmp |= 0x000000ff; - writel(tmp, 0x55000090); -} - #ifdef CONFIG_ARCH_UNIPHIER_LD11 static void uniphier_ld11_misc_init(void) { @@ -192,10 +161,6 @@ int board_init(void) led_puts("U3"); - uniphier_setup_xirq(); - - led_puts("U4"); - support_card_late_init(); led_puts("Uboo"); |