Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi

+18 −18
Original line number Diff line number Diff line
@@ -23,24 +23,24 @@ 


				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_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 @@ 


				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 @@ 


				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 @@ 


				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 @@ 


				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 @@ 


				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-family-pinctrl.dtsi

+75 −75
Original line number Diff line number Diff line
@@ -22,29 +22,29 @@ 
						groups = "u0_a_1";

					};

					default_cfg1 {

						ste,pins = "GPIO0_AJ5", "GPIO2_AH4"; /* CTS+RXD */

						pins = "GPIO0_AJ5", "GPIO2_AH4"; /* CTS+RXD */

						ste,config = <&in_pu>;

					};



					default_cfg2 {

						ste,pins = "GPIO1_AJ3", "GPIO3_AH3"; /* RTS+TXD */

						pins = "GPIO1_AJ3", "GPIO3_AH3"; /* RTS+TXD */

						ste,config = <&out_hi>;

					};

				};



				uart0_sleep_mode: uart0_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO0_AJ5", "GPIO2_AH4"; /* CTS+RXD */

						pins = "GPIO0_AJ5", "GPIO2_AH4"; /* CTS+RXD */

						ste,config = <&slpm_in_wkup_pdis>;

					};



					sleep_cfg2 {

						ste,pins = "GPIO1_AJ3"; /* RTS */

						pins = "GPIO1_AJ3"; /* RTS */

						ste,config = <&slpm_out_hi_wkup_pdis>;

					};



					sleep_cfg3 {

						ste,pins = "GPIO3_AH3"; /* TXD */

						pins = "GPIO3_AH3"; /* TXD */

						ste,config = <&slpm_out_wkup_pdis>;

					};

				};
@@ -57,24 +57,24 @@ 
						groups = "u1rxtx_a_1";

					};

					default_cfg1 {

						ste,pins = "GPIO4_AH6"; /* RXD */

						pins = "GPIO4_AH6"; /* RXD */

						ste,config = <&in_pu>;

					};



					default_cfg2 {

						ste,pins = "GPIO5_AG6"; /* TXD */

						pins = "GPIO5_AG6"; /* TXD */

						ste,config = <&out_hi>;

					};

				};



				uart1_sleep_mode: uart1_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO4_AH6"; /* RXD */

						pins = "GPIO4_AH6"; /* RXD */

						ste,config = <&slpm_in_wkup_pdis>;

					};



					sleep_cfg2 {

						ste,pins = "GPIO5_AG6"; /* TXD */

						pins = "GPIO5_AG6"; /* TXD */

						ste,config = <&slpm_out_wkup_pdis>;

					};

				};
@@ -87,24 +87,24 @@ 
						groups = "u2rxtx_c_1";

					};

					default_cfg1 {

						ste,pins = "GPIO29_W2"; /* RXD */

						pins = "GPIO29_W2"; /* RXD */

						ste,config = <&in_pu>;

					};



					default_cfg2 {

						ste,pins = "GPIO30_W3"; /* TXD */

						pins = "GPIO30_W3"; /* TXD */

						ste,config = <&out_hi>;

					};

				};



				uart2_sleep_mode: uart2_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO29_W2"; /* RXD */

						pins = "GPIO29_W2"; /* RXD */

						ste,config = <&in_wkup_pdis>;

					};



					sleep_cfg2 {

						ste,pins = "GPIO30_W3"; /* TXD */

						pins = "GPIO30_W3"; /* TXD */

						ste,config = <&out_wkup_pdis>;

					};

				};
@@ -118,14 +118,14 @@ 
						groups = "i2c0_a_1";

					};

					default_cfg1 {

						ste,pins = "GPIO147_C15", "GPIO148_B16"; /* SDA/SCL */

						pins = "GPIO147_C15", "GPIO148_B16"; /* SDA/SCL */

						ste,config = <&in_pu>;

					};

				};



				i2c0_sleep_mode: i2c_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO147_C15", "GPIO148_B16"; /* SDA/SCL */

						pins = "GPIO147_C15", "GPIO148_B16"; /* SDA/SCL */

						ste,config = <&slpm_in_wkup_pdis>;

					};

				};
@@ -138,14 +138,14 @@ 
						groups = "i2c1_b_2";

					};

					default_cfg1 {

						ste,pins = "GPIO16_AD3", "GPIO17_AD4"; /* SDA/SCL */

						pins = "GPIO16_AD3", "GPIO17_AD4"; /* SDA/SCL */

						ste,config = <&in_pu>;

					};

				};



				i2c1_sleep_mode: i2c_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO16_AD3", "GPIO17_AD4"; /* SDA/SCL */

						pins = "GPIO16_AD3", "GPIO17_AD4"; /* SDA/SCL */

						ste,config = <&slpm_in_wkup_pdis>;

					};

				};
@@ -158,14 +158,14 @@ 
						groups = "i2c2_b_2";

					};

					default_cfg1 {

						ste,pins = "GPIO10_AF5", "GPIO11_AG4"; /* SDA/SCL */

						pins = "GPIO10_AF5", "GPIO11_AG4"; /* SDA/SCL */

						ste,config = <&in_pu>;

					};

				};



				i2c2_sleep_mode: i2c_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO10_AF5", "GPIO11_AG4"; /* SDA/SCL */

						pins = "GPIO10_AF5", "GPIO11_AG4"; /* SDA/SCL */

						ste,config = <&slpm_in_wkup_pdis>;

					};

				};
@@ -178,14 +178,14 @@ 
						groups = "i2c3_c_2";

					};

					default_cfg1 {

						ste,pins = "GPIO229_AG7", "GPIO230_AF7"; /* SDA/SCL */

						pins = "GPIO229_AG7", "GPIO230_AF7"; /* SDA/SCL */

						ste,config = <&in_pu>;

					};

				};



				i2c3_sleep_mode: i2c_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO229_AG7", "GPIO230_AF7"; /* SDA/SCL */

						pins = "GPIO229_AG7", "GPIO230_AF7"; /* SDA/SCL */

						ste,config = <&slpm_in_wkup_pdis>;

					};

				};
@@ -202,14 +202,14 @@ 
						groups = "i2c4_b_1";

					};

					default_cfg1 {

						ste,pins = "GPIO4_AH6", "GPIO5_AG6"; /* SDA/SCL */

						pins = "GPIO4_AH6", "GPIO5_AG6"; /* SDA/SCL */

						ste,config = <&in_pu>;

					};

				};



				i2c4_sleep_mode: i2c_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO4_AH6", "GPIO5_AG6"; /* SDA/SCL */

						pins = "GPIO4_AH6", "GPIO5_AG6"; /* SDA/SCL */

						ste,config = <&slpm_in_wkup_pdis>;

					};

				};
@@ -223,15 +223,15 @@ 
						groups = "spi2_oc1_2";

					};

					default_cfg1 {

						ste,pins = "GPIO216_AG12"; /* FRM */

						pins = "GPIO216_AG12"; /* FRM */

						ste,config = <&gpio_out_hi>;

					};

					default_cfg2 {

						ste,pins = "GPIO218_AH11"; /* RXD */

						pins = "GPIO218_AH11"; /* RXD */

						ste,config = <&in_pd>;

					};

					default_cfg3 {

						ste,pins =

						pins =

						"GPIO215_AH13", /* TXD */

						"GPIO217_AH12"; /* CLK */

						ste,config = <&out_lo>;
@@ -245,32 +245,32 @@ 
					 * as we do not state any muxing.

					 */

					idle_cfg1 {

						ste,pins = "GPIO218_AH11"; /* RXD */

						pins = "GPIO218_AH11"; /* RXD */

						ste,config = <&slpm_in_pdis>;

					};

					idle_cfg2 {

						ste,pins = "GPIO215_AH13"; /* TXD */

						pins = "GPIO215_AH13"; /* TXD */

						ste,config = <&slpm_out_lo_pdis>;

					};

					idle_cfg3 {

						ste,pins = "GPIO217_AH12"; /* CLK */

						pins = "GPIO217_AH12"; /* CLK */

						ste,config = <&slpm_pdis>;

					};

				};



				spi2_sleep_mode: spi_sleep {

					sleep_cfg1 {

						ste,pins =

						pins =

						"GPIO216_AG12", /* FRM */

						"GPIO218_AH11"; /* RXD */

						ste,config = <&slpm_in_wkup_pdis>;

					};

					sleep_cfg2 {

						ste,pins = "GPIO215_AH13"; /* TXD */

						pins = "GPIO215_AH13"; /* TXD */

						ste,config = <&slpm_out_lo_wkup_pdis>;

					};

					sleep_cfg3 {

						ste,pins = "GPIO217_AH12"; /* CLK */

						pins = "GPIO217_AH12"; /* CLK */

						ste,config = <&slpm_wkup_pdis>;

					};

				};
@@ -285,22 +285,22 @@ 
						groups = "mc0_a_1";

					};

					default_cfg1 {

						ste,pins =

						pins =

						"GPIO18_AC2", /* CMDDIR */

						"GPIO19_AC1", /* DAT0DIR */

						"GPIO20_AB4"; /* DAT2DIR */

						ste,config = <&out_hi>;

					};

					default_cfg2 {

						ste,pins = "GPIO22_AA3"; /* FBCLK */

						pins = "GPIO22_AA3"; /* FBCLK */

						ste,config = <&in_nopull>;

					};

					default_cfg3 {

						ste,pins = "GPIO23_AA4"; /* CLK */

						pins = "GPIO23_AA4"; /* CLK */

						ste,config = <&out_lo>;

					};

					default_cfg4 {

						ste,pins =

						pins =

						"GPIO24_AB2", /* CMD */

						"GPIO25_Y4", /* DAT0 */

						"GPIO26_Y2", /* DAT1 */
@@ -312,14 +312,14 @@ 


				sdi0_sleep_mode: sdi0_sleep {

					sleep_cfg1 {

						ste,pins =

						pins =

						"GPIO18_AC2", /* CMDDIR */

						"GPIO19_AC1", /* DAT0DIR */

						"GPIO20_AB4"; /* DAT2DIR */

						ste,config = <&slpm_out_hi_wkup_pdis>;

					};

					sleep_cfg2 {

						ste,pins =

						pins =

						"GPIO22_AA3", /* FBCLK */

						"GPIO24_AB2", /* CMD */

						"GPIO25_Y4", /* DAT0 */
@@ -329,7 +329,7 @@ 
						ste,config = <&slpm_in_wkup_pdis>;

					};

					sleep_cfg3 {

						ste,pins = "GPIO23_AA4"; /* CLK */

						pins = "GPIO23_AA4"; /* CLK */

						ste,config = <&slpm_out_lo_wkup_pdis>;

					};

				};
@@ -343,15 +343,15 @@ 
						groups = "mc1_a_1";

					};

					default_cfg1 {

						ste,pins = "GPIO208_AH16"; /* CLK */

						pins = "GPIO208_AH16"; /* CLK */

						ste,config = <&out_lo>;

					};

					default_cfg2 {

						ste,pins = "GPIO209_AG15"; /* FBCLK */

						pins = "GPIO209_AG15"; /* FBCLK */

						ste,config = <&in_nopull>;

					};

					default_cfg3 {

						ste,pins =

						pins =

						"GPIO210_AJ15", /* CMD */

						"GPIO211_AG14", /* DAT0 */

						"GPIO212_AF13", /* DAT1 */
@@ -363,11 +363,11 @@ 


				sdi1_sleep_mode: sdi1_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO208_AH16"; /* CLK */

						pins = "GPIO208_AH16"; /* CLK */

						ste,config = <&slpm_out_lo_wkup_pdis>;

					};

					sleep_cfg2 {

						ste,pins =

						pins =

						"GPIO209_AG15", /* FBCLK */

						"GPIO210_AJ15", /* CMD */

						"GPIO211_AG14", /* DAT0 */
@@ -387,15 +387,15 @@ 
						groups = "mc2_a_1";

					};

					default_cfg1 {

						ste,pins = "GPIO128_A5"; /* CLK */

						pins = "GPIO128_A5"; /* CLK */

						ste,config = <&out_lo>;

					};

					default_cfg2 {

						ste,pins = "GPIO130_C8"; /* FBCLK */

						pins = "GPIO130_C8"; /* FBCLK */

						ste,config = <&in_nopull>;

					};

					default_cfg3 {

						ste,pins =

						pins =

						"GPIO129_B4", /* CMD */

						"GPIO131_A12", /* DAT0 */

						"GPIO132_C10", /* DAT1 */
@@ -411,17 +411,17 @@ 


				sdi2_sleep_mode: sdi2_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO128_A5"; /* CLK */

						pins = "GPIO128_A5"; /* CLK */

						ste,config = <&out_lo_wkup_pdis>;

					};

					sleep_cfg2 {

						ste,pins =

						pins =

						"GPIO130_C8", /* FBCLK */

						"GPIO129_B4"; /* CMD */

						ste,config = <&in_wkup_pdis_en>;

					};

					sleep_cfg3 {

						ste,pins =

						pins =

						"GPIO131_A12", /* DAT0 */

						"GPIO132_C10", /* DAT1 */

						"GPIO133_B10", /* DAT2 */
@@ -443,15 +443,15 @@ 
						groups = "mc4_a_1";

					};

					default_cfg1 {

						ste,pins = "GPIO203_AE23"; /* CLK */

						pins = "GPIO203_AE23"; /* CLK */

						ste,config = <&out_lo>;

					};

					default_cfg2 {

						ste,pins = "GPIO202_AF25"; /* FBCLK */

						pins = "GPIO202_AF25"; /* FBCLK */

						ste,config = <&in_nopull>;

					};

					default_cfg3 {

						ste,pins =

						pins =

						"GPIO201_AF24", /* CMD */

						"GPIO200_AH26", /* DAT0 */

						"GPIO199_AH23", /* DAT1 */
@@ -467,11 +467,11 @@ 


				sdi4_sleep_mode: sdi4_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO203_AE23"; /* CLK */

						pins = "GPIO203_AE23"; /* CLK */

						ste,config = <&out_lo_wkup_pdis>;

					};

					sleep_cfg2 {

						ste,pins =

						pins =

						"GPIO202_AF25", /* FBCLK */

						"GPIO201_AF24", /* CMD */

						"GPIO200_AH26", /* DAT0 */
@@ -498,7 +498,7 @@ 
						groups = "msp0txrx_a_1", "msp0tfstck_a_1";

					};

					default_msp0_cfg {

						ste,pins =

						pins =

						"GPIO12_AC4", /* TXD */

						"GPIO15_AC3", /* RXD */

						"GPIO13_AF3", /* TFS */
@@ -515,11 +515,11 @@ 
						groups = "msp1txrx_a_1", "msp1_a_1";

					};

					default_cfg1 {

						ste,pins = "GPIO33_AF2";

						pins = "GPIO33_AF2";

						ste,config = <&out_lo>;

					};

					default_cfg2 {

						ste,pins =

						pins =

						"GPIO34_AE1",

						"GPIO35_AE2",

						"GPIO36_AG2";
@@ -537,14 +537,14 @@ 
						groups = "msp2_a_1";

					};

					default_cfg1 {

						ste,pins =

						pins =

						"GPIO193_AH27", /* TXD */

						"GPIO194_AF27", /* TCK */

						"GPIO195_AG28"; /* TFS */

						ste,config = <&in_pd>;

					};

					default_cfg2 {

						ste,pins = "GPIO196_AG26"; /* RXD */

						pins = "GPIO196_AG26"; /* RXD */

						ste,config = <&out_lo>;

					};

				};
@@ -558,7 +558,7 @@ 
						groups = "usb_a_1";

					};

					default_cfg1 {

						ste,pins =

						pins =

						"GPIO256_AF28", /* NXT */

						"GPIO258_AD29", /* XCLK */

						"GPIO259_AC29", /* DIR */
@@ -573,25 +573,25 @@ 
						ste,config = <&in_nopull>;

					};

					default_cfg2 {

						ste,pins = "GPIO257_AE29"; /* STP */

						pins = "GPIO257_AE29"; /* STP */

						ste,config = <&out_hi>;

					};

				};



				musb_sleep_mode: musb_sleep {

					sleep_cfg1 {

						ste,pins =

						pins =

						"GPIO256_AF28", /* NXT */

						"GPIO258_AD29", /* XCLK */

						"GPIO259_AC29"; /* DIR */

						ste,config = <&slpm_wkup_pdis_en>;

					};

					sleep_cfg2 {

						ste,pins = "GPIO257_AE29"; /* STP */

						pins = "GPIO257_AE29"; /* STP */

						ste,config = <&slpm_out_hi_wkup_pdis>;

					};

					sleep_cfg3 {

						ste,pins =

						pins =

						"GPIO260_AD28", /* DAT7 */

						"GPIO261_AD26", /* DAT6 */

						"GPIO262_AE26", /* DAT5 */
@@ -618,7 +618,7 @@ 
						"lcdvsi1_a_1"; /* VSI1 for HDMI */

					};

					default_cfg1 {

						ste,pins =

						pins =

						"GPIO68_E1", /* VSI0 */

						"GPIO69_E2"; /* VSI1 */

						ste,config = <&in_pu>;
@@ -626,7 +626,7 @@ 
				};

				lcd_sleep_mode: lcd_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO69_E2"; /* VSI1 */

						pins = "GPIO69_E2"; /* VSI1 */

						ste,config = <&slpm_in_wkup_pdis>;

					};

				};
@@ -640,7 +640,7 @@ 
						groups = "kp_a_2";

					};

					default_cfg1 {

						ste,pins =

						pins =

						"GPIO153_B17", /* I7 */

						"GPIO154_C16", /* I6 */

						"GPIO155_C19", /* I5 */
@@ -652,7 +652,7 @@ 
						ste,config = <&in_pd>;

					};

					default_cfg2 {

						ste,pins =

						pins =

						"GPIO157_A18", /* O7 */

						"GPIO158_C18", /* O6 */

						"GPIO159_B19", /* O5 */
@@ -666,7 +666,7 @@ 
				};

				ske_kpa2_sleep_mode: ske_kpa2_sleep {

					sleep_cfg1 {

						ste,pins =

						pins =

						"GPIO153_B17", /* I7 */

						"GPIO154_C16", /* I6 */

						"GPIO155_C19", /* I5 */
@@ -678,7 +678,7 @@ 
						ste,config = <&slpm_in_pu_wkup_pdis_en>;

					};

					sleep_cfg2 {

						ste,pins =

						pins =

						"GPIO157_A18", /* O7 */

						"GPIO158_C18", /* O6 */

						"GPIO159_B19", /* O5 */
@@ -700,7 +700,7 @@ 
						groups = "kp_a_1", "kp_oc1_1";

					};

					default_cfg1 {

						ste,pins =

						pins =

						"GPIO91_B6", /* KP_O0 */

						"GPIO90_A3", /* KP_O1 */

						"GPIO87_B3", /* KP_O2 */
@@ -710,7 +710,7 @@ 
						ste,config = <&out_lo>;

					};

					default_cfg2 {

						ste,pins =

						pins =

						"GPIO93_B7", /* KP_I0 */

						"GPIO92_D6", /* KP_I1 */

						"GPIO89_E6", /* KP_I2 */
@@ -729,13 +729,13 @@ 
					 * These are plain GPIO pins used by WLAN

					 */

					default_cfg1 {

						ste,pins =

						pins =

						"GPIO226_AF8", /* WLAN_PMU_EN */

						"GPIO85_D5"; /* WLAN_ENA */

						ste,config = <&gpio_out_lo>;

					};

					default_cfg2 {

						ste,pins = "GPIO4_AH6"; /* WLAN_IRQ on UART1 */

						pins = "GPIO4_AH6"; /* WLAN_IRQ on UART1 */

						ste,config = <&gpio_in_pu>;

					};

				};

arch/arm/boot/dts/ste-href-stuib.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ 
			prox {

				prox_stuib_mode: prox_stuib {

					stuib_cfg {

						ste,pins = "GPIO217_AH12";

						pins = "GPIO217_AH12";

						ste,config = <&gpio_in_pu>;

					};

				};
@@ -111,7 +111,7 @@ 
			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

+6 −6
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 
			tc35893 {

				tc35893_tvk_mode: tc35893_tvk {

					tvk_cfg {

						ste,pins = "GPIO218_AH11";

						pins = "GPIO218_AH11";

						ste,config = <&gpio_in_pu>;

					};

				};
@@ -138,7 +138,7 @@ 
			prox {

				prox_tvk_mode: prox_tvk {

					tvk_cfg {

						ste,pins = "GPIO217_AH12";

						pins = "GPIO217_AH12";

						ste,config = <&gpio_in_pu>;

					};

				};
@@ -146,7 +146,7 @@ 
			hall {

				hall_tvk_mode: hall_tvk {

					tvk_cfg {

						ste,pins = "GPIO145_C13";

						pins = "GPIO145_C13";

						ste,config = <&gpio_in_pu>;

					};

				};
@@ -155,7 +155,7 @@ 
				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 @@ 
				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

+4 −4
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ 
						groups = "ssp0_a_1";

					};

					hrefprev60_cfg1 {

						ste,pins = "GPIO145_C13"; /* RXD */

						pins = "GPIO145_C13"; /* RXD */

						ste,config = <&in_pd>;

					};
@@ -97,7 +97,7 @@ 
						groups = "mc0dat31dir_a_1";

					};

					hrefprev60_cfg1 {

						ste,pins = "GPIO21_AB3"; /* DAT31DIR */

						pins = "GPIO21_AB3"; /* DAT31DIR */

						ste,config = <&out_hi>;

					};
@@ -106,7 +106,7 @@ 
			tc35892 {

				tc35892_hrefprev60_mode: tc35892_hrefprev60 {

					hrefprev60_cfg {

						ste,pins = "GPIO217_AH12";

						pins = "GPIO217_AH12";

						ste,config = <&gpio_in_pu>;

					};

				};
@@ -118,7 +118,7 @@ 
						groups = "ipgpio0_c_1", "ipgpio1_c_1";

					};

					hrefprev60_cfg1 {

						ste,pins = "GPIO6_AF6", "GPIO7_AG5";

						pins = "GPIO6_AF6", "GPIO7_AG5";

						ste,config = <&in_pu>;

					};

				 };