| Message ID | 1398756095-32542-4-git-send-email-lee.jones@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 04/29/2014 09:21 AM, Lee Jones wrote: > The MiPHY365x is a Generic PHY which can serve various SATA or PCIe > devices. It has 2 ports which it can use for either; both SATA, both > PCIe or one of each in any configuration. > > Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com> > Acked-by: Mark Rutland <mark.rutland@arm.com> > Acked-by: Alexandre Torgue <alexandre.torgue@st.com> > Signed-off-by: Lee Jones <lee.jones@linaro.org> > --- > arch/arm/boot/dts/stih416-b2020-revE.dts | 22 ++++++++++++++++++++++ > arch/arm/boot/dts/stih416-b2020.dts | 6 ++++++ > arch/arm/boot/dts/stih416.dtsi | 14 ++++++++++++++ > 3 files changed, 42 insertions(+) > create mode 100644 arch/arm/boot/dts/stih416-b2020-revE.dts > > diff --git a/arch/arm/boot/dts/stih416-b2020-revE.dts b/arch/arm/boot/dts/stih416-b2020-revE.dts > new file mode 100644 > index 0000000..23fdaf7 > --- /dev/null > +++ b/arch/arm/boot/dts/stih416-b2020-revE.dts > @@ -0,0 +1,22 @@ > +/* > + * Copyright (C) 2014 STMicroelectronics Limited. > + * Author: Lee Jones <lee.jones@linaro.org> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * publishhed by the Free Software Foundation. > + */ > +/dts-v1/; > +#include "stih416.dtsi" > +#include "stih41x-b2020.dtsi" > +/ { > + model = "STiH416 B2020 REV-E"; > + compatible = "st,stih416-b2020", "st,stih416"; > + > + soc { > + miphy365x_phy: miphy365x@fe382000 { > + st,pcie-tx-pol-inv; > + st,sata-gen = <3>; > + }; > + }; > +}; Shouldn't this new board being added in a separate patch? > diff --git a/arch/arm/boot/dts/stih416-b2020.dts b/arch/arm/boot/dts/stih416-b2020.dts > index 276f28d..172f222 100644 > --- a/arch/arm/boot/dts/stih416-b2020.dts > +++ b/arch/arm/boot/dts/stih416-b2020.dts > @@ -13,4 +13,10 @@ > model = "STiH416 B2020"; > compatible = "st,stih416", "st,stih416-b2020"; > > + soc { > + miphy365x_phy: miphy365x@fe382000 { > + st,pcie-tx-pol-inv; > + st,sata-gen = <3>; > + }; > + }; > }; ... -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
> >The MiPHY365x is a Generic PHY which can serve various SATA or PCIe > >devices. It has 2 ports which it can use for either; both SATA, both > >PCIe or one of each in any configuration. > > > >Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com> > >Acked-by: Mark Rutland <mark.rutland@arm.com> > >Acked-by: Alexandre Torgue <alexandre.torgue@st.com> > >Signed-off-by: Lee Jones <lee.jones@linaro.org> > >--- > > arch/arm/boot/dts/stih416-b2020-revE.dts | 22 ++++++++++++++++++++++ > > arch/arm/boot/dts/stih416-b2020.dts | 6 ++++++ > > arch/arm/boot/dts/stih416.dtsi | 14 ++++++++++++++ > > 3 files changed, 42 insertions(+) > > create mode 100644 arch/arm/boot/dts/stih416-b2020-revE.dts > > > >diff --git a/arch/arm/boot/dts/stih416-b2020-revE.dts b/arch/arm/boot/dts/stih416-b2020-revE.dts > >new file mode 100644 > >index 0000000..23fdaf7 > >--- /dev/null > >+++ b/arch/arm/boot/dts/stih416-b2020-revE.dts > >@@ -0,0 +1,22 @@ > >+/* > >+ * Copyright (C) 2014 STMicroelectronics Limited. > >+ * Author: Lee Jones <lee.jones@linaro.org> > >+ * > >+ * This program is free software; you can redistribute it and/or modify > >+ * it under the terms of the GNU General Public License version 2 as > >+ * publishhed by the Free Software Foundation. > >+ */ > >+/dts-v1/; > >+#include "stih416.dtsi" > >+#include "stih41x-b2020.dtsi" > >+/ { > >+ model = "STiH416 B2020 REV-E"; > >+ compatible = "st,stih416-b2020", "st,stih416"; > >+ > >+ soc { > >+ miphy365x_phy: miphy365x@fe382000 { > >+ st,pcie-tx-pol-inv; > >+ st,sata-gen = <3>; > >+ }; > >+ }; > >+}; > Shouldn't this new board being added in a separate patch? I certainly can do that, but I don't think that it's necessary? > >diff --git a/arch/arm/boot/dts/stih416-b2020.dts b/arch/arm/boot/dts/stih416-b2020.dts > >index 276f28d..172f222 100644 > >--- a/arch/arm/boot/dts/stih416-b2020.dts > >+++ b/arch/arm/boot/dts/stih416-b2020.dts > >@@ -13,4 +13,10 @@ > > model = "STiH416 B2020"; > > compatible = "st,stih416", "st,stih416-b2020"; > > > >+ soc { > >+ miphy365x_phy: miphy365x@fe382000 { > >+ st,pcie-tx-pol-inv; > >+ st,sata-gen = <3>; > >+ }; > >+ }; > > }; > ...
On 05/19/2014 05:51 PM, Lee Jones wrote: >>> The MiPHY365x is a Generic PHY which can serve various SATA or PCIe >>> devices. It has 2 ports which it can use for either; both SATA, both >>> PCIe or one of each in any configuration. >>> >>> Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com> >>> Acked-by: Mark Rutland <mark.rutland@arm.com> >>> Acked-by: Alexandre Torgue <alexandre.torgue@st.com> >>> Signed-off-by: Lee Jones <lee.jones@linaro.org> >>> --- >>> arch/arm/boot/dts/stih416-b2020-revE.dts | 22 ++++++++++++++++++++++ >>> arch/arm/boot/dts/stih416-b2020.dts | 6 ++++++ >>> arch/arm/boot/dts/stih416.dtsi | 14 ++++++++++++++ >>> 3 files changed, 42 insertions(+) >>> create mode 100644 arch/arm/boot/dts/stih416-b2020-revE.dts >>> >>> diff --git a/arch/arm/boot/dts/stih416-b2020-revE.dts b/arch/arm/boot/dts/stih416-b2020-revE.dts >>> new file mode 100644 >>> index 0000000..23fdaf7 >>> --- /dev/null >>> +++ b/arch/arm/boot/dts/stih416-b2020-revE.dts >>> @@ -0,0 +1,22 @@ >>> +/* >>> + * Copyright (C) 2014 STMicroelectronics Limited. >>> + * Author: Lee Jones <lee.jones@linaro.org> >>> + * >>> + * This program is free software; you can redistribute it and/or modify >>> + * it under the terms of the GNU General Public License version 2 as >>> + * publishhed by the Free Software Foundation. >>> + */ >>> +/dts-v1/; >>> +#include "stih416.dtsi" >>> +#include "stih41x-b2020.dtsi" >>> +/ { >>> + model = "STiH416 B2020 REV-E"; >>> + compatible = "st,stih416-b2020", "st,stih416"; >>> + >>> + soc { >>> + miphy365x_phy: miphy365x@fe382000 { >>> + st,pcie-tx-pol-inv; >>> + st,sata-gen = <3>; >>> + }; >>> + }; >>> +}; >> Shouldn't this new board being added in a separate patch? > > I certainly can do that, but I don't think that it's necessary? I think it is, as you introduce a new board. Moreover, the miphy description being the same as in stih416-b2020.dts, so I don't understand why you introduce this board for this feature. > >>> diff --git a/arch/arm/boot/dts/stih416-b2020.dts b/arch/arm/boot/dts/stih416-b2020.dts >>> index 276f28d..172f222 100644 >>> --- a/arch/arm/boot/dts/stih416-b2020.dts >>> +++ b/arch/arm/boot/dts/stih416-b2020.dts >>> @@ -13,4 +13,10 @@ >>> model = "STiH416 B2020"; >>> compatible = "st,stih416", "st,stih416-b2020"; >>> >>> + soc { >>> + miphy365x_phy: miphy365x@fe382000 { >>> + st,pcie-tx-pol-inv; >>> + st,sata-gen = <3>; >>> + }; >>> + }; >>> }; >> ... > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
> >>>The MiPHY365x is a Generic PHY which can serve various SATA or PCIe > >>>devices. It has 2 ports which it can use for either; both SATA, both > >>>PCIe or one of each in any configuration. > >>> > >>>Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com> > >>>Acked-by: Mark Rutland <mark.rutland@arm.com> > >>>Acked-by: Alexandre Torgue <alexandre.torgue@st.com> > >>>Signed-off-by: Lee Jones <lee.jones@linaro.org> > >>>--- > >>> arch/arm/boot/dts/stih416-b2020-revE.dts | 22 ++++++++++++++++++++++ > >>> arch/arm/boot/dts/stih416-b2020.dts | 6 ++++++ > >>> arch/arm/boot/dts/stih416.dtsi | 14 ++++++++++++++ > >>> 3 files changed, 42 insertions(+) > >>> create mode 100644 arch/arm/boot/dts/stih416-b2020-revE.dts > >>> > >>>diff --git a/arch/arm/boot/dts/stih416-b2020-revE.dts b/arch/arm/boot/dts/stih416-b2020-revE.dts > >>>new file mode 100644 > >>>index 0000000..23fdaf7 > >>>--- /dev/null > >>>+++ b/arch/arm/boot/dts/stih416-b2020-revE.dts > >>>@@ -0,0 +1,22 @@ > >>>+/* > >>>+ * Copyright (C) 2014 STMicroelectronics Limited. > >>>+ * Author: Lee Jones <lee.jones@linaro.org> > >>>+ * > >>>+ * This program is free software; you can redistribute it and/or modify > >>>+ * it under the terms of the GNU General Public License version 2 as > >>>+ * publishhed by the Free Software Foundation. > >>>+ */ > >>>+/dts-v1/; > >>>+#include "stih416.dtsi" > >>>+#include "stih41x-b2020.dtsi" > >>>+/ { > >>>+ model = "STiH416 B2020 REV-E"; > >>>+ compatible = "st,stih416-b2020", "st,stih416"; > >>>+ > >>>+ soc { > >>>+ miphy365x_phy: miphy365x@fe382000 { > >>>+ st,pcie-tx-pol-inv; > >>>+ st,sata-gen = <3>; > >>>+ }; > >>>+ }; > >>>+}; > >>Shouldn't this new board being added in a separate patch? > > > >I certainly can do that, but I don't think that it's necessary? > > I think it is, as you introduce a new board. Introducing an empty dts file just so you can say "this is a new board" seems odd to me, but I'll go with whatever you feel it right. > Moreover, the miphy description being the same as in > stih416-b2020.dts, so I don't understand why you introduce this > board for this feature. It's historical. There are other differences between rev-E and the other reversions, such as; gpio-leds (red, green) and the reset GPIO for ethernet. As these are dts files (rather than dtsi) files, you can only use one at a time. > >>>diff --git a/arch/arm/boot/dts/stih416-b2020.dts b/arch/arm/boot/dts/stih416-b2020.dts > >>>index 276f28d..172f222 100644 > >>>--- a/arch/arm/boot/dts/stih416-b2020.dts > >>>+++ b/arch/arm/boot/dts/stih416-b2020.dts > >>>@@ -13,4 +13,10 @@ > >>> model = "STiH416 B2020"; > >>> compatible = "st,stih416", "st,stih416-b2020"; > >>> > >>>+ soc { > >>>+ miphy365x_phy: miphy365x@fe382000 { > >>>+ st,pcie-tx-pol-inv; > >>>+ st,sata-gen = <3>; > >>>+ }; > >>>+ }; > >>> }; > >>... > >
On 05/20/2014 10:28 AM, Lee Jones wrote: >>>>> The MiPHY365x is a Generic PHY which can serve various SATA or PCIe >>>>> devices. It has 2 ports which it can use for either; both SATA, both >>>>> PCIe or one of each in any configuration. >>>>> >>>>> Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com> >>>>> Acked-by: Mark Rutland <mark.rutland@arm.com> >>>>> Acked-by: Alexandre Torgue <alexandre.torgue@st.com> >>>>> Signed-off-by: Lee Jones <lee.jones@linaro.org> >>>>> --- >>>>> arch/arm/boot/dts/stih416-b2020-revE.dts | 22 ++++++++++++++++++++++ >>>>> arch/arm/boot/dts/stih416-b2020.dts | 6 ++++++ >>>>> arch/arm/boot/dts/stih416.dtsi | 14 ++++++++++++++ >>>>> 3 files changed, 42 insertions(+) >>>>> create mode 100644 arch/arm/boot/dts/stih416-b2020-revE.dts >>>>> >>>>> diff --git a/arch/arm/boot/dts/stih416-b2020-revE.dts b/arch/arm/boot/dts/stih416-b2020-revE.dts >>>>> new file mode 100644 >>>>> index 0000000..23fdaf7 >>>>> --- /dev/null >>>>> +++ b/arch/arm/boot/dts/stih416-b2020-revE.dts >>>>> @@ -0,0 +1,22 @@ >>>>> +/* >>>>> + * Copyright (C) 2014 STMicroelectronics Limited. >>>>> + * Author: Lee Jones <lee.jones@linaro.org> >>>>> + * >>>>> + * This program is free software; you can redistribute it and/or modify >>>>> + * it under the terms of the GNU General Public License version 2 as >>>>> + * publishhed by the Free Software Foundation. >>>>> + */ >>>>> +/dts-v1/; >>>>> +#include "stih416.dtsi" >>>>> +#include "stih41x-b2020.dtsi" >>>>> +/ { >>>>> + model = "STiH416 B2020 REV-E"; >>>>> + compatible = "st,stih416-b2020", "st,stih416"; >>>>> + >>>>> + soc { >>>>> + miphy365x_phy: miphy365x@fe382000 { >>>>> + st,pcie-tx-pol-inv; >>>>> + st,sata-gen = <3>; >>>>> + }; >>>>> + }; >>>>> +}; >>>> Shouldn't this new board being added in a separate patch? >>> >>> I certainly can do that, but I don't think that it's necessary? >> >> I think it is, as you introduce a new board. > > Introducing an empty dts file just so you can say "this is a new > board" seems odd to me, but I'll go with whatever you feel it right. > >> Moreover, the miphy description being the same as in >> stih416-b2020.dts, so I don't understand why you introduce this >> board for this feature. > > It's historical. There are other differences between rev-E and the > other reversions, such as; gpio-leds (red, green) and the reset GPIO > for ethernet. As these are dts files (rather than dtsi) files, you > can only use one at a time. My point was to create a new patch that would also introduce the differences (Ethernet, leds...). The commit message would explain the differences versus stih416-b2020. From your patch, if I didn't know the differences, I would ask why you don't use stih416-b2020.dts. If you have another pending patch that make Ethernet to work on revE board, you can keep this one as it is. > >>>>> diff --git a/arch/arm/boot/dts/stih416-b2020.dts b/arch/arm/boot/dts/stih416-b2020.dts >>>>> index 276f28d..172f222 100644 >>>>> --- a/arch/arm/boot/dts/stih416-b2020.dts >>>>> +++ b/arch/arm/boot/dts/stih416-b2020.dts >>>>> @@ -13,4 +13,10 @@ >>>>> model = "STiH416 B2020"; >>>>> compatible = "st,stih416", "st,stih416-b2020"; >>>>> >>>>> + soc { >>>>> + miphy365x_phy: miphy365x@fe382000 { >>>>> + st,pcie-tx-pol-inv; >>>>> + st,sata-gen = <3>; >>>>> + }; >>>>> + }; >>>>> }; >>>> ... >>> > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/arch/arm/boot/dts/stih416-b2020-revE.dts b/arch/arm/boot/dts/stih416-b2020-revE.dts new file mode 100644 index 0000000..23fdaf7 --- /dev/null +++ b/arch/arm/boot/dts/stih416-b2020-revE.dts @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2014 STMicroelectronics Limited. + * Author: Lee Jones <lee.jones@linaro.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * publishhed by the Free Software Foundation. + */ +/dts-v1/; +#include "stih416.dtsi" +#include "stih41x-b2020.dtsi" +/ { + model = "STiH416 B2020 REV-E"; + compatible = "st,stih416-b2020", "st,stih416"; + + soc { + miphy365x_phy: miphy365x@fe382000 { + st,pcie-tx-pol-inv; + st,sata-gen = <3>; + }; + }; +}; diff --git a/arch/arm/boot/dts/stih416-b2020.dts b/arch/arm/boot/dts/stih416-b2020.dts index 276f28d..172f222 100644 --- a/arch/arm/boot/dts/stih416-b2020.dts +++ b/arch/arm/boot/dts/stih416-b2020.dts @@ -13,4 +13,10 @@ model = "STiH416 B2020"; compatible = "st,stih416", "st,stih416-b2020"; + soc { + miphy365x_phy: miphy365x@fe382000 { + st,pcie-tx-pol-inv; + st,sata-gen = <3>; + }; + }; }; diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi index 78746d2..00b217a 100644 --- a/arch/arm/boot/dts/stih416.dtsi +++ b/arch/arm/boot/dts/stih416.dtsi @@ -9,6 +9,8 @@ #include "stih41x.dtsi" #include "stih416-clock.dtsi" #include "stih416-pinctrl.dtsi" + +#include <dt-bindings/phy/phy-miphy365x.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/reset-controller/stih416-resets.h> / { @@ -224,5 +226,17 @@ status = "disabled"; }; + + miphy365x_phy: miphy365x@fe382000 { + compatible = "st,miphy365x-phy"; + reg = <0xfe382000 0x100>, + <0xfe38a000 0x100>, + <0xfe394000 0x100>, + <0xfe804000 0x100>; + reg-names = "sata0", "sata1", "pcie0", "pcie1"; + + #phy-cells = <2>; + st,syscfg = <&syscfg_rear>; + }; }; };