| Message ID | 1398155248-1659-2-git-send-email-antoine.tenart@free-electrons.com |
|---|---|
| State | New |
| Headers | show |
[Added MMC maintainers Chris and Ulf for one question below] On 04/22/2014 10:27 AM, Antoine Ténart wrote: > Add the SDHCI nodes for the Marvell Berlin BG2Q, using the mrvl,pxav3-mmc > driver. > > Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> > --- > arch/arm/boot/dts/berlin2q.dtsi | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi > index 5925e6a16749..85d0ca5cc47a 100644 > --- a/arch/arm/boot/dts/berlin2q.dtsi > +++ b/arch/arm/boot/dts/berlin2q.dtsi > @@ -67,6 +67,14 @@ > clock-div = <3>; > }; > > + sdio1clk: sdio1clk { > + compatible = "fixed-factor-clock"; > + #clock-cells = <0>; > + clocks = <&syspll>; > + clock-mult = <1>; > + clock-div = <4>; > + }; > + > soc { > compatible = "simple-bus"; > #address-cells = <1>; > @@ -75,6 +83,30 @@ > ranges = <0 0xf7000000 0x1000000>; > interrupt-parent = <&gic>; > > + sdhci0: sdhci@ab0000 { > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab0000 0x200>; > + clocks = <&sdio1clk>; > + interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; > + status = "disabled"; > + }; > + > + sdhci1: sdhci@ab0800 { > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab0800 0x200>; > + clocks = <&sdio1clk>; > + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; > + status = "disabled"; > + }; > + > + sdhci2: sdhci@ab1000 { Didn't Jisheng ask for sdhci2 being registered at mmc0? Renaming the node labels will not help, but have you tried using an: aliases { mmc0 = &sdhci2; mmc1 = &sdhci0; mmc2 = &sdhci1; }; node and set the platform_device's .id field with what you get from of_alias_get_id(np, "mmc")? @Chris, Ulf: Is there any generic alias, e.g. "sdhci", you prefer for drivers/mmc so we can put it into sdhci_get_of_property()? Sebastian > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab1000 0x200>; > + interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&sdio1clk>; > + status = "disabled"; > + }; > + > l2: l2-cache-controller@ac0000 { > compatible = "arm,pl310-cache"; > reg = <0xac0000 0x1000>; >
Sebastian, On Tue, Apr 22, 2014 at 07:35:27PM +0200, Sebastian Hesselbarth wrote: > On 04/22/2014 10:27 AM, Antoine Ténart wrote: […] > > + sdhci0: sdhci@ab0000 { > > + compatible = "mrvl,pxav3-mmc"; > > + reg = <0xab0000 0x200>; > > + clocks = <&sdio1clk>; > > + interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; > > + status = "disabled"; > > + }; > > + > > + sdhci1: sdhci@ab0800 { > > + compatible = "mrvl,pxav3-mmc"; > > + reg = <0xab0800 0x200>; > > + clocks = <&sdio1clk>; > > + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; > > + status = "disabled"; > > + }; > > + > > + sdhci2: sdhci@ab1000 { > > Didn't Jisheng ask for sdhci2 being registered at mmc0? Yes sure, but I don't know if he agreeded on this solution. I'll ask him. Otherwise aliases seems ok from my point of view. > Renaming the node labels will not help, but have you tried using an: > > aliases { > mmc0 = &sdhci2; > mmc1 = &sdhci0; > mmc2 = &sdhci1; > }; > > node and set the platform_device's .id field with what you get > from of_alias_get_id(np, "mmc")? > > @Chris, Ulf: Is there any generic alias, e.g. "sdhci", you prefer for > drivers/mmc so we can put it into sdhci_get_of_property()? I'd also like the subsystem maintainers to give their opinion on this before updating. Thanks! Antoine
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi index 5925e6a16749..85d0ca5cc47a 100644 --- a/arch/arm/boot/dts/berlin2q.dtsi +++ b/arch/arm/boot/dts/berlin2q.dtsi @@ -67,6 +67,14 @@ clock-div = <3>; }; + sdio1clk: sdio1clk { + compatible = "fixed-factor-clock"; + #clock-cells = <0>; + clocks = <&syspll>; + clock-mult = <1>; + clock-div = <4>; + }; + soc { compatible = "simple-bus"; #address-cells = <1>; @@ -75,6 +83,30 @@ ranges = <0 0xf7000000 0x1000000>; interrupt-parent = <&gic>; + sdhci0: sdhci@ab0000 { + compatible = "mrvl,pxav3-mmc"; + reg = <0xab0000 0x200>; + clocks = <&sdio1clk>; + interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + sdhci1: sdhci@ab0800 { + compatible = "mrvl,pxav3-mmc"; + reg = <0xab0800 0x200>; + clocks = <&sdio1clk>; + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + + sdhci2: sdhci@ab1000 { + compatible = "mrvl,pxav3-mmc"; + reg = <0xab1000 0x200>; + interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&sdio1clk>; + status = "disabled"; + }; + l2: l2-cache-controller@ac0000 { compatible = "arm,pl310-cache"; reg = <0xac0000 0x1000>;
Add the SDHCI nodes for the Marvell Berlin BG2Q, using the mrvl,pxav3-mmc driver. Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> --- arch/arm/boot/dts/berlin2q.dtsi | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)