git.openwrt.org Git - openwrt/staging/neocturne.git/blob

   1 From 4a7dcac3fd18b182f882b65161267612713f72dc Mon Sep 17 00:00:00 2001
   2 From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
   3 Date: Tue, 11 Dec 2018 13:32:31 +0200
   4 Subject: [PATCH] arm64: dts: ls104x: constrain sata dma address size
   5
   6 Limit the dma mask size for sata to 40 bits to match the actual address
   7 size generated towards the interconnect. Re-use the already existing
   8 auxiliary simple bus meant for usb but drop the usb reference from the
   9 node name.
  10
  11 Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
  12 ---
  13  arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 18 +++++++++---------
  14  arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 18 +++++++++---------
  15  2 files changed, 18 insertions(+), 18 deletions(-)
  16
  17 --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
  18 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
  19 @@ -695,7 +695,7 @@
  20                                  <&clockgen 4 0>;
  21                 };
  22
  23 -               usb_aux_bus: usb_aux_bus {
  24 +               aux_bus: aux_bus {
  25                         #address-cells = <2>;
  26                         #size-cells = <2>;
  27                         compatible = "simple-bus";
  28 @@ -740,15 +740,15 @@
  29                                 snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
  30                                 configure-gfladj;
  31                         };
  32 -               };
  33
  34 -               sata: sata@3200000 {
  35 -                       compatible = "fsl,ls1043a-ahci";
  36 -                       reg = <0x0 0x3200000 0x0 0x10000>,
  37 -                               <0x0 0x20140520 0x0 0x4>;
  38 -                       reg-names = "ahci", "sata-ecc";
  39 -                       interrupts = <0 69 0x4>;
  40 -                       clocks = <&clockgen 4 0>;
  41 +                       sata: sata@3200000 {
  42 +                               compatible = "fsl,ls1043a-ahci";
  43 +                               reg = <0x0 0x3200000 0x0 0x10000>,
  44 +                                       <0x0 0x20140520 0x0 0x4>;
  45 +                               reg-names = "ahci", "sata-ecc";
  46 +                               interrupts = <0 69 0x4>;
  47 +                               clocks = <&clockgen 4 0>;
  48 +                       };
  49                 };
  50
  51                 msi1: msi-controller1@1571000 {
  52 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
  53 +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
  54 @@ -593,7 +593,7 @@
  55                                  <&clockgen 4 1>;
  56                 };
  57
  58 -               usb_aux_bus: usb_aux_bus {
  59 +               aux_bus: aux_bus {
  60                         #address-cells = <2>;
  61                         #size-cells = <2>;
  62                         compatible = "simple-bus";
  63 @@ -635,15 +635,15 @@
  64                                 usb3-lpm-capable;
  65                                 snps,dis-u1u2-when-u3-quirk;
  66                         };
  67 -               };
  68
  69 -               sata: sata@3200000 {
  70 -                       compatible = "fsl,ls1046a-ahci";
  71 -                       reg = <0x0 0x3200000 0x0 0x10000>,
  72 -                               <0x0 0x20140520 0x0 0x4>;
  73 -                       reg-names = "ahci", "sata-ecc";
  74 -                       interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
  75 -                       clocks = <&clockgen 4 1>;
  76 +                       sata: sata@3200000 {
  77 +                               compatible = "fsl,ls1046a-ahci";
  78 +                               reg = <0x0 0x3200000 0x0 0x10000>,
  79 +                                       <0x0 0x20140520 0x0 0x4>;
  80 +                               reg-names = "ahci", "sata-ecc";
  81 +                               interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
  82 +                               clocks = <&clockgen 4 1>;
  83 +                       };
  84                 };
  85
  86                 msi1: msi-controller@1580000 {