Skip to content

L
linux
Commit 1637d480 authored by Linus Walleij's avatar Linus Walleij
Browse files
Options

pinctrl: nomadik: force-convert to generic config bindings 

This converts the Nomadik pin controller and all associated device
trees to use the standard, generic config bindings for pin controllers.
There are no such device trees deployed in the wild so this is
safe to do to set a good example.
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 51d39936
Expand all Show whitespace changes
Inline Side-by-side
Showing with 148 additions and 148 deletions
arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi
View file @ 1637d480
......@@ -23,24 +23,24 @@ default_mux {
uart0_default_mode: uart0_default {
default_cfg1 {
ste,pins = "GPIO0", "GPIO2";
pins = "GPIO0", "GPIO2";
ste,config = <&in_pu>;
};
default_cfg2 {
ste,pins = "GPIO1", "GPIO3";
pins = "GPIO1", "GPIO3";
ste,config = <&out_hi>;
};
};
uart0_sleep_mode: uart0_sleep {
sleep_cfg1 {
ste,pins = "GPIO0", "GPIO2";
pins = "GPIO0", "GPIO2";
ste,config = <&slpm_in_pu>;
};
sleep_cfg2 {
ste,pins = "GPIO1", "GPIO3";
pins = "GPIO1", "GPIO3";
ste,config = <&slpm_out_hi>;
};
};
......@@ -54,24 +54,24 @@ default_mux {
};
default_cfg1 {
ste,pins = "GPIO120";
pins = "GPIO120";
ste,config = <&in_pu>;
};
default_cfg2 {
ste,pins = "GPIO121";
pins = "GPIO121";
ste,config = <&out_hi>;
};
};
uart2_sleep_mode: uart2_sleep {
sleep_cfg1 {
ste,pins = "GPIO120";
pins = "GPIO120";
ste,config = <&slpm_in_pu>;
};
sleep_cfg2 {
ste,pins = "GPIO121";
pins = "GPIO121";
ste,config = <&slpm_out_hi>;
};
};
......@@ -87,14 +87,14 @@ default_mux {
i2c0_default_mode: i2c_default {
default_cfg1 {
ste,pins = "GPIO147", "GPIO148";
pins = "GPIO147", "GPIO148";
ste,config = <&in_pu>;
};
};
i2c0_sleep_mode: i2c_sleep {
sleep_cfg1 {
ste,pins = "GPIO147", "GPIO148";
pins = "GPIO147", "GPIO148";
ste,config = <&slpm_in_pu>;
};
};
......@@ -110,14 +110,14 @@ default_mux {
i2c1_default_mode: i2c_default {
default_cfg1 {
ste,pins = "GPIO16", "GPIO17";
pins = "GPIO16", "GPIO17";
ste,config = <&in_pu>;
};
};
i2c1_sleep_mode: i2c_sleep {
sleep_cfg1 {
ste,pins = "GPIO16", "GPIO17";
pins = "GPIO16", "GPIO17";
ste,config = <&slpm_in_pu>;
};
};
......@@ -133,14 +133,14 @@ default_mux {
i2c2_default_mode: i2c_default {
default_cfg1 {
ste,pins = "GPIO10", "GPIO11";
pins = "GPIO10", "GPIO11";
ste,config = <&in_pu>;
};
};
i2c2_sleep_mode: i2c_sleep {
sleep_cfg1 {
ste,pins = "GPIO11", "GPIO11";
pins = "GPIO11", "GPIO11";
ste,config = <&slpm_in_pu>;
};
};
......@@ -156,14 +156,14 @@ default_mux {
i2c4_default_mode: i2c_default {
default_cfg1 {
ste,pins = "GPIO122", "GPIO123";
pins = "GPIO122", "GPIO123";
ste,config = <&in_pu>;
};
};
i2c4_sleep_mode: i2c_sleep {
sleep_cfg1 {
ste,pins = "GPIO122", "GPIO123";
pins = "GPIO122", "GPIO123";
ste,config = <&slpm_in_pu>;
};
};
......@@ -179,14 +179,14 @@ default_mux {
i2c5_default_mode: i2c_default {
default_cfg1 {
ste,pins = "GPIO118", "GPIO119";
pins = "GPIO118", "GPIO119";
ste,config = <&in_pu>;
};
};
i2c5_sleep_mode: i2c_sleep {
sleep_cfg1 {
ste,pins = "GPIO118", "GPIO119";
pins = "GPIO118", "GPIO119";
ste,config = <&slpm_in_pu>;
};
};
......
arch/arm/boot/dts/ste-href-stuib.dtsi
View file @ 1637d480
......@@ -103,7 +103,7 @@ pinctrl {
prox {
prox_stuib_mode: prox_stuib {
stuib_cfg {
ste,pins = "GPIO217_AH12";
pins = "GPIO217_AH12";
ste,config = <&gpio_in_pu>;
};
};
......@@ -111,7 +111,7 @@ stuib_cfg {
hall {
hall_stuib_mode: stuib_tvk {
stuib_cfg {
ste,pins = "GPIO145_C13";
pins = "GPIO145_C13";
ste,config = <&gpio_in_pu>;
};
};
......
arch/arm/boot/dts/ste-href-tvk1281618.dtsi
View file @ 1637d480
......@@ -130,7 +130,7 @@ pinctrl {
tc35893 {
tc35893_tvk_mode: tc35893_tvk {
tvk_cfg {
ste,pins = "GPIO218_AH11";
pins = "GPIO218_AH11";
ste,config = <&gpio_in_pu>;
};
};
......@@ -138,7 +138,7 @@ tvk_cfg {
prox {
prox_tvk_mode: prox_tvk {
tvk_cfg {
ste,pins = "GPIO217_AH12";
pins = "GPIO217_AH12";
ste,config = <&gpio_in_pu>;
};
};
......@@ -146,7 +146,7 @@ tvk_cfg {
hall {
hall_tvk_mode: hall_tvk {
tvk_cfg {
ste,pins = "GPIO145_C13";
pins = "GPIO145_C13";
ste,config = <&gpio_in_pu>;
};
};
......@@ -155,7 +155,7 @@ accelerometer {
accel_tvk_mode: accel_tvk {
/* Accelerometer interrupt lines 1 & 2 */
tvk_cfg {
ste,pins = "GPIO82_C1", "GPIO83_D3";
pins = "GPIO82_C1", "GPIO83_D3";
ste,config = <&gpio_in_pu>;
};
};
......@@ -164,11 +164,11 @@ magnetometer {
magneto_tvk_mode: magneto_tvk {
/* Magnetometer uses GPIO 31 and 32, pull these up/down respectively */
tvk_cfg1 {
ste,pins = "GPIO31_V3";
pins = "GPIO31_V3";
ste,config = <&gpio_in_pu>;
};
tvk_cfg2 {
ste,pins = "GPIO32_V2";
pins = "GPIO32_V2";
ste,config = <&gpio_in_pd>;
};
};
......
arch/arm/boot/dts/ste-hrefprev60.dtsi
View file @ 1637d480
......@@ -83,7 +83,7 @@ hrefprev60_mux {
groups = "ssp0_a_1";
};
hrefprev60_cfg1 {
ste,pins = "GPIO145_C13"; /* RXD */
pins = "GPIO145_C13"; /* RXD */
ste,config = <&in_pd>;
};
......@@ -97,7 +97,7 @@ hrefprev60_mux {
groups = "mc0dat31dir_a_1";
};
hrefprev60_cfg1 {
ste,pins = "GPIO21_AB3"; /* DAT31DIR */
pins = "GPIO21_AB3"; /* DAT31DIR */
ste,config = <&out_hi>;
};
......@@ -106,7 +106,7 @@ hrefprev60_cfg1 {
tc35892 {
tc35892_hrefprev60_mode: tc35892_hrefprev60 {
hrefprev60_cfg {
ste,pins = "GPIO217_AH12";
pins = "GPIO217_AH12";
ste,config = <&gpio_in_pu>;
};
};
......@@ -118,7 +118,7 @@ hrefprev60_mux {
groups = "ipgpio0_c_1", "ipgpio1_c_1";
};
hrefprev60_cfg1 {
ste,pins = "GPIO6_AF6", "GPIO7_AG5";
pins = "GPIO6_AF6", "GPIO7_AG5";
ste,config = <&in_pu>;
};
};
......
arch/arm/boot/dts/ste-hrefv60plus.dtsi
View file @ 1637d480
......@@ -49,7 +49,7 @@ sdi0 {
/* SD card detect GPIO pin, extend default state */
sdi0_default_mode: sdi0_default {
default_hrefv60_cfg1 {
ste,pins = "GPIO95_E8";
pins = "GPIO95_E8";
ste,config = <&gpio_in_pu>;
};
};
......@@ -68,15 +68,15 @@ hrefv60_mux {
groups = "ipgpio0_c_1", "ipgpio1_c_1", "ipgpio4_c_1";
};
hrefv60_cfg1 {
ste,pins = "GPIO6_AF6", "GPIO7_AG5";
pins = "GPIO6_AF6", "GPIO7_AG5";
ste,config = <&in_pu>;
};
hrefv60_cfg2 {
ste,pins = "GPIO21_AB3";
pins = "GPIO21_AB3";
ste,config = <&gpio_out_lo>;
};
hrefv60_cfg3 {
ste,pins = "GPIO64_F3";
pins = "GPIO64_F3";
ste,config = <&out_lo>;
};
};
......@@ -89,7 +89,7 @@ etm {
*/
etm_hrefv60_mode: etm_hrefv60 {
hrefv60_cfg1 {
ste,pins =
pins =
"GPIO70_G5",
"GPIO71_G4",
"GPIO72_H4",
......@@ -103,11 +103,11 @@ nahj {
nahj_hrefv60_mode: nahj_hrefv60 {
/* NAHJ CTRL on GPIO76 to low, CTRL_INV on GPIO216 to high */
hrefv60_cfg1 {
ste,pins = "GPIO76_J2";
pins = "GPIO76_J2";
ste,config = <&gpio_out_lo>;
};
hrefv60_cfg2 {
ste,pins = "GPIO216_AG12";
pins = "GPIO216_AG12";
ste,config = <&gpio_out_hi>;
};
};
......@@ -116,13 +116,13 @@ nfc {
nfc_hrefv60_mode: nfc_hrefv60 {
/* NFC ENA and RESET to low, pulldown IRQ line */
hrefv60_cfg1 {
ste,pins =
pins =
"GPIO77_H1", /* NFC_ENA */
"GPIO142_C11"; /* NFC_RESET */
ste,config = <&gpio_out_lo>;
};
hrefv60_cfg2 {
ste,pins = "GPIO144_B13"; /* NFC_IRQ */
pins = "GPIO144_B13"; /* NFC_IRQ */
ste,config = <&gpio_in_pd>;
};
};
......@@ -130,11 +130,11 @@ hrefv60_cfg2 {
force {
force_hrefv60_mode: force_hrefv60 {
hrefv60_cfg1 {
ste,pins = "GPIO91_B6"; /* FORCE_SENSING_INT */
pins = "GPIO91_B6"; /* FORCE_SENSING_INT */
ste,config = <&gpio_in_pu>;
};
hrefv60_cfg2 {
ste,pins =
pins =
"GPIO92_D6", /* FORCE_SENSING_RST */
"GPIO97_D9"; /* FORCE_SENSING_WU */
ste,config = <&gpio_out_lo>;
......@@ -144,7 +144,7 @@ hrefv60_cfg2 {
dipro {
dipro_hrefv60_mode: dipro_hrefv60 {
hrefv60_cfg1 {
ste,pins = "GPIO139_C9"; /* DIPRO_INT */
pins = "GPIO139_C9"; /* DIPRO_INT */
ste,config = <&gpio_in_pu>;
};
};
......@@ -153,7 +153,7 @@ vaudio_hf {
vaudio_hf_hrefv60_mode: vaudio_hf_hrefv60 {
/* Audio Amplifier HF enable GPIO */
hrefv60_cfg1 {
ste,pins = "GPIO149_B14"; /* VAUDIO_HF_EN, enable MAX8968 */
pins = "GPIO149_B14"; /* VAUDIO_HF_EN, enable MAX8968 */
ste,config = <&gpio_out_hi>;
};
};
......@@ -165,7 +165,7 @@ gbf_hrefv60_mode: gbf_hrefv60 {
* pull low to reset state
*/
hrefv60_cfg1 {
ste,pins = "GPIO171_D23"; /* GBF_ENA_RESET */
pins = "GPIO171_D23"; /* GBF_ENA_RESET */
ste,config = <&gpio_out_lo>;
};
};
......@@ -174,7 +174,7 @@ hdtv {
hdtv_hrefv60_mode: hdtv_hrefv60 {
/* MSP : HDTV INTERFACE GPIO line */
hrefv60_cfg1 {
ste,pins = "GPIO192_AJ27";
pins = "GPIO192_AJ27";
ste,config = <&gpio_in_pd>;
};
};
......@@ -187,11 +187,11 @@ touch_hrefv60_mode: touch_hrefv60 {
* reset signals low.
*/
hrefv60_cfg1 {
ste,pins = "GPIO143_D12", "GPIO146_D13";
pins = "GPIO143_D12", "GPIO146_D13";
ste,config = <&gpio_out_lo>;
};
hrefv60_cfg2 {
ste,pins = "GPIO67_G2";
pins = "GPIO67_G2";
ste,config = <&gpio_in_pu>;
};
};
......@@ -204,11 +204,11 @@ lcd_hrefv60_mode: lcd_hrefv60 {
* Drive DISP1 reset high (not reset), driver DISP2 reset low (reset)
*/
hrefv60_cfg1 {
ste,pins ="GPIO65_F1";
pins ="GPIO65_F1";
ste,config = <&gpio_out_hi>;
};
hrefv60_cfg2 {
ste,pins ="GPIO66_G3";
pins ="GPIO66_G3";
ste,config = <&gpio_out_lo>;
};
};
......
arch/arm/boot/dts/ste-nomadik-s8815.dts
View file @ 1637d480
......@@ -37,12 +37,12 @@ mmcsd-cd {
cd_default_mode: cd_default {
cd_default_cfg1 {
/* CD input GPIO */
ste,pins = "GPIO111_H21";
pins = "GPIO111_H21";
ste,input = <0>;
};
cd_default_cfg2 {
/* CD GPIO biasing */
ste,pins = "GPIO112_J21";
pins = "GPIO112_J21";
ste,output = <0>;
};
};
......@@ -50,7 +50,7 @@ cd_default_cfg2 {
user-led {
user_led_default_mode: user_led_default {
user_led_default_cfg {
ste,pins = "GPIO2_C5";
pins = "GPIO2_C5";
ste,output = <1>;
};
};
......@@ -58,7 +58,7 @@ user_led_default_cfg {
user-button {
user_button_default_mode: user_button_default {
user_button_default_cfg {
ste,pins = "GPIO3_A4";
pins = "GPIO3_A4";
ste,input = <0>;
};
};
......
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
View file @ 1637d480
......@@ -123,18 +123,18 @@ mmcsd_default_mux {
mmcsd_default_mode: mmcsd_default {
mmcsd_default_cfg1 {
/* MCCLK */
ste,pins = "GPIO8_B10";
pins = "GPIO8_B10";
ste,output = <0>;
};
mmcsd_default_cfg2 {
/* MCCMDDIR, MCDAT0DIR, MCDAT31DIR */
ste,pins = "GPIO10_C11", "GPIO15_A12",
pins = "GPIO10_C11", "GPIO15_A12",
"GPIO16_C13";
ste,output = <1>;
};
mmcsd_default_cfg3 {
/* MCCMD, MCDAT3-0, MCMSFBCLK */
ste,pins = "GPIO9_A10", "GPIO11_B11",
pins = "GPIO9_A10", "GPIO11_B11",
"GPIO12_A11", "GPIO13_C12",
"GPIO14_B12", "GPIO24_C15";
ste,input = <1>;
......@@ -150,7 +150,7 @@ i2c0_default_mux {
};
i2c0_default_mode: i2c0_default {
i2c0_default_cfg {
ste,pins = "GPIO62_D3", "GPIO63_D2";
pins = "GPIO62_D3", "GPIO63_D2";
ste,input = <0>;
};
};
......@@ -164,7 +164,7 @@ i2c1_default_mux {
};
i2c1_default_mode: i2c1_default {
i2c1_default_cfg {
ste,pins = "GPIO53_L4", "GPIO54_L3";
pins = "GPIO53_L4", "GPIO54_L3";
ste,input = <0>;
};
};
......@@ -172,7 +172,7 @@ i2c1_default_cfg {
i2c2 {
i2c2_default_mode: i2c2_default {
i2c2_default_cfg {
ste,pins = "GPIO73_C21", "GPIO74_C20";
pins = "GPIO73_C21", "GPIO74_C20";
ste,input = <0>;
};
};
......
arch/arm/boot/dts/ste-snowball.dts
View file @ 1637d480
......@@ -409,12 +409,12 @@ snowball_mux {
};
/* LAN IRQ pin */
snowball_cfg1 {
ste,pins = "GPIO140_B11";
pins = "GPIO140_B11";
ste,config = <&in_nopull>;
};
/* LAN reset pin */
snowball_cfg2 {
ste,pins = "GPIO141_C12";
pins = "GPIO141_C12";
ste,config = <&gpio_out_hi>;
};
......@@ -427,7 +427,7 @@ snowball_mux {
groups = "mc0dat31dir_a_1";
};
snowball_cfg1 {
ste,pins = "GPIO21_AB3"; /* DAT31DIR */
pins = "GPIO21_AB3"; /* DAT31DIR */
ste,config = <&out_hi>;
};
......@@ -440,15 +440,15 @@ snowball_mux {
groups = "ssp0_a_1";
};
snowball_cfg1 {
ste,pins = "GPIO144_B13"; /* FRM */
pins = "GPIO144_B13"; /* FRM */
ste,config = <&gpio_out_hi>;
};
snowball_cfg2 {
ste,pins = "GPIO145_C13"; /* RXD */
pins = "GPIO145_C13"; /* RXD */
ste,config = <&in_pd>;
};
snowball_cfg3 {
ste,pins =
pins =
"GPIO146_D13", /* TXD */
"GPIO143_D12"; /* CLK */
ste,config = <&out_lo>;
......@@ -459,7 +459,7 @@ snowball_cfg3 {
gpio_led {
gpioled_snowball_mode: gpioled_default {
snowball_cfg1 {
ste,pins = "GPIO142_C11";
pins = "GPIO142_C11";
ste,config = <&gpio_out_hi>;
};
......@@ -469,7 +469,7 @@ accelerometer {
accel_snowball_mode: accel_snowball {
/* Accelerometer lines */
snowball_cfg1 {
ste,pins =
pins =
"GPIO163_C20", /* ACCEL_IRQ1 */
"GPIO164_B21"; /* ACCEL_IRQ2 */
ste,config = <&gpio_in_pu>;
......@@ -479,7 +479,7 @@ snowball_cfg1 {
magnetometer {
magneto_snowball_mode: magneto_snowball {
snowball_cfg1 {
ste,pins = "GPIO165_C21"; /* MAG_DRDY */
pins = "GPIO165_C21"; /* MAG_DRDY */
ste,config = <&gpio_in_pu>;
};
};
......@@ -491,7 +491,7 @@ gbf_snowball_mode: gbf_snowball {
* pull low to reset state
*/
snowball_cfg1 {
ste,pins = "GPIO171_D23"; /* GBF_ENA_RESET */
pins = "GPIO171_D23"; /* GBF_ENA_RESET */
ste,config = <&gpio_out_lo>;
};
};
......@@ -503,13 +503,13 @@ wlan_snowball_mode: wlan_snowball {
* These are plain GPIO pins used by WLAN
*/
snowball_cfg1 {
ste,pins =
pins =
"GPIO161_D21", /* WLAN_PMU_EN */
"GPIO215_AH13"; /* WLAN_ENA */
ste,config = <&gpio_out_lo>;
};
snowball_cfg2 {
ste,pins = "GPIO216_AG12"; /* WLAN_IRQ */
pins = "GPIO216_AG12"; /* WLAN_IRQ */
ste,config = <&gpio_in_pu>;
};
};
......
drivers/pinctrl/nomadik/pinctrl-nomadik.c
View file @ 1637d480
......@@ -1552,7 +1552,7 @@ static int nmk_pinctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
const char *gpio_name;
const char *pin;
ret = of_property_count_strings(np, "ste,pins");
ret = of_property_count_strings(np, "pins");
if (ret < 0)
goto exit;
ret = pinctrl_utils_reserve_map(pctldev, map,
......@@ -1561,7 +1561,7 @@ static int nmk_pinctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
if (ret < 0)
goto exit;
of_property_for_each_string(np, "ste,pins", prop, pin) {
of_property_for_each_string(np, "pins", prop, pin) {
gpio_name = nmk_find_pin_name(pctldev, pin);
ret = nmk_dt_add_map_configs(map, reserved_maps,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7