All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables
@ 2017-08-20 15:13 Marek Vasut
  2017-08-20 15:13 ` [U-Boot] [PATCH 02/12] ARM: rmobile: Add u-boot, dm-pre-reloc to clock nodes on Gen3 Marek Vasut
                   ` (11 more replies)
  0 siblings, 12 replies; 24+ messages in thread
From: Marek Vasut @ 2017-08-20 15:13 UTC (permalink / raw)
  To: u-boot

The R8A7795 and R8A7796 tables use different constants to identify
clock in DT, so split the tables and use the correct constants on
R8A7795. This fixes UART clock misconfiguration on R8A7795.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 drivers/clk/renesas/clk-rcar-gen3.c | 129 +++++++++++++++++++++++++++---------
 1 file changed, 96 insertions(+), 33 deletions(-)

diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c
index 5ea7d9a1f5..4e74856940 100644
--- a/drivers/clk/renesas/clk-rcar-gen3.c
+++ b/drivers/clk/renesas/clk-rcar-gen3.c
@@ -73,6 +73,8 @@ struct gen3_clk_priv {
 	struct clk	clk_extal;
 	struct clk	clk_extalr;
 	const struct rcar_gen3_cpg_pll_config *cpg_pll_config;
+	const struct cpg_core_clk *core_clk;
+	u32		core_clk_size;
 	const struct mssr_mod_clk *mod_clk;
 	u32		mod_clk_size;
 };
@@ -181,7 +183,7 @@ enum clk_ids {
 	MOD_CLK_BASE
 };
 
-static const struct cpg_core_clk gen3_core_clks[] = {
+static const struct cpg_core_clk r8a7795_core_clks[] = {
 	/* External Clock Inputs */
 	DEF_INPUT("extal",      CLK_EXTAL),
 	DEF_INPUT("extalr",     CLK_EXTALR),
@@ -203,38 +205,38 @@ static const struct cpg_core_clk gen3_core_clks[] = {
 	DEF_FIXED(".sdsrc",     CLK_SDSRC,         CLK_PLL1_DIV2,  2, 1),
 
 	/* Core Clock Outputs */
-	DEF_FIXED("ztr",        R8A7796_CLK_ZTR,   CLK_PLL1_DIV2,  6, 1),
-	DEF_FIXED("ztrd2",      R8A7796_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
-	DEF_FIXED("zt",         R8A7796_CLK_ZT,    CLK_PLL1_DIV2,  4, 1),
-	DEF_FIXED("zx",         R8A7796_CLK_ZX,    CLK_PLL1_DIV2,  2, 1),
-	DEF_FIXED("s0d1",       R8A7796_CLK_S0D1,  CLK_S0,         1, 1),
-	DEF_FIXED("s0d2",       R8A7796_CLK_S0D2,  CLK_S0,         2, 1),
-	DEF_FIXED("s0d3",       R8A7796_CLK_S0D3,  CLK_S0,         3, 1),
-	DEF_FIXED("s0d4",       R8A7796_CLK_S0D4,  CLK_S0,         4, 1),
-	DEF_FIXED("s0d6",       R8A7796_CLK_S0D6,  CLK_S0,         6, 1),
-	DEF_FIXED("s0d8",       R8A7796_CLK_S0D8,  CLK_S0,         8, 1),
-	DEF_FIXED("s0d12",      R8A7796_CLK_S0D12, CLK_S0,        12, 1),
-	DEF_FIXED("s1d1",       R8A7796_CLK_S1D1,  CLK_S1,         1, 1),
-	DEF_FIXED("s1d2",       R8A7796_CLK_S1D2,  CLK_S1,         2, 1),
-	DEF_FIXED("s1d4",       R8A7796_CLK_S1D4,  CLK_S1,         4, 1),
-	DEF_FIXED("s2d1",       R8A7796_CLK_S2D1,  CLK_S2,         1, 1),
-	DEF_FIXED("s2d2",       R8A7796_CLK_S2D2,  CLK_S2,         2, 1),
-	DEF_FIXED("s2d4",       R8A7796_CLK_S2D4,  CLK_S2,         4, 1),
-	DEF_FIXED("s3d1",       R8A7796_CLK_S3D1,  CLK_S3,         1, 1),
-	DEF_FIXED("s3d2",       R8A7796_CLK_S3D2,  CLK_S3,         2, 1),
-	DEF_FIXED("s3d4",       R8A7796_CLK_S3D4,  CLK_S3,         4, 1),
-
-	DEF_GEN3_SD("sd0",      R8A7796_CLK_SD0,   CLK_SDSRC,     0x074),
-	DEF_GEN3_SD("sd1",      R8A7796_CLK_SD1,   CLK_SDSRC,     0x078),
-	DEF_GEN3_SD("sd2",      R8A7796_CLK_SD2,   CLK_SDSRC,     0x268),
-	DEF_GEN3_SD("sd3",      R8A7796_CLK_SD3,   CLK_SDSRC,     0x26c),
-
-	DEF_FIXED("cl",         R8A7796_CLK_CL,    CLK_PLL1_DIV2, 48, 1),
-	DEF_FIXED("cp",         R8A7796_CLK_CP,    CLK_EXTAL,      2, 1),
+	DEF_FIXED("ztr",        R8A7795_CLK_ZTR,   CLK_PLL1_DIV2,  6, 1),
+	DEF_FIXED("ztrd2",      R8A7795_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
+	DEF_FIXED("zt",         R8A7795_CLK_ZT,    CLK_PLL1_DIV2,  4, 1),
+	DEF_FIXED("zx",         R8A7795_CLK_ZX,    CLK_PLL1_DIV2,  2, 1),
+	DEF_FIXED("s0d1",       R8A7795_CLK_S0D1,  CLK_S0,         1, 1),
+	DEF_FIXED("s0d2",       R8A7795_CLK_S0D2,  CLK_S0,         2, 1),
+	DEF_FIXED("s0d3",       R8A7795_CLK_S0D3,  CLK_S0,         3, 1),
+	DEF_FIXED("s0d4",       R8A7795_CLK_S0D4,  CLK_S0,         4, 1),
+	DEF_FIXED("s0d6",       R8A7795_CLK_S0D6,  CLK_S0,         6, 1),
+	DEF_FIXED("s0d8",       R8A7795_CLK_S0D8,  CLK_S0,         8, 1),
+	DEF_FIXED("s0d12",      R8A7795_CLK_S0D12, CLK_S0,        12, 1),
+	DEF_FIXED("s1d1",       R8A7795_CLK_S1D1,  CLK_S1,         1, 1),
+	DEF_FIXED("s1d2",       R8A7795_CLK_S1D2,  CLK_S1,         2, 1),
+	DEF_FIXED("s1d4",       R8A7795_CLK_S1D4,  CLK_S1,         4, 1),
+	DEF_FIXED("s2d1",       R8A7795_CLK_S2D1,  CLK_S2,         1, 1),
+	DEF_FIXED("s2d2",       R8A7795_CLK_S2D2,  CLK_S2,         2, 1),
+	DEF_FIXED("s2d4",       R8A7795_CLK_S2D4,  CLK_S2,         4, 1),
+	DEF_FIXED("s3d1",       R8A7795_CLK_S3D1,  CLK_S3,         1, 1),
+	DEF_FIXED("s3d2",       R8A7795_CLK_S3D2,  CLK_S3,         2, 1),
+	DEF_FIXED("s3d4",       R8A7795_CLK_S3D4,  CLK_S3,         4, 1),
+
+	DEF_GEN3_SD("sd0",      R8A7795_CLK_SD0,   CLK_SDSRC,     0x074),
+	DEF_GEN3_SD("sd1",      R8A7795_CLK_SD1,   CLK_SDSRC,     0x078),
+	DEF_GEN3_SD("sd2",      R8A7795_CLK_SD2,   CLK_SDSRC,     0x268),
+	DEF_GEN3_SD("sd3",      R8A7795_CLK_SD3,   CLK_SDSRC,     0x26c),
+
+	DEF_FIXED("cl",         R8A7795_CLK_CL,    CLK_PLL1_DIV2, 48, 1),
+	DEF_FIXED("cp",         R8A7795_CLK_CP,    CLK_EXTAL,      2, 1),
 
 	/* NOTE: HDMI, CSI, CAN etc. clock are missing */
 
-	DEF_BASE("r",           R8A7796_CLK_R,     CLK_TYPE_GEN3_R, CLK_RINT),
+	DEF_BASE("r",           R8A7795_CLK_R,     CLK_TYPE_GEN3_R, CLK_RINT),
 };
 
 static const struct mssr_mod_clk r8a7795_mod_clks[] = {
@@ -392,6 +394,62 @@ static const struct mssr_mod_clk r8a7795_mod_clks[] = {
 	DEF_MOD("scu-src0",		1031,	MOD_CLK_ID(1017)),
 };
 
+static const struct cpg_core_clk r8a7796_core_clks[] = {
+	/* External Clock Inputs */
+	DEF_INPUT("extal",      CLK_EXTAL),
+	DEF_INPUT("extalr",     CLK_EXTALR),
+
+	/* Internal Core Clocks */
+	DEF_BASE(".main",       CLK_MAIN, CLK_TYPE_GEN3_MAIN, CLK_EXTAL),
+	DEF_BASE(".pll0",       CLK_PLL0, CLK_TYPE_GEN3_PLL0, CLK_MAIN),
+	DEF_BASE(".pll1",       CLK_PLL1, CLK_TYPE_GEN3_PLL1, CLK_MAIN),
+	DEF_BASE(".pll2",       CLK_PLL2, CLK_TYPE_GEN3_PLL2, CLK_MAIN),
+	DEF_BASE(".pll3",       CLK_PLL3, CLK_TYPE_GEN3_PLL3, CLK_MAIN),
+	DEF_BASE(".pll4",       CLK_PLL4, CLK_TYPE_GEN3_PLL4, CLK_MAIN),
+
+	DEF_FIXED(".pll1_div2", CLK_PLL1_DIV2,     CLK_PLL1,       2, 1),
+	DEF_FIXED(".pll1_div4", CLK_PLL1_DIV4,     CLK_PLL1_DIV2,  2, 1),
+	DEF_FIXED(".s0",        CLK_S0,            CLK_PLL1_DIV2,  2, 1),
+	DEF_FIXED(".s1",        CLK_S1,            CLK_PLL1_DIV2,  3, 1),
+	DEF_FIXED(".s2",        CLK_S2,            CLK_PLL1_DIV2,  4, 1),
+	DEF_FIXED(".s3",        CLK_S3,            CLK_PLL1_DIV2,  6, 1),
+	DEF_FIXED(".sdsrc",     CLK_SDSRC,         CLK_PLL1_DIV2,  2, 1),
+
+	/* Core Clock Outputs */
+	DEF_FIXED("ztr",        R8A7796_CLK_ZTR,   CLK_PLL1_DIV2,  6, 1),
+	DEF_FIXED("ztrd2",      R8A7796_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
+	DEF_FIXED("zt",         R8A7796_CLK_ZT,    CLK_PLL1_DIV2,  4, 1),
+	DEF_FIXED("zx",         R8A7796_CLK_ZX,    CLK_PLL1_DIV2,  2, 1),
+	DEF_FIXED("s0d1",       R8A7796_CLK_S0D1,  CLK_S0,         1, 1),
+	DEF_FIXED("s0d2",       R8A7796_CLK_S0D2,  CLK_S0,         2, 1),
+	DEF_FIXED("s0d3",       R8A7796_CLK_S0D3,  CLK_S0,         3, 1),
+	DEF_FIXED("s0d4",       R8A7796_CLK_S0D4,  CLK_S0,         4, 1),
+	DEF_FIXED("s0d6",       R8A7796_CLK_S0D6,  CLK_S0,         6, 1),
+	DEF_FIXED("s0d8",       R8A7796_CLK_S0D8,  CLK_S0,         8, 1),
+	DEF_FIXED("s0d12",      R8A7796_CLK_S0D12, CLK_S0,        12, 1),
+	DEF_FIXED("s1d1",       R8A7796_CLK_S1D1,  CLK_S1,         1, 1),
+	DEF_FIXED("s1d2",       R8A7796_CLK_S1D2,  CLK_S1,         2, 1),
+	DEF_FIXED("s1d4",       R8A7796_CLK_S1D4,  CLK_S1,         4, 1),
+	DEF_FIXED("s2d1",       R8A7796_CLK_S2D1,  CLK_S2,         1, 1),
+	DEF_FIXED("s2d2",       R8A7796_CLK_S2D2,  CLK_S2,         2, 1),
+	DEF_FIXED("s2d4",       R8A7796_CLK_S2D4,  CLK_S2,         4, 1),
+	DEF_FIXED("s3d1",       R8A7796_CLK_S3D1,  CLK_S3,         1, 1),
+	DEF_FIXED("s3d2",       R8A7796_CLK_S3D2,  CLK_S3,         2, 1),
+	DEF_FIXED("s3d4",       R8A7796_CLK_S3D4,  CLK_S3,         4, 1),
+
+	DEF_GEN3_SD("sd0",      R8A7796_CLK_SD0,   CLK_SDSRC,     0x074),
+	DEF_GEN3_SD("sd1",      R8A7796_CLK_SD1,   CLK_SDSRC,     0x078),
+	DEF_GEN3_SD("sd2",      R8A7796_CLK_SD2,   CLK_SDSRC,     0x268),
+	DEF_GEN3_SD("sd3",      R8A7796_CLK_SD3,   CLK_SDSRC,     0x26c),
+
+	DEF_FIXED("cl",         R8A7796_CLK_CL,    CLK_PLL1_DIV2, 48, 1),
+	DEF_FIXED("cp",         R8A7796_CLK_CP,    CLK_EXTAL,      2, 1),
+
+	/* NOTE: HDMI, CSI, CAN etc. clock are missing */
+
+	DEF_BASE("r",           R8A7796_CLK_R,     CLK_TYPE_GEN3_R, CLK_RINT),
+};
+
 static const struct mssr_mod_clk r8a7796_mod_clks[] = {
 	DEF_MOD("scif5",		 202,	R8A7796_CLK_S3D4),
 	DEF_MOD("scif4",		 203,	R8A7796_CLK_S3D4),
@@ -648,17 +706,18 @@ static int gen3_clk_get_mod(struct clk *clk, const struct mssr_mod_clk **mssr)
 
 static int gen3_clk_get_core(struct clk *clk, const struct cpg_core_clk **core)
 {
+	struct gen3_clk_priv *priv = dev_get_priv(clk->dev);
 	const unsigned long clkid = clk->id & 0xffff;
 	int i;
 
 	if (gen3_clk_is_mod(clk))
 		return -EINVAL;
 
-	for (i = 0; i < ARRAY_SIZE(gen3_core_clks); i++) {
-		if (gen3_core_clks[i].id != clkid)
+	for (i = 0; i < priv->core_clk_size; i++) {
+		if (priv->core_clk[i].id != clkid)
 			continue;
 
-		*core = &gen3_core_clks[i];
+		*core = &priv->core_clk[i];
 		return 0;
 	}
 
@@ -895,6 +954,8 @@ static int gen3_clk_probe(struct udevice *dev)
 
 	switch (model) {
 	case CLK_R8A7795:
+		priv->core_clk = r8a7795_core_clks;
+		priv->core_clk_size = ARRAY_SIZE(r8a7795_core_clks);
 		priv->mod_clk = r8a7795_mod_clks;
 		priv->mod_clk_size = ARRAY_SIZE(r8a7795_mod_clks);
 		ret = fdt_node_offset_by_compatible(gd->fdt_blob, -1,
@@ -903,6 +964,8 @@ static int gen3_clk_probe(struct udevice *dev)
 			return ret;
 		break;
 	case CLK_R8A7796:
+		priv->core_clk = r8a7796_core_clks;
+		priv->core_clk_size = ARRAY_SIZE(r8a7796_core_clks);
 		priv->mod_clk = r8a7796_mod_clks;
 		priv->mod_clk_size = ARRAY_SIZE(r8a7796_mod_clks);
 		ret = fdt_node_offset_by_compatible(gd->fdt_blob, -1,
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 02/12] ARM: rmobile: Add u-boot, dm-pre-reloc to clock nodes on Gen3
  2017-08-20 15:13 [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Marek Vasut
@ 2017-08-20 15:13 ` Marek Vasut
  2017-08-25 22:21   ` Nobuhiro Iwamatsu
  2017-08-20 15:13 ` [U-Boot] [PATCH 03/12] ARM: rmobile: Enable KSZ90X1 PHY on Salvator-X Marek Vasut
                   ` (10 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Marek Vasut @ 2017-08-20 15:13 UTC (permalink / raw)
  To: u-boot

We need the clock available very early, add the u-boot,dm-pre-reloc
DT property on those nodes, so they come up very in the process.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 arch/arm/dts/r8a7795.dtsi | 4 ++++
 arch/arm/dts/r8a7796.dtsi | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/arch/arm/dts/r8a7795.dtsi b/arch/arm/dts/r8a7795.dtsi
index e99d6443b3..110d0681c8 100644
--- a/arch/arm/dts/r8a7795.dtsi
+++ b/arch/arm/dts/r8a7795.dtsi
@@ -129,6 +129,7 @@
 		#clock-cells = <0>;
 		/* This value must be overridden by the board */
 		clock-frequency = <0>;
+		u-boot,dm-pre-reloc;
 	};
 
 	extalr_clk: extalr {
@@ -136,6 +137,7 @@
 		#clock-cells = <0>;
 		/* This value must be overridden by the board */
 		clock-frequency = <0>;
+		u-boot,dm-pre-reloc;
 	};
 
 	/*
@@ -189,6 +191,7 @@
 		#address-cells = <2>;
 		#size-cells = <2>;
 		ranges;
+		u-boot,dm-pre-reloc;
 
 		gic: interrupt-controller at f1010000 {
 			compatible = "arm,gic-400";
@@ -380,6 +383,7 @@
 			#clock-cells = <2>;
 			#power-domain-cells = <0>;
 			#reset-cells = <1>;
+			u-boot,dm-pre-reloc;
 		};
 
 		rst: reset-controller at e6160000 {
diff --git a/arch/arm/dts/r8a7796.dtsi b/arch/arm/dts/r8a7796.dtsi
index 2ec1ed5f49..298df5db9f 100644
--- a/arch/arm/dts/r8a7796.dtsi
+++ b/arch/arm/dts/r8a7796.dtsi
@@ -111,6 +111,7 @@
 		#clock-cells = <0>;
 		/* This value must be overridden by the board */
 		clock-frequency = <0>;
+		u-boot,dm-pre-reloc;
 	};
 
 	extalr_clk: extalr {
@@ -118,6 +119,7 @@
 		#clock-cells = <0>;
 		/* This value must be overridden by the board */
 		clock-frequency = <0>;
+		u-boot,dm-pre-reloc;
 	};
 
 	/* External CAN clock - to be overridden by boards that provide it */
@@ -140,6 +142,7 @@
 		#address-cells = <2>;
 		#size-cells = <2>;
 		ranges;
+		u-boot,dm-pre-reloc;
 
 		gic: interrupt-controller at f1010000 {
 			compatible = "arm,gic-400";
@@ -333,6 +336,7 @@
 			#clock-cells = <2>;
 			#power-domain-cells = <0>;
 			#reset-cells = <1>;
+			u-boot,dm-pre-reloc;
 		};
 
 		rst: reset-controller at e6160000 {
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 03/12] ARM: rmobile: Enable KSZ90X1 PHY on Salvator-X
  2017-08-20 15:13 [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Marek Vasut
  2017-08-20 15:13 ` [U-Boot] [PATCH 02/12] ARM: rmobile: Add u-boot, dm-pre-reloc to clock nodes on Gen3 Marek Vasut
@ 2017-08-20 15:13 ` Marek Vasut
  2017-08-25 22:26   ` Nobuhiro Iwamatsu
  2017-08-20 15:13 ` [U-Boot] [PATCH 04/12] ARM: rmobile: Enable HUSH parser Marek Vasut
                   ` (9 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Marek Vasut @ 2017-08-20 15:13 UTC (permalink / raw)
  To: u-boot

Commit da3b9e7fd6a1 (Move PHY_MICREL and PHY_MICREL_KSZ90X1 to Kconfig)
broke ethernet support on R8A779x Salvator-X boards by disabling the
KSZ90x1 PHY in Kconfig. Reenable it.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Alexandru Gagniuc <alex.g@adaptrum.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
---
 configs/r8a7795_salvator-x_defconfig | 1 +
 configs/r8a7796_salvator-x_defconfig | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig
index f517e0e7ab..3d36698127 100644
--- a/configs/r8a7795_salvator-x_defconfig
+++ b/configs/r8a7795_salvator-x_defconfig
@@ -24,6 +24,7 @@ CONFIG_CLK=y
 CONFIG_CLK_RENESAS=y
 CONFIG_SH_SDHI=y
 CONFIG_PHY_MICREL=y
+CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_DM_ETH=y
 CONFIG_RENESAS_RAVB=y
 CONFIG_SCIF_CONSOLE=y
diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig
index 247f8785e3..10aa0bed44 100644
--- a/configs/r8a7796_salvator-x_defconfig
+++ b/configs/r8a7796_salvator-x_defconfig
@@ -25,6 +25,7 @@ CONFIG_CLK=y
 CONFIG_CLK_RENESAS=y
 CONFIG_SH_SDHI=y
 CONFIG_PHY_MICREL=y
+CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_DM_ETH=y
 CONFIG_RENESAS_RAVB=y
 CONFIG_SCIF_CONSOLE=y
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 04/12] ARM: rmobile: Enable HUSH parser
  2017-08-20 15:13 [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Marek Vasut
  2017-08-20 15:13 ` [U-Boot] [PATCH 02/12] ARM: rmobile: Add u-boot, dm-pre-reloc to clock nodes on Gen3 Marek Vasut
  2017-08-20 15:13 ` [U-Boot] [PATCH 03/12] ARM: rmobile: Enable KSZ90X1 PHY on Salvator-X Marek Vasut
@ 2017-08-20 15:13 ` Marek Vasut
  2017-08-25 22:27   ` Nobuhiro Iwamatsu
  2017-08-20 15:13 ` [U-Boot] [PATCH 05/12] ARM: rmobile: Remove RAVB probing from Salvator-X board Marek Vasut
                   ` (8 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Marek Vasut @ 2017-08-20 15:13 UTC (permalink / raw)
  To: u-boot

The HUSH parser was disabled somewhere along the way, reenable it.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Alexandru Gagniuc <alex.g@adaptrum.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
---
 configs/r8a7795_salvator-x_defconfig | 1 +
 configs/r8a7795_ulcb_defconfig       | 1 +
 configs/r8a7796_salvator-x_defconfig | 1 +
 configs/r8a7796_ulcb_defconfig       | 1 +
 4 files changed, 4 insertions(+)

diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig
index 3d36698127..d83eaf2b67 100644
--- a/configs/r8a7795_salvator-x_defconfig
+++ b/configs/r8a7795_salvator-x_defconfig
@@ -10,6 +10,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
 CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb"
 CONFIG_VERSION_VARIABLE=y
+CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MMC=y
diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig
index 8b6b03ba32..82e5942091 100644
--- a/configs/r8a7795_ulcb_defconfig
+++ b/configs/r8a7795_ulcb_defconfig
@@ -9,6 +9,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
 CONFIG_DEFAULT_FDT_FILE="r8a7795-h3ulcb.dtb"
 CONFIG_VERSION_VARIABLE=y
+CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MMC=y
diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig
index 10aa0bed44..141316127a 100644
--- a/configs/r8a7796_salvator-x_defconfig
+++ b/configs/r8a7796_salvator-x_defconfig
@@ -11,6 +11,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
 CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb"
 CONFIG_VERSION_VARIABLE=y
+CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MMC=y
diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
index bc995deea0..160bde2ef3 100644
--- a/configs/r8a7796_ulcb_defconfig
+++ b/configs/r8a7796_ulcb_defconfig
@@ -10,6 +10,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
 CONFIG_DEFAULT_FDT_FILE="r8a7796-m3ulcb.dtb"
 CONFIG_VERSION_VARIABLE=y
+CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_MMC=y
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 05/12] ARM: rmobile: Remove RAVB probing from Salvator-X board
  2017-08-20 15:13 [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Marek Vasut
                   ` (2 preceding siblings ...)
  2017-08-20 15:13 ` [U-Boot] [PATCH 04/12] ARM: rmobile: Enable HUSH parser Marek Vasut
@ 2017-08-20 15:13 ` Marek Vasut
  2017-08-25 22:22   ` Nobuhiro Iwamatsu
  2017-08-20 15:13 ` [U-Boot] [PATCH 06/12] ARM: rmobile: Remove RAVB probing from ULCB board Marek Vasut
                   ` (7 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Marek Vasut @ 2017-08-20 15:13 UTC (permalink / raw)
  To: u-boot

Drop the RAVB bit from the board since RAVB now probes from DT instead.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 board/renesas/salvator-x/salvator-x.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index 6270de4e40..ce3892da90 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -161,17 +161,6 @@ int board_init(void)
 	return 0;
 }
 
-static struct eth_pdata salvator_x_ravb_platdata = {
-	.iobase		= 0xE6800000,
-	.phy_interface	= 0,
-	.max_speed	= 1000,
-};
-
-U_BOOT_DEVICE(salvator_x_ravb) = {
-	.name		= "ravb",
-	.platdata	= &salvator_x_ravb_platdata,
-};
-
 #ifdef CONFIG_SH_SDHI
 int board_mmc_init(bd_t *bis)
 {
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 06/12] ARM: rmobile: Remove RAVB probing from ULCB board
  2017-08-20 15:13 [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Marek Vasut
                   ` (3 preceding siblings ...)
  2017-08-20 15:13 ` [U-Boot] [PATCH 05/12] ARM: rmobile: Remove RAVB probing from Salvator-X board Marek Vasut
@ 2017-08-20 15:13 ` Marek Vasut
  2017-08-25 22:22   ` Nobuhiro Iwamatsu
  2017-08-20 15:13 ` [U-Boot] [PATCH 07/12] ARM: rmobile: Remove Serial SH probing from Salvator-X board Marek Vasut
                   ` (6 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Marek Vasut @ 2017-08-20 15:13 UTC (permalink / raw)
  To: u-boot

Drop the RAVB bit from the board since RAVB now probes from DT instead.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 board/renesas/ulcb/ulcb.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 4005ec8ad5..e249bd27d4 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -140,17 +140,6 @@ int board_init(void)
 	return 0;
 }
 
-static struct eth_pdata salvator_x_ravb_platdata = {
-	.iobase		= 0xE6800000,
-	.phy_interface	= 0,
-	.max_speed	= 1000,
-};
-
-U_BOOT_DEVICE(salvator_x_ravb) = {
-	.name		= "ravb",
-	.platdata	= &salvator_x_ravb_platdata,
-};
-
 #ifdef CONFIG_SH_SDHI
 int board_mmc_init(bd_t *bis)
 {
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 07/12] ARM: rmobile: Remove Serial SH probing from Salvator-X board
  2017-08-20 15:13 [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Marek Vasut
                   ` (4 preceding siblings ...)
  2017-08-20 15:13 ` [U-Boot] [PATCH 06/12] ARM: rmobile: Remove RAVB probing from ULCB board Marek Vasut
@ 2017-08-20 15:13 ` Marek Vasut
  2017-08-25 22:23   ` Nobuhiro Iwamatsu
  2017-08-20 15:13 ` [U-Boot] [PATCH 08/12] ARM: rmobile: Remove Serial SH probing from ULCB board Marek Vasut
                   ` (5 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Marek Vasut @ 2017-08-20 15:13 UTC (permalink / raw)
  To: u-boot

Drop the Serial SH bit from the board since UART now probes from DT instead.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 board/renesas/salvator-x/salvator-x.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index ce3892da90..4ed80f5493 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -300,15 +300,3 @@ void reset_cpu(ulong addr)
 	writel(RST_CODE, RST_CA57RESCNT);
 #endif
 }
-
-static const struct sh_serial_platdata serial_platdata = {
-	.base = SCIF2_BASE,
-	.type = PORT_SCIF,
-	.clk = CONFIG_SH_SCIF_CLK_FREQ,
-	.clk_mode = INT_CLK,
-};
-
-U_BOOT_DEVICE(salvator_x_scif2) = {
-	.name = "serial_sh",
-	.platdata = &serial_platdata,
-};
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 08/12] ARM: rmobile: Remove Serial SH probing from ULCB board
  2017-08-20 15:13 [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Marek Vasut
                   ` (5 preceding siblings ...)
  2017-08-20 15:13 ` [U-Boot] [PATCH 07/12] ARM: rmobile: Remove Serial SH probing from Salvator-X board Marek Vasut
@ 2017-08-20 15:13 ` Marek Vasut
  2017-08-25 22:23   ` Nobuhiro Iwamatsu
  2017-08-20 15:13 ` [U-Boot] [PATCH 09/12] ARM: rmobile: Remove SH SDHI probing from Salvator-X board Marek Vasut
                   ` (4 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Marek Vasut @ 2017-08-20 15:13 UTC (permalink / raw)
  To: u-boot

Drop the Serial SH bit from the board since UART now probes from DT instead.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 board/renesas/ulcb/ulcb.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index e249bd27d4..6b080311d0 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -232,15 +232,3 @@ int dram_init_banksize(void)
 const struct rmobile_sysinfo sysinfo = {
 	CONFIG_RCAR_BOARD_STRING
 };
-
-static const struct sh_serial_platdata serial_platdata = {
-	.base = SCIF2_BASE,
-	.type = PORT_SCIF,
-	.clk = CONFIG_SH_SCIF_CLK_FREQ,
-	.clk_mode = INT_CLK,
-};
-
-U_BOOT_DEVICE(salvator_x_scif2) = {
-	.name = "serial_sh",
-	.platdata = &serial_platdata,
-};
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 09/12] ARM: rmobile: Remove SH SDHI probing from Salvator-X board
  2017-08-20 15:13 [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Marek Vasut
                   ` (6 preceding siblings ...)
  2017-08-20 15:13 ` [U-Boot] [PATCH 08/12] ARM: rmobile: Remove Serial SH probing from ULCB board Marek Vasut
@ 2017-08-20 15:13 ` Marek Vasut
  2017-08-25 22:23   ` Nobuhiro Iwamatsu
  2017-08-20 15:13 ` [U-Boot] [PATCH 10/12] ARM: rmobile: Remove SH SDHI probing from ULCB board Marek Vasut
                   ` (3 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Marek Vasut @ 2017-08-20 15:13 UTC (permalink / raw)
  To: u-boot

Drop the SH SDHI bit from the board since SD now probes from DT instead.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 board/renesas/salvator-x/salvator-x.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index 4ed80f5493..a09cd56d66 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -164,8 +164,6 @@ int board_init(void)
 #ifdef CONFIG_SH_SDHI
 int board_mmc_init(bd_t *bis)
 {
-	int ret = -ENODEV;
-
 	/* SDHI0 */
 	gpio_request(GPIO_GFN_SD0_DAT0, NULL);
 	gpio_request(GPIO_GFN_SD0_DAT1, NULL);
@@ -181,11 +179,6 @@ int board_mmc_init(bd_t *bis)
 	gpio_direction_output(GPIO_GP_5_2, 1);	/* power on */
 	gpio_direction_output(GPIO_GP_5_1, 1);	/* 1: 3.3V, 0: 1.8V */
 
-	ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI0_BASE, 0,
-			   SH_SDHI_QUIRK_64BIT_BUF);
-	if (ret)
-		return ret;
-
 	/* SDHI1/SDHI2 eMMC */
 	gpio_request(GPIO_GFN_SD1_DAT0, NULL);
 	gpio_request(GPIO_GFN_SD1_DAT1, NULL);
@@ -208,11 +201,6 @@ int board_mmc_init(bd_t *bis)
 	gpio_direction_output(GPIO_GP_5_3, 0);	/* 1: 3.3V, 0: 1.8V */
 	gpio_direction_output(GPIO_GP_5_9, 0);	/* 1: 3.3V, 0: 1.8V */
 
-	ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI2_BASE, 1,
-			   SH_SDHI_QUIRK_64BIT_BUF);
-	if (ret)
-		return ret;
-
 #if defined(CONFIG_R8A7795)
 	/* SDHI3 */
 	gpio_request(GPIO_GFN_SD3_DAT0, NULL);	/* GP_4_9 */
@@ -240,9 +228,7 @@ int board_mmc_init(bd_t *bis)
 	gpio_direction_output(GPIO_GP_3_15, 1);	/* power on */
 	gpio_direction_output(GPIO_GP_3_14, 1);	/* 1: 3.3V, 0: 1.8V */
 
-	ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI3_BASE, 2,
-			   SH_SDHI_QUIRK_64BIT_BUF);
-	return ret;
+	return 0;
 }
 #endif
 
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 10/12] ARM: rmobile: Remove SH SDHI probing from ULCB board
  2017-08-20 15:13 [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Marek Vasut
                   ` (7 preceding siblings ...)
  2017-08-20 15:13 ` [U-Boot] [PATCH 09/12] ARM: rmobile: Remove SH SDHI probing from Salvator-X board Marek Vasut
@ 2017-08-20 15:13 ` Marek Vasut
  2017-08-25 22:23   ` Nobuhiro Iwamatsu
  2017-08-20 15:13 ` [U-Boot] [PATCH 11/12] ARM: rmobile: Enable MMC and USB DM on Salvator-X Marek Vasut
                   ` (2 subsequent siblings)
  11 siblings, 1 reply; 24+ messages in thread
From: Marek Vasut @ 2017-08-20 15:13 UTC (permalink / raw)
  To: u-boot

Drop the SH SDHI bit from the board since SD now probes from DT instead.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 board/renesas/ulcb/ulcb.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 6b080311d0..068cbdea03 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -143,8 +143,6 @@ int board_init(void)
 #ifdef CONFIG_SH_SDHI
 int board_mmc_init(bd_t *bis)
 {
-	int ret = -ENODEV;
-
 	/* SDHI0 */
 	gpio_request(GPIO_GFN_SD0_DAT0, NULL);
 	gpio_request(GPIO_GFN_SD0_DAT1, NULL);
@@ -160,11 +158,6 @@ int board_mmc_init(bd_t *bis)
 	gpio_direction_output(GPIO_GP_5_2, 1);	/* power on */
 	gpio_direction_output(GPIO_GP_5_1, 1);	/* 1: 3.3V, 0: 1.8V */
 
-	ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI0_BASE, 0,
-			   SH_SDHI_QUIRK_64BIT_BUF);
-	if (ret)
-		return ret;
-
 	/* SDHI1/SDHI2 eMMC */
 	gpio_request(GPIO_GFN_SD1_DAT0, NULL);
 	gpio_request(GPIO_GFN_SD1_DAT1, NULL);
@@ -187,10 +180,7 @@ int board_mmc_init(bd_t *bis)
 	gpio_direction_output(GPIO_GP_5_3, 0);	/* 1: 3.3V, 0: 1.8V */
 	gpio_direction_output(GPIO_GP_5_9, 0);	/* 1: 3.3V, 0: 1.8V */
 
-	ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI2_BASE, 1,
-			   SH_SDHI_QUIRK_64BIT_BUF);
-
-	return ret;
+	return 0;
 }
 #endif
 
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 11/12] ARM: rmobile: Enable MMC and USB DM on Salvator-X
  2017-08-20 15:13 [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Marek Vasut
                   ` (8 preceding siblings ...)
  2017-08-20 15:13 ` [U-Boot] [PATCH 10/12] ARM: rmobile: Remove SH SDHI probing from ULCB board Marek Vasut
@ 2017-08-20 15:13 ` Marek Vasut
  2017-08-25 22:24   ` Nobuhiro Iwamatsu
  2017-08-20 15:13 ` [U-Boot] [PATCH 12/12] ARM: rmobile: Enable MMC and USB DM on ULCB Marek Vasut
  2017-08-25 22:20 ` [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Nobuhiro Iwamatsu
  11 siblings, 1 reply; 24+ messages in thread
From: Marek Vasut @ 2017-08-20 15:13 UTC (permalink / raw)
  To: u-boot

Enable the MMC and USB DM on the board since it's the modern method
and now supported by the drivers.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 configs/r8a7795_salvator-x_defconfig | 2 ++
 configs/r8a7796_salvator-x_defconfig | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig
index d83eaf2b67..d53504a5bb 100644
--- a/configs/r8a7795_salvator-x_defconfig
+++ b/configs/r8a7795_salvator-x_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_CLK=y
 CONFIG_CLK_RENESAS=y
+CONFIG_DM_MMC=y
 CONFIG_SH_SDHI=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
@@ -30,6 +31,7 @@ CONFIG_DM_ETH=y
 CONFIG_RENESAS_RAVB=y
 CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_SMBIOS_MANUFACTURER=""
diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig
index 141316127a..d18bf2e965 100644
--- a/configs/r8a7796_salvator-x_defconfig
+++ b/configs/r8a7796_salvator-x_defconfig
@@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_CLK=y
 CONFIG_CLK_RENESAS=y
+CONFIG_DM_MMC=y
 CONFIG_SH_SDHI=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
@@ -31,6 +32,7 @@ CONFIG_DM_ETH=y
 CONFIG_RENESAS_RAVB=y
 CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_SMBIOS_MANUFACTURER=""
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 12/12] ARM: rmobile: Enable MMC and USB DM on ULCB
  2017-08-20 15:13 [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Marek Vasut
                   ` (9 preceding siblings ...)
  2017-08-20 15:13 ` [U-Boot] [PATCH 11/12] ARM: rmobile: Enable MMC and USB DM on Salvator-X Marek Vasut
@ 2017-08-20 15:13 ` Marek Vasut
  2017-08-25 22:24   ` Nobuhiro Iwamatsu
  2017-08-25 22:20 ` [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Nobuhiro Iwamatsu
  11 siblings, 1 reply; 24+ messages in thread
From: Marek Vasut @ 2017-08-20 15:13 UTC (permalink / raw)
  To: u-boot

Enable the MMC and USB DM on the board since it's the modern method
and now supported by the drivers.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 configs/r8a7795_ulcb_defconfig | 2 ++
 configs/r8a7796_ulcb_defconfig | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig
index 82e5942091..42913dffaf 100644
--- a/configs/r8a7795_ulcb_defconfig
+++ b/configs/r8a7795_ulcb_defconfig
@@ -21,11 +21,13 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_CLK=y
 CONFIG_CLK_RENESAS=y
+CONFIG_DM_MMC=y
 CONFIG_SH_SDHI=y
 CONFIG_DM_ETH=y
 CONFIG_RENESAS_RAVB=y
 CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_SMBIOS_MANUFACTURER=""
diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
index 160bde2ef3..e5f560612b 100644
--- a/configs/r8a7796_ulcb_defconfig
+++ b/configs/r8a7796_ulcb_defconfig
@@ -22,11 +22,13 @@ CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_CLK=y
 CONFIG_CLK_RENESAS=y
+CONFIG_DM_MMC=y
 CONFIG_SH_SDHI=y
 CONFIG_DM_ETH=y
 CONFIG_RENESAS_RAVB=y
 CONFIG_SCIF_CONSOLE=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_SMBIOS_MANUFACTURER=""
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables
  2017-08-20 15:13 [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Marek Vasut
                   ` (10 preceding siblings ...)
  2017-08-20 15:13 ` [U-Boot] [PATCH 12/12] ARM: rmobile: Enable MMC and USB DM on ULCB Marek Vasut
@ 2017-08-25 22:20 ` Nobuhiro Iwamatsu
  11 siblings, 0 replies; 24+ messages in thread
From: Nobuhiro Iwamatsu @ 2017-08-25 22:20 UTC (permalink / raw)
  To: u-boot

Hi,

2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:
> The R8A7795 and R8A7796 tables use different constants to identify
> clock in DT, so split the tables and use the correct constants on
> R8A7795. This fixes UART clock misconfiguration on R8A7795.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> ---
>  drivers/clk/renesas/clk-rcar-gen3.c | 129 +++++++++++++++++++++++++++---------
>  1 file changed, 96 insertions(+), 33 deletions(-)

Applied, thanks.

Best regards,
  Nobuhiro

>
> diff --git a/drivers/clk/renesas/clk-rcar-gen3.c b/drivers/clk/renesas/clk-rcar-gen3.c
> index 5ea7d9a1f5..4e74856940 100644
> --- a/drivers/clk/renesas/clk-rcar-gen3.c
> +++ b/drivers/clk/renesas/clk-rcar-gen3.c
> @@ -73,6 +73,8 @@ struct gen3_clk_priv {
>         struct clk      clk_extal;
>         struct clk      clk_extalr;
>         const struct rcar_gen3_cpg_pll_config *cpg_pll_config;
> +       const struct cpg_core_clk *core_clk;
> +       u32             core_clk_size;
>         const struct mssr_mod_clk *mod_clk;
>         u32             mod_clk_size;
>  };
> @@ -181,7 +183,7 @@ enum clk_ids {
>         MOD_CLK_BASE
>  };
>
> -static const struct cpg_core_clk gen3_core_clks[] = {
> +static const struct cpg_core_clk r8a7795_core_clks[] = {
>         /* External Clock Inputs */
>         DEF_INPUT("extal",      CLK_EXTAL),
>         DEF_INPUT("extalr",     CLK_EXTALR),
> @@ -203,38 +205,38 @@ static const struct cpg_core_clk gen3_core_clks[] = {
>         DEF_FIXED(".sdsrc",     CLK_SDSRC,         CLK_PLL1_DIV2,  2, 1),
>
>         /* Core Clock Outputs */
> -       DEF_FIXED("ztr",        R8A7796_CLK_ZTR,   CLK_PLL1_DIV2,  6, 1),
> -       DEF_FIXED("ztrd2",      R8A7796_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
> -       DEF_FIXED("zt",         R8A7796_CLK_ZT,    CLK_PLL1_DIV2,  4, 1),
> -       DEF_FIXED("zx",         R8A7796_CLK_ZX,    CLK_PLL1_DIV2,  2, 1),
> -       DEF_FIXED("s0d1",       R8A7796_CLK_S0D1,  CLK_S0,         1, 1),
> -       DEF_FIXED("s0d2",       R8A7796_CLK_S0D2,  CLK_S0,         2, 1),
> -       DEF_FIXED("s0d3",       R8A7796_CLK_S0D3,  CLK_S0,         3, 1),
> -       DEF_FIXED("s0d4",       R8A7796_CLK_S0D4,  CLK_S0,         4, 1),
> -       DEF_FIXED("s0d6",       R8A7796_CLK_S0D6,  CLK_S0,         6, 1),
> -       DEF_FIXED("s0d8",       R8A7796_CLK_S0D8,  CLK_S0,         8, 1),
> -       DEF_FIXED("s0d12",      R8A7796_CLK_S0D12, CLK_S0,        12, 1),
> -       DEF_FIXED("s1d1",       R8A7796_CLK_S1D1,  CLK_S1,         1, 1),
> -       DEF_FIXED("s1d2",       R8A7796_CLK_S1D2,  CLK_S1,         2, 1),
> -       DEF_FIXED("s1d4",       R8A7796_CLK_S1D4,  CLK_S1,         4, 1),
> -       DEF_FIXED("s2d1",       R8A7796_CLK_S2D1,  CLK_S2,         1, 1),
> -       DEF_FIXED("s2d2",       R8A7796_CLK_S2D2,  CLK_S2,         2, 1),
> -       DEF_FIXED("s2d4",       R8A7796_CLK_S2D4,  CLK_S2,         4, 1),
> -       DEF_FIXED("s3d1",       R8A7796_CLK_S3D1,  CLK_S3,         1, 1),
> -       DEF_FIXED("s3d2",       R8A7796_CLK_S3D2,  CLK_S3,         2, 1),
> -       DEF_FIXED("s3d4",       R8A7796_CLK_S3D4,  CLK_S3,         4, 1),
> -
> -       DEF_GEN3_SD("sd0",      R8A7796_CLK_SD0,   CLK_SDSRC,     0x074),
> -       DEF_GEN3_SD("sd1",      R8A7796_CLK_SD1,   CLK_SDSRC,     0x078),
> -       DEF_GEN3_SD("sd2",      R8A7796_CLK_SD2,   CLK_SDSRC,     0x268),
> -       DEF_GEN3_SD("sd3",      R8A7796_CLK_SD3,   CLK_SDSRC,     0x26c),
> -
> -       DEF_FIXED("cl",         R8A7796_CLK_CL,    CLK_PLL1_DIV2, 48, 1),
> -       DEF_FIXED("cp",         R8A7796_CLK_CP,    CLK_EXTAL,      2, 1),
> +       DEF_FIXED("ztr",        R8A7795_CLK_ZTR,   CLK_PLL1_DIV2,  6, 1),
> +       DEF_FIXED("ztrd2",      R8A7795_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
> +       DEF_FIXED("zt",         R8A7795_CLK_ZT,    CLK_PLL1_DIV2,  4, 1),
> +       DEF_FIXED("zx",         R8A7795_CLK_ZX,    CLK_PLL1_DIV2,  2, 1),
> +       DEF_FIXED("s0d1",       R8A7795_CLK_S0D1,  CLK_S0,         1, 1),
> +       DEF_FIXED("s0d2",       R8A7795_CLK_S0D2,  CLK_S0,         2, 1),
> +       DEF_FIXED("s0d3",       R8A7795_CLK_S0D3,  CLK_S0,         3, 1),
> +       DEF_FIXED("s0d4",       R8A7795_CLK_S0D4,  CLK_S0,         4, 1),
> +       DEF_FIXED("s0d6",       R8A7795_CLK_S0D6,  CLK_S0,         6, 1),
> +       DEF_FIXED("s0d8",       R8A7795_CLK_S0D8,  CLK_S0,         8, 1),
> +       DEF_FIXED("s0d12",      R8A7795_CLK_S0D12, CLK_S0,        12, 1),
> +       DEF_FIXED("s1d1",       R8A7795_CLK_S1D1,  CLK_S1,         1, 1),
> +       DEF_FIXED("s1d2",       R8A7795_CLK_S1D2,  CLK_S1,         2, 1),
> +       DEF_FIXED("s1d4",       R8A7795_CLK_S1D4,  CLK_S1,         4, 1),
> +       DEF_FIXED("s2d1",       R8A7795_CLK_S2D1,  CLK_S2,         1, 1),
> +       DEF_FIXED("s2d2",       R8A7795_CLK_S2D2,  CLK_S2,         2, 1),
> +       DEF_FIXED("s2d4",       R8A7795_CLK_S2D4,  CLK_S2,         4, 1),
> +       DEF_FIXED("s3d1",       R8A7795_CLK_S3D1,  CLK_S3,         1, 1),
> +       DEF_FIXED("s3d2",       R8A7795_CLK_S3D2,  CLK_S3,         2, 1),
> +       DEF_FIXED("s3d4",       R8A7795_CLK_S3D4,  CLK_S3,         4, 1),
> +
> +       DEF_GEN3_SD("sd0",      R8A7795_CLK_SD0,   CLK_SDSRC,     0x074),
> +       DEF_GEN3_SD("sd1",      R8A7795_CLK_SD1,   CLK_SDSRC,     0x078),
> +       DEF_GEN3_SD("sd2",      R8A7795_CLK_SD2,   CLK_SDSRC,     0x268),
> +       DEF_GEN3_SD("sd3",      R8A7795_CLK_SD3,   CLK_SDSRC,     0x26c),
> +
> +       DEF_FIXED("cl",         R8A7795_CLK_CL,    CLK_PLL1_DIV2, 48, 1),
> +       DEF_FIXED("cp",         R8A7795_CLK_CP,    CLK_EXTAL,      2, 1),
>
>         /* NOTE: HDMI, CSI, CAN etc. clock are missing */
>
> -       DEF_BASE("r",           R8A7796_CLK_R,     CLK_TYPE_GEN3_R, CLK_RINT),
> +       DEF_BASE("r",           R8A7795_CLK_R,     CLK_TYPE_GEN3_R, CLK_RINT),
>  };
>
>  static const struct mssr_mod_clk r8a7795_mod_clks[] = {
> @@ -392,6 +394,62 @@ static const struct mssr_mod_clk r8a7795_mod_clks[] = {
>         DEF_MOD("scu-src0",             1031,   MOD_CLK_ID(1017)),
>  };
>
> +static const struct cpg_core_clk r8a7796_core_clks[] = {
> +       /* External Clock Inputs */
> +       DEF_INPUT("extal",      CLK_EXTAL),
> +       DEF_INPUT("extalr",     CLK_EXTALR),
> +
> +       /* Internal Core Clocks */
> +       DEF_BASE(".main",       CLK_MAIN, CLK_TYPE_GEN3_MAIN, CLK_EXTAL),
> +       DEF_BASE(".pll0",       CLK_PLL0, CLK_TYPE_GEN3_PLL0, CLK_MAIN),
> +       DEF_BASE(".pll1",       CLK_PLL1, CLK_TYPE_GEN3_PLL1, CLK_MAIN),
> +       DEF_BASE(".pll2",       CLK_PLL2, CLK_TYPE_GEN3_PLL2, CLK_MAIN),
> +       DEF_BASE(".pll3",       CLK_PLL3, CLK_TYPE_GEN3_PLL3, CLK_MAIN),
> +       DEF_BASE(".pll4",       CLK_PLL4, CLK_TYPE_GEN3_PLL4, CLK_MAIN),
> +
> +       DEF_FIXED(".pll1_div2", CLK_PLL1_DIV2,     CLK_PLL1,       2, 1),
> +       DEF_FIXED(".pll1_div4", CLK_PLL1_DIV4,     CLK_PLL1_DIV2,  2, 1),
> +       DEF_FIXED(".s0",        CLK_S0,            CLK_PLL1_DIV2,  2, 1),
> +       DEF_FIXED(".s1",        CLK_S1,            CLK_PLL1_DIV2,  3, 1),
> +       DEF_FIXED(".s2",        CLK_S2,            CLK_PLL1_DIV2,  4, 1),
> +       DEF_FIXED(".s3",        CLK_S3,            CLK_PLL1_DIV2,  6, 1),
> +       DEF_FIXED(".sdsrc",     CLK_SDSRC,         CLK_PLL1_DIV2,  2, 1),
> +
> +       /* Core Clock Outputs */
> +       DEF_FIXED("ztr",        R8A7796_CLK_ZTR,   CLK_PLL1_DIV2,  6, 1),
> +       DEF_FIXED("ztrd2",      R8A7796_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
> +       DEF_FIXED("zt",         R8A7796_CLK_ZT,    CLK_PLL1_DIV2,  4, 1),
> +       DEF_FIXED("zx",         R8A7796_CLK_ZX,    CLK_PLL1_DIV2,  2, 1),
> +       DEF_FIXED("s0d1",       R8A7796_CLK_S0D1,  CLK_S0,         1, 1),
> +       DEF_FIXED("s0d2",       R8A7796_CLK_S0D2,  CLK_S0,         2, 1),
> +       DEF_FIXED("s0d3",       R8A7796_CLK_S0D3,  CLK_S0,         3, 1),
> +       DEF_FIXED("s0d4",       R8A7796_CLK_S0D4,  CLK_S0,         4, 1),
> +       DEF_FIXED("s0d6",       R8A7796_CLK_S0D6,  CLK_S0,         6, 1),
> +       DEF_FIXED("s0d8",       R8A7796_CLK_S0D8,  CLK_S0,         8, 1),
> +       DEF_FIXED("s0d12",      R8A7796_CLK_S0D12, CLK_S0,        12, 1),
> +       DEF_FIXED("s1d1",       R8A7796_CLK_S1D1,  CLK_S1,         1, 1),
> +       DEF_FIXED("s1d2",       R8A7796_CLK_S1D2,  CLK_S1,         2, 1),
> +       DEF_FIXED("s1d4",       R8A7796_CLK_S1D4,  CLK_S1,         4, 1),
> +       DEF_FIXED("s2d1",       R8A7796_CLK_S2D1,  CLK_S2,         1, 1),
> +       DEF_FIXED("s2d2",       R8A7796_CLK_S2D2,  CLK_S2,         2, 1),
> +       DEF_FIXED("s2d4",       R8A7796_CLK_S2D4,  CLK_S2,         4, 1),
> +       DEF_FIXED("s3d1",       R8A7796_CLK_S3D1,  CLK_S3,         1, 1),
> +       DEF_FIXED("s3d2",       R8A7796_CLK_S3D2,  CLK_S3,         2, 1),
> +       DEF_FIXED("s3d4",       R8A7796_CLK_S3D4,  CLK_S3,         4, 1),
> +
> +       DEF_GEN3_SD("sd0",      R8A7796_CLK_SD0,   CLK_SDSRC,     0x074),
> +       DEF_GEN3_SD("sd1",      R8A7796_CLK_SD1,   CLK_SDSRC,     0x078),
> +       DEF_GEN3_SD("sd2",      R8A7796_CLK_SD2,   CLK_SDSRC,     0x268),
> +       DEF_GEN3_SD("sd3",      R8A7796_CLK_SD3,   CLK_SDSRC,     0x26c),
> +
> +       DEF_FIXED("cl",         R8A7796_CLK_CL,    CLK_PLL1_DIV2, 48, 1),
> +       DEF_FIXED("cp",         R8A7796_CLK_CP,    CLK_EXTAL,      2, 1),
> +
> +       /* NOTE: HDMI, CSI, CAN etc. clock are missing */
> +
> +       DEF_BASE("r",           R8A7796_CLK_R,     CLK_TYPE_GEN3_R, CLK_RINT),
> +};
> +
>  static const struct mssr_mod_clk r8a7796_mod_clks[] = {
>         DEF_MOD("scif5",                 202,   R8A7796_CLK_S3D4),
>         DEF_MOD("scif4",                 203,   R8A7796_CLK_S3D4),
> @@ -648,17 +706,18 @@ static int gen3_clk_get_mod(struct clk *clk, const struct mssr_mod_clk **mssr)
>
>  static int gen3_clk_get_core(struct clk *clk, const struct cpg_core_clk **core)
>  {
> +       struct gen3_clk_priv *priv = dev_get_priv(clk->dev);
>         const unsigned long clkid = clk->id & 0xffff;
>         int i;
>
>         if (gen3_clk_is_mod(clk))
>                 return -EINVAL;
>
> -       for (i = 0; i < ARRAY_SIZE(gen3_core_clks); i++) {
> -               if (gen3_core_clks[i].id != clkid)
> +       for (i = 0; i < priv->core_clk_size; i++) {
> +               if (priv->core_clk[i].id != clkid)
>                         continue;
>
> -               *core = &gen3_core_clks[i];
> +               *core = &priv->core_clk[i];
>                 return 0;
>         }
>
> @@ -895,6 +954,8 @@ static int gen3_clk_probe(struct udevice *dev)
>
>         switch (model) {
>         case CLK_R8A7795:
> +               priv->core_clk = r8a7795_core_clks;
> +               priv->core_clk_size = ARRAY_SIZE(r8a7795_core_clks);
>                 priv->mod_clk = r8a7795_mod_clks;
>                 priv->mod_clk_size = ARRAY_SIZE(r8a7795_mod_clks);
>                 ret = fdt_node_offset_by_compatible(gd->fdt_blob, -1,
> @@ -903,6 +964,8 @@ static int gen3_clk_probe(struct udevice *dev)
>                         return ret;
>                 break;
>         case CLK_R8A7796:
> +               priv->core_clk = r8a7796_core_clks;
> +               priv->core_clk_size = ARRAY_SIZE(r8a7796_core_clks);
>                 priv->mod_clk = r8a7796_mod_clks;
>                 priv->mod_clk_size = ARRAY_SIZE(r8a7796_mod_clks);
>                 ret = fdt_node_offset_by_compatible(gd->fdt_blob, -1,
> --
> 2.11.0
>



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6

^ permalink raw reply	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 02/12] ARM: rmobile: Add u-boot, dm-pre-reloc to clock nodes on Gen3
  2017-08-20 15:13 ` [U-Boot] [PATCH 02/12] ARM: rmobile: Add u-boot, dm-pre-reloc to clock nodes on Gen3 Marek Vasut
@ 2017-08-25 22:21   ` Nobuhiro Iwamatsu
  0 siblings, 0 replies; 24+ messages in thread
From: Nobuhiro Iwamatsu @ 2017-08-25 22:21 UTC (permalink / raw)
  To: u-boot

Hi,

2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:
> We need the clock available very early, add the u-boot,dm-pre-reloc
> DT property on those nodes, so they come up very in the process.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> ---
>  arch/arm/dts/r8a7795.dtsi | 4 ++++
>  arch/arm/dts/r8a7796.dtsi | 4 ++++
>  2 files changed, 8 insertions(+)

Applied, thanks.

Best regards,
  Nobuhiro

>
> diff --git a/arch/arm/dts/r8a7795.dtsi b/arch/arm/dts/r8a7795.dtsi
> index e99d6443b3..110d0681c8 100644
> --- a/arch/arm/dts/r8a7795.dtsi
> +++ b/arch/arm/dts/r8a7795.dtsi
> @@ -129,6 +129,7 @@
>                 #clock-cells = <0>;
>                 /* This value must be overridden by the board */
>                 clock-frequency = <0>;
> +               u-boot,dm-pre-reloc;
>         };
>
>         extalr_clk: extalr {
> @@ -136,6 +137,7 @@
>                 #clock-cells = <0>;
>                 /* This value must be overridden by the board */
>                 clock-frequency = <0>;
> +               u-boot,dm-pre-reloc;
>         };
>
>         /*
> @@ -189,6 +191,7 @@
>                 #address-cells = <2>;
>                 #size-cells = <2>;
>                 ranges;
> +               u-boot,dm-pre-reloc;
>
>                 gic: interrupt-controller at f1010000 {
>                         compatible = "arm,gic-400";
> @@ -380,6 +383,7 @@
>                         #clock-cells = <2>;
>                         #power-domain-cells = <0>;
>                         #reset-cells = <1>;
> +                       u-boot,dm-pre-reloc;
>                 };
>
>                 rst: reset-controller at e6160000 {
> diff --git a/arch/arm/dts/r8a7796.dtsi b/arch/arm/dts/r8a7796.dtsi
> index 2ec1ed5f49..298df5db9f 100644
> --- a/arch/arm/dts/r8a7796.dtsi
> +++ b/arch/arm/dts/r8a7796.dtsi
> @@ -111,6 +111,7 @@
>                 #clock-cells = <0>;
>                 /* This value must be overridden by the board */
>                 clock-frequency = <0>;
> +               u-boot,dm-pre-reloc;
>         };
>
>         extalr_clk: extalr {
> @@ -118,6 +119,7 @@
>                 #clock-cells = <0>;
>                 /* This value must be overridden by the board */
>                 clock-frequency = <0>;
> +               u-boot,dm-pre-reloc;
>         };
>
>         /* External CAN clock - to be overridden by boards that provide it */
> @@ -140,6 +142,7 @@
>                 #address-cells = <2>;
>                 #size-cells = <2>;
>                 ranges;
> +               u-boot,dm-pre-reloc;
>
>                 gic: interrupt-controller at f1010000 {
>                         compatible = "arm,gic-400";
> @@ -333,6 +336,7 @@
>                         #clock-cells = <2>;
>                         #power-domain-cells = <0>;
>                         #reset-cells = <1>;
> +                       u-boot,dm-pre-reloc;
>                 };
>
>                 rst: reset-controller at e6160000 {
> --
> 2.11.0
>



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6

^ permalink raw reply	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 05/12] ARM: rmobile: Remove RAVB probing from Salvator-X board
  2017-08-20 15:13 ` [U-Boot] [PATCH 05/12] ARM: rmobile: Remove RAVB probing from Salvator-X board Marek Vasut
@ 2017-08-25 22:22   ` Nobuhiro Iwamatsu
  0 siblings, 0 replies; 24+ messages in thread
From: Nobuhiro Iwamatsu @ 2017-08-25 22:22 UTC (permalink / raw)
  To: u-boot

Hi,

2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:
> Drop the RAVB bit from the board since RAVB now probes from DT instead.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> ---
>  board/renesas/salvator-x/salvator-x.c | 11 -----------
>  1 file changed, 11 deletions(-)

Applied, thanks.

Best regards,
  Nobuhiro

>
> diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
> index 6270de4e40..ce3892da90 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -161,17 +161,6 @@ int board_init(void)
>         return 0;
>  }
>
> -static struct eth_pdata salvator_x_ravb_platdata = {
> -       .iobase         = 0xE6800000,
> -       .phy_interface  = 0,
> -       .max_speed      = 1000,
> -};
> -
> -U_BOOT_DEVICE(salvator_x_ravb) = {
> -       .name           = "ravb",
> -       .platdata       = &salvator_x_ravb_platdata,
> -};
> -
>  #ifdef CONFIG_SH_SDHI
>  int board_mmc_init(bd_t *bis)
>  {
> --
> 2.11.0
>



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6

^ permalink raw reply	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 06/12] ARM: rmobile: Remove RAVB probing from ULCB board
  2017-08-20 15:13 ` [U-Boot] [PATCH 06/12] ARM: rmobile: Remove RAVB probing from ULCB board Marek Vasut
@ 2017-08-25 22:22   ` Nobuhiro Iwamatsu
  0 siblings, 0 replies; 24+ messages in thread
From: Nobuhiro Iwamatsu @ 2017-08-25 22:22 UTC (permalink / raw)
  To: u-boot

Hi,

2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:
> Drop the RAVB bit from the board since RAVB now probes from DT instead.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> ---
>  board/renesas/ulcb/ulcb.c | 11 -----------
>  1 file changed, 11 deletions(-)

Applied, thanks.

Best regards,
  Nobuhiro
>
> diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
> index 4005ec8ad5..e249bd27d4 100644
> --- a/board/renesas/ulcb/ulcb.c
> +++ b/board/renesas/ulcb/ulcb.c
> @@ -140,17 +140,6 @@ int board_init(void)
>         return 0;
>  }
>
> -static struct eth_pdata salvator_x_ravb_platdata = {
> -       .iobase         = 0xE6800000,
> -       .phy_interface  = 0,
> -       .max_speed      = 1000,
> -};
> -
> -U_BOOT_DEVICE(salvator_x_ravb) = {
> -       .name           = "ravb",
> -       .platdata       = &salvator_x_ravb_platdata,
> -};
> -
>  #ifdef CONFIG_SH_SDHI
>  int board_mmc_init(bd_t *bis)
>  {
> --
> 2.11.0
>



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6

^ permalink raw reply	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 07/12] ARM: rmobile: Remove Serial SH probing from Salvator-X board
  2017-08-20 15:13 ` [U-Boot] [PATCH 07/12] ARM: rmobile: Remove Serial SH probing from Salvator-X board Marek Vasut
@ 2017-08-25 22:23   ` Nobuhiro Iwamatsu
  0 siblings, 0 replies; 24+ messages in thread
From: Nobuhiro Iwamatsu @ 2017-08-25 22:23 UTC (permalink / raw)
  To: u-boot

Hi,

2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:
> Drop the Serial SH bit from the board since UART now probes from DT instead.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> ---
>  board/renesas/salvator-x/salvator-x.c | 12 ------------
>  1 file changed, 12 deletions(-)

Applied, thanks.

Best regards,
  Nobuhiro
>
> diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
> index ce3892da90..4ed80f5493 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -300,15 +300,3 @@ void reset_cpu(ulong addr)
>         writel(RST_CODE, RST_CA57RESCNT);
>  #endif
>  }
> -
> -static const struct sh_serial_platdata serial_platdata = {
> -       .base = SCIF2_BASE,
> -       .type = PORT_SCIF,
> -       .clk = CONFIG_SH_SCIF_CLK_FREQ,
> -       .clk_mode = INT_CLK,
> -};
> -
> -U_BOOT_DEVICE(salvator_x_scif2) = {
> -       .name = "serial_sh",
> -       .platdata = &serial_platdata,
> -};
> --
> 2.11.0
>



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6

^ permalink raw reply	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 08/12] ARM: rmobile: Remove Serial SH probing from ULCB board
  2017-08-20 15:13 ` [U-Boot] [PATCH 08/12] ARM: rmobile: Remove Serial SH probing from ULCB board Marek Vasut
@ 2017-08-25 22:23   ` Nobuhiro Iwamatsu
  0 siblings, 0 replies; 24+ messages in thread
From: Nobuhiro Iwamatsu @ 2017-08-25 22:23 UTC (permalink / raw)
  To: u-boot

Hi,

2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:
> Drop the Serial SH bit from the board since UART now probes from DT instead.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> ---
>  board/renesas/ulcb/ulcb.c | 12 ------------
>  1 file changed, 12 deletions(-)

Applied, thanks.

Best regards,
  Nobuhiro
>
> diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
> index e249bd27d4..6b080311d0 100644
> --- a/board/renesas/ulcb/ulcb.c
> +++ b/board/renesas/ulcb/ulcb.c
> @@ -232,15 +232,3 @@ int dram_init_banksize(void)
>  const struct rmobile_sysinfo sysinfo = {
>         CONFIG_RCAR_BOARD_STRING
>  };
> -
> -static const struct sh_serial_platdata serial_platdata = {
> -       .base = SCIF2_BASE,
> -       .type = PORT_SCIF,
> -       .clk = CONFIG_SH_SCIF_CLK_FREQ,
> -       .clk_mode = INT_CLK,
> -};
> -
> -U_BOOT_DEVICE(salvator_x_scif2) = {
> -       .name = "serial_sh",
> -       .platdata = &serial_platdata,
> -};
> --
> 2.11.0
>



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6

^ permalink raw reply	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 09/12] ARM: rmobile: Remove SH SDHI probing from Salvator-X board
  2017-08-20 15:13 ` [U-Boot] [PATCH 09/12] ARM: rmobile: Remove SH SDHI probing from Salvator-X board Marek Vasut
@ 2017-08-25 22:23   ` Nobuhiro Iwamatsu
  0 siblings, 0 replies; 24+ messages in thread
From: Nobuhiro Iwamatsu @ 2017-08-25 22:23 UTC (permalink / raw)
  To: u-boot

Hi,

2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:
> Drop the SH SDHI bit from the board since SD now probes from DT instead.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> ---
>  board/renesas/salvator-x/salvator-x.c | 16 +---------------
>  1 file changed, 1 insertion(+), 15 deletions(-)

Applied, thanks.

Best regards,
  Nobuhiro

>
> diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
> index 4ed80f5493..a09cd56d66 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -164,8 +164,6 @@ int board_init(void)
>  #ifdef CONFIG_SH_SDHI
>  int board_mmc_init(bd_t *bis)
>  {
> -       int ret = -ENODEV;
> -
>         /* SDHI0 */
>         gpio_request(GPIO_GFN_SD0_DAT0, NULL);
>         gpio_request(GPIO_GFN_SD0_DAT1, NULL);
> @@ -181,11 +179,6 @@ int board_mmc_init(bd_t *bis)
>         gpio_direction_output(GPIO_GP_5_2, 1);  /* power on */
>         gpio_direction_output(GPIO_GP_5_1, 1);  /* 1: 3.3V, 0: 1.8V */
>
> -       ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI0_BASE, 0,
> -                          SH_SDHI_QUIRK_64BIT_BUF);
> -       if (ret)
> -               return ret;
> -
>         /* SDHI1/SDHI2 eMMC */
>         gpio_request(GPIO_GFN_SD1_DAT0, NULL);
>         gpio_request(GPIO_GFN_SD1_DAT1, NULL);
> @@ -208,11 +201,6 @@ int board_mmc_init(bd_t *bis)
>         gpio_direction_output(GPIO_GP_5_3, 0);  /* 1: 3.3V, 0: 1.8V */
>         gpio_direction_output(GPIO_GP_5_9, 0);  /* 1: 3.3V, 0: 1.8V */
>
> -       ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI2_BASE, 1,
> -                          SH_SDHI_QUIRK_64BIT_BUF);
> -       if (ret)
> -               return ret;
> -
>  #if defined(CONFIG_R8A7795)
>         /* SDHI3 */
>         gpio_request(GPIO_GFN_SD3_DAT0, NULL);  /* GP_4_9 */
> @@ -240,9 +228,7 @@ int board_mmc_init(bd_t *bis)
>         gpio_direction_output(GPIO_GP_3_15, 1); /* power on */
>         gpio_direction_output(GPIO_GP_3_14, 1); /* 1: 3.3V, 0: 1.8V */
>
> -       ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI3_BASE, 2,
> -                          SH_SDHI_QUIRK_64BIT_BUF);
> -       return ret;
> +       return 0;
>  }
>  #endif
>
> --
> 2.11.0
>



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6

^ permalink raw reply	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 10/12] ARM: rmobile: Remove SH SDHI probing from ULCB board
  2017-08-20 15:13 ` [U-Boot] [PATCH 10/12] ARM: rmobile: Remove SH SDHI probing from ULCB board Marek Vasut
@ 2017-08-25 22:23   ` Nobuhiro Iwamatsu
  0 siblings, 0 replies; 24+ messages in thread
From: Nobuhiro Iwamatsu @ 2017-08-25 22:23 UTC (permalink / raw)
  To: u-boot

Hi,

2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:
> Drop the SH SDHI bit from the board since SD now probes from DT instead.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> ---
>  board/renesas/ulcb/ulcb.c | 12 +-----------
>  1 file changed, 1 insertion(+), 11 deletions(-)

Applied, thanks.

Best regards,
  Nobuhiro
>
> diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
> index 6b080311d0..068cbdea03 100644
> --- a/board/renesas/ulcb/ulcb.c
> +++ b/board/renesas/ulcb/ulcb.c
> @@ -143,8 +143,6 @@ int board_init(void)
>  #ifdef CONFIG_SH_SDHI
>  int board_mmc_init(bd_t *bis)
>  {
> -       int ret = -ENODEV;
> -
>         /* SDHI0 */
>         gpio_request(GPIO_GFN_SD0_DAT0, NULL);
>         gpio_request(GPIO_GFN_SD0_DAT1, NULL);
> @@ -160,11 +158,6 @@ int board_mmc_init(bd_t *bis)
>         gpio_direction_output(GPIO_GP_5_2, 1);  /* power on */
>         gpio_direction_output(GPIO_GP_5_1, 1);  /* 1: 3.3V, 0: 1.8V */
>
> -       ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI0_BASE, 0,
> -                          SH_SDHI_QUIRK_64BIT_BUF);
> -       if (ret)
> -               return ret;
> -
>         /* SDHI1/SDHI2 eMMC */
>         gpio_request(GPIO_GFN_SD1_DAT0, NULL);
>         gpio_request(GPIO_GFN_SD1_DAT1, NULL);
> @@ -187,10 +180,7 @@ int board_mmc_init(bd_t *bis)
>         gpio_direction_output(GPIO_GP_5_3, 0);  /* 1: 3.3V, 0: 1.8V */
>         gpio_direction_output(GPIO_GP_5_9, 0);  /* 1: 3.3V, 0: 1.8V */
>
> -       ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI2_BASE, 1,
> -                          SH_SDHI_QUIRK_64BIT_BUF);
> -
> -       return ret;
> +       return 0;
>  }
>  #endif
>
> --
> 2.11.0
>



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6

^ permalink raw reply	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 11/12] ARM: rmobile: Enable MMC and USB DM on Salvator-X
  2017-08-20 15:13 ` [U-Boot] [PATCH 11/12] ARM: rmobile: Enable MMC and USB DM on Salvator-X Marek Vasut
@ 2017-08-25 22:24   ` Nobuhiro Iwamatsu
  0 siblings, 0 replies; 24+ messages in thread
From: Nobuhiro Iwamatsu @ 2017-08-25 22:24 UTC (permalink / raw)
  To: u-boot

Hi,

2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:
> Enable the MMC and USB DM on the board since it's the modern method
> and now supported by the drivers.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> ---
>  configs/r8a7795_salvator-x_defconfig | 2 ++
>  configs/r8a7796_salvator-x_defconfig | 2 ++
>  2 files changed, 4 insertions(+)

Applied, thanks.

Best regards,
  Nobuhiro

>
> diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig
> index d83eaf2b67..d53504a5bb 100644
> --- a/configs/r8a7795_salvator-x_defconfig
> +++ b/configs/r8a7795_salvator-x_defconfig
> @@ -23,6 +23,7 @@ CONFIG_CMD_FAT=y
>  CONFIG_OF_CONTROL=y
>  CONFIG_CLK=y
>  CONFIG_CLK_RENESAS=y
> +CONFIG_DM_MMC=y
>  CONFIG_SH_SDHI=y
>  CONFIG_PHY_MICREL=y
>  CONFIG_PHY_MICREL_KSZ90X1=y
> @@ -30,6 +31,7 @@ CONFIG_DM_ETH=y
>  CONFIG_RENESAS_RAVB=y
>  CONFIG_SCIF_CONSOLE=y
>  CONFIG_USB=y
> +CONFIG_DM_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_SMBIOS_MANUFACTURER=""
> diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig
> index 141316127a..d18bf2e965 100644
> --- a/configs/r8a7796_salvator-x_defconfig
> +++ b/configs/r8a7796_salvator-x_defconfig
> @@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
>  CONFIG_OF_CONTROL=y
>  CONFIG_CLK=y
>  CONFIG_CLK_RENESAS=y
> +CONFIG_DM_MMC=y
>  CONFIG_SH_SDHI=y
>  CONFIG_PHY_MICREL=y
>  CONFIG_PHY_MICREL_KSZ90X1=y
> @@ -31,6 +32,7 @@ CONFIG_DM_ETH=y
>  CONFIG_RENESAS_RAVB=y
>  CONFIG_SCIF_CONSOLE=y
>  CONFIG_USB=y
> +CONFIG_DM_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_SMBIOS_MANUFACTURER=""
> --
> 2.11.0
>



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6

^ permalink raw reply	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 12/12] ARM: rmobile: Enable MMC and USB DM on ULCB
  2017-08-20 15:13 ` [U-Boot] [PATCH 12/12] ARM: rmobile: Enable MMC and USB DM on ULCB Marek Vasut
@ 2017-08-25 22:24   ` Nobuhiro Iwamatsu
  0 siblings, 0 replies; 24+ messages in thread
From: Nobuhiro Iwamatsu @ 2017-08-25 22:24 UTC (permalink / raw)
  To: u-boot

Hi,

2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:
> Enable the MMC and USB DM on the board since it's the modern method
> and now supported by the drivers.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
> ---
>  configs/r8a7795_ulcb_defconfig | 2 ++
>  configs/r8a7796_ulcb_defconfig | 2 ++
>  2 files changed, 4 insertions(+)

Applied, thanks.

Best regards,
  Nobuhiro

>
> diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig
> index 82e5942091..42913dffaf 100644
> --- a/configs/r8a7795_ulcb_defconfig
> +++ b/configs/r8a7795_ulcb_defconfig
> @@ -21,11 +21,13 @@ CONFIG_OF_CONTROL=y
>  CONFIG_ENV_IS_IN_MMC=y
>  CONFIG_CLK=y
>  CONFIG_CLK_RENESAS=y
> +CONFIG_DM_MMC=y
>  CONFIG_SH_SDHI=y
>  CONFIG_DM_ETH=y
>  CONFIG_RENESAS_RAVB=y
>  CONFIG_SCIF_CONSOLE=y
>  CONFIG_USB=y
> +CONFIG_DM_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_SMBIOS_MANUFACTURER=""
> diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
> index 160bde2ef3..e5f560612b 100644
> --- a/configs/r8a7796_ulcb_defconfig
> +++ b/configs/r8a7796_ulcb_defconfig
> @@ -22,11 +22,13 @@ CONFIG_OF_CONTROL=y
>  CONFIG_ENV_IS_IN_MMC=y
>  CONFIG_CLK=y
>  CONFIG_CLK_RENESAS=y
> +CONFIG_DM_MMC=y
>  CONFIG_SH_SDHI=y
>  CONFIG_DM_ETH=y
>  CONFIG_RENESAS_RAVB=y
>  CONFIG_SCIF_CONSOLE=y
>  CONFIG_USB=y
> +CONFIG_DM_USB=y
>  CONFIG_USB_EHCI_HCD=y
>  CONFIG_USB_STORAGE=y
>  CONFIG_SMBIOS_MANUFACTURER=""
> --
> 2.11.0
>



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6

^ permalink raw reply	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 03/12] ARM: rmobile: Enable KSZ90X1 PHY on Salvator-X
  2017-08-20 15:13 ` [U-Boot] [PATCH 03/12] ARM: rmobile: Enable KSZ90X1 PHY on Salvator-X Marek Vasut
@ 2017-08-25 22:26   ` Nobuhiro Iwamatsu
  0 siblings, 0 replies; 24+ messages in thread
From: Nobuhiro Iwamatsu @ 2017-08-25 22:26 UTC (permalink / raw)
  To: u-boot

Hi,

2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:
> Commit da3b9e7fd6a1 (Move PHY_MICREL and PHY_MICREL_KSZ90X1 to Kconfig)
> broke ethernet support on R8A779x Salvator-X boards by disabling the
> KSZ90x1 PHY in Kconfig. Reenable it.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Alexandru Gagniuc <alex.g@adaptrum.com>
> Cc: Joe Hershberger <joe.hershberger@ni.com>
> ---
>  configs/r8a7795_salvator-x_defconfig | 1 +
>  configs/r8a7796_salvator-x_defconfig | 1 +
>  2 files changed, 2 insertions(+)

Applied, thanks.

Best regards,
  Nobuhiro
>
> diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig
> index f517e0e7ab..3d36698127 100644
> --- a/configs/r8a7795_salvator-x_defconfig
> +++ b/configs/r8a7795_salvator-x_defconfig
> @@ -24,6 +24,7 @@ CONFIG_CLK=y
>  CONFIG_CLK_RENESAS=y
>  CONFIG_SH_SDHI=y
>  CONFIG_PHY_MICREL=y
> +CONFIG_PHY_MICREL_KSZ90X1=y
>  CONFIG_DM_ETH=y
>  CONFIG_RENESAS_RAVB=y
>  CONFIG_SCIF_CONSOLE=y
> diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig
> index 247f8785e3..10aa0bed44 100644
> --- a/configs/r8a7796_salvator-x_defconfig
> +++ b/configs/r8a7796_salvator-x_defconfig
> @@ -25,6 +25,7 @@ CONFIG_CLK=y
>  CONFIG_CLK_RENESAS=y
>  CONFIG_SH_SDHI=y
>  CONFIG_PHY_MICREL=y
> +CONFIG_PHY_MICREL_KSZ90X1=y
>  CONFIG_DM_ETH=y
>  CONFIG_RENESAS_RAVB=y
>  CONFIG_SCIF_CONSOLE=y
> --
> 2.11.0
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6

^ permalink raw reply	[flat|nested] 24+ messages in thread
* [U-Boot] [PATCH 04/12] ARM: rmobile: Enable HUSH parser
  2017-08-20 15:13 ` [U-Boot] [PATCH 04/12] ARM: rmobile: Enable HUSH parser Marek Vasut
@ 2017-08-25 22:27   ` Nobuhiro Iwamatsu
  0 siblings, 0 replies; 24+ messages in thread
From: Nobuhiro Iwamatsu @ 2017-08-25 22:27 UTC (permalink / raw)
  To: u-boot

Hi,

2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.vasut@gmail.com>:
> The HUSH parser was disabled somewhere along the way, reenable it.
>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Alexandru Gagniuc <alex.g@adaptrum.com>
> Cc: Joe Hershberger <joe.hershberger@ni.com>
> ---
>  configs/r8a7795_salvator-x_defconfig | 1 +
>  configs/r8a7795_ulcb_defconfig       | 1 +
>  configs/r8a7796_salvator-x_defconfig | 1 +
>  configs/r8a7796_ulcb_defconfig       | 1 +
>  4 files changed, 4 insertions(+)

Applied, thanks.

Best regards,
  Nobuhiro

>
> diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig
> index 3d36698127..d83eaf2b67 100644
> --- a/configs/r8a7795_salvator-x_defconfig
> +++ b/configs/r8a7795_salvator-x_defconfig
> @@ -10,6 +10,7 @@ CONFIG_USE_BOOTARGS=y
>  CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
>  CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb"
>  CONFIG_VERSION_VARIABLE=y
> +CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
>  CONFIG_CMD_MMC=y
> diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig
> index 8b6b03ba32..82e5942091 100644
> --- a/configs/r8a7795_ulcb_defconfig
> +++ b/configs/r8a7795_ulcb_defconfig
> @@ -9,6 +9,7 @@ CONFIG_USE_BOOTARGS=y
>  CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
>  CONFIG_DEFAULT_FDT_FILE="r8a7795-h3ulcb.dtb"
>  CONFIG_VERSION_VARIABLE=y
> +CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
>  CONFIG_CMD_MMC=y
> diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig
> index 10aa0bed44..141316127a 100644
> --- a/configs/r8a7796_salvator-x_defconfig
> +++ b/configs/r8a7796_salvator-x_defconfig
> @@ -11,6 +11,7 @@ CONFIG_USE_BOOTARGS=y
>  CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
>  CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb"
>  CONFIG_VERSION_VARIABLE=y
> +CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
>  CONFIG_CMD_MMC=y
> diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
> index bc995deea0..160bde2ef3 100644
> --- a/configs/r8a7796_ulcb_defconfig
> +++ b/configs/r8a7796_ulcb_defconfig
> @@ -10,6 +10,7 @@ CONFIG_USE_BOOTARGS=y
>  CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
>  CONFIG_DEFAULT_FDT_FILE="r8a7796-m3ulcb.dtb"
>  CONFIG_VERSION_VARIABLE=y
> +CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_BOOTZ=y
>  # CONFIG_CMD_IMLS is not set
>  CONFIG_CMD_MMC=y
> --
> 2.11.0
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6

^ permalink raw reply	[flat|nested] 24+ messages in thread
end of thread, other threads:[~2017-08-25 22:27 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-20 15:13 [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Marek Vasut
2017-08-20 15:13 ` [U-Boot] [PATCH 02/12] ARM: rmobile: Add u-boot, dm-pre-reloc to clock nodes on Gen3 Marek Vasut
2017-08-25 22:21   ` Nobuhiro Iwamatsu
2017-08-20 15:13 ` [U-Boot] [PATCH 03/12] ARM: rmobile: Enable KSZ90X1 PHY on Salvator-X Marek Vasut
2017-08-25 22:26   ` Nobuhiro Iwamatsu
2017-08-20 15:13 ` [U-Boot] [PATCH 04/12] ARM: rmobile: Enable HUSH parser Marek Vasut
2017-08-25 22:27   ` Nobuhiro Iwamatsu
2017-08-20 15:13 ` [U-Boot] [PATCH 05/12] ARM: rmobile: Remove RAVB probing from Salvator-X board Marek Vasut
2017-08-25 22:22   ` Nobuhiro Iwamatsu
2017-08-20 15:13 ` [U-Boot] [PATCH 06/12] ARM: rmobile: Remove RAVB probing from ULCB board Marek Vasut
2017-08-25 22:22   ` Nobuhiro Iwamatsu
2017-08-20 15:13 ` [U-Boot] [PATCH 07/12] ARM: rmobile: Remove Serial SH probing from Salvator-X board Marek Vasut
2017-08-25 22:23   ` Nobuhiro Iwamatsu
2017-08-20 15:13 ` [U-Boot] [PATCH 08/12] ARM: rmobile: Remove Serial SH probing from ULCB board Marek Vasut
2017-08-25 22:23   ` Nobuhiro Iwamatsu
2017-08-20 15:13 ` [U-Boot] [PATCH 09/12] ARM: rmobile: Remove SH SDHI probing from Salvator-X board Marek Vasut
2017-08-25 22:23   ` Nobuhiro Iwamatsu
2017-08-20 15:13 ` [U-Boot] [PATCH 10/12] ARM: rmobile: Remove SH SDHI probing from ULCB board Marek Vasut
2017-08-25 22:23   ` Nobuhiro Iwamatsu
2017-08-20 15:13 ` [U-Boot] [PATCH 11/12] ARM: rmobile: Enable MMC and USB DM on Salvator-X Marek Vasut
2017-08-25 22:24   ` Nobuhiro Iwamatsu
2017-08-20 15:13 ` [U-Boot] [PATCH 12/12] ARM: rmobile: Enable MMC and USB DM on ULCB Marek Vasut
2017-08-25 22:24   ` Nobuhiro Iwamatsu
2017-08-25 22:20 ` [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables Nobuhiro Iwamatsu

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.