Initial Device Tree support for S3C64xx

Quoted 4 lines · Tomasz Figa

(quoted diff) +1 -0

+	* This gpio driver includes support for device tree support and

there

(quoted diff) +1 -0

+	* are platforms using it. In order to maintain compatibility with

those + * platforms, and to allow non-dt Exynos4210 platforms to

Quoted 1 line

this + * gpiolib support, a check is added to find out if there

Quoted 1 line

active

Cut'n'paste error here.

drivers/gpio/gpio-samsung.c static __init int samsung_gpiolib_init(void) · line 3034

Quoted 5 lines · Tomasz Figa

drivers/gpio/gpio-samsung.c +1 -0

 		{ .compatible = "samsung,exynos4x12-pinctrl", },
 		{ .compatible = "samsung,exynos5250-pinctrl", },
 		{ .compatible = "samsung,exynos5440-pinctrl", },
 
+		{ },

Strictly speaking this is a separate bug fix (though I see that's already in -next separately anyway so whatever).

Quoted 2 lines · On Tuesday 16 of April 2013 17:27:50 Mark Brown wrote:

Strictly speaking this is a separate bug fix (though I see that's already in -next separately anyway so whatever).

Right. But this fix is so small that I thought it would be a major waste of mail server processing power to send it as a separate patch.

Quoted 4 lines · Tomasz Figa

Quoted 2 lines · On Tuesday 16 of April 2013 17:27:50 Mark Brown wrote:

Strictly speaking this is a separate bug fix (though I see that's already in -next separately anyway so whatever).

Quoted 2 lines

Right. But this fix is so small that I thought it would be a major waste of mail server processing power to send it as a separate patch.

There's reviewer bandwidth too - one of the things people check for is that the change is doing what it's supposed to do, extra stuff in there is usually a red flag.

This patch adds basic device tree definitions for Samsung S3C64xx SoCs.

Since all the SoCs in the series are very similar, the files are created hierarchically - one file for the whole series and then separate files for particular SoCs including the common one.

Signed-off-by Tomasz Figa <[email protected]>

---
 arch/arm/boot/dts/s3c6400.dtsi         |  33 ++
 arch/arm/boot/dts/s3c6410.dtsi         |  33 ++
 arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 683 +++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/s3c64xx.dtsi         | 136 +++++++
 4 files changed, 885 insertions(+)
 create mode 100644 arch/arm/boot/dts/s3c6400.dtsi
 create mode 100644 arch/arm/boot/dts/s3c6410.dtsi
 create mode 100644 arch/arm/boot/dts/s3c64xx-pinctrl.dtsi
 create mode 100644 arch/arm/boot/dts/s3c64xx.dtsi

arch/arm/boot/dts/s3c64xx.dtsi new file +104 -0

+		compatible = "arm,pl192-vic";
+		interrupt-controller;
+		reg = <0x71200000 0x1000>;
+		#interrupt-cells = <1>;
+	};
+
+	vic1: interrupt-controller at 71300000 {
+		compatible = "arm,pl192-vic";
+		interrupt-controller;
+		reg = <0x71300000 0x1000>;
+		#interrupt-cells = <1>;
+	};
+
+	pinctrl0: pinctrl at 7f008000 {
+		compatible = "samsung,s3c64xx-pinctrl";
+		reg = <0x7f008000 0x1000>;
+		interrupt-parent = <&vic1>;
+		interrupts = <21>;
+
+		pctrl_int_map: pinctrl-interrupt-map {
+			interrupt-map = <0 &vic0 0>,
+					<1 &vic0 1>,
+					<2 &vic1 0>,
+					<3 &vic1 1>;
+			#address-cells = <0>;
+			#size-cells = <0>;
+			#interrupt-cells = <1>;
+		};
+
+		wakeup-interrupt-controller {
+			compatible = "samsung,s3c64xx-wakeup-eint";
+			interrupts = <0>, <1>, <2>, <3>;
+			interrupt-parent = <&pctrl_int_map>;
+		};
+	};
+
+	pwm: pwm at 7f006000 {
+		compatible = "samsung,s3c6400-pwm";
+		reg = <0x7f006000 0x1000>;
+		interrupt-parent = <&vic0>;
+		interrupts = <23>, <24>, <25>, <27>, <28>;
+		samsung,pwm-outputs = <0>, <1>;
+		#pwm-cells = <3>;
+		status = "disabled";
+	};
+
+	uart0: serial at 7f005000 {
+		compatible = "samsung,s3c6400-uart";
+		reg = <0x7f005000 0x100>;
+		interrupt-parent = <&vic1>;
+		interrupts = <5>;
+		status = "disabled";
+	};
+
+	uart1: serial at 7f005400 {
+		compatible = "samsung,s3c6400-uart";
+		reg = <0x7f005400 0x100>;
+		interrupt-parent = <&vic1>;
+		interrupts = <6>;
+		status = "disabled";
+	};
+
+	uart2: serial at 7f005800 {
+		compatible = "samsung,s3c6400-uart";
+		reg = <0x7f005800 0x100>;
+		interrupt-parent = <&vic1>;
+		interrupts = <7>;
+		status = "disabled";
+	};
+
+	uart3: serial at 7f005c00 {
+		compatible = "samsung,s3c6400-uart";
+		reg = <0x7f005c00 0x100>;
+		interrupt-parent = <&vic1>;
+		interrupts = <8>;
+		status = "disabled";
+	};
+
+	sdhci0: sdhci at 7c200000 {
+		compatible = "samsung,s3c6410-sdhci";
+		reg = <0x7c200000 0x100>;
+		interrupt-parent = <&vic1>;
+		interrupts = <24>;
+		status = "disabled";
+	};
+
+	sdhci1: sdhci at 7c300000 {
+		compatible = "samsung,s3c6410-sdhci";
+		reg = <0x7c300000 0x100>;
+		interrupt-parent = <&vic1>;
+		interrupts = <25>;
+		status = "disabled";
+	};
+
+	sdhci2: sdhci at 7c400000 {
+		compatible = "samsung,s3c6410-sdhci";
+		reg = <0x7c400000 0x100>;
+		interrupt-parent = <&vic1>;
+		interrupts = <17>;
+		status = "disabled";
+	};
+};
+
+/include/ "s3c64xx-pinctrl.dtsi"

Quoted 9 lines · Tomasz Figa

This patch adds basic device tree definitions for Samsung S3C64xx SoCs.

Since all the SoCs in the series are very similar, the files are created hierarchically - one file for the whole series and then separate files for particular SoCs including the common one.

Signed-off-by Tomasz Figa <[email protected]>

---

Quoted 10 lines

 arch/arm/boot/dts/s3c6400.dtsi         |  33 ++
 arch/arm/boot/dts/s3c6410.dtsi         |  33 ++
 arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 683
 +++++++++++++++++++++++++++++++++ arch/arm/boot/dts/s3c64xx.dtsi        
 | 136 +++++++
 4 files changed, 885 insertions(+)
 create mode 100644 arch/arm/boot/dts/s3c6400.dtsi
 create mode 100644 arch/arm/boot/dts/s3c6410.dtsi
 create mode 100644 arch/arm/boot/dts/s3c64xx-pinctrl.dtsi
 create mode 100644 arch/arm/boot/dts/s3c64xx.dtsi

[...]

Review

Quoted 2 lines

(quoted diff) +2 -0

+
+	vic0: interrupt-controller at 71200000 {

These nodes should be off a "simple-bus" node.

Rob

Quoted 94 lines

arch/arm/boot/dts/s3c64xx.dtsi new file +94 -0

+		compatible = "arm,pl192-vic";
+		interrupt-controller;
+		reg = <0x71200000 0x1000>;
+		#interrupt-cells = <1>;
+	};
+
+	vic1: interrupt-controller at 71300000 {
+		compatible = "arm,pl192-vic";
+		interrupt-controller;
+		reg = <0x71300000 0x1000>;
+		#interrupt-cells = <1>;
+	};
+
+	pinctrl0: pinctrl at 7f008000 {
+		compatible = "samsung,s3c64xx-pinctrl";
+		reg = <0x7f008000 0x1000>;
+		interrupt-parent = <&vic1>;
+		interrupts = <21>;
+
+		pctrl_int_map: pinctrl-interrupt-map {
+			interrupt-map = <0 &vic0 0>,
+					<1 &vic0 1>,
+					<2 &vic1 0>,
+					<3 &vic1 1>;
+			#address-cells = <0>;
+			#size-cells = <0>;
+			#interrupt-cells = <1>;
+		};
+
+		wakeup-interrupt-controller {
+			compatible = "samsung,s3c64xx-wakeup-eint";
+			interrupts = <0>, <1>, <2>, <3>;
+			interrupt-parent = <&pctrl_int_map>;
+		};
+	};
+
+	pwm: pwm at 7f006000 {
+		compatible = "samsung,s3c6400-pwm";
+		reg = <0x7f006000 0x1000>;
+		interrupt-parent = <&vic0>;
+		interrupts = <23>, <24>, <25>, <27>, <28>;
+		samsung,pwm-outputs = <0>, <1>;
+		#pwm-cells = <3>;
+		status = "disabled";
+	};
+
+	uart0: serial at 7f005000 {
+		compatible = "samsung,s3c6400-uart";
+		reg = <0x7f005000 0x100>;
+		interrupt-parent = <&vic1>;
+		interrupts = <5>;
+		status = "disabled";
+	};
+
+	uart1: serial at 7f005400 {
+		compatible = "samsung,s3c6400-uart";
+		reg = <0x7f005400 0x100>;
+		interrupt-parent = <&vic1>;
+		interrupts = <6>;
+		status = "disabled";
+	};
+
+	uart2: serial at 7f005800 {
+		compatible = "samsung,s3c6400-uart";
+		reg = <0x7f005800 0x100>;
+		interrupt-parent = <&vic1>;
+		interrupts = <7>;
+		status = "disabled";
+	};
+
+	uart3: serial at 7f005c00 {
+		compatible = "samsung,s3c6400-uart";
+		reg = <0x7f005c00 0x100>;
+		interrupt-parent = <&vic1>;
+		interrupts = <8>;
+		status = "disabled";
+	};
+
+	sdhci0: sdhci at 7c200000 {
+		compatible = "samsung,s3c6410-sdhci";
+		reg = <0x7c200000 0x100>;
+		interrupt-parent = <&vic1>;
+		interrupts = <24>;
+		status = "disabled";
+	};
+
+	sdhci1: sdhci at 7c300000 {
+		compatible = "samsung,s3c6410-sdhci";
+		reg = <0x7c300000 0x100>;
+		interrupt-parent = <&vic1>;
+		interrupts = <25>;
+		status = "disabled";
+	};
+

arch/arm/boot/dts/s3c64xx.dtsi line 136

Quoted 10 lines

arch/arm/boot/dts/s3c64xx.dtsi new file +10 -0

+	sdhci2: sdhci at 7c400000 {
+		compatible = "samsung,s3c6410-sdhci";
+		reg = <0x7c400000 0x100>;
+		interrupt-parent = <&vic1>;
+		interrupts = <17>;
+		status = "disabled";
+	};
+};
+
+/include/ "s3c64xx-pinctrl.dtsi"

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 26 lines · On Tuesday 16 of April 2013 08:09:10 Rob Herring wrote:

Quoted 19 lines · Tomasz Figa

This patch adds basic device tree definitions for Samsung S3C64xx SoCs.

Since all the SoCs in the series are very similar, the files are created hierarchically - one file for the whole series and then separate files for particular SoCs including the common one.

Signed-off-by Tomasz Figa <[email protected]>

---

 arch/arm/boot/dts/s3c6400.dtsi         |  33 ++
 arch/arm/boot/dts/s3c6410.dtsi         |  33 ++
 arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 683
 +++++++++++++++++++++++++++++++++ arch/arm/boot/dts/s3c64xx.dtsi
 | 136 +++++++
 4 files changed, 885 insertions(+)
 create mode 100644 arch/arm/boot/dts/s3c6400.dtsi
 create mode 100644 arch/arm/boot/dts/s3c6410.dtsi
 create mode 100644 arch/arm/boot/dts/s3c64xx-pinctrl.dtsi
 create mode 100644 arch/arm/boot/dts/s3c64xx.dtsi

[...]

Quoted 2 lines

(quoted diff) +2 -0

+
+   vic0: interrupt-controller at 71200000 {

Quoted 1 line

These nodes should be off a "simple-bus" node.

Hmm, is there any reason behind it?

I thought simple bus was just a convenient helper to represent hierarchical bus structures if one has a need to do so.

Quoted 6 lines

Quoted 3 lines

Quoted 1 line

+ vic0: interrupt-controller at 71200000 {

These nodes should be off a "simple-bus" node.

Hmm, is there any reason behind it?

Quoted 2 lines

I thought simple bus was just a convenient helper to represent hierarchical bus structures if one has a need to do so.

No. The DT should reflect the bus structure of the chip. How accurately it is done is up to you and the information available, but you have to have a bus of some sort.

There's obvious examples that don't follow this, but I'd like to not have more.

Quoted 10 lines · Rob Herring

Quoted 9 lines

Quoted 3 lines

Quoted 1 line

+ vic0: interrupt-controller at 71200000 {

These nodes should be off a "simple-bus" node.

Hmm, is there any reason behind it?

I thought simple bus was just a convenient helper to represent hierarchical
bus structures if one has a need to do so.

Quoted 6 lines

No. The DT should reflect the bus structure of the chip. How accurately it is done is up to you and the information available, but you have to have a bus of some sort.

There's obvious examples that don't follow this, but I'd like to not have more.

Tomasz, can you address comments?

Quoted 1 line

Tomasz, can you address comments?

Please discard this series for now.

I've decided to post it for 3.11, including a driver for Common Clock Framework and several cleanup patches, which I have ready and waiting.

This series adds Device Tree support for Samsung S3C64xx SoC series.

It fixes several problems preventing from booting an S3C64xx-based system using Device Tree, adds all the infrastructure for Device Tree-based board support, including mach-s3c64xx-dt and dts include files for S3C64xx SoCs, and basic device tree source for FriendlyARM Mini6410 board.

Commit f67faf487 added driver data for Exynos5250, which is available only if CONFIG_PINCTRL_EXYNOS is enabled. However probably due to merge error, the reference to this driver data structure was located outside of relevant ifdef and compiled unconditionally, leading to link error with CONFIG_PINCTRL_EXYNOS.

This patch fixes mentioned link error by moving driver data entry under ifdef CONFIG_PINCTRL_EXYNOS.

Signed-off-by Tomasz Figa <[email protected]>

Quoted 9 lines · Tomasz Figa

Commit f67faf487 added driver data for Exynos5250, which is available only if CONFIG_PINCTRL_EXYNOS is enabled. However probably due to merge error, the reference to this driver data structure was located outside of relevant ifdef and compiled unconditionally, leading to link error with CONFIG_PINCTRL_EXYNOS.

This patch fixes mentioned link error by moving driver data entry under ifdef CONFIG_PINCTRL_EXYNOS.

Quoted 1 line

Signed-off-by Tomasz Figa <[email protected]>

This does not apply to my "devel" branch in the pinctrl tree.

Could you rebase it on that branch?

Or is the error not even in my tree?

Quoted 4 lines · On Tuesday 23 of April 2013 14:03:12 Linus Walleij wrote:

This does not apply to my "devel" branch in the pinctrl tree.

Could you rebase it on that branch?

Quoted 1 line

Or is the error not even in my tree?

This one got sent incorrectly due to my mistake. Please try the correct version:

[PATCH RESEND 2/2] pinctrl: samsung: Fix link error with CONFIG_PINCTRL_EXYNOS disabled

Quoted 10 lines · Tomasz Figa

Quoted 5 lines · On Tuesday 23 of April 2013 14:03:12 Linus Walleij wrote:

This does not apply to my "devel" branch in the pinctrl tree.

Could you rebase it on that branch?

Or is the error not even in my tree?

This one got sent incorrectly due to my mistake. Please try the correct version:

Quoted 2 lines

[PATCH RESEND 2/2] pinctrl: samsung: Fix link error with CONFIG_PINCTRL_EXYNOS disabled

This does not apply either.

Can you please test against the "devel" branch in the pinctrl tree?

Quoted 16 lines · On Wednesday 24 of April 2013 16:27:09 Linus Walleij wrote:

Quoted 5 lines · Tomasz Figa

Quoted 4 lines · On Tuesday 23 of April 2013 14:03:12 Linus Walleij wrote:

This does not apply to my "devel" branch in the pinctrl tree.

Could you rebase it on that branch?

Quoted 7 lines

Quoted 1 line

Or is the error not even in my tree?

This one got sent incorrectly due to my mistake. Please try the correct version:

[PATCH RESEND 2/2] pinctrl: samsung: Fix link error with CONFIG_PINCTRL_EXYNOS disabled

This does not apply either.

Quoted 1 line

Can you please test against the "devel" branch in the pinctrl tree?

Right, it does not apply.

Well, actually it does with git am -3, but it is incorrect, since the problem it intends to fix is not present in your tree, but rather is a merge error in linux-next in a merge of Kgene's and your tree...

Commit de88cbb7 moved definitions of chained_irq_enter and chained_irq_exit to a generic header, which must be now included instead of the legacy arch-specific one.

This patch fixes build error caused by including the legacy header leading to undefined chained_irq_enter and chained_irq_exit symbols.

Signed-off-by Tomasz Figa <[email protected]>

This series adds Device Tree support for Samsung S3C64xx SoC series.

It fixes several problems preventing from booting an S3C64xx-based system using Device Tree, adds all the infrastructure for Device Tree-based board support, including mach-s3c64xx-dt and dts include files for S3C64xx SoCs, and basic device tree source for FriendlyARM Mini6410 board.