| Message ID | 1398181105-19714-4-git-send-email-antoine.tenart@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Dear Antoine Ténart, On Tue, 22 Apr 2014 17:38:22 +0200, Antoine Ténart wrote: > The BG2Q has an AHCI SATA controller. Add the corresponding node > in its device tree. I believe the commit log should explain why an apparently unrelated generic-regs@ node gets added in this commit. Thanks! Thomas > diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi > index 07452a7483fa..8e58aae73365 100644 > --- a/arch/arm/boot/dts/berlin2q.dtsi > +++ b/arch/arm/boot/dts/berlin2q.dtsi > @@ -183,6 +183,18 @@ > }; > }; > > + ahci: sata@e90000 { > + compatible = "marvell,berlin-ahci"; > + reg = <0xe90000 0x10000>; > + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; > + status = "disable"; > + }; > + > + generic-regs@ea0110 { > + compatible = "marvell,berlin-generic-regs", "syscon"; > + reg = <0xea0110 0x10>; > + }; > + > apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>;
Dear Antoine Ténart, On Tue, 22 Apr 2014 17:38:22 +0200, Antoine Ténart wrote: > + ahci: sata@e90000 { > + compatible = "marvell,berlin-ahci"; > + reg = <0xe90000 0x10000>; > + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; > + status = "disable"; Should be: status = "disabled"; And ditto for patches 5 and 6. Thanks, Thomas
On 04/22/2014 06:28 PM, Thomas Petazzoni wrote: > Dear Antoine Ténart, > > On Tue, 22 Apr 2014 17:38:22 +0200, Antoine Ténart wrote: >> The BG2Q has an AHCI SATA controller. Add the corresponding node >> in its device tree. > > I believe the commit log should explain why an apparently unrelated > generic-regs@ node gets added in this commit. generic-regs@ is from another patch, please drop it entirely. Sebastian >> diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi >> index 07452a7483fa..8e58aae73365 100644 >> --- a/arch/arm/boot/dts/berlin2q.dtsi >> +++ b/arch/arm/boot/dts/berlin2q.dtsi >> @@ -183,6 +183,18 @@ >> }; >> }; >> >> + ahci: sata@e90000 { >> + compatible = "marvell,berlin-ahci"; >> + reg = <0xe90000 0x10000>; >> + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; >> + status = "disable"; >> + }; >> + >> + generic-regs@ea0110 { >> + compatible = "marvell,berlin-generic-regs", "syscon"; >> + reg = <0xea0110 0x10>; >> + }; >> + >> apb@fc0000 { >> compatible = "simple-bus"; >> #address-cells = <1>; > > >
diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi index 07452a7483fa..8e58aae73365 100644 --- a/arch/arm/boot/dts/berlin2q.dtsi +++ b/arch/arm/boot/dts/berlin2q.dtsi @@ -183,6 +183,18 @@ }; }; + ahci: sata@e90000 { + compatible = "marvell,berlin-ahci"; + reg = <0xe90000 0x10000>; + interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; + status = "disable"; + }; + + generic-regs@ea0110 { + compatible = "marvell,berlin-generic-regs", "syscon"; + reg = <0xea0110 0x10>; + }; + apb@fc0000 { compatible = "simple-bus"; #address-cells = <1>;
The BG2Q has an AHCI SATA controller. Add the corresponding node in its device tree. Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> --- arch/arm/boot/dts/berlin2q.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)