* [U-Boot] [PATCH 0/5] ARM: uniphier: UniPhier updates for v2018.01-rc1
@ 2017-11-24 15:24 Masahiro Yamada
2017-11-24 15:24 ` [U-Boot] [PATCH 1/5] ARM: uniphier: set CONFIG_LOGLEVEL to 6 Masahiro Yamada
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Masahiro Yamada @ 2017-11-24 15:24 UTC (permalink / raw)
To: u-boot
Masahiro Yamada (5):
ARM: uniphier: set CONFIG_LOGLEVEL to 6
ARM: uniphier: remove IRQ settings
ARM: uniphier: remove XIRQ pin settings
gpio: uniphier: import dt-binginds header from Linux
ARM: dts: uniphier: Sync with Linux 4.15-rc1
arch/arm/dts/uniphier-ld11-ref.dts | 10 +++-
arch/arm/dts/uniphier-ld11.dtsi | 50 ++++++++++++++++--
arch/arm/dts/uniphier-ld20-ref.dts | 10 +++-
arch/arm/dts/uniphier-ld20.dtsi | 87 +++++++++++++++++++++++++++++++-
arch/arm/dts/uniphier-ld4-ref.dts | 10 +++-
arch/arm/dts/uniphier-ld4.dtsi | 23 +++++++--
arch/arm/dts/uniphier-ld6b-ref.dts | 10 +++-
arch/arm/dts/uniphier-pinctrl.dtsi | 52 +++++++++----------
arch/arm/dts/uniphier-pro4-ref.dts | 10 +++-
arch/arm/dts/uniphier-pro4.dtsi | 22 ++++++--
arch/arm/dts/uniphier-pro5.dtsi | 16 +++++-
arch/arm/dts/uniphier-pxs2.dtsi | 66 +++++++++++++++++++++---
arch/arm/dts/uniphier-pxs3-ref.dts | 10 +++-
arch/arm/dts/uniphier-pxs3.dtsi | 42 ++++++++++++++-
arch/arm/dts/uniphier-sld8-ref.dts | 10 +++-
arch/arm/dts/uniphier-sld8.dtsi | 23 +++++++--
arch/arm/dts/uniphier-support-card.dtsi | 3 +-
arch/arm/dts/uniphier-v7-u-boot.dtsi | 8 +--
arch/arm/mach-uniphier/board_init.c | 51 -------------------
arch/arm/mach-uniphier/sbc/sbc-ld11.c | 2 +-
arch/arm/mach-uniphier/sbc/sbc-pxs2.c | 2 +-
configs/uniphier_ld4_sld8_defconfig | 1 +
configs/uniphier_v7_defconfig | 1 +
configs/uniphier_v8_defconfig | 1 +
drivers/gpio/gpio-uniphier.c | 3 +-
include/dt-bindings/gpio/uniphier-gpio.h | 18 +++++++
26 files changed, 422 insertions(+), 119 deletions(-)
create mode 100644 include/dt-bindings/gpio/uniphier-gpio.h
--
2.7.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 1/5] ARM: uniphier: set CONFIG_LOGLEVEL to 6
2017-11-24 15:24 [U-Boot] [PATCH 0/5] ARM: uniphier: UniPhier updates for v2018.01-rc1 Masahiro Yamada
@ 2017-11-24 15:24 ` Masahiro Yamada
2017-11-24 15:24 ` [U-Boot] [PATCH 2/5] ARM: uniphier: remove IRQ settings Masahiro Yamada
2017-11-24 15:24 ` [U-Boot] [PATCH 3/5] ARM: uniphier: remove XIRQ pin settings Masahiro Yamada
2 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2017-11-24 15:24 UTC (permalink / raw)
To: u-boot
Print out KERN_NOTICE or higher level log messages.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
configs/uniphier_ld4_sld8_defconfig | 1 +
configs/uniphier_v7_defconfig | 1 +
configs/uniphier_v8_defconfig | 1 +
3 files changed, 3 insertions(+)
diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig
index 3a991d7..542cebd 100644
--- a/configs/uniphier_ld4_sld8_defconfig
+++ b/configs/uniphier_ld4_sld8_defconfig
@@ -9,6 +9,7 @@ CONFIG_ARCH_UNIPHIER_LD4_SLD8=y
CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ld4-ref"
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
+CONFIG_LOGLEVEL=6
CONFIG_SPL=y
CONFIG_SPL_NOR_SUPPORT=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/uniphier_v7_defconfig b/configs/uniphier_v7_defconfig
index b4b54c0..9082ba5 100644
--- a/configs/uniphier_v7_defconfig
+++ b/configs/uniphier_v7_defconfig
@@ -8,6 +8,7 @@ CONFIG_SPL_NAND_SUPPORT=y
CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_DEFAULT_DEVICE_TREE="uniphier-pxs2-vodka"
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
+CONFIG_LOGLEVEL=6
CONFIG_SPL=y
CONFIG_SPL_NOR_SUPPORT=y
CONFIG_HUSH_PARSER=y
diff --git a/configs/uniphier_v8_defconfig b/configs/uniphier_v8_defconfig
index bc4bbbf..746e451 100644
--- a/configs/uniphier_v8_defconfig
+++ b/configs/uniphier_v8_defconfig
@@ -7,6 +7,7 @@ CONFIG_ARCH_UNIPHIER_V8_MULTI=y
CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ld20-ref"
# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
+CONFIG_LOGLEVEL=6
CONFIG_HUSH_PARSER=y
CONFIG_CMD_CONFIG=y
CONFIG_CMD_IMLS=y
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 2/5] ARM: uniphier: remove IRQ settings
2017-11-24 15:24 [U-Boot] [PATCH 0/5] ARM: uniphier: UniPhier updates for v2018.01-rc1 Masahiro Yamada
2017-11-24 15:24 ` [U-Boot] [PATCH 1/5] ARM: uniphier: set CONFIG_LOGLEVEL to 6 Masahiro Yamada
@ 2017-11-24 15:24 ` Masahiro Yamada
2017-11-24 15:24 ` [U-Boot] [PATCH 3/5] ARM: uniphier: remove XIRQ pin settings Masahiro Yamada
2 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2017-11-24 15:24 UTC (permalink / raw)
To: u-boot
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>
---
arch/arm/mach-uniphier/board_init.c | 35 -----------------------------------
1 file changed, 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");
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 3/5] ARM: uniphier: remove XIRQ pin settings
2017-11-24 15:24 [U-Boot] [PATCH 0/5] ARM: uniphier: UniPhier updates for v2018.01-rc1 Masahiro Yamada
2017-11-24 15:24 ` [U-Boot] [PATCH 1/5] ARM: uniphier: set CONFIG_LOGLEVEL to 6 Masahiro Yamada
2017-11-24 15:24 ` [U-Boot] [PATCH 2/5] ARM: uniphier: remove IRQ settings Masahiro Yamada
@ 2017-11-24 15:24 ` Masahiro Yamada
2 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2017-11-24 15:24 UTC (permalink / raw)
To: u-boot
The XIRQ pins are now set up on the Linux side by the GPIO hogging.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/arm/mach-uniphier/board_init.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c
index 28784ea..121b786 100644
--- a/arch/arm/mach-uniphier/board_init.c
+++ b/arch/arm/mach-uniphier/board_init.c
@@ -17,24 +17,9 @@
DECLARE_GLOBAL_DATA_PTR;
-#ifdef CONFIG_ARCH_UNIPHIER_LD11
-static void uniphier_ld11_misc_init(void)
-{
- 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);
-}
-#endif
-
#ifdef CONFIG_ARCH_UNIPHIER_LD20
static void uniphier_ld20_misc_init(void)
{
- 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);
-
/* ES1 errata: increase VDD09 supply to suppress VBO noise */
if (uniphier_get_soc_revision() == 1) {
writel(0x00000003, 0x6184e004);
@@ -105,7 +90,6 @@ static const struct uniphier_initdata uniphier_initdata[] = {
.sbc_init = uniphier_ld11_sbc_init,
.pll_init = uniphier_ld11_pll_init,
.clk_init = uniphier_ld11_clk_init,
- .misc_init = uniphier_ld11_misc_init,
},
#endif
#if defined(CONFIG_ARCH_UNIPHIER_LD20)
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 3/5] ARM: uniphier: remove XIRQ pin settings
2017-11-24 15:25 [U-Boot] [PATCH 0/5] ARM: uniphier: UniPhier updates for v2018.01-rc1 Masahiro Yamada
@ 2017-11-24 15:25 ` Masahiro Yamada
0 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2017-11-24 15:25 UTC (permalink / raw)
To: u-boot
The XIRQ pins are now set up on the Linux side by the GPIO hogging.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
arch/arm/mach-uniphier/board_init.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c
index 28784ea..121b786 100644
--- a/arch/arm/mach-uniphier/board_init.c
+++ b/arch/arm/mach-uniphier/board_init.c
@@ -17,24 +17,9 @@
DECLARE_GLOBAL_DATA_PTR;
-#ifdef CONFIG_ARCH_UNIPHIER_LD11
-static void uniphier_ld11_misc_init(void)
-{
- 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);
-}
-#endif
-
#ifdef CONFIG_ARCH_UNIPHIER_LD20
static void uniphier_ld20_misc_init(void)
{
- 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);
-
/* ES1 errata: increase VDD09 supply to suppress VBO noise */
if (uniphier_get_soc_revision() == 1) {
writel(0x00000003, 0x6184e004);
@@ -105,7 +90,6 @@ static const struct uniphier_initdata uniphier_initdata[] = {
.sbc_init = uniphier_ld11_sbc_init,
.pll_init = uniphier_ld11_pll_init,
.clk_init = uniphier_ld11_clk_init,
- .misc_init = uniphier_ld11_misc_init,
},
#endif
#if defined(CONFIG_ARCH_UNIPHIER_LD20)
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-11-24 15:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-24 15:24 [U-Boot] [PATCH 0/5] ARM: uniphier: UniPhier updates for v2018.01-rc1 Masahiro Yamada
2017-11-24 15:24 ` [U-Boot] [PATCH 1/5] ARM: uniphier: set CONFIG_LOGLEVEL to 6 Masahiro Yamada
2017-11-24 15:24 ` [U-Boot] [PATCH 2/5] ARM: uniphier: remove IRQ settings Masahiro Yamada
2017-11-24 15:24 ` [U-Boot] [PATCH 3/5] ARM: uniphier: remove XIRQ pin settings Masahiro Yamada
2017-11-24 15:25 [U-Boot] [PATCH 0/5] ARM: uniphier: UniPhier updates for v2018.01-rc1 Masahiro Yamada
2017-11-24 15:25 ` [U-Boot] [PATCH 3/5] ARM: uniphier: remove XIRQ pin settings Masahiro Yamada
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.