On Mon, Feb 03, 2014 at 11:35:14AM +0100, Hans de Goede wrote: > Hi, > > On 01/31/2014 02:45 PM, Maxime Ripard wrote: > >Hi Hans, > > > >On Wed, Jan 22, 2014 at 08:04:48PM +0100, Hans de Goede wrote: > >>From: Oliver Schinagl <[email protected]> > >> > >>This patch adds sunxi sata support to A10 boards that have such a connector. > >>Some boards also feature a regulator via a GPIO and support for this is also > >>added. > >> > >>Signed-off-by: Olliver Schinagl <[email protected]> > >>Signed-off-by: Hans de Goede <[email protected]> > >>--- > >> arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ++++ > >> arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +++++ > >> arch/arm/boot/dts/sun4i-a10.dtsi | 8 +++++++ > >> arch/arm/boot/dts/sunxi-ahci-reg.dtsi | 38 > >> ++++++++++++++++++++++++++++++ > > > >I'm still half convinced about this at the moment, given the number of > >platforms we support, we can always change it back if things become too > >messy. > > I assume that this == sunxi-ahci-reg.dtsi ? To be sure I understand > you correctly, you're ok with going this route for now, right ?
Yep.
> How about the same for the usb ohci/ehci controller dts patches ? Currently
> they
> are still using the put a regulator node in each dts file model, which leads
> to
> a lot of boilerplate code. So I would like to move to the same model as I'm
> using here for the sata supply.
That would make sense too.
> >> 4 files changed, 56 insertions(+)
> >> create mode 100644 arch/arm/boot/dts/sunxi-ahci-reg.dtsi
> >>
> >>diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts
> >>b/arch/arm/boot/dts/sun4i-a10-a1000.dts
> >>index aef8207..3fb7305 100644
> >>--- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
> >>+++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
> >>@@ -48,6 +48,10 @@
> >> status = "okay";
> >> };
> >>
> >>+ ahci: sata@01c18000 {
> >>+ status = "okay";
> >>+ };
> >>+
> >> pinctrl@01c20800 {
> >> mmc0_cd_pin_a1000: mmc0_cd_pin@0 {
> >> allwinner,pins = "PH1";
> >>diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
> >>b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
> >>index f50fb2b..6ae1110 100644
> >>--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
> >>+++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
> >>@@ -12,6 +12,7 @@
> >>
> >> /dts-v1/;
> >> /include/ "sun4i-a10.dtsi"
> >>+/include/ "sunxi-ahci-reg.dtsi"
> >>
> >> / {
> >> model = "Cubietech Cubieboard";
> >>@@ -51,6 +52,11 @@
> >> status = "okay";
> >> };
> >>
> >>+ ahci: sata@01c18000 {
> >>+ target-supply = <®_ahci_5v>;
> >>+ status = "okay";
> >>+ };
> >>+
> >> pinctrl@01c20800 {
> >> mmc0_cd_pin_cubieboard: mmc0_cd_pin@0 {
> >> allwinner,pins = "PH1";
> >>diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi
> >>b/arch/arm/boot/dts/sun4i-a10.dtsi
> >>index 4736dd2..198dcda 100644
> >>--- a/arch/arm/boot/dts/sun4i-a10.dtsi
> >>+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
> >>@@ -331,6 +331,14 @@
> >> status = "disabled";
> >> };
> >>
> >>+ ahci: sata@01c18000 {
> >>+ compatible = "allwinner,sun4i-a10-ahci";
> >
> >To be consistent with the rest of the sun4i devices compatible, It
> >should be sun4i-ahci.
> >
> >However, since these devices don't use the same compatible pattern as
> >their own machine compatible, and are consisent with the rest of the
> >compatibles for the other SoCs, we can probably make this a go to
> >transition progressively to this pattern.
>
> Ack, I think it would be good to be consistent and try to use
> sun?i-aXX-foo everywhere. I noticed that we already use that in various
> places, so I thought it would be good to do that for all new dts bindings.
Yes, that's my plan.
> >I'll cook up some patches for the other devices.
>
> Thanks.
And I sent them on sunday.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
signature.asc
Description: Digital signature
