mvebu: pinctrl: sync compatible string with Linux 4.17-rc4

For pinctrl driver of mvebu, the compatible strings
supported are defined differently from Linux version.
The patch aligned the compatible string with
Linux 4.17-rc4.

Signed-off-by: Evan Wang <xswang@marvell.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/dts/armada-ap806.dtsi b/arch/arm/dts/armada-ap806.dtsi
index e0d301682b957b329e0922e7725eb634c42821f2..ebdee514c09ae3c14f2741d470e78ffe5bf0940e 100644 (file)
--- a/arch/arm/dts/armada-ap806.dtsi
+++ b/arch/arm/dts/armada-ap806.dtsi
@@ -141,7 +141,7 @@
                        };
 
                        ap_pinctl: ap-pinctl@6F4000 {
-                               compatible = "marvell,armada-ap806-pinctrl";
+                               compatible = "marvell,ap806-pinctrl";
                                bank-name ="apn-806";
                                reg = <0x6F4000 0x10>;
                                pin-count = <20>;

diff --git a/arch/arm/dts/armada-cp110-master.dtsi b/arch/arm/dts/armada-cp110-master.dtsi
index 8c336f2c38fd0ba0277c4a9e4b3f38c35af3de92..551d00d7746485f736d08f488c2900be712cb028 100644 (file)
--- a/arch/arm/dts/armada-cp110-master.dtsi
+++ b/arch/arm/dts/armada-cp110-master.dtsi
@@ -120,8 +120,8 @@
 
                        cpm_pinctl: cpm-pinctl@440000 {
                                compatible = "marvell,mvebu-pinctrl",
-                                            "marvell,a70x0-pinctrl",
-                                            "marvell,a80x0-cp0-pinctrl";
+                                            "marvell,armada-7k-pinctrl",
+                                            "marvell,armada-8k-cpm-pinctrl";
                                bank-name ="cp0-110";
                                reg = <0x440000 0x20>;
                                pin-count = <63>;

diff --git a/arch/arm/dts/armada-cp110-slave.dtsi b/arch/arm/dts/armada-cp110-slave.dtsi
index 0cdb3d3ae3d67ef0bef154448a5ab981e67c4009..2ea9004f1d4962683b2f0335468e23c3d7985bee 100644 (file)
--- a/arch/arm/dts/armada-cp110-slave.dtsi
+++ b/arch/arm/dts/armada-cp110-slave.dtsi
@@ -120,7 +120,7 @@
 
                        cps_pinctl: cps-pinctl@440000 {
                                compatible = "marvell,mvebu-pinctrl",
-                                            "marvell,a80x0-cp1-pinctrl";
+                                            "marvell,armada-8k-cps-pinctrl";
                                bank-name ="cp1-110";
                                reg = <0x440000 0x20>;
                                pin-count = <63>;

diff --git a/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt b/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt
index 5f86c0a00bfa75c5c04cd7cfc76509f6b746a2b4..1fc1bc66456a0062c3c69275f9979c77736cd7d1 100644 (file)
--- a/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt
+++ b/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt
@@ -6,10 +6,10 @@ mpp pins or group of pins and a mpp function common to all pins.
 
 Required properties for the pinctrl driver:
 - compatible:  "marvell,mvebu-pinctrl",
-               "marvell,armada-ap806-pinctrl",
-               "marvell,a70x0-pinctrl",
-               "marvell,a80x0-cp0-pinctrl",
-               "marvell,a80x0-cp1-pinctrl"
+               "marvell,ap806-pinctrl",
+               "marvell,armada-7k-pinctrl",
+               "marvell,armada-8k-cpm-pinctrl",
+               "marvell,armada-8k-cps-pinctrl"
 - bank-name:   A string defining the pinc controller bank name
 - reg:                 A pair of values defining the pin controller base address
                and the address space
@@ -31,7 +31,7 @@ Example:
                config-space {
                        pinctl: pinctl@6F4000 {
                                compatible = "marvell,mvebu-pinctrl",
-                                            "marvell,armada-ap806-pinctrl";
+                                            "marvell,ap806-pinctrl";
                                bank-name ="apn-806";
                                reg = <0x6F4000 0x10>;
                                pin-count = <20>;
@@ -52,8 +52,8 @@ Example:
                config-space {
                        cpm_pinctl: pinctl@44000 {
                                compatible = "marvell,mvebu-pinctrl",
-                                            "marvell,a70x0-pinctrl",
-                                            "marvell,a80x0-cp0-pinctrl";
+                                            "marvell,armada-7k-pinctrl",
+                                            "marvell,armada-8k-cpm-pinctrl";
                                bank-name ="cp0-110";
                                reg = <0x440000 0x20>;
                                pin-count = <63>;
@@ -89,7 +89,7 @@ Example:
                config-space {
                        cps_pinctl: pinctl@44000 {
                                compatible = "marvell,mvebu-pinctrl",
-                                            "marvell,a80x0-cp1-pinctrl";
+                                            "marvell,armada-8k-cps-pinctrl";
                                bank-name ="cp1-110";
                                reg = <0x440000 0x20>;
                                pin-count = <63>;

diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index d4f2970a6924c95db5a94103647ef9fecf42e64b..583262683f223a3ae18b1a981dfc4d7879de4e6d 100644 (file)
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -161,10 +161,10 @@ static struct pinctrl_ops mvebu_pinctrl_ops = {
 
 static const struct udevice_id mvebu_pinctrl_ids[] = {
        { .compatible = "marvell,mvebu-pinctrl" },
-       { .compatible = "marvell,armada-ap806-pinctrl" },
-       { .compatible = "marvell,a70x0-pinctrl" },
-       { .compatible = "marvell,a80x0-cp0-pinctrl" },
-       { .compatible = "marvell,a80x0-cp1-pinctrl" },
+       { .compatible = "marvell,ap806-pinctrl" },
+       { .compatible = "marvell,armada-7k-pinctrl" },
+       { .compatible = "marvell,armada-8k-cpm-pinctrl" },
+       { .compatible = "marvell,armada-8k-cps-pinctrl" },
        { }
 };