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>;
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
