From mboxrd@z Thu Jan 1 00:00:00 1970 From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth) Date: Tue, 22 Apr 2014 19:22:42 +0200 Subject: [PATCH 3/6] ARM: berlin: add the AHCI node for the BG2Q In-Reply-To: <20140422182802.447c2912@skate> References: <1398181105-19714-1-git-send-email-antoine.tenart@free-electrons.com> <1398181105-19714-4-git-send-email-antoine.tenart@free-electrons.com> <20140422182802.447c2912@skate> Message-ID: <5356A562.2090403@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 at e90000 { >> + compatible = "marvell,berlin-ahci"; >> + reg = <0xe90000 0x10000>; >> + interrupts = ; >> + status = "disable"; >> + }; >> + >> + generic-regs at ea0110 { >> + compatible = "marvell,berlin-generic-regs", "syscon"; >> + reg = <0xea0110 0x10>; >> + }; >> + >> apb at fc0000 { >> compatible = "simple-bus"; >> #address-cells = <1>; > > >