| Message ID | 1397652011-21284-4-git-send-email-antoine.tenart@free-electrons.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Apr 16, 2014 at 02:40:10PM +0200, Antoine Ténart wrote: > Add the SDHCI nodes for the Marvell Berlin BG2Q, using the berlin-sdhci > driver. > > Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> > --- > arch/arm/boot/dts/berlin2q.dtsi | 40 ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 40 insertions(+) > > diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi > index 5925e6a16749..8f897d461460 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,38 @@ > ranges = <0 0xf7000000 0x1000000>; > interrupt-parent = <&gic>; > > + sdhci0: sdhci@ab0000 { > + compatible = "marvell,berlin2q-sdhci"; > + reg = <0xab0000 0x200>; > + clocks = <&sdio1clk>; > + interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; > + keep-power-in-suspend; > + enable-sdio-wakeup; > + broken-cd; Hi Antoine I would expect these three last properties to be a property of the board, not the SoC. Or am i missing something? Thanks Andrew
Hi Andrew, On Wed, Apr 16, 2014 at 03:09:15PM +0200, Andrew Lunn wrote: > On Wed, Apr 16, 2014 at 02:40:10PM +0200, Antoine Ténart wrote: > > Add the SDHCI nodes for the Marvell Berlin BG2Q, using the berlin-sdhci > > driver. > > > > Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> > > --- > > arch/arm/boot/dts/berlin2q.dtsi | 40 ++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 40 insertions(+) > > > > diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi > > index 5925e6a16749..8f897d461460 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,38 @@ > > ranges = <0 0xf7000000 0x1000000>; > > interrupt-parent = <&gic>; > > > > + sdhci0: sdhci@ab0000 { > > + compatible = "marvell,berlin2q-sdhci"; > > + reg = <0xab0000 0x200>; > > + clocks = <&sdio1clk>; > > + interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; > > + keep-power-in-suspend; > > + enable-sdio-wakeup; > > + broken-cd; > > Hi Antoine > > I would expect these three last properties to be a property of the > board, not the SoC. Or am i missing something? No reason, I'll move them. Thanks ! Antoine
Hi Antoine, On Wed, 16 Apr 2014 05:40:10 -0700 Antoine Ténart <antoine.tenart@free-electrons.com> wrote: > Add the SDHCI nodes for the Marvell Berlin BG2Q, using the berlin-sdhci > driver. > > Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> > --- > arch/arm/boot/dts/berlin2q.dtsi | 40 > ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) > > diff --git a/arch/arm/boot/dts/berlin2q.dtsi > b/arch/arm/boot/dts/berlin2q.dtsi index 5925e6a16749..8f897d461460 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,38 @@ > ranges = <0 0xf7000000 0x1000000>; > interrupt-parent = <&gic>; > > + sdhci0: sdhci@ab0000 { > + compatible = "marvell,berlin2q-sdhci"; > + reg = <0xab0000 0x200>; > + clocks = <&sdio1clk>; > + interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; > + keep-power-in-suspend; > + enable-sdio-wakeup; > + broken-cd; > + status = "disabled"; > + }; > + > + sdhci1: sdhci@ab0800 { > + compatible = "marvell,berlin2q-sdhci"; > + reg = <0xab0800 0x200>; > + clocks = <&sdio1clk>; > + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; > + keep-power-in-suspend; > + enable-sdio-wakeup; > + status = "disabled"; > + }; > + > + sdhci2: sdhci@ab1000 { > + compatible = "marvell,berlin2q-sdhci"; > + reg = <0xab1000 0x200>; > + interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&sdio1clk>; > + keep-power-in-suspend; > + enable-sdio-wakeup; > + broken-cd; > + status = "disabled"; > + }; could we put sdhci@ab1000 at the first of sdhci lists? For two reasons: 1. sdhci@ab0000 and sdhci@ab0800 is called as sdhci1 and sdhci2 in mrvl internal discussion, so this would make the name consistent when we upgrade linux kernel to one mainline version. 2. sdhci@ab1000 is always used for emmc. if sdhci@ab0800 is put at the head of sdhci@ab1000, and there's one sdcard in it, mmcblock0 would be the sdcard rather than emmc. I dunno whether there's elegant solutions for these two issues. alias? Could anyone kindly help? Thanks in advance, Jisheng
On 04/17/2014 05:33 AM, Jisheng Zhang wrote: > On Wed, 16 Apr 2014 05:40:10 -0700 > Antoine Ténart <antoine.tenart@free-electrons.com> wrote: >> Add the SDHCI nodes for the Marvell Berlin BG2Q, using the berlin-sdhci >> driver. [...] >> + sdhci0: sdhci@ab0000 { >> + compatible = "marvell,berlin2q-sdhci"; >> + reg = <0xab0000 0x200>; >> + clocks = <&sdio1clk>; >> + interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; >> + keep-power-in-suspend; >> + enable-sdio-wakeup; >> + broken-cd; >> + status = "disabled"; >> + }; >> + >> + sdhci1: sdhci@ab0800 { >> + compatible = "marvell,berlin2q-sdhci"; >> + reg = <0xab0800 0x200>; >> + clocks = <&sdio1clk>; >> + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; >> + keep-power-in-suspend; >> + enable-sdio-wakeup; >> + status = "disabled"; >> + }; >> + >> + sdhci2: sdhci@ab1000 { >> + compatible = "marvell,berlin2q-sdhci"; >> + reg = <0xab1000 0x200>; >> + interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; >> + clocks = <&sdio1clk>; >> + keep-power-in-suspend; >> + enable-sdio-wakeup; >> + broken-cd; >> + status = "disabled"; >> + }; > > could we put sdhci@ab1000 at the first of sdhci lists? For two reasons: Don't reorder the nodes, but use aliases. > 1. sdhci@ab0000 and sdhci@ab0800 is called as sdhci1 and sdhci2 in mrvl > internal discussion, so this would make the name consistent when we > upgrade linux kernel to one mainline version. How about we only move the node labels? > 2. sdhci@ab1000 is always used for emmc. if sdhci@ab0800 is put at the > head of sdhci@ab1000, and there's one sdcard in it, mmcblock0 would be > the sdcard rather than emmc. And label this one sdhci0? > I dunno whether there's elegant solutions for these two issues. alias? Could > anyone kindly help? Have a look at drivers/mmc/host/dw_mmc.c: ctrl_id = of_alias_get_id(host->dev->of_node, "mshc"); this also requires an aliases node in berlin2foo.dtsi: aliases { mshc0 = &sdhci0; mshc1 = &sdhci1; mshc2 = &sdhci2; }; Rather than using "mshc", I'd prefer something like "sdio" or "mmc". Also, if that alias would be part of generic mmc OF code would be good too, but we'll have to wait for Chris' call here. Sebastian
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi index 5925e6a16749..8f897d461460 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,38 @@ ranges = <0 0xf7000000 0x1000000>; interrupt-parent = <&gic>; + sdhci0: sdhci@ab0000 { + compatible = "marvell,berlin2q-sdhci"; + reg = <0xab0000 0x200>; + clocks = <&sdio1clk>; + interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>; + keep-power-in-suspend; + enable-sdio-wakeup; + broken-cd; + status = "disabled"; + }; + + sdhci1: sdhci@ab0800 { + compatible = "marvell,berlin2q-sdhci"; + reg = <0xab0800 0x200>; + clocks = <&sdio1clk>; + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; + keep-power-in-suspend; + enable-sdio-wakeup; + status = "disabled"; + }; + + sdhci2: sdhci@ab1000 { + compatible = "marvell,berlin2q-sdhci"; + reg = <0xab1000 0x200>; + interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&sdio1clk>; + keep-power-in-suspend; + enable-sdio-wakeup; + broken-cd; + 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 berlin-sdhci driver. Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> --- arch/arm/boot/dts/berlin2q.dtsi | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)