Skip to contentSkip to conversation

ARM: dts: align sdio numbers to HW definition

PATCH Applied Christian Daudt 1 participant 4 messages Aug 8, 2013 – Aug 19, 2013

Subsystems (4)
Device tree bindings Broadcom BCM2711/BCM2835 Arm architecture Broadcom BCM281XX/BCM11XXX/BCM216XX Arm architecture Broadcom iproc Arm architecture
lore
Share & tools
lore

Christian Daudt

author
#0 lore raw

PATCH 1/2 ARM: dts: align sdio numbers to HW definition

Clean up the sdio numbering to be 1-base as defined in HW spec, instead of the current 0-base

Reviewed-by Alex Elder <[email protected]>
Signed-off-by Christian Daudt <[email protected]>
arch/arm/boot/dts/bcm11351-brt.dts +3 -3
index 67ec524..647a78c 100644
@@ -27,18 +27,18 @@
 		status = "okay";
 	};
 
-	sdio0: sdio at 0x3f180000 {
+	sdio1: sdio at 3f180000 {
 		max-frequency = <48000000>;
 		status = "okay";
 	};
 
-	sdio1: sdio at 0x3f190000 {
+	sdio2: sdio at 3f190000 {
 		non-removable;
 		max-frequency = <48000000>;
 		status = "okay";
 	};
 
-	sdio3: sdio at 0x3f1b0000 {
+	sdio4: sdio at 3f1b0000 {
 		max-frequency = <48000000>;
 		status = "okay";
 	};
arch/arm/boot/dts/bcm11351.dtsi +4 -4
index 8f094ba..d34e49db 100644
@@ -68,28 +68,28 @@
 		clock-frequency = <32768>;
 	};
 
-	sdio0: sdio at 0x3f180000 {
+	sdio1: sdio at 3f180000 {
 		compatible = "bcm,kona-sdhci";
 		reg = <0x3f180000 0x10000>;
 		interrupts = <0x0 77 0x4>;
 		status = "disabled";
 	};
 
-	sdio1: sdio at 0x3f190000 {
+	sdio2: sdio at 3f190000 {
 		compatible = "bcm,kona-sdhci";
 		reg = <0x3f190000 0x10000>;
 		interrupts = <0x0 76 0x4>;
 		status = "disabled";
 	};
 
-	sdio2: sdio at 0x3f1a0000 {
+	sdio3: sdio at 3f1a0000 {
 		compatible = "bcm,kona-sdhci";
 		reg = <0x3f1a0000 0x10000>;
 		interrupts = <0x0 74 0x4>;
 		status = "disabled";
 	};
 
-	sdio3: sdio at 0x3f1b0000 {
+	sdio4: sdio at 3f1b0000 {
 		compatible = "bcm,kona-sdhci";
 		reg = <0x3f1b0000 0x10000>;
 		interrupts = <0x0 73 0x4>;
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/2 ARM: dts: add sdio blocks to bcm28155-ap board

Enable sdio for bcm28155 AP board

Reviewed-by Alex Elder <[email protected]>
Signed-off-by Christian Daudt <[email protected]>
arch/arm/boot/dts/bcm28155-ap.dts +16 -0
index 0d66db6..4b0a3ec 100644
@@ -26,4 +26,20 @@
 	uart at 3e000000 {
 		status = "okay";
 	};
+
+	sdio1: sdio at 3f180000 {
+		max-frequency = <48000000>;
+		status = "okay";
+	};
+
+	sdio2: sdio at 3f190000 {
+		non-removable;
+		max-frequency = <48000000>;
+		status = "okay";
+	};
+
+	sdio4: sdio at 3f1b0000 {
+		max-frequency = <48000000>;
+		status = "okay";
+	};
 };
Signature · 1 line
1.7.10.4
author Applied
#2 lore raw

Re: [PATCH 2/2] ARM: dts: add sdio blocks to bcm28155-ap board

Quoted 20 lines · Christian Daudt

Enable sdio for bcm28155 AP board

Reviewed-by Alex Elder <[email protected]>
Signed-off-by Christian Daudt <[email protected]>
arch/arm/boot/dts/bcm28155-ap.dts +7 -0
index 0d66db6..4b0a3ec 100644
@@ -26,4 +26,20 @@
  	uart at 3e000000 {
  		status = "okay";
  	};
+
+	sdio1: sdio at 3f180000 {
+		max-frequency = <48000000>;
+		status = "okay";
+	};
+
+	sdio2: sdio at 3f190000 {

arch/arm/boot/dts/bcm28155-ap.dts line 45

Quoted 10 lines
arch/arm/boot/dts/bcm28155-ap.dts +9 -0
+		non-removable;
+		max-frequency = <48000000>;
+		status = "okay";
+	};
+
+	sdio4: sdio at 3f1b0000 {
+		max-frequency = <48000000>;
+		status = "okay";
+	};
  };

applied to bcm/for-3.12/dt

thanks,
csd

author Applied
#3 lore raw
In reply to Christian Daudt
Quoted 59 lines · Christian Daudt

Clean up the sdio numbering to be 1-base as defined in HW spec, instead of the current 0-base

Reviewed-by Alex Elder <[email protected]>
Signed-off-by Christian Daudt <[email protected]>
arch/arm/boot/dts/bcm11351-brt.dts +3 -3
index 67ec524..647a78c 100644
@@ -27,18 +27,18 @@
  		status = "okay";
  	};
 
-	sdio0: sdio at 0x3f180000 {
+	sdio1: sdio at 3f180000 {
  		max-frequency = <48000000>;
  		status = "okay";
  	};
 
-	sdio1: sdio at 0x3f190000 {
+	sdio2: sdio at 3f190000 {
  		non-removable;
  		max-frequency = <48000000>;
  		status = "okay";
  	};
 
-	sdio3: sdio at 0x3f1b0000 {
+	sdio4: sdio at 3f1b0000 {
  		max-frequency = <48000000>;
  		status = "okay";
  	};
arch/arm/boot/dts/bcm11351.dtsi +3 -3
index 8f094ba..d34e49db 100644
@@ -68,28 +68,28 @@
  		clock-frequency = <32768>;
  	};
 
-	sdio0: sdio at 0x3f180000 {
+	sdio1: sdio at 3f180000 {
  		compatible = "bcm,kona-sdhci";
  		reg = <0x3f180000 0x10000>;
  		interrupts = <0x0 77 0x4>;
  		status = "disabled";
  	};
 
-	sdio1: sdio at 0x3f190000 {
+	sdio2: sdio at 3f190000 {
  		compatible = "bcm,kona-sdhci";
  		reg = <0x3f190000 0x10000>;
  		interrupts = <0x0 76 0x4>;
  		status = "disabled";
  	};
 
-	sdio2: sdio at 0x3f1a0000 {
+	sdio3: sdio at 3f1a0000 {
  		compatible = "bcm,kona-sdhci";

arch/arm/boot/dts/bcm11351.dtsi line 95

Quoted 10 lines
arch/arm/boot/dts/bcm11351.dtsi +1 -1
  		reg = <0x3f1a0000 0x10000>;
  		interrupts = <0x0 74 0x4>;
  		status = "disabled";
  	};
 
-	sdio3: sdio at 0x3f1b0000 {
+	sdio4: sdio at 3f1b0000 {
  		compatible = "bcm,kona-sdhci";
  		reg = <0x3f1b0000 0x10000>;
  		interrupts = <0x0 73 0x4>;

applied to bcm/for-3.12/dt
thanks,
csd