ARM: dts: fixes and additions for pxa platform

This series carries a number of smaller fixes for the PXA SoC dts include files. The last patch is a revised version of the Raumfeld audio devices DTS.

Daniel Mack (7):
ARM: dts: pxa2xx: drop #address-cells and #size-cells from /cpus
ARM: dts: pxa3xx: drop #address-cells and #size-cells from pinctrl
node
ARM: dts: pxa2xx: fix hwuart memory range
ARM: dts: pxa: merge &pxa3xx_ohci with &usb0
ARM: dts: pxa3xx: order timer and gcu nodes under /pxabus
ARM: dts: pxa3xx: clean up pxa3xx clock controller node name
ARM: dts: pxa3xx: Add Raumfeld DTS files

 arch/arm/boot/dts/Makefile                    |   7 +
 arch/arm/boot/dts/pxa2xx.dtsi                 |   7 +-
 arch/arm/boot/dts/pxa300-raumfeld-common.dtsi | 405 ++++++++++++++++++
 .../boot/dts/pxa300-raumfeld-connector.dts    |  73 ++++
 .../boot/dts/pxa300-raumfeld-controller.dts   | 266 ++++++++++++
 .../boot/dts/pxa300-raumfeld-speaker-l.dts    |  11 +
 .../boot/dts/pxa300-raumfeld-speaker-m.dts    |  11 +
 .../boot/dts/pxa300-raumfeld-speaker-one.dts  | 137 ++++++
 .../boot/dts/pxa300-raumfeld-speaker-s.dts    |  11 +
 .../dts/pxa300-raumfeld-tuneable-clock.dtsi   |  85 ++++
 arch/arm/boot/dts/pxa3xx.dtsi                 |  44 +-
 11 files changed, 1026 insertions(+), 31 deletions(-)
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-common.dtsi
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-connector.dts
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-controller.dts
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-speaker-l.dts
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-speaker-m.dts
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-speaker-one.dts
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-speaker-s.dts
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-tuneable-clock.dtsi

2.19.2

PXA is single-core only, so this node will not have enumerable children. Drop the #address-cells and #size-cells properties to squelch a dtc warning.

---
 arch/arm/boot/dts/pxa2xx.dtsi | 2 --
 1 file changed, 2 deletions(-)

index 080d5c5169b5..7d3dfa8259f8 100644
@@ -43,8 +43,6 @@
 	};
 
 	cpus {
-		#address-cells = <0>;
-		#size-cells = <0>;
 		cpu {
 			compatible = "marvell,xscale";
 			device_type = "cpu";

2.19.2

Applied to pxa/dt, thanks.

Cheers.

--
Robert

The pinctrl node does not have any children, so the #address-cells and #size-cells properties are not needed.

---
 arch/arm/boot/dts/pxa3xx.dtsi | 2 --
 1 file changed, 2 deletions(-)

index 264f681bebd9..eb3223e85f9a 100644
@@ -151,8 +151,6 @@
 		pinctrl: pinctrl@40e10000 {
 			compatible = "pinconf-single";
 			reg = <0x40e10000 0xffff>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 			#pinctrl-cells = <1>;
 			pinctrl-single,register-width = <32>;
 			pinctrl-single,function-mask = <0x7>;

2.19.2

Applied to pxa/dt, thanks.

Cheers.

--
Robert

The memory range for the hwuart is at 0x41600000, not 0x41100000. This also solves a conflict with the MMC controller node.

---
 arch/arm/boot/dts/pxa2xx.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 7d3dfa8259f8..30e77ebbcc4d 100644
@@ -117,9 +117,9 @@
 			status = "disabled";
 		};
 
-		hwuart: serial@41100000 {
+		hwuart: serial@41600000 {
 			compatible = "mrvl,pxa-uart";
-			reg = <0x41100000 0x30>;
+			reg = <0x41600000 0x30>;
 			interrupts = <7>;
 			status = "disabled";
 		};

2.19.2

Applied to pxa/dt, thanks.

Cheers.

--
Robert

Both pxa3xx.dtsi and pxa2xx.dtsi define a node for the USB controller. Merge them, and get rid of the one in pxa3xx.dtsi.

---
 arch/arm/boot/dts/pxa2xx.dtsi | 1 +
 arch/arm/boot/dts/pxa3xx.dtsi | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

index 30e77ebbcc4d..c00b1115f2a7 100644
@@ -138,6 +138,7 @@
 			compatible = "marvell,pxa-ohci";
 			reg = <0x4c000000 0x10000>;
 			interrupts = <3>;
+			clocks = <&clks CLK_USBH>;
 			status = "disabled";
 		};
 

index eb3223e85f9a..eb9443208578 100644
@@ -202,14 +202,6 @@
 			status = "disabled";
 		};
 
-		pxa3xx_ohci: usb@4c000000 {
-			compatible = "marvell,pxa-ohci";
-			reg = <0x4c000000 0x10000>;
-			interrupts = <3>;
-			clocks = <&clks CLK_USBH>;
-			status = "disabled";
-		};
-
 		pwm0: pwm@40b00000 {
 			compatible = "marvell,pxa270-pwm";
 			reg = <0x40b00000 0x10>;

2.19.2

Excellent, but can be even better :)
Could you please address as well pxa27x.dtsi ?

As a matter of fact, this was already discussed here :
https://patchwork.kernel.org/patch/8375421/

So the proper solution might be a bit different, as if you look at the thread I put up there, pxa25x doesn't have an USB host controller.

Cheers.

--
Robert

Ah, okay. Thanks for the pointer. Will send a new patch, just ignore this one please.

Thanks,
Daniel

These are devices on the PXA bus, so make the device tree structure reflect that.

---
 arch/arm/boot/dts/pxa3xx.dtsi | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

index eb9443208578..de49e7f666c0 100644
@@ -265,6 +265,22 @@
 			clocks = <&clks CLK_SSP4>;
 			status = "disabled";
 		};
+
+		timer@40a00000 {
+			compatible = "marvell,pxa-timer";
+			reg = <0x40a00000 0x20>;
+			interrupts = <26>;
+			clocks = <&clks CLK_OSTIMER>;
+			status = "okay";
+		};
+
+		gcu: display-controller@54000000 {
+			compatible = "marvell,pxa300-gcu";
+			reg = <0x54000000 0x1000>;
+			interrupts = <39>;
+			clocks = <&clks CLK_PXA300_GCU>;
+			status = "disabled";
+		};
 	};
 
 	clocks {

@@ -282,20 +298,4 @@
 			status = "okay";
 		};
 	};
-
-	timer@40a00000 {
-		compatible = "marvell,pxa-timer";
-		reg = <0x40a00000 0x20>;
-		interrupts = <26>;
-		clocks = <&clks CLK_OSTIMER>;
-		status = "okay";
-	};
-
-	gcu: display-controller@54000000 {
-		compatible = "marvell,pxa300-gcu";
-		reg = <0x54000000 0x1000>;
-		interrupts = <39>;
-		clocks = <&clks CLK_PXA300_GCU>;
-		status = "disabled";
-	};
 };

2.19.2

Applied to pxa/dt, thanks.

Cheers.

--
Robert

The clock controller node does not need a unit slave designator as it does not have a reg property. Also, remove the underscore from the name.

---
 arch/arm/boot/dts/pxa3xx.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index de49e7f666c0..6131491ab5e7 100644
@@ -292,7 +292,7 @@
 		#size-cells = <1>;
 		ranges;
 
-		clks: pxa3xx_clks@41300004 {
+		clks: clocks {
 			compatible = "marvell,pxa300-clocks";
 			#clock-cells = <1>;
 			status = "okay";

2.19.2

Applied to pxa/dt, thanks.

Cheers.

--
Robert

This patch adds a set of DTS files that support all PXA3xx based Raumfeld audio hardware devices.

Common nodes are factored out into 'common' and 'tuneable-clock' include files to keep the top-level DTS files smaller.

---
 arch/arm/boot/dts/Makefile                    |   7 +
 arch/arm/boot/dts/pxa300-raumfeld-common.dtsi | 405 ++++++++++++++++++
 .../boot/dts/pxa300-raumfeld-connector.dts    |  73 ++++
 .../boot/dts/pxa300-raumfeld-controller.dts   | 266 ++++++++++++
 .../boot/dts/pxa300-raumfeld-speaker-l.dts    |  11 +
 .../boot/dts/pxa300-raumfeld-speaker-m.dts    |  11 +
 .../boot/dts/pxa300-raumfeld-speaker-one.dts  | 137 ++++++
 .../boot/dts/pxa300-raumfeld-speaker-s.dts    |  11 +
 .../dts/pxa300-raumfeld-tuneable-clock.dtsi   |  85 ++++
 9 files changed, 1006 insertions(+)
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-common.dtsi
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-connector.dts
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-controller.dts
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-speaker-l.dts
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-speaker-m.dts
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-speaker-one.dts
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-speaker-s.dts
 create mode 100644 arch/arm/boot/dts/pxa300-raumfeld-tuneable-clock.dtsi

index b0e966d625b9..a4c921fe325f 100644
@@ -778,6 +778,13 @@ dtb-$(CONFIG_ARCH_ACTIONS) += \
 	owl-s500-sparky.dtb
 dtb-$(CONFIG_ARCH_PRIMA2) += \
 	prima2-evb.dtb
+dtb-$(CONFIG_ARCH_PXA) += \
+	pxa300-raumfeld-connector.dtb \
+	pxa300-raumfeld-controller.dtb \
+	pxa300-raumfeld-speaker-s.dtb \
+	pxa300-raumfeld-speaker-m.dtb \
+	pxa300-raumfeld-speaker-l.dtb \
+	pxa300-raumfeld-speaker-one.dtb
 dtb-$(CONFIG_ARCH_OXNAS) += \
 	ox810se-wd-mbwe.dtb \
 	ox820-cloudengines-pogoplug-series-3.dtb

new file mode 100644
index 000000000000..5a0f7f17856f
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+
+#include "pxa300-raumfeld-common.dtsi"
+#include "pxa300-raumfeld-tuneable-clock.dtsi"
+
+/ {
+	model = "Raumfeld Speaker L (PXA3xx)";
+	compatible = "raumfeld,raumfeld-speaker-l-pxa303", "marvell,pxa300";
+};

new file mode 100644
index 000000000000..fa10d896282c
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+
+#include "pxa300-raumfeld-common.dtsi"
+#include "pxa300-raumfeld-tuneable-clock.dtsi"
+
+/ {
+	model = "Raumfeld Speaker M (PXA3xx)";
+	compatible = "raumfeld,raumfeld-speaker-m-pxa303", "marvell,pxa300";
+};

new file mode 100644
index 000000000000..36e20cbf8704
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0
+
+/dts-v1/;
+
+#include "pxa300-raumfeld-common.dtsi"
+#include "pxa300-raumfeld-tuneable-clock.dtsi"
+
+/ {
+	model = "Raumfeld Speaker S (PXA3xx)";
+	compatible = "raumfeld,raumfeld-speaker-s-pxa303", "marvell,pxa300";
+};

2.19.2

Queued into pxa/dt, thanks.

Cheers.

--
Robert