| Message ID | 1386177364-10164-5-git-send-email-andrew@lunn.ch |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On Wed, Dec 04, 2013 at 11:01:20PM +0300, Sergei Shtylyov wrote: > Hello. > > On 12/04/2013 08:16 PM, Andrew Lunn wrote: > > >Add nodes for the two SATA PHYs on kirkewood. > >Add node for the one SATA PHY on Dove. > >Add pHandles to the PHYs in the sata nodes. > > I don't think this patch should be pushed thru the libata tree. > However, you didn't Cc linux-arm-kernel... I've actually no idea how this will go upstream, since it is three different subsystems, generic phy, libata, and arm/mvebu. I will leave it up to the maintainers to decide that. I can add some more CC: for v2. > >+ sata_phy0: sata_phy@0 { > > The node should rather be named "sata-phy@0" to be in line with > "ethernet-phy" found in the ePAPR spec. [1], hyphen is generally > preferred to underscore in the device trees. O.K, will do. kirkwood.dtsi and dove.dtsi already follow this pattern of - in the @ part. Thanks Andrew -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello. On 12/04/2013 08:16 PM, Andrew Lunn wrote: > Add nodes for the two SATA PHYs on kirkewood. > Add node for the one SATA PHY on Dove. > Add pHandles to the PHYs in the sata nodes. I don't think this patch should be pushed thru the libata tree. However, you didn't Cc linux-arm-kernel... > Signed-off-by: Andrew Lunn <andrew@lunn.ch> [...] > diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi > index 113a8bc7bee7..d56b3c675249 100644 > --- a/arch/arm/boot/dts/dove.dtsi > +++ b/arch/arm/boot/dts/dove.dtsi > @@ -490,10 +490,21 @@ [...] > + sata_phy0: sata_phy@0 { The node should rather be named "sata-phy@0" to be in line with "ethernet-phy" found in the ePAPR spec. [1], hyphen is generally preferred to underscore in the device trees. > + compatible = "marvell,mvebu-sata-phy"; > + reg = <0xa2000 0x0334>; > + clocks = <&gate_clk 3>; > + clock-names = "sata"; > + #phy-cells = <0>; > + status = "ok"; > + }; > + > rtc: real-time-clock@d8500 { > compatible = "marvell,orion-rtc"; > reg = <0xd8500 0x20>; [...] > diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi > index 8b73c80f1dad..5558b89d48ce 100644 > --- a/arch/arm/boot/dts/kirkwood.dtsi > +++ b/arch/arm/boot/dts/kirkwood.dtsi > @@ -282,5 +282,23 @@ > /* set phy-handle property in board file */ > }; > }; > + > + sata_phy0: sata_phy@0 { Same comment. > + compatible = "marvell,mvebu-sata-phy"; > + reg = <0x82000 0x0334>; > + clocks = <&gate_clk 14>; > + clock-names = "sata"; > + #phy-cells = <0>; > + status = "ok"; > + }; > + > + sata_phy1: sata_phy@1 { ... and here. > + compatible = "marvell,mvebu-sata-phy"; > + reg = <0x84000 0x0334>; > + clocks = <&gate_clk 15>; > + clock-names = "sata"; > + #phy-cells = <0>; > + status = "ok"; > + }; > }; > }; [1] http://www.power.org/resources/downloads/Power_ePAPR_APPROVED_v1.0.pdf WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Wednesday 04 December 2013 10:46 PM, Andrew Lunn wrote: > Add nodes for the two SATA PHYs on kirkewood. > Add node for the one SATA PHY on Dove. > Add pHandles to the PHYs in the sata nodes. > > Signed-off-by: Andrew Lunn <andrew@lunn.ch> > --- > arch/arm/boot/dts/dove.dtsi | 11 +++++++++++ > arch/arm/boot/dts/kirkwood-6281.dtsi | 2 ++ > arch/arm/boot/dts/kirkwood-6282.dtsi | 2 ++ > arch/arm/boot/dts/kirkwood.dtsi | 18 ++++++++++++++++++ > 4 files changed, 33 insertions(+) > > diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi > index 113a8bc7bee7..d56b3c675249 100644 > --- a/arch/arm/boot/dts/dove.dtsi > +++ b/arch/arm/boot/dts/dove.dtsi > @@ -490,10 +490,21 @@ > reg = <0xa0000 0x2400>; > interrupts = <62>; > clocks = <&gate_clk 3>; > + phys = <&sata_phy0>; > + phy-names = "0"; A more descriptive phy-names would be good here and below. > nr-ports = <1>; > status = "disabled"; > }; > > + sata_phy0: sata_phy@0 { > + compatible = "marvell,mvebu-sata-phy"; > + reg = <0xa2000 0x0334>; > + clocks = <&gate_clk 3>; > + clock-names = "sata"; > + #phy-cells = <0>; Ah.. only you documentation was having this value as '1'. Only that needs to be fixed then. Thanks Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 113a8bc7bee7..d56b3c675249 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -490,10 +490,21 @@ reg = <0xa0000 0x2400>; interrupts = <62>; clocks = <&gate_clk 3>; + phys = <&sata_phy0>; + phy-names = "0"; nr-ports = <1>; status = "disabled"; }; + sata_phy0: sata_phy@0 { + compatible = "marvell,mvebu-sata-phy"; + reg = <0xa2000 0x0334>; + clocks = <&gate_clk 3>; + clock-names = "sata"; + #phy-cells = <0>; + status = "ok"; + }; + rtc: real-time-clock@d8500 { compatible = "marvell,orion-rtc"; reg = <0xd8500 0x20>; diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi index 650ef30e1856..92a1c747456a 100644 --- a/arch/arm/boot/dts/kirkwood-6281.dtsi +++ b/arch/arm/boot/dts/kirkwood-6281.dtsi @@ -89,6 +89,8 @@ interrupts = <21>; clocks = <&gate_clk 14>, <&gate_clk 15>; clock-names = "0", "1"; + phys = <&sata_phy0>, <&sata_phy1>; + phy-names = "0", "1"; status = "disabled"; }; diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi index 3933a331ddc2..dfa6b073cf00 100644 --- a/arch/arm/boot/dts/kirkwood-6282.dtsi +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi @@ -117,6 +117,8 @@ interrupts = <21>; clocks = <&gate_clk 14>, <&gate_clk 15>; clock-names = "0", "1"; + phys = <&sata_phy0>, <&sata_phy1>; + phy-names = "0", "1"; status = "disabled"; }; diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index 8b73c80f1dad..5558b89d48ce 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi @@ -282,5 +282,23 @@ /* set phy-handle property in board file */ }; }; + + sata_phy0: sata_phy@0 { + compatible = "marvell,mvebu-sata-phy"; + reg = <0x82000 0x0334>; + clocks = <&gate_clk 14>; + clock-names = "sata"; + #phy-cells = <0>; + status = "ok"; + }; + + sata_phy1: sata_phy@1 { + compatible = "marvell,mvebu-sata-phy"; + reg = <0x84000 0x0334>; + clocks = <&gate_clk 15>; + clock-names = "sata"; + #phy-cells = <0>; + status = "ok"; + }; }; };
Add nodes for the two SATA PHYs on kirkewood. Add node for the one SATA PHY on Dove. Add pHandles to the PHYs in the sata nodes. Signed-off-by: Andrew Lunn <andrew@lunn.ch> --- arch/arm/boot/dts/dove.dtsi | 11 +++++++++++ arch/arm/boot/dts/kirkwood-6281.dtsi | 2 ++ arch/arm/boot/dts/kirkwood-6282.dtsi | 2 ++ arch/arm/boot/dts/kirkwood.dtsi | 18 ++++++++++++++++++ 4 files changed, 33 insertions(+)