scsi: ceva: rename the resource name to match the linux kernel one

The driver will look for a named resource "ecc-addr", but this isn't the
official binding. In fact, the official device tree binding
documentation doesn't mention any resource names at all. But it is safe
to assume that it's the linux ones we have to use if we want to be
compatible with the linux device tree. Thus rename "ecc-addr" to
"sata-ecc" and convert all the users in u-boot.

While at it, also rename "sata-base" to "ahci" although its not used at
all.

This change doesn't affect the SATA controller on the ZynqMP.

Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/arch/arm/dts/fsl-ls1012a.dtsi b/arch/arm/dts/fsl-ls1012a.dtsi
index dcdcd444b34d08d7e6ea80e1c53329cde79e8059..0ea899c7d7c58405b2c966b56ac45135f326b4f7 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a.dtsi
+++ b/arch/arm/dts/fsl-ls1012a.dtsi
@@ -157,7 +157,7 @@
                        compatible = "fsl,ls1012a-ahci";
                        reg = <0x0 0x3200000 0x0 0x10000 /* ccsr sata base */
                               0x0 0x20140520 0x0 0x4>;  /* ecc sata addr */
-                       reg-names = "sata-base", "ecc-addr";
+                       reg-names = "ahci", "sata-ecc";
                        interrupts = <0 69 4>;
                        clocks = <&clockgen 4 0>;
                        status = "disabled";

diff --git a/arch/arm/dts/fsl-ls1028a.dtsi b/arch/arm/dts/fsl-ls1028a.dtsi
index cf381a0856a4cf89aba42f12f189b51284fedb79..34aad526fe31de7aaa967e5a8053da6522efdaa9 100644 (file)
--- a/arch/arm/dts/fsl-ls1028a.dtsi
+++ b/arch/arm/dts/fsl-ls1028a.dtsi
@@ -338,7 +338,7 @@
                        compatible = "fsl,ls1028a-ahci";
                        reg = <0x0 0x3200000 0x0 0x10000        /* ccsr sata base */
                               0x7 0x100520  0x0 0x4>;          /* ecc sata addr*/
-                       reg-names = "sata-base", "ecc-addr";
+                       reg-names = "ahci", "sata-ecc";
                        interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
                        status = "disabled";
                };

diff --git a/arch/arm/dts/fsl-ls1043a.dtsi b/arch/arm/dts/fsl-ls1043a.dtsi
index 3aaec8b6af9799e70a095fc72642134f1f06040f..52dc5a9638241295ea504f34d00b78c79a5f492c 100644 (file)
--- a/arch/arm/dts/fsl-ls1043a.dtsi
+++ b/arch/arm/dts/fsl-ls1043a.dtsi
@@ -331,7 +331,7 @@
                        compatible = "fsl,ls1043a-ahci";
                        reg = <0x0 0x3200000 0x0 0x10000 /* ccsr sata base */
                               0x0 0x20140520 0x0 0x4>;  /* ecc sata addr*/
-                       reg-names = "sata-base", "ecc-addr";
+                       reg-names = "ahci", "sata-ecc";
                        interrupts = <0 69 4>;
                        clocks = <&clockgen 4 0>;
                        status = "disabled";

diff --git a/arch/arm/dts/fsl-ls1046a.dtsi b/arch/arm/dts/fsl-ls1046a.dtsi
index 6a205cd3dfc8bb0fcabcc3a5e630e8ca045bef50..a60cbf11fc56c05377e8c99d7b0e1397b8913dc4 100644 (file)
--- a/arch/arm/dts/fsl-ls1046a.dtsi
+++ b/arch/arm/dts/fsl-ls1046a.dtsi
@@ -367,7 +367,7 @@
                        compatible = "fsl,ls1046a-ahci";
                        reg = <0x0 0x3200000 0x0 0x10000 /* ccsr sata base */
                               0x0 0x20140520 0x0 0x4>;  /* ecc sata addr*/
-                       reg-names = "sata-base", "ecc-addr";
+                       reg-names = "ahci", "sata-ecc";
                        interrupts = <0 69 4>;
                        clocks = <&clockgen 4 1>;
                        status = "disabled";

diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi
index 73c89288581bc6060ab04445691885b47a150469..f73fdfda8b51eb06fc2319b316b4371867af0439 100644 (file)
--- a/arch/arm/dts/fsl-ls1088a.dtsi
+++ b/arch/arm/dts/fsl-ls1088a.dtsi
@@ -226,7 +226,7 @@
                compatible = "fsl,ls1088a-ahci";
                reg = <0x0 0x3200000 0x0 0x10000 /* ccsr sata base */
                       0x7 0x100520  0x0 0x4>;   /* ecc sata addr*/
-               reg-names = "sata-base", "ecc-addr";
+               reg-names = "ahci", "sata-ecc";
                interrupts = <0 133 4>;
                status = "disabled";
        };

diff --git a/arch/arm/dts/ls1021a.dtsi b/arch/arm/dts/ls1021a.dtsi
index 8aefc82f8788f10d229c010e03d2ee4376a0668a..86192cbb7f3d1b0529fde684dc523407be5050f7 100644 (file)
--- a/arch/arm/dts/ls1021a.dtsi
+++ b/arch/arm/dts/ls1021a.dtsi
@@ -469,7 +469,7 @@
                sata: sata@3200000 {
                        compatible = "fsl,ls1021a-ahci";
                        reg = <0x3200000 0x10000 0x20220520 0x4>;
-                       reg-names = "sata-base", "ecc-addr";
+                       reg-names = "ahci", "sata-ecc";
                        interrupts = <0 101 4>;
                        status = "disabled";
                };

diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c
index 87e6a90f74e48d9b89467335e5ec2f0c47a5f3bd..b71f10223da803f80fd757b67d7f267faf476d91 100644 (file)
--- a/drivers/ata/sata_ceva.c
+++ b/drivers/ata/sata_ceva.c
@@ -212,7 +212,7 @@ static int sata_ceva_of_to_plat(struct udevice *dev)
        if (priv->base == FDT_ADDR_T_NONE)
                return -EINVAL;
 
-       ret = dev_read_resource_byname(dev, "ecc-addr", &res_regs);
+       ret = dev_read_resource_byname(dev, "sata-ecc", &res_regs);
        if (ret)
                priv->ecc_base = 0;
        else