Skip to contentSkip to conversation

ARM: dts: sun7i: Add OOB irq support to boards with sdio wifi

PATCH New Hans de Goede 2 participants 5 messages Mar 10, 2015

Subsystems (2)
Device tree bindings Arm/Allwinner sunXi SoC support
lore
Share & tools
lore

Hans de Goede

author
#0 lore raw

v2 cover ARM: dts: sun7i: Add OOB irq support to boards with sdio wifi

Hi Maxime,

Here is v2 of the dts patches to add OOB irq support to boards with sdio wifi.

Changes since v1:
-New patch to set the address / size cells in the dtsi -Use macro for the irq type

Regards,

Hans

author
#1 lore raw

PATCH v2 1/2 ARM: dts: sunxi: Add address- and size-cells properties to the mmc ctrl nodes

Sometimes we need to specify non-probably information for sdio devices in the devicetree, this is done through child nodes addressed by the reg property, whereby the reg property refers to the sdio function number, see; Documentation/devicetree/bindings/mmc/mmc.txt

This commit adds the necessary address- and size-cells properties to the mmc controller nodes in the dtsi files, so that dts files needing such a child node do not need to specify these themselves.

Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/boot/dts/sun4i-a10.dtsi | 8 ++++++++
 arch/arm/boot/dts/sun5i.dtsi     | 6 ++++++
 arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++++++
 arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++
 arch/arm/boot/dts/sun8i-a23.dtsi | 6 ++++++
 arch/arm/boot/dts/sun9i-a80.dtsi | 8 ++++++++
 6 files changed, 44 insertions(+)
arch/arm/boot/dts/sun4i-a10.dtsi +8 -0
index e550415..48f96cd 100644
@@ -527,6 +527,8 @@
 				      "sample";
 			interrupts = <32>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc1: mmc at 01c10000 {

@@ -542,6 +544,8 @@
 				      "sample";
 			interrupts = <33>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc2: mmc at 01c11000 {

@@ -557,6 +561,8 @@
 				      "sample";
 			interrupts = <34>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc3: mmc at 01c12000 {

@@ -572,6 +578,8 @@
 				      "sample";
 			interrupts = <35>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		usb_otg: usb at 01c13000 {
arch/arm/boot/dts/sun5i.dtsi +6 -0
index cf730d4..ca15d35 100644
@@ -352,6 +352,8 @@
 				      "sample";
 			interrupts = <32>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc1: mmc at 01c10000 {

@@ -367,6 +369,8 @@
 				      "sample";
 			interrupts = <33>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc2: mmc at 01c11000 {

@@ -382,6 +386,8 @@
 				      "sample";
 			interrupts = <34>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		usb_otg: usb at 01c13000 {
arch/arm/boot/dts/sun6i-a31.dtsi +8 -0
index fa2f403..96563d3 100644
@@ -402,6 +402,8 @@
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc1: mmc at 01c10000 {

@@ -419,6 +421,8 @@
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc2: mmc at 01c11000 {

@@ -436,6 +440,8 @@
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc3: mmc at 01c12000 {

@@ -453,6 +459,8 @@
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		usbphy: phy at 01c19400 {
arch/arm/boot/dts/sun7i-a20.dtsi +8 -0
index 1d0b9ac..9ddefcd 100644
@@ -606,6 +606,8 @@
 				      "sample";
 			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc1: mmc at 01c10000 {

@@ -621,6 +623,8 @@
 				      "sample";
 			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc2: mmc at 01c11000 {

@@ -636,6 +640,8 @@
 				      "sample";
 			interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc3: mmc at 01c12000 {

@@ -651,6 +657,8 @@
 				      "sample";
 			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		usb_otg: usb at 01c13000 {
arch/arm/boot/dts/sun8i-a23.dtsi +6 -0
index 382ebd1..85e7b2b 100644
@@ -286,6 +286,8 @@
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc1: mmc at 01c10000 {

@@ -303,6 +305,8 @@
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc2: mmc at 01c11000 {

@@ -320,6 +324,8 @@
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		pio: pinctrl at 01c20800 {
arch/arm/boot/dts/sun9i-a80.dtsi +8 -0
index 2f7f82c..abe7bbf 100644
@@ -447,6 +447,8 @@
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc1: mmc at 01c10000 {

@@ -459,6 +461,8 @@
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc2: mmc at 01c11000 {

@@ -471,6 +475,8 @@
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc3: mmc at 01c12000 {

@@ -483,6 +489,8 @@
 			reset-names = "ahb";
 			interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
 			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		mmc_config_clk: clk at 01c13000 {
Signature · 1 line
2.3.1
Applied
#2 lore raw

PATCH v2 1/2 ARM: dts: sunxi: Add address- and size-cells properties to the mmc ctrl nodes

Quoted 10 lines · Hans de Goede

Sometimes we need to specify non-probably information for sdio devices in the devicetree, this is done through child nodes addressed by the reg property, whereby the reg property refers to the sdio function number, see; Documentation/devicetree/bindings/mmc/mmc.txt

This commit adds the necessary address- and size-cells properties to the mmc controller nodes in the dtsi files, so that dts files needing such a child node do not need to specify these themselves.

Signed-off-by Hans de Goede <[email protected]>

Applied, thanks!

Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150310/e4309f67/attachment.sig>
author
#3 lore raw

PATCH v2 2/2 ARM: dts: sun7i: Add OOB irq support to boards with broadcom sdio wifi

In reply to Hans de Goede
Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 8 ++++++++
 arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts  | 8 ++++++++
 2 files changed, 16 insertions(+)
arch/arm/boot/dts/sun7i-a20-cubietruck.dts +8 -0
index 012c337..d85ae00 100644
@@ -173,6 +173,14 @@
 	bus-width = <4>;
 	non-removable;
 	status = "okay";
+
+	brcmf: bcrmf at 1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+		interrupt-parent = <&pio>;
+		interrupts = <10 IRQ_TYPE_LEVEL_LOW>; /* PH10 / EINT10 */
+		interrupt-names = "host-wake";
+	};
 };
 
 &mmc3_pins_a {
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts +8 -0
index baee563..c11574c 100644
@@ -170,6 +170,14 @@
 	bus-width = <4>;
 	non-removable;
 	status = "okay";
+
+	brcmf: bcrmf at 1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+		interrupt-parent = <&pio>;
+		interrupts = <10 IRQ_TYPE_LEVEL_LOW>; /* PH10 / EINT10 */
+		interrupt-names = "host-wake";
+	};
 };
 
 &mmc3_pins_a {
Signature · 1 line
2.3.1
#4 lore raw

PATCH v2 2/2 ARM: dts: sun7i: Add OOB irq support to boards with broadcom sdio wifi

Quoted 1 line · Hans de Goede
Signed-off-by Hans de Goede <[email protected]>

Some commit log would have been nice, but I just applied the patch.

Thanks!
Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150310/2566d384/attachment.sig>