From 4a7dcac3fd18b182f882b65161267612713f72dc Mon Sep 17 00:00:00 2001 From: Laurentiu Tudor Date: Tue, 11 Dec 2018 13:32:31 +0200 Subject: [PATCH] arm64: dts: ls104x: constrain sata dma address size Limit the dma mask size for sata to 40 bits to match the actual address size generated towards the interconnect. Re-use the already existing auxiliary simple bus meant for usb but drop the usb reference from the node name. Signed-off-by: Laurentiu Tudor --- arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 18 +++++++++--------- arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi @@ -696,7 +696,7 @@ <&clockgen 4 0>; }; - usb_aux_bus: usb_aux_bus { + aux_bus: aux_bus { #address-cells = <2>; #size-cells = <2>; compatible = "simple-bus"; @@ -741,15 +741,15 @@ snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>; configure-gfladj; }; - }; - sata: sata@3200000 { - compatible = "fsl,ls1043a-ahci"; - reg = <0x0 0x3200000 0x0 0x10000>, - <0x0 0x20140520 0x0 0x4>; - reg-names = "ahci", "sata-ecc"; - interrupts = <0 69 0x4>; - clocks = <&clockgen 4 0>; + sata: sata@3200000 { + compatible = "fsl,ls1043a-ahci"; + reg = <0x0 0x3200000 0x0 0x10000>, + <0x0 0x20140520 0x0 0x4>; + reg-names = "ahci", "sata-ecc"; + interrupts = <0 69 0x4>; + clocks = <&clockgen 4 0>; + }; }; msi1: msi-controller1@1571000 { --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi @@ -594,7 +594,7 @@ <&clockgen 4 1>; }; - usb_aux_bus: usb_aux_bus { + aux_bus: aux_bus { #address-cells = <2>; #size-cells = <2>; compatible = "simple-bus"; @@ -636,15 +636,15 @@ usb3-lpm-capable; snps,dis-u1u2-when-u3-quirk; }; - }; - sata: sata@3200000 { - compatible = "fsl,ls1046a-ahci"; - reg = <0x0 0x3200000 0x0 0x10000>, - <0x0 0x20140520 0x0 0x4>; - reg-names = "ahci", "sata-ecc"; - interrupts = ; - clocks = <&clockgen 4 1>; + sata: sata@3200000 { + compatible = "fsl,ls1046a-ahci"; + reg = <0x0 0x3200000 0x0 0x10000>, + <0x0 0x20140520 0x0 0x4>; + reg-names = "ahci", "sata-ecc"; + interrupts = ; + clocks = <&clockgen 4 1>; + }; }; msi1: msi-controller@1580000 {