[PATCH 0/6] Provide basic support for the u9540

[PATCH 0/6] Provide basic support for the u9540

[Lee Jones]

After this patch-set has been applied the Mainline kernel
successfully boots on the u9540 development board. It is
by no means fully enabled, but it does provide solid
foundations for further development.

 arch/arm/boot/dts/u9540.dts      |   47 ++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-ux500/cpu-db8500.c |   15 +++++++++++-
 drivers/mfd/db8500-prcmu.c       |    8 +++++--
 3 files changed, 67 insertions(+), 3 deletions(-)

[PATCH 1/6] ARM: ux500: Remove unused board compatible string

[Lee Jones]

'st-ericsson,u8500' is too much of a broad name to be used for
any of the supported development boards supported by ST-Ericsson.
As such it was never used. It has no place to remain in the board
compatible list, hence why it's being removed.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/cpu-db8500.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 9f87b4d..3d8e321 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -330,7 +330,6 @@ static void __init u8500_init_machine(void)
 static const char * u8500_dt_board_compat[] = {
 	"calaosystems,snowball-a9500",
 	"st-ericsson,hrefv60+",
-	"st-ericsson,u8500",
 	"st-ericsson,mop500",
 	NULL,
 };
-- 
1.7.9.5

[PATCH 2/6] ARM: ux500: Add skeleton DTS file for the u9540

[Lee Jones]

This patch sees the creation of a sparse Device Tree file for
ST-Ericsson's latest development board supporting the latest
dual-core Cortex-a9 u9540 SoC.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/u9540.dts |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 arch/arm/boot/dts/u9540.dts

diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/u9540.dts
new file mode 100644
index 0000000..0a66f34
--- /dev/null
+++ b/arch/arm/boot/dts/u9540.dts
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2012 ST-Ericsson AB
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+/include/ "dbx5x0.dtsi"
+
+/ {
+	model = "ST-Ericsson U9540 platform with Device Tree";
+	compatible = "st-ericsson,u9540";
+
+	memory {
+		reg = <0x00000000 0x20000000>;
+	};
+
+	soc-u9500 {
+	};
+
+};
-- 
1.7.9.5

[PATCH 3/6] ARM: ux500: Add support for ST-Ericsson's u9540 SoC

[Lee Jones]

First level board support for the u9540.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/mach-ux500/cpu-db8500.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 3d8e321..6b7f970 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -17,6 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mfd/abx500/ab8500.h>
+#include <linux/mfd/dbx500-prcmu.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/regulator/machine.h>
@@ -319,6 +320,8 @@ static void __init u8500_init_machine(void)
 		snowball_pinmaps_init();
 	else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
 		hrefv60_pinmaps_init();
+	else if (of_machine_is_compatible("st-ericsson,u9540")) {}
+		/* TODO: Add u9540 pinmaps. */
 
 	/* TODO: Export SoC, USB, cpu-freq and DMA40 */
 	parent = u8500_of_init_devices();
@@ -331,6 +334,7 @@ static const char * u8500_dt_board_compat[] = {
 	"calaosystems,snowball-a9500",
 	"st-ericsson,hrefv60+",
 	"st-ericsson,mop500",
+	"st-ericsson,u9540",
 	NULL,
 };
 
@@ -345,4 +349,14 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
 	.dt_compat      = u8500_dt_board_compat,
 MACHINE_END
 
+DT_MACHINE_START(U9540_DT, "ST-Ericsson 9540 platform (Device Tree Support)")
+	.map_io		= u8500_map_io,
+	.init_irq	= ux500_init_irq,
+	.timer		= &ux500_timer,
+	.handle_irq	= gic_handle_irq,
+	.init_machine	= u8500_init_machine,
+	.init_late	= NULL,
+	.dt_compat      = u8500_dt_board_compat,
+MACHINE_END
+
 #endif
-- 
1.7.9.5

[PATCH 4/6] ARM: ux500: Add UART support to the u9540 Device Tree

[Lee Jones]

Add the 3 UART nodes required to enable serial ports on the u9540.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/u9540.dts |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/u9540.dts
index 0a66f34..28efe20 100644
--- a/arch/arm/boot/dts/u9540.dts
+++ b/arch/arm/boot/dts/u9540.dts
@@ -21,6 +21,17 @@
 	};
 
 	soc-u9500 {
-	};
 
+		uart@80120000 {
+			status = "okay";
+		};
+
+		uart@80121000 {
+			status = "okay";
+		};
+
+		uart@80007000 {
+			status = "okay";
+		};
+	};
 };
-- 
1.7.9.5

[PATCH 5/6] ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree

[Lee Jones]

Here we add the device node for the SDI4 (MMC) port to the u9540
Device Tree source file. This will allow successful probing of
the internal MMC storage device when booting with DT enabled.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/u9540.dts |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/u9540.dts
index 28efe20..2dade76 100644
--- a/arch/arm/boot/dts/u9540.dts
+++ b/arch/arm/boot/dts/u9540.dts
@@ -21,7 +21,6 @@
 	};
 
 	soc-u9500 {
-
 		uart@80120000 {
 			status = "okay";
 		};
@@ -33,5 +32,16 @@
 		uart@80007000 {
 			status = "okay";
 		};
+
+		// On-board eMMC
+		sdi4_per2@80114000 {
+			arm,primecell-periphid = <0x10480180>;
+		        max-frequency = <50000000>;
+			bus-width = <8>;
+			mmc-cap-mmc-highspeed;
+			vmmc-supply = <&ab8500_ldo_aux2_reg>;
+
+			status = "okay";
+		};
 	};
 };
-- 
1.7.9.5

[PATCH 6/6] mfd: Differentiate between u8500 and u9540 TCDM address mapping

[Lee Jones]

The TCDM mappings are quite different from u8500 to u9540. If these
aren't correctly specified for a given board, it will fail to boot.
Here we add the correct TCDM base for the u9540.

Please note that although this patch allows us to boot the u9540,
it doesn't provide us with full enablement. For that, another
patch-set will follow which completely re-vamps the way the PRCMU
is passed TCDM mappings.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/mfd/db8500-prcmu.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 9d51585..fd0462a 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2670,7 +2670,7 @@ static int db8500_irq_init(struct device_node *np)
 
 void __init db8500_prcmu_early_init(void)
 {
-	if (cpu_is_u8500v2()) {
+	if (cpu_is_u8500v2() || cpu_is_u9540()) {
 		void *tcpm_base = ioremap_nocache(U8500_PRCMU_TCPM_BASE, SZ_4K);
 
 		if (tcpm_base != NULL) {
@@ -2688,7 +2688,11 @@ void __init db8500_prcmu_early_init(void)
 			iounmap(tcpm_base);
 		}
 
-		tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE);
+		if (cpu_is_u9540())
+			tcdm_base = ioremap_nocache(U8500_PRCMU_TCDM_BASE,
+						SZ_4K + SZ_8K) + SZ_8K;
+		else
+			tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE);
 	} else {
 		pr_err("prcmu: Unsupported chip version\n");
 		BUG();
-- 
1.7.9.5

Re: [PATCH 6/6] mfd: Differentiate between u8500 and u9540 TCDM address mapping

[Arnd Bergmann]

On Wednesday 10 October 2012, Lee Jones wrote:
> @@ -2688,7 +2688,11 @@ void __init db8500_prcmu_early_init(void)
>                         iounmap(tcpm_base);
>                 }
>  
> -               tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE);
> +               if (cpu_is_u9540())
> +                       tcdm_base = ioremap_nocache(U8500_PRCMU_TCDM_BASE,
> +                                               SZ_4K + SZ_8K) + SZ_8K;
> +               else
> +                       tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE);
>         } else {
>                 pr_err("prcmu: Unsupported chip version\n");
>                 BUG();

Would it be possible to get the base out of the device tree and always
map it from there? Adding another dependency on a fixed constant is
just going to make the conversion to multiplatform harder, since it
was decided that device drivers should not have access to platform
header files in the multiplatform case.

	Arnd

Re: [PATCH 3/6] ARM: ux500: Add support for ST-Ericsson's u9540 SoC

[Jean-Christophe PLAGNIOL-VILLARD]

On 16:18 Wed 10 Oct     , Lee Jones wrote:
> First level board support for the u9540.
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  arch/arm/mach-ux500/cpu-db8500.c |   14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
> index 3d8e321..6b7f970 100644
> --- a/arch/arm/mach-ux500/cpu-db8500.c
> +++ b/arch/arm/mach-ux500/cpu-db8500.c
> @@ -17,6 +17,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/io.h>
>  #include <linux/mfd/abx500/ab8500.h>
> +#include <linux/mfd/dbx500-prcmu.h>
>  #include <linux/of.h>
>  #include <linux/of_platform.h>
>  #include <linux/regulator/machine.h>
> @@ -319,6 +320,8 @@ static void __init u8500_init_machine(void)
>  		snowball_pinmaps_init();
>  	else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
>  		hrefv60_pinmaps_init();
> +	else if (of_machine_is_compatible("st-ericsson,u9540")) {}
> +		/* TODO: Add u9540 pinmaps. */
do you via DT no here
>  
>  	/* TODO: Export SoC, USB, cpu-freq and DMA40 */
>  	parent = u8500_of_init_devices();
> @@ -331,6 +334,7 @@ static const char * u8500_dt_board_compat[] = {
>  	"calaosystems,snowball-a9500",
>  	"st-ericsson,hrefv60+",
>  	"st-ericsson,mop500",
> +	"st-ericsson,u9540",
stop to add more compatible sue a more generic one
>  	NULL,
>  };
>  
> @@ -345,4 +349,14 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
>  	.dt_compat      = u8500_dt_board_compat,
>  MACHINE_END
>  
> +DT_MACHINE_START(U9540_DT, "ST-Ericsson 9540 platform (Device Tree Support)")
> +	.map_io		= u8500_map_io,
> +	.init_irq	= ux500_init_irq,
> +	.timer		= &ux500_timer,
> +	.handle_irq	= gic_handle_irq,
> +	.init_machine	= u8500_init_machine,
> +	.init_late	= NULL,
> +	.dt_compat      = u8500_dt_board_compat,
> +MACHINE_END
really?
no need drop it for a more generic on

Best Regards,
J.

Re: [PATCH 4/6] ARM: ux500: Add UART support to the u9540 Device Tree

[Jean-Christophe PLAGNIOL-VILLARD]

On 16:18 Wed 10 Oct     , Lee Jones wrote:
> Add the 3 UART nodes required to enable serial ports on the u9540.
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  arch/arm/boot/dts/u9540.dts |   13 ++++++++++++-
dts? it's dtsi

it's the soc not the board
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/u9540.dts
> index 0a66f34..28efe20 100644
> --- a/arch/arm/boot/dts/u9540.dts
> +++ b/arch/arm/boot/dts/u9540.dts
> @@ -21,6 +21,17 @@
>  	};
>  
>  	soc-u9500 {
> -	};
>  
> +		uart@80120000 {
> +			status = "okay";
> +		};
> +
> +		uart@80121000 {
> +			status = "okay";
> +		};
> +
> +		uart@80007000 {
> +			status = "okay";
> +		};
do not enable device by default in the soc

Best Regards,
J.
> +	};
>  };
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 5/6] ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree

[Jean-Christophe PLAGNIOL-VILLARD]

On 16:18 Wed 10 Oct     , Lee Jones wrote:
> Here we add the device node for the SDI4 (MMC) port to the u9540
> Device Tree source file. This will allow successful probing of
> the internal MMC storage device when booting with DT enabled.
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  arch/arm/boot/dts/u9540.dts |   12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/u9540.dts
> index 28efe20..2dade76 100644
> --- a/arch/arm/boot/dts/u9540.dts
> +++ b/arch/arm/boot/dts/u9540.dts
> @@ -21,7 +21,6 @@
>  	};
>  
>  	soc-u9500 {
> -
why?
>  		uart@80120000 {
>  			status = "okay";
>  		};
> @@ -33,5 +32,16 @@
>  		uart@80007000 {
>  			status = "okay";
>  		};
> +
> +		// On-board eMMC
no c++ comment
> +		sdi4_per2@80114000 {
> +			arm,primecell-periphid = <0x10480180>;
> +		        max-frequency = <50000000>;
> +			bus-width = <8>;
> +			mmc-cap-mmc-highspeed;
> +			vmmc-supply = <&ab8500_ldo_aux2_reg>;
you need add the pinctrl here

Best Regards,
J.

Re: [PATCH 5/6] ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree

[Lee Jones]

On Wed, 10 Oct 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:

> On 16:18 Wed 10 Oct     , Lee Jones wrote:
> > Here we add the device node for the SDI4 (MMC) port to the u9540
> > Device Tree source file. This will allow successful probing of
> > the internal MMC storage device when booting with DT enabled.
> > 
> > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > ---
> >  arch/arm/boot/dts/u9540.dts |   12 +++++++++++-
> >  1 file changed, 11 insertions(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/u9540.dts
> > index 28efe20..2dade76 100644
> > --- a/arch/arm/boot/dts/u9540.dts
> > +++ b/arch/arm/boot/dts/u9540.dts
> > @@ -21,7 +21,6 @@
> >  	};
> >  
> >  	soc-u9500 {
> > -
> why?

My OCD shining though. It's either this or I create a seperate patch
for it. I think sneaking it in here is better.

> >  		uart@80120000 {
> >  			status = "okay";
> >  		};
> > @@ -33,5 +32,16 @@
> >  		uart@80007000 {
> >  			status = "okay";
> >  		};
> > +
> > +		// On-board eMMC
> no c++ comment

Single line comments are perfectly valid in DTS(I) files.

See: Documentation/devicetree/booting-without-of.txt

> > +		sdi4_per2@80114000 {
> > +			arm,primecell-periphid = <0x10480180>;
> > +		        max-frequency = <50000000>;
> > +			bus-width = <8>;
> > +			mmc-cap-mmc-highspeed;
> > +			vmmc-supply = <&ab8500_ldo_aux2_reg>;
> you need add the pinctrl here

Pinctrl will come in time. We have a priority list.

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 4/6] ARM: ux500: Add UART support to the u9540 Device Tree

[Lee Jones]

On Wed, 10 Oct 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:

> On 16:18 Wed 10 Oct     , Lee Jones wrote:
> > Add the 3 UART nodes required to enable serial ports on the u9540.
> > 
> > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > ---
> >  arch/arm/boot/dts/u9540.dts |   13 ++++++++++++-
> dts? it's dtsi

No it's not.

> it's the soc not the board

This is the board file, not the SoC.

> >  1 file changed, 12 insertions(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/u9540.dts
> > index 0a66f34..28efe20 100644
> > --- a/arch/arm/boot/dts/u9540.dts
> > +++ b/arch/arm/boot/dts/u9540.dts
> > @@ -21,6 +21,17 @@
> >  	};
> >  
> >  	soc-u9500 {
> > -	};
> >  
> > +		uart@80120000 {
> > +			status = "okay";
> > +		};
> > +
> > +		uart@80121000 {
> > +			status = "okay";
> > +		};
> > +
> > +		uart@80007000 {
> > +			status = "okay";
> > +		};
> do not enable device by default in the soc

See above.

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 3/6] ARM: ux500: Add support for ST-Ericsson's u9540 SoC

[Lee Jones]

On Wed, 10 Oct 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:

> On 16:18 Wed 10 Oct     , Lee Jones wrote:
> > First level board support for the u9540.
> > 
> > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > ---
> >  arch/arm/mach-ux500/cpu-db8500.c |   14 ++++++++++++++
> >  1 file changed, 14 insertions(+)
> > 
> > diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
> > index 3d8e321..6b7f970 100644
> > --- a/arch/arm/mach-ux500/cpu-db8500.c
> > +++ b/arch/arm/mach-ux500/cpu-db8500.c
> > @@ -17,6 +17,7 @@
> >  #include <linux/platform_device.h>
> >  #include <linux/io.h>
> >  #include <linux/mfd/abx500/ab8500.h>
> > +#include <linux/mfd/dbx500-prcmu.h>
> >  #include <linux/of.h>
> >  #include <linux/of_platform.h>
> >  #include <linux/regulator/machine.h>
> > @@ -319,6 +320,8 @@ static void __init u8500_init_machine(void)
> >  		snowball_pinmaps_init();
> >  	else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
> >  		hrefv60_pinmaps_init();
> > +	else if (of_machine_is_compatible("st-ericsson,u9540")) {}
> > +		/* TODO: Add u9540 pinmaps. */
> do you via DT no here

We don't support pinctrl yet. It will come, it's just not available yet.

> >  	/* TODO: Export SoC, USB, cpu-freq and DMA40 */
> >  	parent = u8500_of_init_devices();
> > @@ -331,6 +334,7 @@ static const char * u8500_dt_board_compat[] = {
> >  	"calaosystems,snowball-a9500",
> >  	"st-ericsson,hrefv60+",
> >  	"st-ericsson,mop500",
> > +	"st-ericsson,u9540",
> stop to add more compatible sue a more generic one

Not entirely sure what you mean here.

These are the only four boards we officially support.

There are other uXXXX boards that we do not.

> >  	NULL,
> >  };
> >  
> > @@ -345,4 +349,14 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
> >  	.dt_compat      = u8500_dt_board_compat,
> >  MACHINE_END
> >  
> > +DT_MACHINE_START(U9540_DT, "ST-Ericsson 9540 platform (Device Tree Support)")
> > +	.map_io		= u8500_map_io,
> > +	.init_irq	= ux500_init_irq,
> > +	.timer		= &ux500_timer,
> > +	.handle_irq	= gic_handle_irq,
> > +	.init_machine	= u8500_init_machine,
> > +	.init_late	= NULL,
> > +	.dt_compat      = u8500_dt_board_compat,
> > +MACHINE_END
> really?
> no need drop it for a more generic on

This may look the same as the previous MACHINE_START now, but
it will have differences in the future as more u9540 support is
upstreamed. I think it should stick around as a separate entity
for the time being. If we can consolidate the init functions at
a later date, believe me I will make sure it happens.

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 4/6] ARM: ux500: Add UART support to the u9540 Device Tree

[Jean-Christophe PLAGNIOL-VILLARD]

On 08:29 Thu 11 Oct     , Lee Jones wrote:
> On Wed, 10 Oct 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:
> 
> > On 16:18 Wed 10 Oct     , Lee Jones wrote:
> > > Add the 3 UART nodes required to enable serial ports on the u9540.
> > > 
> > > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > ---
> > >  arch/arm/boot/dts/u9540.dts |   13 ++++++++++++-
> > dts? it's dtsi
> 
> No it's not.
so the name of the file is wrong s u9540 is a SoC name

Best Regards,
J.

Re: [PATCH 3/6] ARM: ux500: Add support for ST-Ericsson's u9540 SoC

[Jean-Christophe PLAGNIOL-VILLARD]

On 08:38 Thu 11 Oct     , Lee Jones wrote:
> On Wed, 10 Oct 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:
> 
> > On 16:18 Wed 10 Oct     , Lee Jones wrote:
> > > First level board support for the u9540.
> > > 
> > > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > ---
> > >  arch/arm/mach-ux500/cpu-db8500.c |   14 ++++++++++++++
> > >  1 file changed, 14 insertions(+)
> > > 
> > > diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
> > > index 3d8e321..6b7f970 100644
> > > --- a/arch/arm/mach-ux500/cpu-db8500.c
> > > +++ b/arch/arm/mach-ux500/cpu-db8500.c
> > > @@ -17,6 +17,7 @@
> > >  #include <linux/platform_device.h>
> > >  #include <linux/io.h>
> > >  #include <linux/mfd/abx500/ab8500.h>
> > > +#include <linux/mfd/dbx500-prcmu.h>
> > >  #include <linux/of.h>
> > >  #include <linux/of_platform.h>
> > >  #include <linux/regulator/machine.h>
> > > @@ -319,6 +320,8 @@ static void __init u8500_init_machine(void)
> > >  		snowball_pinmaps_init();
> > >  	else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
> > >  		hrefv60_pinmaps_init();
> > > +	else if (of_machine_is_compatible("st-ericsson,u9540")) {}
> > > +		/* TODO: Add u9540 pinmaps. */
> > do you via DT no here
> 
> We don't support pinctrl yet. It will come, it's just not available yet.
so stop to add more and update the drviers

and u9540 is a SoC name not a baord name
> 
> > >  	/* TODO: Export SoC, USB, cpu-freq and DMA40 */
> > >  	parent = u8500_of_init_devices();
> > > @@ -331,6 +334,7 @@ static const char * u8500_dt_board_compat[] = {
> > >  	"calaosystems,snowball-a9500",
> > >  	"st-ericsson,hrefv60+",
> > >  	"st-ericsson,mop500",
> > > +	"st-ericsson,u9540",
> > stop to add more compatible sue a more generic one
> 
> Not entirely sure what you mean here.
> 
> These are the only four boards we officially support.
> 
> There are other uXXXX boards that we do not.
you do not need it just mach a global compatbile
> 
> > >  	NULL,
> > >  };
> > >  
> > > @@ -345,4 +349,14 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
> > >  	.dt_compat      = u8500_dt_board_compat,
> > >  MACHINE_END
> > >  
> > > +DT_MACHINE_START(U9540_DT, "ST-Ericsson 9540 platform (Device Tree Support)")
> > > +	.map_io		= u8500_map_io,
> > > +	.init_irq	= ux500_init_irq,
> > > +	.timer		= &ux500_timer,
> > > +	.handle_irq	= gic_handle_irq,
> > > +	.init_machine	= u8500_init_machine,
> > > +	.init_late	= NULL,
> > > +	.dt_compat      = u8500_dt_board_compat,
> > > +MACHINE_END
> > really?
> > no need drop it for a more generic on
> 
> This may look the same as the previous MACHINE_START now, but
> it will have differences in the future as more u9540 support is
> upstreamed. I think it should stick around as a separate entity
> for the time being. If we can consolidate the init functions at
> a later date, believe me I will make sure it happens.
> 
> -- 
> Lee Jones
> Linaro ST-Ericsson Landing Team Lead
> Linaro.org │ Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 6/6] mfd: Differentiate between u8500 and u9540 TCDM address mapping

[Lee Jones]

On Wed, 10 Oct 2012, Arnd Bergmann wrote:

> On Wednesday 10 October 2012, Lee Jones wrote:
> > @@ -2688,7 +2688,11 @@ void __init db8500_prcmu_early_init(void)
> >                         iounmap(tcpm_base);
> >                 }
> >  
> > -               tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE);
> > +               if (cpu_is_u9540())
> > +                       tcdm_base = ioremap_nocache(U8500_PRCMU_TCDM_BASE,
> > +                                               SZ_4K + SZ_8K) + SZ_8K;
> > +               else
> > +                       tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE);
> >         } else {
> >                 pr_err("prcmu: Unsupported chip version\n");
> >                 BUG();
> 
> Would it be possible to get the base out of the device tree and always
> map it from there? Adding another dependency on a fixed constant is
> just going to make the conversion to multiplatform harder, since it
> was decided that device drivers should not have access to platform
> header files in the multiplatform case.

>From what I understand, this code has to be called before Device
Tree kicks in. Actually, this code is mearly a stand-in until Loic
has finished with the PRCMU re-vamp. Once that's complete, this
stuff will be passed from init_IRQ(), which is invoked directly in
start_kernel().

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 6/6] mfd: Differentiate between u8500 and u9540 TCDM address mapping

[Arnd Bergmann]

On Thursday 11 October 2012, Lee Jones wrote:
> From what I understand, this code has to be called before Device
> Tree kicks in. Actually, this code is mearly a stand-in until Loic
> has finished with the PRCMU re-vamp. Once that's complete, this
> stuff will be passed from init_IRQ(), which is invoked directly in
> start_kernel().

Ok, fair enough.

	Arnd

Re: [PATCH 3/6] ARM: ux500: Add support for ST-Ericsson's u9540 SoC

[Lee Jones]

On Thu, 11 Oct 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:

> On 08:38 Thu 11 Oct     , Lee Jones wrote:
> > On Wed, 10 Oct 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > 
> > > On 16:18 Wed 10 Oct     , Lee Jones wrote:
> > > > First level board support for the u9540.
> > > > 
> > > > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > > ---
> > > >  arch/arm/mach-ux500/cpu-db8500.c |   14 ++++++++++++++
> > > >  1 file changed, 14 insertions(+)
> > > > 
> > > > diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
> > > > index 3d8e321..6b7f970 100644
> > > > --- a/arch/arm/mach-ux500/cpu-db8500.c
> > > > +++ b/arch/arm/mach-ux500/cpu-db8500.c
> > > > @@ -17,6 +17,7 @@
> > > >  #include <linux/platform_device.h>
> > > >  #include <linux/io.h>
> > > >  #include <linux/mfd/abx500/ab8500.h>
> > > > +#include <linux/mfd/dbx500-prcmu.h>
> > > >  #include <linux/of.h>
> > > >  #include <linux/of_platform.h>
> > > >  #include <linux/regulator/machine.h>
> > > > @@ -319,6 +320,8 @@ static void __init u8500_init_machine(void)
> > > >  		snowball_pinmaps_init();
> > > >  	else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
> > > >  		hrefv60_pinmaps_init();
> > > > +	else if (of_machine_is_compatible("st-ericsson,u9540")) {}
> > > > +		/* TODO: Add u9540 pinmaps. */
> > > do you via DT no here
> > 
> > We don't support pinctrl yet. It will come, it's just not available yet.
> so stop to add more and update the drviers

We'll get round to it. 

We have a set priority list. Neither you nor I have control over that.

> and u9540 is a SoC name not a baord name

It's both. The u9540 board is affectionately called the u9540 board.

> > > >  	/* TODO: Export SoC, USB, cpu-freq and DMA40 */
> > > >  	parent = u8500_of_init_devices();
> > > > @@ -331,6 +334,7 @@ static const char * u8500_dt_board_compat[] = {
> > > >  	"calaosystems,snowball-a9500",
> > > >  	"st-ericsson,hrefv60+",
> > > >  	"st-ericsson,mop500",
> > > > +	"st-ericsson,u9540",
> > > stop to add more compatible sue a more generic one
> > 
> > Not entirely sure what you mean here.
> > 
> > These are the only four boards we officially support.
> > 
> > There are other uXXXX boards that we do not.
> you do not need it just mach a global compatbile

Why? What difference does it make? I could understand if we
had a long list of supported boards, but I think this is move
verbose and descriptive.

> > > >  	NULL,
> > > >  };
> > > >  
> > > > @@ -345,4 +349,14 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
> > > >  	.dt_compat      = u8500_dt_board_compat,
> > > >  MACHINE_END
> > > >  
> > > > +DT_MACHINE_START(U9540_DT, "ST-Ericsson 9540 platform (Device Tree Support)")
> > > > +	.map_io		= u8500_map_io,
> > > > +	.init_irq	= ux500_init_irq,
> > > > +	.timer		= &ux500_timer,
> > > > +	.handle_irq	= gic_handle_irq,
> > > > +	.init_machine	= u8500_init_machine,
> > > > +	.init_late	= NULL,
> > > > +	.dt_compat      = u8500_dt_board_compat,
> > > > +MACHINE_END
> > > really?
> > > no need drop it for a more generic on
> > 
> > This may look the same as the previous MACHINE_START now, but
> > it will have differences in the future as more u9540 support is
> > upstreamed. I think it should stick around as a separate entity
> > for the time being. If we can consolidate the init functions at
> > a later date, believe me I will make sure it happens.

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 4/6] ARM: ux500: Add UART support to the u9540 Device Tree

[Lee Jones]

On Thu, 11 Oct 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:

> On 08:29 Thu 11 Oct     , Lee Jones wrote:
> > On Wed, 10 Oct 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > 
> > > On 16:18 Wed 10 Oct     , Lee Jones wrote:
> > > > Add the 3 UART nodes required to enable serial ports on the u9540.
> > > > 
> > > > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > > ---
> > > >  arch/arm/boot/dts/u9540.dts |   13 ++++++++++++-
> > > dts? it's dtsi
> > 
> > No it's not.
> so the name of the file is wrong s u9540 is a SoC name

The board could actually be called either ccu9540, or just 
u9540. I picked one and went with it. The full name is the
u9540 development board.

-- 
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 4/6] ARM: ux500: Add UART support to the u9540 Device Tree

[Jean-Christophe PLAGNIOL-VILLARD]

On 10:22 Thu 11 Oct     , Lee Jones wrote:
> On Thu, 11 Oct 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:
> 
> > On 08:29 Thu 11 Oct     , Lee Jones wrote:
> > > On Wed, 10 Oct 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > 
> > > > On 16:18 Wed 10 Oct     , Lee Jones wrote:
> > > > > Add the 3 UART nodes required to enable serial ports on the u9540.
> > > > > 
> > > > > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > > > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > > > ---
> > > > >  arch/arm/boot/dts/u9540.dts |   13 ++++++++++++-
> > > > dts? it's dtsi
> > > 
> > > No it's not.
> > so the name of the file is wrong s u9540 is a SoC name
> 
> The board could actually be called either ccu9540, or just 
> u9540. I picked one and went with it. The full name is the
> u9540 development board.
so use ccu9540 as u9540 is the soc name so if we use u9540 as compatible we
expect to mach the soc and not a board

Best Regards,
J.

Re: [PATCH 3/6] ARM: ux500: Add support for ST-Ericsson's u9540 SoC

[Jean-Christophe PLAGNIOL-VILLARD]

On 10:20 Thu 11 Oct     , Lee Jones wrote:
> On Thu, 11 Oct 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:
> 
> > On 08:38 Thu 11 Oct     , Lee Jones wrote:
> > > On Wed, 10 Oct 2012, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > 
> > > > On 16:18 Wed 10 Oct     , Lee Jones wrote:
> > > > > First level board support for the u9540.
> > > > > 
> > > > > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > > > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > > > ---
> > > > >  arch/arm/mach-ux500/cpu-db8500.c |   14 ++++++++++++++
> > > > >  1 file changed, 14 insertions(+)
> > > > > 
> > > > > diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
> > > > > index 3d8e321..6b7f970 100644
> > > > > --- a/arch/arm/mach-ux500/cpu-db8500.c
> > > > > +++ b/arch/arm/mach-ux500/cpu-db8500.c
> > > > > @@ -17,6 +17,7 @@
> > > > >  #include <linux/platform_device.h>
> > > > >  #include <linux/io.h>
> > > > >  #include <linux/mfd/abx500/ab8500.h>
> > > > > +#include <linux/mfd/dbx500-prcmu.h>
> > > > >  #include <linux/of.h>
> > > > >  #include <linux/of_platform.h>
> > > > >  #include <linux/regulator/machine.h>
> > > > > @@ -319,6 +320,8 @@ static void __init u8500_init_machine(void)
> > > > >  		snowball_pinmaps_init();
> > > > >  	else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
> > > > >  		hrefv60_pinmaps_init();
> > > > > +	else if (of_machine_is_compatible("st-ericsson,u9540")) {}
> > > > > +		/* TODO: Add u9540 pinmaps. */
> > > > do you via DT no here
> > > 
> > > We don't support pinctrl yet. It will come, it's just not available yet.
> > so stop to add more and update the drviers
> 
> We'll get round to it. 
> 
> We have a set priority list. Neither you nor I have control over that.
yes but code mainline is not driver be politics but by code review

so no do the effort to add the dt to the pinctrl it's 12 hours work so you have
no excuse to delay it again
> 
> > and u9540 is a SoC name not a baord name
> 
> It's both. The u9540 board is affectionately called the u9540 board.
> 
> > > > >  	/* TODO: Export SoC, USB, cpu-freq and DMA40 */
> > > > >  	parent = u8500_of_init_devices();
> > > > > @@ -331,6 +334,7 @@ static const char * u8500_dt_board_compat[] = {
> > > > >  	"calaosystems,snowball-a9500",
> > > > >  	"st-ericsson,hrefv60+",
> > > > >  	"st-ericsson,mop500",
> > > > > +	"st-ericsson,u9540",
> > > > stop to add more compatible sue a more generic one
> > > 
> > > Not entirely sure what you mean here.
> > > 
> > > These are the only four boards we officially support.
> > > 
> > > There are other uXXXX boards that we do not.
> > you do not need it just mach a global compatbile
> 
> Why? What difference does it make? I could understand if we
> had a long list of supported boards, but I think this is move
> verbose and descriptive.

this is already the case simplify it and give a good example in the mainline
code as people just do copy & paste usualy
> 
> > > > >  	NULL,
> > > > >  };
> > > > >  
> > > > > @@ -345,4 +349,14 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
> > > > >  	.dt_compat      = u8500_dt_board_compat,
> > > > >  MACHINE_END
> > > > >  
> > > > > +DT_MACHINE_START(U9540_DT, "ST-Ericsson 9540 platform (Device Tree Support)")
> > > > > +	.map_io		= u8500_map_io,
> > > > > +	.init_irq	= ux500_init_irq,
> > > > > +	.timer		= &ux500_timer,
> > > > > +	.handle_irq	= gic_handle_irq,
> > > > > +	.init_machine	= u8500_init_machine,
> > > > > +	.init_late	= NULL,
> > > > > +	.dt_compat      = u8500_dt_board_compat,
> > > > > +MACHINE_END
> > > > really?
> > > > no need drop it for a more generic on
> > > 
> > > This may look the same as the previous MACHINE_START now, but
> > > it will have differences in the future as more u9540 support is
> > > upstreamed. I think it should stick around as a separate entity
> > > for the time being. If we can consolidate the init functions at
> > > a later date, believe me I will make sure it happens.
no sorry add it when it's need not now

Best Regards,
J.

Re: [PATCH 4/6] ARM: ux500: Add UART support to the u9540 Device Tree

[Linus Walleij]

On Thu, Oct 11, 2012 at 8:06 PM, Jean-Christophe PLAGNIOL-VILLARD
<plagnioj@jcrosoft.com> wrote:
> On 10:22 Thu 11 Oct     , Lee Jones wrote:

>> The board could actually be called either ccu9540, or just
>> u9540. I picked one and went with it. The full name is the
>> u9540 development board.
>
> so use ccu9540 as u9540 is the soc name so if we use u9540 as compatible we
> expect to mach the soc and not a board

I basically agree.

However the SoC (digital ASIC) is named DB9540.

U9540 is the entire chipset (DB9540, AB9540 etc) a variant
of the NovaThor series.

Yours,
Linus Walleij