Skip to contentSkip to conversation

Broadcom Cygnus device tree changes

PATCH Superseded Ray Jui 3 participants 25 messages Sep 18, 2015 – Sep 24, 2015

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Ray Jui

author maintainer
#0 lore raw

v2 cover Broadcom Cygnus device tree changes

This patch series cleans up the Broadcom Cygnus device tree files and makes it more consistent with the rest of Broadcom iProc device tree files. This patch series also enables various peripherals on Cygnus boards. They include:

bcm11360_entphn:
NAND

bcm958300k:
touchscreen

bcm958305k:
I2C, PCIe, NAND, touchscreen

Code is based on v4.3-rc1 and is available on GITHUB:
https://github.com/Broadcom/cygnus-linux/tree/cygnus-dt-v2

Chages from V1:
- Break the major clean up change into separate patches

Ray Jui (9):
ARM: dts: consolidate aliases for Cygnus dt files
ARM: dts: Use label for device nodes in Cygnus dts
ARM: dts: Remove unused PCI I/O resource in Cygnus
ARM: dts: Put Cygnus core components under core bus
ARM: dts: Move all Cygnus peripherals into soc bus
ARM: dts: Reorder Cygnus peripherals
ARM: dts: Enable various peripherals on bcm958305k
ARM: dts: Enable NAND support on bcm911360_entphn
ARM: dts: enable touchscreen support on Cygnus

 arch/arm/boot/dts/bcm-cygnus.dtsi      | 337 +++++++++++++++++----------------
 arch/arm/boot/dts/bcm911360_entphn.dts |  28 ++-
 arch/arm/boot/dts/bcm911360k.dts       |  10 +-
 arch/arm/boot/dts/bcm958300k.dts       |  45 ++---
 arch/arm/boot/dts/bcm958305k.dts       |  41 +++-
 arch/arm/boot/dts/bcm9hmidc.dtsi       |  42 ++++
 6 files changed, 299 insertions(+), 204 deletions(-)
 create mode 100644 arch/arm/boot/dts/bcm9hmidc.dtsi
Signature · 1 line
1.9.1
author maintainer
#1 lore raw

PATCH v2 1/9 ARM: dts: consolidate aliases for Cygnus dt files

Move aliases into bcm-cygnus.dtsi to avoid duplications in Cygnus dts files

---
 arch/arm/boot/dts/bcm-cygnus.dtsi      | 4 ++++
 arch/arm/boot/dts/bcm911360_entphn.dts | 4 ----
 arch/arm/boot/dts/bcm911360k.dts       | 4 ----
 arch/arm/boot/dts/bcm958300k.dts       | 4 ----
 arch/arm/boot/dts/bcm958305k.dts       | 4 ----
 5 files changed, 4 insertions(+), 16 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +4 -0
index e1ac07a..30903ba 100644
@@ -40,6 +40,10 @@
 	model = "Broadcom Cygnus SoC";
 	interrupt-parent = <&gic>;
 
+	aliases {
+		serial0 = &uart3;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
arch/arm/boot/dts/bcm911360_entphn.dts +0 -4
index 7db4843..0e1320e 100644
@@ -39,10 +39,6 @@
 	model = "Cygnus Enterprise Phone (BCM911360_ENTPHN)";
 	compatible = "brcm,bcm11360", "brcm,cygnus";
 
-	aliases {
-		serial0 = &uart3;
-	};
-
 	chosen {
 		stdout-path = &uart3;
 		bootargs = "console=ttyS0,115200";
arch/arm/boot/dts/bcm911360k.dts +0 -4
index 9658d4f..2af40c6 100644
@@ -38,10 +38,6 @@
 	model = "Cygnus SVK (BCM911360K)";
 	compatible = "brcm,bcm11360", "brcm,cygnus";
 
-	aliases {
-		serial0 = &uart3;
-	};
-
 	chosen {
 		stdout-path = &uart3;
 		bootargs = "console=ttyS0,115200";
arch/arm/boot/dts/bcm958300k.dts +0 -4
index 2f63052..75e50f0 100644
@@ -38,10 +38,6 @@
 	model = "Cygnus SVK (BCM958300K)";
 	compatible = "brcm,bcm58300", "brcm,cygnus";
 
-	aliases {
-		serial0 = &uart3;
-	};
-
 	chosen {
 		stdout-path = &uart3;
 		bootargs = "console=ttyS0,115200";
arch/arm/boot/dts/bcm958305k.dts +0 -4
index 56b429a..bf62e1b 100644
@@ -38,10 +38,6 @@
 	model = "Cygnus Wireless Audio (BCM958305K)";
 	compatible = "brcm,bcm58305", "brcm,cygnus";
 
-	aliases {
-		serial0 = &uart3;
-	};
-
 	chosen {
 		stdout-path = &uart3;
 		bootargs = "console=ttyS0,115200";
Signature · 1 line
1.9.1
#2 lore raw

Re: [PATCH v2 1/9] ARM: dts: consolidate aliases for Cygnus dt files

Quoted 3 lines · On Friday 18 September 2015 14:24:06 Ray Jui wrote:

Move aliases into bcm-cygnus.dtsi to avoid duplications in Cygnus dts files

We generally recommend keeping them separate:

arch/arm/boot/dts/bcm-cygnus.dtsi line 46

Quoted 12 lines
arch/arm/boot/dts/bcm-cygnus.dtsi +4 -0
index e1ac07a..30903ba 100644
@@ -40,6 +40,10 @@
        model = "Broadcom Cygnus SoC";
        interrupt-parent = <&gic>;
 
+       aliases {
+               serial0 = &uart3;
+       };
+

The SoC has at least four uarts according to this, so it seems unlikely that each board really only uses only the fourth one of them and labels it '0' on the board. As soon as you get one board that has more than one uart wired up, you would need to undo this.

Arnd

author maintainer
#3 lore raw

Re: [PATCH v2 1/9] ARM: dts: consolidate aliases for Cygnus dt files

Quoted 25 lines · Arnd Bergmann
Quoted 3 lines · On Friday 18 September 2015 14:24:06 Ray Jui wrote:

Move aliases into bcm-cygnus.dtsi to avoid duplications in Cygnus dts files

We generally recommend keeping them separate:

arch/arm/boot/dts/bcm-cygnus.dtsi line 46

Quoted 12 lines
arch/arm/boot/dts/bcm-cygnus.dtsi +4 -0
index e1ac07a..30903ba 100644
@@ -40,6 +40,10 @@
        model = "Broadcom Cygnus SoC";
        interrupt-parent = <&gic>;
 
+       aliases {
+               serial0 = &uart3;
+       };
+

The SoC has at least four uarts according to this, so it seems unlikely that each board really only uses only the fourth one of them and labels it '0' on the board. As soon as you get one board that has more than one uart wired up, you would need to undo this.

Quoted 2 lines

Arnd

I think Scott might have explained this in the past. uart3 is going to be used on all Cygnus boards (including all future boards) because the bootrom was designed to use uart3 as console and that won't change.

Let me know if you still think I need to move this back to the dts.

Thanks,

Ray

#4 lore raw

Re: [PATCH v2 1/9] ARM: dts: consolidate aliases for Cygnus dt files

Quoted 9 lines · On Friday 18 September 2015 14:44:54 Ray Jui wrote:
Quoted 7 lines · Arnd Bergmann

On Friday 18 September 2015 14:24:06 Ray Jui wrote:

The SoC has at least four uarts according to this, so it seems unlikely that each board really only uses only the fourth one of them and labels it '0' on the board. As soon as you get one board that has more than one uart wired up, you would need to undo this.

Quoted 5 lines

I think Scott might have explained this in the past. uart3 is going to be used on all Cygnus boards (including all future boards) because the bootrom was designed to use uart3 as console and that won't change.

Let me know if you still think I need to move this back to the dts.

I would still like to see them stay in the .dts file, if only for consistency with other platforms.

Also, even if you can guarantee that uart3 is always used for the console, that doesn't prevent board designers from adding more than one uart, right?

Arnd

author maintainer
#5 lore raw

Re: [PATCH v2 1/9] ARM: dts: consolidate aliases for Cygnus dt files

Quoted 16 lines · Arnd Bergmann
Quoted 9 lines · On Friday 18 September 2015 14:44:54 Ray Jui wrote:
Quoted 7 lines · Arnd Bergmann

On Friday 18 September 2015 14:24:06 Ray Jui wrote:

The SoC has at least four uarts according to this, so it seems unlikely that each board really only uses only the fourth one of them and labels it '0' on the board. As soon as you get one board that has more than one uart wired up, you would need to undo this.

Quoted 5 lines

I think Scott might have explained this in the past. uart3 is going to be used on all Cygnus boards (including all future boards) because the bootrom was designed to use uart3 as console and that won't change.

Let me know if you still think I need to move this back to the dts.

Quoted 9 lines

I would still like to see them stay in the .dts file, if only for consistency with other platforms.

Also, even if you can guarantee that uart3 is always used for the console, that doesn't prevent board designers from adding more than one uart, right?

Arnd

Okay. Given that this patch series has been merged by Florian, I'll submit another patch to move it back to .dts files.

Thanks,

Ray

#6 lore raw

Re: [PATCH v2 1/9] ARM: dts: consolidate aliases for Cygnus dt files

Quoted 26 lines · Ray Jui
Quoted 23 lines · Arnd Bergmann
Quoted 9 lines · On Friday 18 September 2015 14:44:54 Ray Jui wrote:
Quoted 7 lines · Arnd Bergmann

On Friday 18 September 2015 14:24:06 Ray Jui wrote:

The SoC has at least four uarts according to this, so it seems unlikely that each board really only uses only the fourth one of them and labels it '0' on the board. As soon as you get one board that has more than one uart wired up, you would need to undo this.

Quoted 5 lines

I think Scott might have explained this in the past. uart3 is going to be used on all Cygnus boards (including all future boards) because the bootrom was designed to use uart3 as console and that won't change.

Let me know if you still think I need to move this back to the dts.

I would still like to see them stay in the .dts file, if only for consistency with other platforms.

Also, even if you can guarantee that uart3 is always used for the console, that doesn't prevent board designers from adding more than one uart, right?

Quoted 5 lines
Quoted 2 lines

Arnd

Okay. Given that this patch series has been merged by Florian, I'll submit another patch to move it back to .dts files.

You could send me either a replacement patch series (all 9), or an individual patch to replace a previous version (e.g; replace v2 with a v3), or an incremental one, whatever works for you.

Thanks!

Signature · 1 line
Florian
author maintainer
#7 lore raw

Re: [PATCH v2 1/9] ARM: dts: consolidate aliases for Cygnus dt files

Quoted 30 lines · Florian Fainelli
Quoted 29 lines · Ray Jui
Quoted 25 lines · Arnd Bergmann
Quoted 9 lines · On Friday 18 September 2015 14:44:54 Ray Jui wrote:
Quoted 7 lines · Arnd Bergmann

On Friday 18 September 2015 14:24:06 Ray Jui wrote:

The SoC has at least four uarts according to this, so it seems unlikely that each board really only uses only the fourth one of them and labels it '0' on the board. As soon as you get one board that has more than one uart wired up, you would need to undo this.

Quoted 5 lines

I think Scott might have explained this in the past. uart3 is going to be used on all Cygnus boards (including all future boards) because the bootrom was designed to use uart3 as console and that won't change.

Let me know if you still think I need to move this back to the dts.

I would still like to see them stay in the .dts file, if only for consistency with other platforms.

Also, even if you can guarantee that uart3 is always used for the console, that doesn't prevent board designers from adding more than one uart, right?

Arnd

Quoted 9 lines
Quoted 2 lines

Okay. Given that this patch series has been merged by Florian, I'll submit another patch to move it back to .dts files.

You could send me either a replacement patch series (all 9), or an individual patch to replace a previous version (e.g; replace v2 with a v3), or an incremental one, whatever works for you.

Thanks!

Hi Florian, I just sent you an incremental patch to move the alias back to .dts files.

Thanks,

Ray

author maintainer
#8 lore raw

PATCH v2 2/9 ARM: dts: Use label for device nodes in Cygnus dts

In reply to Ray Jui

Use label instead of full path to reference device nodes in Cygnus dts files

---
 arch/arm/boot/dts/bcm911360_entphn.dts |  8 +++----
 arch/arm/boot/dts/bcm911360k.dts       |  6 ++---
 arch/arm/boot/dts/bcm958300k.dts       | 40 +++++++++++++++++-----------------
 arch/arm/boot/dts/bcm958305k.dts       |  6 ++---
 4 files changed, 30 insertions(+), 30 deletions(-)
arch/arm/boot/dts/bcm911360_entphn.dts +4 -4
index 0e1320e..f791a3b 100644
@@ -44,10 +44,6 @@
 		bootargs = "console=ttyS0,115200";
 	};
 
-	uart3: serial at 18023000 {
-		status = "okay";
-	};
-
 	gpio_keys {
 		compatible = "gpio-keys";
 		#address-cells = <1>;
@@ -60,3 +56,7 @@
 		};
 	};
 };
+
+&uart3 {
+	status = "okay";
+};
arch/arm/boot/dts/bcm911360k.dts +3 -3
index 2af40c6..814011c 100644
@@ -42,8 +42,8 @@
 		stdout-path = &uart3;
 		bootargs = "console=ttyS0,115200";
 	};
+};
 
-	uart3: serial at 18023000 {
-		status = "okay";
-	};
+&uart3 {
+	status = "okay";
 };
arch/arm/boot/dts/bcm958300k.dts +20 -20
index 75e50f0..d8dc9f0 100644
@@ -42,32 +42,32 @@
 		stdout-path = &uart3;
 		bootargs = "console=ttyS0,115200";
 	};
+};
 
-	pcie0: pcie at 18012000 {
-		status = "okay";
-	};
+&pcie0 {
+	status = "okay";
+};
 
-	pcie1: pcie at 18013000 {
-		status = "okay";
-	};
+&pcie1 {
+	status = "okay";
+};
 
-	uart3: serial at 18023000 {
-		status = "okay";
-	};
+&uart3 {
+	status = "okay";
+};
 
-	nand: nand at 18046000 {
-		nandcs at 1 {
-			compatible = "brcm,nandcs";
-			reg = <0>;
-			nand-on-flash-bbt;
+&nand {
+	nandcs at 1 {
+		compatible = "brcm,nandcs";
+		reg = <0>;
+		nand-on-flash-bbt;
 
-			#address-cells = <1>;
-			#size-cells = <1>;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-			nand-ecc-strength = <24>;
-			nand-ecc-step-size = <1024>;
+		nand-ecc-strength = <24>;
+		nand-ecc-step-size = <1024>;
 
-			brcm,nand-oob-sector-size = <27>;
-		};
+		brcm,nand-oob-sector-size = <27>;
 	};
 };
arch/arm/boot/dts/bcm958305k.dts +3 -3
index bf62e1b..af11a8e 100644
@@ -42,8 +42,8 @@
 		stdout-path = &uart3;
 		bootargs = "console=ttyS0,115200";
 	};
+};
 
-	uart3: serial at 18023000 {
-		status = "okay";
-	};
+&uart3 {
+	status = "okay";
 };
Signature · 1 line
1.9.1
author maintainer
#9 lore raw

PATCH v2 3/9 ARM: dts: Remove unused PCI I/O resource in Cygnus

In reply to Ray Jui

Remove unused PCI I/O resource in bcm-cygnus.dtsi

---
 arch/arm/boot/dts/bcm-cygnus.dtsi | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +2 -4
index 30903ba..0a5898b 100644
@@ -145,8 +145,7 @@
 		#address-cells = <3>;
 		#size-cells = <2>;
 		device_type = "pci";
-		ranges = <0x81000000 0 0	  0x28000000 0 0x00010000
-			  0x82000000 0 0x20000000 0x20000000 0 0x04000000>;
+		ranges = <0x82000000 0 0x20000000 0x20000000 0 0x04000000>;
 
 		status = "disabled";
 	};
@@ -166,8 +165,7 @@
 		#address-cells = <3>;
 		#size-cells = <2>;
 		device_type = "pci";
-		ranges = <0x81000000 0 0	  0x48000000 0 0x00010000
-			  0x82000000 0 0x40000000 0x40000000 0 0x04000000>;
+		ranges = <0x82000000 0 0x40000000 0x40000000 0 0x04000000>;
 
 		status = "disabled";
 	};
Signature · 1 line
1.9.1
author maintainer
#11 lore raw

Re: [PATCH v2 3/9] ARM: dts: Remove unused PCI I/O resource in Cygnus

Quoted 11 lines · Arnd Bergmann
Quoted 5 lines · On Friday 18 September 2015 14:24:08 Ray Jui wrote:

Remove unused PCI I/O resource in bcm-cygnus.dtsi

Why? How do you know that nobody ever plugs in a card with I/O ports?

Arnd

I'll drop this change.

Thanks,

Ray

author maintainer
#12 lore raw

PATCH v2 4/9 ARM: dts: Put Cygnus core components under core bus

In reply to Ray Jui

Put all Cygnus core components into "core" node of type "simple-bus" in bcm-cygnus.dtsi

---
 arch/arm/boot/dts/bcm-cygnus.dtsi | 54 ++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 24 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +30 -24
index 0a5898b..d4e2d04 100644
@@ -58,6 +58,36 @@
 
 	/include/ "bcm-cygnus-clock.dtsi"
 
+	core {
+		compatible = "simple-bus";
+		ranges;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		timer at 19020200 {
+			compatible = "arm,cortex-a9-global-timer";
+			reg = <0x19020200 0x100>;
+			interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&periph_clk>;
+		};
+
+		gic: interrupt-controller at 19021000 {
+			compatible = "arm,cortex-a9-gic";
+			#interrupt-cells = <3>;
+			#address-cells = <0>;
+			interrupt-controller;
+			reg = <0x19021000 0x1000>,
+			      <0x19020100 0x100>;
+		};
+
+		L2: l2-cache {
+			compatible = "arm,pl310-cache";
+			reg = <0x19022000 0x1000>;
+			cache-unified;
+			cache-level = <2>;
+		};
+	};
+
 	pinctrl: pinctrl at 0x0301d0c8 {
 		compatible = "brcm,cygnus-pinmux";
 		reg = <0x0301d0c8 0x30>,
@@ -225,28 +255,4 @@
 
 		brcm,nand-has-wp;
 	};
-
-	gic: interrupt-controller at 19021000 {
-		compatible = "arm,cortex-a9-gic";
-		#interrupt-cells = <3>;
-		#address-cells = <0>;
-		interrupt-controller;
-		reg = <0x19021000 0x1000>,
-		      <0x19020100 0x100>;
-	};
-
-	L2: l2-cache {
-		compatible = "arm,pl310-cache";
-		reg = <0x19022000 0x1000>;
-		cache-unified;
-		cache-level = <2>;
-	};
-
-	timer at 19020200 {
-		compatible = "arm,cortex-a9-global-timer";
-		reg = <0x19020200 0x100>;
-		interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&periph_clk>;
-	};
-
 };
Signature · 1 line
1.9.1
#13 lore raw

Re: [PATCH v2 4/9] ARM: dts: Put Cygnus core components under core bus

Quoted 6 lines · On Friday 18 September 2015 14:24:09 Ray Jui wrote:
arch/arm/boot/dts/bcm-cygnus.dtsi +4 -0
+       core {
+               compatible = "simple-bus";
+               ranges;
+               #address-cells = <1>;

arch/arm/boot/dts/bcm-cygnus.dtsi line 74

Quoted 10 lines
arch/arm/boot/dts/bcm-cygnus.dtsi +10 -0
+               #size-cells = <1>;
+
+               timer at 19020200 {
+                       compatible = "arm,cortex-a9-global-timer";
+                       reg = <0x19020200 0x100>;
+                       interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&periph_clk>;
+               };
+
+               gic: interrupt-controller at 19021000 {

Could it be that all 'core' components are in the 0x19xxxxxx address range? If so, please set up an appropriate ranges property for the bus. Also add the address field for the bus according to which addresses are routed to it.

Arnd

author maintainer
#14 lore raw

Re: [PATCH v2 4/9] ARM: dts: Put Cygnus core components under core bus

Quoted 23 lines · Arnd Bergmann
Quoted 6 lines · On Friday 18 September 2015 14:24:09 Ray Jui wrote:
arch/arm/boot/dts/bcm-cygnus.dtsi +4 -0
+       core {
+               compatible = "simple-bus";
+               ranges;
+               #address-cells = <1>;

arch/arm/boot/dts/bcm-cygnus.dtsi line 74

Quoted 10 lines
arch/arm/boot/dts/bcm-cygnus.dtsi +10 -0
+               #size-cells = <1>;
+
+               timer at 19020200 {
+                       compatible = "arm,cortex-a9-global-timer";
+                       reg = <0x19020200 0x100>;
+                       interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&periph_clk>;
+               };
+
+               gic: interrupt-controller at 19021000 {

Could it be that all 'core' components are in the 0x19xxxxxx address range? If so, please set up an appropriate ranges property for the bus. Also add the address field for the bus according to which addresses are routed to it.

Quoted 2 lines

Arnd

Yes all 'core' components are in the 0x19xxxxx address range for Cygnus. It's fine and makes sense to set up proper ranges for this bus. But I might have some issues with the 'soc' components and the 'soc' bus, which I'll explain and discuss on the next email.

Ray

author maintainer
#15 lore raw

PATCH v2 5/9 ARM: dts: Move all Cygnus peripherals into soc bus

In reply to Ray Jui

Move all Cygnus peripherals to be under the "soc" bus node of type "simple-bus"

---
 arch/arm/boot/dts/bcm-cygnus.dtsi | 275 +++++++++++++++++++-------------------
 1 file changed, 138 insertions(+), 137 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +138 -137
index d4e2d04..3d29b77 100644
@@ -88,171 +88,172 @@
 		};
 	};
 
-	pinctrl: pinctrl at 0x0301d0c8 {
-		compatible = "brcm,cygnus-pinmux";
-		reg = <0x0301d0c8 0x30>,
-		      <0x0301d24c 0x2c>;
-	};
+	soc {
+		compatible = "simple-bus";
+		ranges;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-	gpio_crmu: gpio at 03024800 {
-		compatible = "brcm,cygnus-crmu-gpio";
-		reg = <0x03024800 0x50>,
-		      <0x03024008 0x18>;
-		#gpio-cells = <2>;
-		gpio-controller;
-	};
+		pinctrl: pinctrl at 0301d0c8 {
+			compatible = "brcm,cygnus-pinmux";
+			reg = <0x0301d0c8 0x30>,
+			      <0x0301d24c 0x2c>;
+		};
 
-	gpio_ccm: gpio at 1800a000 {
-		compatible = "brcm,cygnus-ccm-gpio";
-		reg = <0x1800a000 0x50>,
-		      <0x0301d164 0x20>;
-		#gpio-cells = <2>;
-		gpio-controller;
-		interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-controller;
-	};
+		gpio_crmu: gpio at 03024800 {
+			compatible = "brcm,cygnus-crmu-gpio";
+			reg = <0x03024800 0x50>,
+			      <0x03024008 0x18>;
+			#gpio-cells = <2>;
+			gpio-controller;
+		};
 
-	gpio_asiu: gpio at 180a5000 {
-		compatible = "brcm,cygnus-asiu-gpio";
-		reg = <0x180a5000 0x668>;
-		#gpio-cells = <2>;
-		gpio-controller;
+		gpio_ccm: gpio at 1800a000 {
+			compatible = "brcm,cygnus-ccm-gpio";
+			reg = <0x1800a000 0x50>,
+			      <0x0301d164 0x20>;
+			#gpio-cells = <2>;
+			gpio-controller;
+			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-controller;
+		};
 
-		pinmux = <&pinctrl>;
+		gpio_asiu: gpio at 180a5000 {
+			compatible = "brcm,cygnus-asiu-gpio";
+			reg = <0x180a5000 0x668>;
+			#gpio-cells = <2>;
+			gpio-controller;
 
-		interrupt-controller;
-		interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
-	};
+			pinmux = <&pinctrl>;
 
-	amba {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "arm,amba-bus", "simple-bus";
-		interrupt-parent = <&gic>;
-		ranges;
+			interrupt-controller;
+			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+		};
 
-		wdt at 18009000 {
-			 compatible = "arm,sp805" , "arm,primecell";
-			 reg = <0x18009000 0x1000>;
-			 interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
-			 clocks = <&axi81_clk>;
-			 clock-names = "apb_pclk";
+		wdt0: wdt at 18009000 {
+			compatible = "arm,sp805" , "arm,primecell";
+			reg = <0x18009000 0x1000>;
+			interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&axi81_clk>;
+			clock-names = "apb_pclk";
 		};
-	};
 
-	i2c0: i2c at 18008000 {
-		compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c";
-		reg = <0x18008000 0x100>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-		interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;
-		clock-frequency = <100000>;
-		status = "disabled";
-	};
+		i2c0: i2c at 18008000 {
+			compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c";
+			reg = <0x18008000 0x100>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;
+			clock-frequency = <100000>;
+			status = "disabled";
+		};
 
-	i2c1: i2c at 1800b000 {
-		compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c";
-		reg = <0x1800b000 0x100>;
-		#address-cells = <1>;
-		#size-cells = <0>;
-		interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;
-		clock-frequency = <100000>;
-		status = "disabled";
-	};
+		i2c1: i2c at 1800b000 {
+			compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c";
+			reg = <0x1800b000 0x100>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;
+			clock-frequency = <100000>;
+			status = "disabled";
+		};
 
-	pcie0: pcie at 18012000 {
-		compatible = "brcm,iproc-pcie";
-		reg = <0x18012000 0x1000>;
+		pcie0: pcie at 18012000 {
+			compatible = "brcm,iproc-pcie";
+			reg = <0x18012000 0x1000>;
 
-		#interrupt-cells = <1>;
-		interrupt-map-mask = <0 0 0 0>;
-		interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>;
+			#interrupt-cells = <1>;
+			interrupt-map-mask = <0 0 0 0>;
+			interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>;
 
-		linux,pci-domain = <0>;
+			linux,pci-domain = <0>;
 
-		bus-range = <0x00 0xff>;
+			bus-range = <0x00 0xff>;
 
-		#address-cells = <3>;
-		#size-cells = <2>;
-		device_type = "pci";
-		ranges = <0x82000000 0 0x20000000 0x20000000 0 0x04000000>;
+			#address-cells = <3>;
+			#size-cells = <2>;
+			device_type = "pci";
+			ranges = <0x82000000 0 0x20000000 0x20000000 0 0x04000000>;
 
-		status = "disabled";
-	};
+			status = "disabled";
+		};
 
-	pcie1: pcie at 18013000 {
-		compatible = "brcm,iproc-pcie";
-		reg = <0x18013000 0x1000>;
+		pcie1: pcie at 18013000 {
+			compatible = "brcm,iproc-pcie";
+			reg = <0x18013000 0x1000>;
 
-		#interrupt-cells = <1>;
-		interrupt-map-mask = <0 0 0 0>;
-		interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>;
+			#interrupt-cells = <1>;
+			interrupt-map-mask = <0 0 0 0>;
+			interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>;
 
-		linux,pci-domain = <1>;
+			linux,pci-domain = <1>;
 
-		bus-range = <0x00 0xff>;
+			bus-range = <0x00 0xff>;
 
-		#address-cells = <3>;
-		#size-cells = <2>;
-		device_type = "pci";
-		ranges = <0x82000000 0 0x40000000 0x40000000 0 0x04000000>;
+			#address-cells = <3>;
+			#size-cells = <2>;
+			device_type = "pci";
+			ranges = <0x82000000 0 0x40000000 0x40000000 0 0x04000000>;
 
-		status = "disabled";
-	};
+			status = "disabled";
+		};
 
-	uart0: serial at 18020000 {
-		compatible = "snps,dw-apb-uart";
-		reg = <0x18020000 0x100>;
-		reg-shift = <2>;
-		reg-io-width = <4>;
-		interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&axi81_clk>;
-		clock-frequency = <100000000>;
-		status = "disabled";
-	};
+		uart0: serial at 18020000 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x18020000 0x100>;
+			reg-shift = <2>;
+			reg-io-width = <4>;
+			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&axi81_clk>;
+			clock-frequency = <100000000>;
+			status = "disabled";
+		};
 
-	uart1: serial at 18021000 {
-		compatible = "snps,dw-apb-uart";
-		reg = <0x18021000 0x100>;
-		reg-shift = <2>;
-		reg-io-width = <4>;
-		interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&axi81_clk>;
-		clock-frequency = <100000000>;
-		status = "disabled";
-	};
+		uart1: serial at 18021000 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x18021000 0x100>;
+			reg-shift = <2>;
+			reg-io-width = <4>;
+			interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&axi81_clk>;
+			clock-frequency = <100000000>;
+			status = "disabled";
+		};
 
-	uart2: serial at 18022000 {
-		compatible = "snps,dw-apb-uart";
-		reg = <0x18020000 0x100>;
-		reg-shift = <2>;
-		reg-io-width = <4>;
-		interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&axi81_clk>;
-		clock-frequency = <100000000>;
-		status = "disabled";
-	};
+		uart2: serial at 18022000 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x18020000 0x100>;
+			reg-shift = <2>;
+			reg-io-width = <4>;
+			interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&axi81_clk>;
+			clock-frequency = <100000000>;
+			status = "disabled";
+		};
 
-	uart3: serial at 18023000 {
-		compatible = "snps,dw-apb-uart";
-		reg = <0x18023000 0x100>;
-		reg-shift = <2>;
-		reg-io-width = <4>;
-		interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&axi81_clk>;
-		clock-frequency = <100000000>;
-		status = "disabled";
-	};
+		uart3: serial at 18023000 {
+			compatible = "snps,dw-apb-uart";
+			reg = <0x18023000 0x100>;
+			reg-shift = <2>;
+			reg-io-width = <4>;
+			interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&axi81_clk>;
+			clock-frequency = <100000000>;
+			status = "disabled";
+		};
 
-	nand: nand at 18046000 {
-		compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand";
-		reg = <0x18046000 0x600>, <0xf8105408 0x600>, <0x18046f00 0x20>;
-		reg-names = "nand", "iproc-idm", "iproc-ext";
-		interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+		nand: nand at 18046000 {
+			compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1",
+				     "brcm,brcmnand";
+			reg = <0x18046000 0x600>, <0xf8105408 0x600>,
+			      <0x18046f00 0x20>;
+			reg-names = "nand", "iproc-idm", "iproc-ext";
+			interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
 
-		#address-cells = <1>;
-		#size-cells = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
 
-		brcm,nand-has-wp;
+			brcm,nand-has-wp;
+		};
 	};
 };
Signature · 1 line
1.9.1
#16 lore raw

Re: [PATCH v2 5/9] ARM: dts: Move all Cygnus peripherals into soc bus

arch/arm/boot/dts/bcm-cygnus.dtsi line 97

Quoted 8 lines · On Friday 18 September 2015 14:24:10 Ray Jui wrote:
arch/arm/boot/dts/bcm-cygnus.dtsi +6 -0
+       soc {
+               compatible = "simple-bus";
+               ranges;
+               #address-cells = <1>;
+               #size-cells = <1>;
 
+               pinctrl: pinctrl at 0301d0c8 {

Similarly to the core bus, this seems to have address ranges 0x03xxxxxx and 0x18xxxxxx on it, so put those into the ranges.

It probably also makes sense to name the bus according to what kind of bus (axi, ahb, plb, ...) is used here. If the soc has nested buses (e.g. an ahb connected to an axi bus,) then model both of them in the DT.

Arnd

author maintainer
#17 lore raw

Re: [PATCH v2 5/9] ARM: dts: Move all Cygnus peripherals into soc bus

Quoted 7 lines · Arnd Bergmann
Quoted 5 lines · On Friday 18 September 2015 14:24:10 Ray Jui wrote:
arch/arm/boot/dts/bcm-cygnus.dtsi +5 -0
+       soc {
+               compatible = "simple-bus";
+               ranges;
+               #address-cells = <1>;
+               #size-cells = <1>;
Quoted 6 lines
Quoted 2 lines

+ pinctrl: pinctrl at 0301d0c8 {

Similarly to the core bus, this seems to have address ranges 0x03xxxxxx and 0x18xxxxxx on it, so put those into the ranges.

Okay we have an issue here. For whatever reason, the Cygnus ASIC team decided to put registers for the same block in random locations. We see similar issues in all of our other iProc based SoCs. We have communicated this to our ASIC team, and hopefully they can revert the trend for the next SoC.

For example, the gpio_ccm has registers in the following regions:

gpio_ccm: gpio at 1800a000 {
    compatible = "brcm,cygnus-ccm-gpio";
    reg = <0x1800a000 0x50>,
          <0x0301d164 0x20>;

NAND is worse, it has registers in 3 different separate regions:

nand: nand at 18046000 {
    compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1",
                 "brcm,brcmnand";
    reg = <0x18046000 0x600>, <0xf8105408 0x600>,
          <0x18046f00 0x20>;

As you can see, this makes it impossible to define a proper address range for the bus; therefore, I'll have to keep the ranges undefined and a simple 1:1 mapping under this bus.

Quoted 3 lines

It probably also makes sense to name the bus according to what kind of bus (axi, ahb, plb, ...) is used here. If the soc has nested buses (e.g. an ahb connected to an axi bus,) then model both of them in the DT.

Based on the block diagram from the ASIC team, it looks like all of them are connected to one major AXI fabric. I can rename the bus to AXI.

Quoted 3 lines

Arnd

Thanks,

Ray

#18 lore raw

Re: [PATCH v2 5/9] ARM: dts: Move all Cygnus peripherals into soc bus

Quoted 36 lines · On Friday 18 September 2015 15:11:27 Ray Jui wrote:
Quoted 7 lines · Arnd Bergmann
Quoted 5 lines · On Friday 18 September 2015 14:24:10 Ray Jui wrote:
arch/arm/boot/dts/bcm-cygnus.dtsi +5 -0
+       soc {
+               compatible = "simple-bus";
+               ranges;
+               #address-cells = <1>;
+               #size-cells = <1>;
Quoted 6 lines
Quoted 2 lines

+ pinctrl: pinctrl at 0301d0c8 {

Similarly to the core bus, this seems to have address ranges 0x03xxxxxx and 0x18xxxxxx on it, so put those into the ranges.

Okay we have an issue here. For whatever reason, the Cygnus ASIC team decided to put registers for the same block in random locations. We see similar issues in all of our other iProc based SoCs. We have communicated this to our ASIC team, and hopefully they can revert the trend for the next SoC.

For example, the gpio_ccm has registers in the following regions:

gpio_ccm: gpio at 1800a000 {
    compatible = "brcm,cygnus-ccm-gpio";
    reg = <0x1800a000 0x50>,
          <0x0301d164 0x20>;

NAND is worse, it has registers in 3 different separate regions:

nand: nand at 18046000 {
    compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1",
                 "brcm,brcmnand";
    reg = <0x18046000 0x600>, <0xf8105408 0x600>,
          <0x18046f00 0x20>;
Quoted 3 lines

As you can see, this makes it impossible to define a proper address range for the bus; therefore, I'll have to keep the ranges undefined and a simple 1:1 mapping under this bus.

Hmm, you could still try to list them as non-overlapping with other buses on the root node like

	ranges = <0x03000000 0x03000000 0x01000000>,
		 <0x18000000 0x18000000 0x01000000>,
		 <0xf8000000 0xf8000000 0x01000000>;

which clarifies how the bus is wired up in hardware.

Alternatively, you could make a more elaborate mapping, if there are in fact multiple hardware ranges, like

	#address-cells = <2>; # space:offset
	ranges = <1 0  0x03000000 0x01000000>,
		 <2 0  0x18000000 0x01000000>,
		 <3 0  0xf8000000 0x01000000>;

It really depends on what the hardware designers were thinking. If the AXI bus actually decodes the entire 32-bit address range and devices are just located at random addresses in there, your current scheme is probably closest to reality.

Quoted 6 lines
Quoted 3 lines

It probably also makes sense to name the bus according to what kind of bus (axi, ahb, plb, ...) is used here. If the soc has nested buses (e.g. an ahb connected to an axi bus,) then model both of them in the DT.

Based on the block diagram from the ASIC team, it looks like all of them are connected to one major AXI fabric. I can rename the bus to AXI.

Ok.

Arnd

author maintainer
#19 lore raw

Re: [PATCH v2 5/9] ARM: dts: Move all Cygnus peripherals into soc bus

Quoted 58 lines · Arnd Bergmann
Quoted 36 lines · On Friday 18 September 2015 15:11:27 Ray Jui wrote:
Quoted 7 lines · Arnd Bergmann
Quoted 5 lines · On Friday 18 September 2015 14:24:10 Ray Jui wrote:
arch/arm/boot/dts/bcm-cygnus.dtsi +5 -0
+       soc {
+               compatible = "simple-bus";
+               ranges;
+               #address-cells = <1>;
+               #size-cells = <1>;
Quoted 6 lines
Quoted 2 lines

+ pinctrl: pinctrl at 0301d0c8 {

Similarly to the core bus, this seems to have address ranges 0x03xxxxxx and 0x18xxxxxx on it, so put those into the ranges.

Okay we have an issue here. For whatever reason, the Cygnus ASIC team decided to put registers for the same block in random locations. We see similar issues in all of our other iProc based SoCs. We have communicated this to our ASIC team, and hopefully they can revert the trend for the next SoC.

For example, the gpio_ccm has registers in the following regions:

gpio_ccm: gpio at 1800a000 {
    compatible = "brcm,cygnus-ccm-gpio";
    reg = <0x1800a000 0x50>,
          <0x0301d164 0x20>;

NAND is worse, it has registers in 3 different separate regions:

nand: nand at 18046000 {
    compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1",
                 "brcm,brcmnand";
    reg = <0x18046000 0x600>, <0xf8105408 0x600>,
          <0x18046f00 0x20>;
Quoted 3 lines

As you can see, this makes it impossible to define a proper address range for the bus; therefore, I'll have to keep the ranges undefined and a simple 1:1 mapping under this bus.

Hmm, you could still try to list them as non-overlapping with other buses on the root node like

	ranges = <0x03000000 0x03000000 0x01000000>,
		 <0x18000000 0x18000000 0x01000000>,
		 <0xf8000000 0xf8000000 0x01000000>;

which clarifies how the bus is wired up in hardware.

Alternatively, you could make a more elaborate mapping, if there are in fact multiple hardware ranges, like

	#address-cells = <2>; # space:offset
	ranges = <1 0  0x03000000 0x01000000>,
		 <2 0  0x18000000 0x01000000>,
		 <3 0  0xf8000000 0x01000000>;
Quoted 5 lines

It really depends on what the hardware designers were thinking. If the AXI bus actually decodes the entire 32-bit address range and devices are just located at random addresses in there, your current scheme is probably closest to reality.

I see. Let me talk to our ASIC team to get this clarified. If in the end the AXI bus decodes the entire 32-bit address space, no change will be made. Otherwise, I'll submit another patch to list the actual address space that the AXI bus decodes.

Thanks for the review. It's very helpful!

Ray

author maintainer
#20 lore raw

Re: [PATCH v2 5/9] ARM: dts: Move all Cygnus peripherals into soc bus

Quoted 67 lines · Ray Jui
Quoted 58 lines · Arnd Bergmann
Quoted 36 lines · On Friday 18 September 2015 15:11:27 Ray Jui wrote:
Quoted 7 lines · Arnd Bergmann
Quoted 5 lines · On Friday 18 September 2015 14:24:10 Ray Jui wrote:
arch/arm/boot/dts/bcm-cygnus.dtsi +5 -0
+       soc {
+               compatible = "simple-bus";
+               ranges;
+               #address-cells = <1>;
+               #size-cells = <1>;
Quoted 6 lines
Quoted 2 lines

+ pinctrl: pinctrl at 0301d0c8 {

Similarly to the core bus, this seems to have address ranges 0x03xxxxxx and 0x18xxxxxx on it, so put those into the ranges.

Okay we have an issue here. For whatever reason, the Cygnus ASIC team decided to put registers for the same block in random locations. We see similar issues in all of our other iProc based SoCs. We have communicated this to our ASIC team, and hopefully they can revert the trend for the next SoC.

For example, the gpio_ccm has registers in the following regions:

gpio_ccm: gpio at 1800a000 {
    compatible = "brcm,cygnus-ccm-gpio";
    reg = <0x1800a000 0x50>,
          <0x0301d164 0x20>;

NAND is worse, it has registers in 3 different separate regions:

nand: nand at 18046000 {
    compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1",
                 "brcm,brcmnand";
    reg = <0x18046000 0x600>, <0xf8105408 0x600>,
          <0x18046f00 0x20>;
Quoted 3 lines

As you can see, this makes it impossible to define a proper address range for the bus; therefore, I'll have to keep the ranges undefined and a simple 1:1 mapping under this bus.

Hmm, you could still try to list them as non-overlapping with other buses on the root node like

	ranges = <0x03000000 0x03000000 0x01000000>,
		 <0x18000000 0x18000000 0x01000000>,
		 <0xf8000000 0xf8000000 0x01000000>;

which clarifies how the bus is wired up in hardware.

Alternatively, you could make a more elaborate mapping, if there are in fact multiple hardware ranges, like

	#address-cells = <2>; # space:offset
	ranges = <1 0  0x03000000 0x01000000>,
		 <2 0  0x18000000 0x01000000>,
		 <3 0  0xf8000000 0x01000000>;
Quoted 5 lines

It really depends on what the hardware designers were thinking. If the AXI bus actually decodes the entire 32-bit address range and devices are just located at random addresses in there, your current scheme is probably closest to reality.

Quoted 9 lines

I see. Let me talk to our ASIC team to get this clarified. If in the end the AXI bus decodes the entire 32-bit address space, no change will be made. Otherwise, I'll submit another patch to list the actual address space that the AXI bus decodes.

Thanks for the review. It's very helpful!

Ray

I just got feedback from our ASIC team. The NIC-301 is the main AXI fabric that decodes the entire 32-bit address space on Cygnus.

I'll keep this as it is for now.

Thanks,

Ray

author maintainer
#21 lore raw

PATCH v2 6/9 ARM: dts: Reorder Cygnus peripherals

In reply to Ray Jui

Reorder all Cygnus peripherals based on base register addresses in bcm-cygnus.dtsi

---
 arch/arm/boot/dts/bcm-cygnus.dtsi | 56 +++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 28 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +28 -28
index 3d29b77..dfa9a3c 100644
@@ -108,26 +108,14 @@
 			gpio-controller;
 		};
 
-		gpio_ccm: gpio at 1800a000 {
-			compatible = "brcm,cygnus-ccm-gpio";
-			reg = <0x1800a000 0x50>,
-			      <0x0301d164 0x20>;
-			#gpio-cells = <2>;
-			gpio-controller;
-			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-controller;
-		};
-
-		gpio_asiu: gpio at 180a5000 {
-			compatible = "brcm,cygnus-asiu-gpio";
-			reg = <0x180a5000 0x668>;
-			#gpio-cells = <2>;
-			gpio-controller;
-
-			pinmux = <&pinctrl>;
-
-			interrupt-controller;
-			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+		i2c0: i2c at 18008000 {
+			compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c";
+			reg = <0x18008000 0x100>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;
+			clock-frequency = <100000>;
+			status = "disabled";
 		};
 
 		wdt0: wdt at 18009000 {
@@ -138,14 +126,14 @@
 			clock-names = "apb_pclk";
 		};
 
-		i2c0: i2c at 18008000 {
-			compatible = "brcm,cygnus-iproc-i2c", "brcm,iproc-i2c";
-			reg = <0x18008000 0x100>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;
-			clock-frequency = <100000>;
-			status = "disabled";
+		gpio_ccm: gpio at 1800a000 {
+			compatible = "brcm,cygnus-ccm-gpio";
+			reg = <0x1800a000 0x50>,
+			      <0x0301d164 0x20>;
+			#gpio-cells = <2>;
+			gpio-controller;
+			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-controller;
 		};
 
 		i2c1: i2c at 1800b000 {
@@ -255,5 +243,17 @@
 
 			brcm,nand-has-wp;
 		};
+
+		gpio_asiu: gpio at 180a5000 {
+			compatible = "brcm,cygnus-asiu-gpio";
+			reg = <0x180a5000 0x668>;
+			#gpio-cells = <2>;
+			gpio-controller;
+
+			pinmux = <&pinctrl>;
+
+			interrupt-controller;
+			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+		};
 	};
 };
Signature · 1 line
1.9.1
author maintainer
#22 lore raw

PATCH v2 7/9 ARM: dts: Enable various peripherals on bcm958305k

In reply to Ray Jui

This patch enables various peripherals on Broadcom Cygnus wireless audio board (bcm958305k). These peripherals include I2C, PCIe, and NAND

---
 arch/arm/boot/dts/bcm958305k.dts | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
arch/arm/boot/dts/bcm958305k.dts +32 -0
index af11a8e..9863a19 100644
@@ -44,6 +44,38 @@
 	};
 };
 
+&i2c0 {
+	status = "okay";
+};
+
+&i2c1 {
+	status = "okay";
+};
+
+&pcie0 {
+	status = "okay";
+};
+
+&pcie1 {
+	status = "okay";
+};
+
 &uart3 {
 	status = "okay";
 };
+
+&nand {
+	nandcs at 1 {
+		compatible = "brcm,nandcs";
+		reg = <0>;
+		nand-on-flash-bbt;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		nand-ecc-strength = <24>;
+		nand-ecc-step-size = <1024>;
+
+		brcm,nand-oob-sector-size = <27>;
+	};
+};
Signature · 1 line
1.9.1
author maintainer
#23 lore raw

PATCH v2 8/9 ARM: dts: Enable NAND support on bcm911360_entphn

In reply to Ray Jui

This patch enables NAND support on Broadcom Cygnus form factor board (bcm911360_entphn)

---
 arch/arm/boot/dts/bcm911360_entphn.dts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/boot/dts/bcm911360_entphn.dts +16 -0
index f791a3b..8b3800f 100644
@@ -60,3 +60,19 @@
 &uart3 {
 	status = "okay";
 };
+
+&nand {
+	nandcs at 1 {
+		compatible = "brcm,nandcs";
+		reg = <0>;
+		nand-on-flash-bbt;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		nand-ecc-strength = <24>;
+		nand-ecc-step-size = <1024>;
+
+		brcm,nand-oob-sector-size = <27>;
+	};
+};
Signature · 1 line
1.9.1
author maintainer
#24 lore raw

PATCH v2 9/9 ARM: dts: enable touchscreen support on Cygnus

In reply to Ray Jui

This patch enables touchscreen support on bcm958300k and bcm958305k. Touchscreen is connected to these boards through the bcm9hmidc daughter card, and therefore also adding bcm9hmidc.dtsi that describes the daughter card

---
 arch/arm/boot/dts/bcm-cygnus.dtsi | 10 ++++++++++
 arch/arm/boot/dts/bcm958300k.dts  |  1 +
 arch/arm/boot/dts/bcm958305k.dts  |  1 +
 arch/arm/boot/dts/bcm9hmidc.dtsi  | 42 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+)
 create mode 100644 arch/arm/boot/dts/bcm9hmidc.dtsi
arch/arm/boot/dts/bcm-cygnus.dtsi +10 -0
index dfa9a3c..d898838 100644
@@ -32,6 +32,7 @@
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/clock/bcm-cygnus.h>
 
 #include "skeleton.dtsi"
 
@@ -255,5 +256,14 @@
 			interrupt-controller;
 			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
 		};
+
+		touchscreen: tsc at 180a6000 {
+			compatible = "brcm,iproc-touchscreen";
+			reg = <0x180a6000 0x40>;
+			clocks = <&asiu_clks BCM_CYGNUS_ASIU_ADC_CLK>;
+			clock-names = "tsc_clk";
+			interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>;
+			status = "disabled";
+		};
 	};
 };
arch/arm/boot/dts/bcm958300k.dts +1 -0
index d8dc9f0..2e31581 100644
@@ -33,6 +33,7 @@
 /dts-v1/;
 
 #include "bcm-cygnus.dtsi"
+#include "bcm9hmidc.dtsi"
 
 / {
 	model = "Cygnus SVK (BCM958300K)";
arch/arm/boot/dts/bcm958305k.dts +1 -0
index 9863a19..288a637 100644
@@ -33,6 +33,7 @@
 /dts-v1/;
 
 #include "bcm-cygnus.dtsi"
+#include "bcm9hmidc.dtsi"
 
 / {
 	model = "Cygnus Wireless Audio (BCM958305K)";
arch/arm/boot/dts/bcm9hmidc.dtsi new file +42 -0

42 lines not on this page · raw message

Signature · 1 line
1.9.1