From d7358f845645c588aff84ac6b476a17d3eec75fa Mon Sep 17 00:00:00 2001 From: Christian Daudt Date: Wed, 7 Aug 2013 22:37:47 -0700 Subject: [PATCH] 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 Signed-off-by: Christian Daudt Reviewed-by: Alex Elder --- arch/arm/boot/dts/bcm11351-brt.dts | 6 +++--- arch/arm/boot/dts/bcm11351.dtsi | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/bcm11351-brt.dts b/arch/arm/boot/dts/bcm11351-brt.dts index 67ec524098b5..647a78c6b61e 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 f43558c1f069..2ffd292e815f 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>; -- 2.20.1