LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Evan Wang 2018-05-25 14:20:51 +08:00 committed by Stefan Roese
parent 17afbbf944
commit f246648d37
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/dts/armada-ap806.dtsi
View File

@ -141,7 +141,7 @@
}; };
ap_pinctl: ap-pinctl@6F4000 { ap_pinctl: ap-pinctl@6F4000 {
compatible = "marvell,armada-ap806-pinctrl"; compatible = "marvell,ap806-pinctrl";
bank-name ="apn-806"; bank-name ="apn-806";
reg = <0x6F4000 0x10>; reg = <0x6F4000 0x10>;
pin-count = <20>; pin-count = <20>;

4
arch/arm/dts/armada-cp110-master.dtsi
View File

@ -120,8 +120,8 @@
cpm_pinctl: cpm-pinctl@440000 { cpm_pinctl: cpm-pinctl@440000 {
compatible = "marvell,mvebu-pinctrl", compatible = "marvell,mvebu-pinctrl",
"marvell,a70x0-pinctrl", "marvell,armada-7k-pinctrl",
"marvell,a80x0-cp0-pinctrl"; "marvell,armada-8k-cpm-pinctrl";
bank-name ="cp0-110"; bank-name ="cp0-110";
reg = <0x440000 0x20>; reg = <0x440000 0x20>;
pin-count = <63>; pin-count = <63>;

2
arch/arm/dts/armada-cp110-slave.dtsi
View File

@ -120,7 +120,7 @@
cps_pinctl: cps-pinctl@440000 { cps_pinctl: cps-pinctl@440000 {
compatible = "marvell,mvebu-pinctrl", compatible = "marvell,mvebu-pinctrl",
"marvell,a80x0-cp1-pinctrl"; "marvell,armada-8k-cps-pinctrl";
bank-name ="cp1-110"; bank-name ="cp1-110";
reg = <0x440000 0x20>; reg = <0x440000 0x20>;
pin-count = <63>; pin-count = <63>;

16
doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt
View File

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

8
drivers/pinctrl/mvebu/pinctrl-mvebu.c
View File

@ -161,10 +161,10 @@ static struct pinctrl_ops mvebu_pinctrl_ops = {
static const struct udevice_id mvebu_pinctrl_ids[] = { static const struct udevice_id mvebu_pinctrl_ids[] = {
{ .compatible = "marvell,mvebu-pinctrl" }, { .compatible = "marvell,mvebu-pinctrl" },
{ .compatible = "marvell,armada-ap806-pinctrl" }, { .compatible = "marvell,ap806-pinctrl" },
{ .compatible = "marvell,a70x0-pinctrl" }, { .compatible = "marvell,armada-7k-pinctrl" },
{ .compatible = "marvell,a80x0-cp0-pinctrl" }, { .compatible = "marvell,armada-8k-cpm-pinctrl" },
{ .compatible = "marvell,a80x0-cp1-pinctrl" }, { .compatible = "marvell,armada-8k-cps-pinctrl" },
{ } { }
}; };