[U-Boot] [PATCH 1/3] mvebu: pinctrl: sync compatible string with Linux 4.17-rc4

[Stefan Roese]

On 24.05.2018 10:20, xswang at marvell.com wrote:
> From: Evan Wang <xswang at marvell.com>
> 
> Signed-off-by: Evan Wang <xswang at marvell.com>

Even for minimal changes (which this patch is not btw), a small
commit text is mandatory. Please insert a short patch description
here in your v2.

Other than this, please add my:

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
> 
>   arch/arm/dts/armada-ap806.dtsi                           |  2 +-
>   arch/arm/dts/armada-cp110-master.dtsi                    |  4 ++--
>   arch/arm/dts/armada-cp110-slave.dtsi                     |  2 +-
>   .../pinctrl/marvell,mvebu-pinctrl.txt                    | 16 ++++++++--------
>   drivers/pinctrl/mvebu/pinctrl-mvebu.c                    |  8 ++++----
>   5 files changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm/dts/armada-ap806.dtsi b/arch/arm/dts/armada-ap806.dtsi
> index e0d3016..ebdee51 100644
> --- a/arch/arm/dts/armada-ap806.dtsi
> +++ b/arch/arm/dts/armada-ap806.dtsi
> @@ -141,7 +141,7 @@
>   			};
>   
>   			ap_pinctl: ap-pinctl at 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 8c336f2..551d00d 100644
> --- a/arch/arm/dts/armada-cp110-master.dtsi
> +++ b/arch/arm/dts/armada-cp110-master.dtsi
> @@ -120,8 +120,8 @@
>   
>   			cpm_pinctl: cpm-pinctl at 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 0cdb3d3..2ea9004 100644
> --- a/arch/arm/dts/armada-cp110-slave.dtsi
> +++ b/arch/arm/dts/armada-cp110-slave.dtsi
> @@ -120,7 +120,7 @@
>   
>   			cps_pinctl: cps-pinctl at 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 5f86c0a..1fc1bc6 100644
> --- 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 at 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 at 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 at 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 ec19583..556bf78 100644
> --- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
> +++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
> @@ -162,10 +162,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" },
>   	{ }
>   };
>   
> 

Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de