| Message ID | 1408436126-23390-1-git-send-email-addy.ke@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Addy, On Tue, Aug 19, 2014 at 1:15 AM, Addy Ke <addy.ke@rock-chips.com> wrote: > This patch requires that <https://patchwork.kernel.org/patch/4701721/> > land in order to compile. > > Signed-off-by: Addy Ke <addy.ke@rock-chips.com> > --- > Changes in v2: > - repost patch to match what's in Heiko's "wip/v3.18-next/dts" tree > for the other dwmmc controllers > - add "cd" and "int" line, suggested by Doug Anderson > - fix up sdio1 configuration error > > Changes in v3: > - sort sdio0 and sdio1 by pin number, suggested by Doug Anderson > - add "ro" and "bkpwr" line, suggested by Doug Anderson > > arch/arm/boot/dts/rk3288.dtsi | 102 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 102 insertions(+) > > diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi > index 36be7bb..12c0297 100644 > --- a/arch/arm/boot/dts/rk3288.dtsi > +++ b/arch/arm/boot/dts/rk3288.dtsi > @@ -88,6 +88,26 @@ > status = "disabled"; > }; > > + sdio0: dwmmc@ff0d0000 { > + compatible = "rockchip,rk3288-dw-mshc"; > + clocks = <&cru HCLK_SDIO0>, <&cru SCLK_SDIO0>; > + clock-names = "biu", "ciu"; > + fifo-depth = <0x100>; > + interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; > + reg = <0xff0d0000 0x4000>; > + status = "disabled"; > + }; > + > + sdio1: dwmmc@ff0e0000 { > + compatible = "rockchip,rk3288-dw-mshc"; > + clocks = <&cru HCLK_SDIO1>, <&cru SCLK_SDIO1>; > + clock-names = "biu", "ciu"; > + fifo-depth = <0x100>; > + interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; > + reg = <0xff0e0000 0x4000>; > + status = "disabled"; > + }; > + > emmc: dwmmc@ff0f0000 { > compatible = "rockchip,rk3288-dw-mshc"; > clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>; > @@ -508,6 +528,88 @@ > }; > }; > > + sdio0 { > + sdio0_bus1: sdio0-bus1 { > + rockchip,pins = <4 20 RK_FUNC_1 &pcfg_pull_up>; > + }; > + > + sdio0_bus4: sdio0-bus4 { > + rockchip,pins = <4 20 RK_FUNC_1 &pcfg_pull_up>, > + <4 21 RK_FUNC_1 &pcfg_pull_up>, > + <4 22 RK_FUNC_1 &pcfg_pull_up>, > + <4 23 RK_FUNC_1 &pcfg_pull_up>; > + }; > + > + sdio0_cmd: sdio0-cmd { > + rockchip,pins = <4 24 RK_FUNC_1 &pcfg_pull_up>; > + }; > + > + sdio0_clk: sdio0-clk { > + rockchip,pins = <4 25 RK_FUNC_1 &pcfg_pull_none>; > + }; > + > + sdio0_cd: sdio0-cd { > + rockchip,pins = <4 26 RK_FUNC_1 &pcfg_pull_up>; > + }; > + > + sdio0_ro: sdio0-ro { I probably would have called it "sdio0-wp", not "sdio-ro". That matches the syntax used elsewhere ("wp-gpios", "disable-wp", etc). Can you do one more spin? With that change, you can add my Reviewed-by tag. > + rockchip,pins = <4 27 RK_FUNC_1 &pcfg_pull_up>; > + }; > + > + sdio0_pwr: sdio0-pwr { > + rockchip,pins = <4 28 RK_FUNC_1 &pcfg_pull_up>; > + }; > + > + sdio0_bkpwr: sdio0-bkpwr { > + rockchip,pins = <4 29 RK_FUNC_1 &pcfg_pull_up>; > + }; > + > + sdio0_int: sdio0-int { > + rockchip,pins = <4 30 RK_FUNC_1 &pcfg_pull_up>; > + }; > + }; > + > + sdio1 { > + sdio1_bus1: sdio1-bus1 { > + rockchip,pins = <3 24 RK_FUNC_4 &pcfg_pull_up>; > + }; > + > + sdio1_bus4: sdio1-bus4 { > + rockchip,pins = <3 24 RK_FUNC_4 &pcfg_pull_up>, > + <3 25 RK_FUNC_4 &pcfg_pull_up>, > + <3 26 RK_FUNC_4 &pcfg_pull_up>, > + <3 27 RK_FUNC_4 &pcfg_pull_up>; > + }; > + > + sdio1_cd: sdio1-cd { > + rockchip,pins = <3 28 RK_FUNC_4 &pcfg_pull_up>; > + }; > + > + sdio1_ro: sdio1-ro { Here, too.
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 36be7bb..12c0297 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -88,6 +88,26 @@ status = "disabled"; }; + sdio0: dwmmc@ff0d0000 { + compatible = "rockchip,rk3288-dw-mshc"; + clocks = <&cru HCLK_SDIO0>, <&cru SCLK_SDIO0>; + clock-names = "biu", "ciu"; + fifo-depth = <0x100>; + interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; + reg = <0xff0d0000 0x4000>; + status = "disabled"; + }; + + sdio1: dwmmc@ff0e0000 { + compatible = "rockchip,rk3288-dw-mshc"; + clocks = <&cru HCLK_SDIO1>, <&cru SCLK_SDIO1>; + clock-names = "biu", "ciu"; + fifo-depth = <0x100>; + interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; + reg = <0xff0e0000 0x4000>; + status = "disabled"; + }; + emmc: dwmmc@ff0f0000 { compatible = "rockchip,rk3288-dw-mshc"; clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>; @@ -508,6 +528,88 @@ }; }; + sdio0 { + sdio0_bus1: sdio0-bus1 { + rockchip,pins = <4 20 RK_FUNC_1 &pcfg_pull_up>; + }; + + sdio0_bus4: sdio0-bus4 { + rockchip,pins = <4 20 RK_FUNC_1 &pcfg_pull_up>, + <4 21 RK_FUNC_1 &pcfg_pull_up>, + <4 22 RK_FUNC_1 &pcfg_pull_up>, + <4 23 RK_FUNC_1 &pcfg_pull_up>; + }; + + sdio0_cmd: sdio0-cmd { + rockchip,pins = <4 24 RK_FUNC_1 &pcfg_pull_up>; + }; + + sdio0_clk: sdio0-clk { + rockchip,pins = <4 25 RK_FUNC_1 &pcfg_pull_none>; + }; + + sdio0_cd: sdio0-cd { + rockchip,pins = <4 26 RK_FUNC_1 &pcfg_pull_up>; + }; + + sdio0_ro: sdio0-ro { + rockchip,pins = <4 27 RK_FUNC_1 &pcfg_pull_up>; + }; + + sdio0_pwr: sdio0-pwr { + rockchip,pins = <4 28 RK_FUNC_1 &pcfg_pull_up>; + }; + + sdio0_bkpwr: sdio0-bkpwr { + rockchip,pins = <4 29 RK_FUNC_1 &pcfg_pull_up>; + }; + + sdio0_int: sdio0-int { + rockchip,pins = <4 30 RK_FUNC_1 &pcfg_pull_up>; + }; + }; + + sdio1 { + sdio1_bus1: sdio1-bus1 { + rockchip,pins = <3 24 RK_FUNC_4 &pcfg_pull_up>; + }; + + sdio1_bus4: sdio1-bus4 { + rockchip,pins = <3 24 RK_FUNC_4 &pcfg_pull_up>, + <3 25 RK_FUNC_4 &pcfg_pull_up>, + <3 26 RK_FUNC_4 &pcfg_pull_up>, + <3 27 RK_FUNC_4 &pcfg_pull_up>; + }; + + sdio1_cd: sdio1-cd { + rockchip,pins = <3 28 RK_FUNC_4 &pcfg_pull_up>; + }; + + sdio1_ro: sdio1-ro { + rockchip,pins = <3 29 RK_FUNC_4 &pcfg_pull_up>; + }; + + sdio1_bkpwr: sdio1-bkpwr { + rockchip,pins = <3 30 RK_FUNC_4 &pcfg_pull_up>; + }; + + sdio1_int: sdio1-int { + rockchip,pins = <3 31 RK_FUNC_4 &pcfg_pull_up>; + }; + + sdio1_cmd: sdio1-cmd { + rockchip,pins = <4 6 RK_FUNC_4 &pcfg_pull_up>; + }; + + sdio1_clk: sdio1-clk { + rockchip,pins = <4 7 RK_FUNC_4 &pcfg_pull_none>; + }; + + sdio1_pwr: sdio1-pwr { + rockchip,pins = <4 9 RK_FUNC_4 &pcfg_pull_up>; + }; + }; + emmc { emmc_clk: emmc-clk { rockchip,pins = <3 18 RK_FUNC_2 &pcfg_pull_none>;
This patch requires that <https://patchwork.kernel.org/patch/4701721/> land in order to compile. Signed-off-by: Addy Ke <addy.ke@rock-chips.com> --- Changes in v2: - repost patch to match what's in Heiko's "wip/v3.18-next/dts" tree for the other dwmmc controllers - add "cd" and "int" line, suggested by Doug Anderson - fix up sdio1 configuration error Changes in v3: - sort sdio0 and sdio1 by pin number, suggested by Doug Anderson - add "ro" and "bkpwr" line, suggested by Doug Anderson arch/arm/boot/dts/rk3288.dtsi | 102 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+)