tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: dts: qcom: align PMIC GPIO pin configuration with DT schema

DT schema expects PMIC GPIO pin configuration nodes to be named with
'-state' suffix. Optional children should be either 'pinconf' or
followed with '-pins' suffix.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220507194913.261121-10-krzysztof.kozlowski@linaro.org

authored by

Krzysztof Kozlowski and committed by
Bjorn Andersson 4fcdaf4b 39eebfce

+37 -37
+10 -10
arch/arm/boot/dts/qcom-apq8060-dragonboard.dts
··· 273 273 }; 274 274 275 275 gpio@150 { 276 - dragon_ethernet_gpios: ethernet-gpios { 276 + dragon_ethernet_gpios: ethernet-state { 277 277 pinconf { 278 278 pins = "gpio7"; 279 279 function = "normal"; ··· 282 282 power-source = <PM8058_GPIO_S3>; 283 283 }; 284 284 }; 285 - dragon_bmp085_gpios: bmp085-gpios { 285 + dragon_bmp085_gpios: bmp085-state { 286 286 pinconf { 287 287 pins = "gpio16"; 288 288 function = "normal"; ··· 291 291 power-source = <PM8058_GPIO_S3>; 292 292 }; 293 293 }; 294 - dragon_mpu3050_gpios: mpu3050-gpios { 294 + dragon_mpu3050_gpios: mpu3050-state { 295 295 pinconf { 296 296 pins = "gpio17"; 297 297 function = "normal"; ··· 300 300 power-source = <PM8058_GPIO_S3>; 301 301 }; 302 302 }; 303 - dragon_sdcc3_gpios: sdcc3-gpios { 303 + dragon_sdcc3_gpios: sdcc3-state { 304 304 pinconf { 305 305 pins = "gpio22"; 306 306 function = "normal"; ··· 309 309 power-source = <PM8058_GPIO_S3>; 310 310 }; 311 311 }; 312 - dragon_sdcc5_gpios: sdcc5-gpios { 312 + dragon_sdcc5_gpios: sdcc5-state { 313 313 pinconf { 314 314 pins = "gpio26"; 315 315 function = "normal"; ··· 319 319 power-source = <PM8058_GPIO_S3>; 320 320 }; 321 321 }; 322 - dragon_ak8975_gpios: ak8975-gpios { 322 + dragon_ak8975_gpios: ak8975-state { 323 323 pinconf { 324 324 pins = "gpio33"; 325 325 function = "normal"; ··· 328 328 power-source = <PM8058_GPIO_S3>; 329 329 }; 330 330 }; 331 - dragon_cm3605_gpios: cm3605-gpios { 331 + dragon_cm3605_gpios: cm3605-state { 332 332 /* Pin 34 connected to the proxy IRQ */ 333 - pinconf_gpio34 { 333 + gpio34-pins { 334 334 pins = "gpio34"; 335 335 function = "normal"; 336 336 input-enable; ··· 338 338 power-source = <PM8058_GPIO_S3>; 339 339 }; 340 340 /* Pin 35 connected to ASET */ 341 - pinconf_gpio35 { 341 + gpio35-pins { 342 342 pins = "gpio35"; 343 343 function = "normal"; 344 344 output-high; ··· 346 346 power-source = <PM8058_GPIO_S3>; 347 347 }; 348 348 }; 349 - dragon_veth_gpios: veth-gpios { 349 + dragon_veth_gpios: veth-state { 350 350 pinconf { 351 351 pins = "gpio40"; 352 352 function = "normal";
+2 -2
arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
··· 196 196 qcom,ssbi@500000 { 197 197 pmic@0 { 198 198 gpio@150 { 199 - wlan_default_gpios: wlan-gpios { 200 - pios { 199 + wlan_default_gpios: wlan-gpios-state { 200 + pinconf { 201 201 pins = "gpio43"; 202 202 function = "normal"; 203 203 bias-disable;
+4 -4
arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
··· 291 291 qcom,ssbi@500000 { 292 292 pmic@0 { 293 293 gpio@150 { 294 - wlan_default_gpios: wlan-gpios { 295 - pios { 294 + wlan_default_gpios: wlan-gpios-state { 295 + pinconf { 296 296 pins = "gpio43"; 297 297 function = "normal"; 298 298 bias-disable; ··· 300 300 }; 301 301 }; 302 302 303 - notify_led: nled { 304 - pios { 303 + notify_led: nled-state { 304 + pinconf { 305 305 pins = "gpio18"; 306 306 function = "normal"; 307 307 bias-disable;
+1 -1
arch/arm/boot/dts/qcom-apq8064-sony-xperia-lagan-yuga.dts
··· 334 334 qcom,ssbi@500000 { 335 335 pmic@0 { 336 336 gpio@150 { 337 - gpio_keys_pin_a: gpio-keys-pin-active { 337 + gpio_keys_pin_a: gpio-keys-active-state { 338 338 pins = "gpio3", "gpio4", "gpio29", "gpio35"; 339 339 function = "normal"; 340 340
+1 -1
arch/arm/boot/dts/qcom-mdm9615-wp8548.dtsi
··· 114 114 }; 115 115 116 116 &pmicgpio { 117 - usb_vbus_5v_pins: usb_vbus_5v_pins { 117 + usb_vbus_5v_pins: usb-vbus-5v-state { 118 118 pins = "gpio4"; 119 119 function = "normal"; 120 120 output-high;
+4 -4
arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
··· 272 272 }; 273 273 274 274 &pm8941_gpios { 275 - gpio_keys_pin_a: gpio-keys-active { 275 + gpio_keys_pin_a: gpio-keys-active-state { 276 276 pins = "gpio2", "gpio3"; 277 277 function = "normal"; 278 278 ··· 280 280 power-source = <PM8941_GPIO_S3>; 281 281 }; 282 282 283 - fuelgauge_pin: fuelgauge-int { 283 + fuelgauge_pin: fuelgauge-int-state { 284 284 pins = "gpio9"; 285 285 function = "normal"; 286 286 ··· 289 289 power-source = <PM8941_GPIO_S3>; 290 290 }; 291 291 292 - wlan_sleep_clk_pin: wl-sleep-clk { 292 + wlan_sleep_clk_pin: wl-sleep-clk-state { 293 293 pins = "gpio16"; 294 294 function = "func2"; 295 295 ··· 297 297 power-source = <PM8941_GPIO_S3>; 298 298 }; 299 299 300 - wlan_regulator_pin: wl-reg-active { 300 + wlan_regulator_pin: wl-reg-active-state { 301 301 pins = "gpio17"; 302 302 function = "normal"; 303 303
+1 -1
arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
··· 163 163 }; 164 164 165 165 &pm8941_gpios { 166 - gpio_keys_pin_a: gpio-keys-active { 166 + gpio_keys_pin_a: gpio-keys-active-state { 167 167 pins = "gpio2", "gpio3", "gpio4", "gpio5"; 168 168 function = "normal"; 169 169
+1 -1
arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
··· 110 110 }; 111 111 112 112 &pm8941_gpios { 113 - gpio_keys_pin_a: gpio-keys-active { 113 + gpio_keys_pin_a: gpio-keys-active-state { 114 114 pins = "gpio1", "gpio2", "gpio5"; 115 115 function = "normal"; 116 116
+7 -7
arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
··· 398 398 }; 399 399 400 400 &pma8084_gpios { 401 - gpio_keys_pin_a: gpio-keys-active { 401 + gpio_keys_pin_a: gpio-keys-active-state { 402 402 pins = "gpio2", "gpio3", "gpio5"; 403 403 function = "normal"; 404 404 ··· 406 406 power-source = <PMA8084_GPIO_S4>; 407 407 }; 408 408 409 - touchkey_pin: touchkey-int-pin { 409 + touchkey_pin: touchkey-int-state { 410 410 pins = "gpio6"; 411 411 function = "normal"; 412 412 bias-disable; ··· 414 414 power-source = <PMA8084_GPIO_S4>; 415 415 }; 416 416 417 - touch_pin: touchscreen-int-pin { 417 + touch_pin: touchscreen-int-state { 418 418 pins = "gpio8"; 419 419 function = "normal"; 420 420 bias-disable; ··· 422 422 power-source = <PMA8084_GPIO_S4>; 423 423 }; 424 424 425 - panel_en_pin: panel-en-pin { 425 + panel_en_pin: panel-en-state { 426 426 pins = "gpio14"; 427 427 function = "normal"; 428 428 bias-pull-up; ··· 430 430 qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>; 431 431 }; 432 432 433 - wlan_sleep_clk_pin: wlan-sleep-clk-pin { 433 + wlan_sleep_clk_pin: wlan-sleep-clk-state { 434 434 pins = "gpio16"; 435 435 function = "func2"; 436 436 ··· 439 439 qcom,drive-strength = <PMIC_GPIO_STRENGTH_HIGH>; 440 440 }; 441 441 442 - panel_rst_pin: panel-rst-pin { 442 + panel_rst_pin: panel-rst-state { 443 443 pins = "gpio17"; 444 444 function = "normal"; 445 445 bias-disable; ··· 447 447 qcom,drive-strength = <PMIC_GPIO_STRENGTH_LOW>; 448 448 }; 449 449 450 - fuelgauge_pin: fuelgauge-int-pin { 450 + fuelgauge_pin: fuelgauge-int-state { 451 451 pins = "gpio21"; 452 452 function = "normal"; 453 453 bias-disable;
+5 -5
arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
··· 244 244 }; 245 245 246 246 &pm8941_gpios { 247 - gpio_keys_pin_a: gpio-keys-active { 247 + gpio_keys_pin_a: gpio-keys-active-state { 248 248 pins = "gpio2", "gpio5"; 249 249 function = "normal"; 250 250 ··· 252 252 power-source = <PM8941_GPIO_S3>; 253 253 }; 254 254 255 - bt_reg_on_pin: bt-reg-on { 255 + bt_reg_on_pin: bt-reg-on-state { 256 256 pins = "gpio16"; 257 257 function = "normal"; 258 258 ··· 260 260 power-source = <PM8941_GPIO_S3>; 261 261 }; 262 262 263 - wlan_sleep_clk_pin: wl-sleep-clk { 263 + wlan_sleep_clk_pin: wl-sleep-clk-state { 264 264 pins = "gpio17"; 265 265 function = "func2"; 266 266 ··· 268 268 power-source = <PM8941_GPIO_S3>; 269 269 }; 270 270 271 - wlan_regulator_pin: wl-reg-active { 271 + wlan_regulator_pin: wl-reg-active-state { 272 272 pins = "gpio18"; 273 273 function = "normal"; 274 274 ··· 276 276 power-source = <PM8941_GPIO_S3>; 277 277 }; 278 278 279 - lcd_dcdc_en_pin_a: lcd-dcdc-en-active { 279 + lcd_dcdc_en_pin_a: lcd-dcdc-en-active-state { 280 280 pins = "gpio20"; 281 281 function = "normal"; 282 282
+1 -1
arch/arm/boot/dts/qcom-pm8941.dtsi
··· 68 68 interrupt-controller; 69 69 #interrupt-cells = <2>; 70 70 71 - boost_bypass_n_pin: boost-bypass { 71 + boost_bypass_n_pin: boost-bypass-state { 72 72 pins = "gpio21"; 73 73 function = "normal"; 74 74 };