2013-08-08 19:08:09

by Christian Daudt

Subject: [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]>

diff --git a/arch/arm/boot/dts/bcm11351-brt.dts b/arch/arm/boot/dts/bcm11351-brt.dts
index 67ec524..647a78c 100644
--- a/arch/arm/boot/dts/bcm11351-brt.dts
+++ b/arch/arm/boot/dts/bcm11351-brt.dts
@@ -27,18 +27,18 @@
status = "okay";
};

- sdio0: sdio@0x3f180000 {
+ sdio1: sdio@3f180000 {
max-frequency = <48000000>;
status = "okay";
};

- sdio1: sdio@0x3f190000 {
+ sdio2: sdio@3f190000 {
non-removable;
max-frequency = <48000000>;
status = "okay";
};

- sdio3: sdio@0x3f1b0000 {
+ sdio4: sdio@3f1b0000 {
max-frequency = <48000000>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi
index 8f094ba..d34e49db 100644
--- a/arch/arm/boot/dts/bcm11351.dtsi
+++ b/arch/arm/boot/dts/bcm11351.dtsi
@@ -68,28 +68,28 @@
clock-frequency = <32768>;
};

- sdio0: sdio@0x3f180000 {
+ sdio1: sdio@3f180000 {
compatible = "bcm,kona-sdhci";
reg = <0x3f180000 0x10000>;
interrupts = <0x0 77 0x4>;
status = "disabled";
};

- sdio1: sdio@0x3f190000 {
+ sdio2: sdio@3f190000 {
compatible = "bcm,kona-sdhci";
reg = <0x3f190000 0x10000>;
interrupts = <0x0 76 0x4>;
status = "disabled";
};

- sdio2: sdio@0x3f1a0000 {
+ sdio3: sdio@3f1a0000 {
compatible = "bcm,kona-sdhci";
reg = <0x3f1a0000 0x10000>;
interrupts = <0x0 74 0x4>;
status = "disabled";
};

- sdio3: sdio@0x3f1b0000 {
+ sdio4: sdio@3f1b0000 {
compatible = "bcm,kona-sdhci";
reg = <0x3f1b0000 0x10000>;
interrupts = <0x0 73 0x4>;
--
1.7.10.4

2013-08-08 19:08:11

by Christian Daudt

Subject: [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]>

diff --git a/arch/arm/boot/dts/bcm28155-ap.dts b/arch/arm/boot/dts/bcm28155-ap.dts
index 0d66db6..4b0a3ec 100644
--- a/arch/arm/boot/dts/bcm28155-ap.dts
+++ b/arch/arm/boot/dts/bcm28155-ap.dts
@@ -26,4 +26,20 @@
uart@3e000000 {
status = "okay";
};
+
+ sdio1: sdio@3f180000 {
+ max-frequency = <48000000>;
+ status = "okay";
+ };
+
+ sdio2: sdio@3f190000 {
+ non-removable;
+ max-frequency = <48000000>;
+ status = "okay";
+ };
+
+ sdio4: sdio@3f1b0000 {
+ max-frequency = <48000000>;
+ status = "okay";
+ };
};
--
1.7.10.4

2013-08-19 23:59:45

by Christian Daudt

Subject: Re: [PATCH 1/2] ARM: dts: align sdio numbers to HW definition

On 13-08-08 12:07 PM, Christian Daudt wrote:
> 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]>
>
> diff --git a/arch/arm/boot/dts/bcm11351-brt.dts b/arch/arm/boot/dts/bcm11351-brt.dts
> index 67ec524..647a78c 100644
> --- a/arch/arm/boot/dts/bcm11351-brt.dts
> +++ b/arch/arm/boot/dts/bcm11351-brt.dts
> @@ -27,18 +27,18 @@
> status = "okay";
> };
>
> - sdio0: sdio@0x3f180000 {
> + sdio1: sdio@3f180000 {
> max-frequency = <48000000>;
> status = "okay";
> };
>
> - sdio1: sdio@0x3f190000 {
> + sdio2: sdio@3f190000 {
> non-removable;
> max-frequency = <48000000>;
> status = "okay";
> };
>
> - sdio3: sdio@0x3f1b0000 {
> + sdio4: sdio@3f1b0000 {
> max-frequency = <48000000>;
> status = "okay";
> };
> diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi
> index 8f094ba..d34e49db 100644
> --- a/arch/arm/boot/dts/bcm11351.dtsi
> +++ b/arch/arm/boot/dts/bcm11351.dtsi
> @@ -68,28 +68,28 @@
> clock-frequency = <32768>;
> };
>
> - sdio0: sdio@0x3f180000 {
> + sdio1: sdio@3f180000 {
> compatible = "bcm,kona-sdhci";
> reg = <0x3f180000 0x10000>;
> interrupts = <0x0 77 0x4>;
> status = "disabled";
> };
>
> - sdio1: sdio@0x3f190000 {
> + sdio2: sdio@3f190000 {
> compatible = "bcm,kona-sdhci";
> reg = <0x3f190000 0x10000>;
> interrupts = <0x0 76 0x4>;
> status = "disabled";
> };
>
> - sdio2: sdio@0x3f1a0000 {
> + sdio3: sdio@3f1a0000 {
> compatible = "bcm,kona-sdhci";
> reg = <0x3f1a0000 0x10000>;
> interrupts = <0x0 74 0x4>;
> status = "disabled";
> };
>
> - sdio3: sdio@0x3f1b0000 {
> + sdio4: sdio@3f1b0000 {
> compatible = "bcm,kona-sdhci";
> reg = <0x3f1b0000 0x10000>;
> interrupts = <0x0 73 0x4>;
applied to bcm/for-3.12/dt
thanks,
csd

2013-08-20 00:00:06

by Christian Daudt

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

On 13-08-08 12:07 PM, Christian Daudt wrote:
> Enable sdio for bcm28155 AP board
>
> Reviewed-by: Alex Elder <[email protected]>
> Signed-off-by: Christian Daudt <[email protected]>
>
> diff --git a/arch/arm/boot/dts/bcm28155-ap.dts b/arch/arm/boot/dts/bcm28155-ap.dts
> index 0d66db6..4b0a3ec 100644
> --- a/arch/arm/boot/dts/bcm28155-ap.dts
> +++ b/arch/arm/boot/dts/bcm28155-ap.dts
> @@ -26,4 +26,20 @@
> uart@3e000000 {
> status = "okay";
> };
> +
> + sdio1: sdio@3f180000 {
> + max-frequency = <48000000>;
> + status = "okay";
> + };
> +
> + sdio2: sdio@3f190000 {
> + non-removable;
> + max-frequency = <48000000>;
> + status = "okay";
> + };
> +
> + sdio4: sdio@3f1b0000 {
> + max-frequency = <48000000>;
> + status = "okay";
> + };
> };
applied to bcm/for-3.12/dt

thanks,
csd