Skip to content

L
linux
Commit 8b276ca0 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson
Browse files
Options

arm64: dts: qcom: msm8916: align TLMM pin configuration with DT schema 

DT schema expects TLMM pin configuration nodes to be named with
'-state' suffix and their optional children with '-pins' suffix.
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@somainline.org>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221024002356.28261-2-krzysztof.kozlowski@linaro.org
parent 5a134c94
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 259 additions and 251 deletions
arch/arm64/boot/dts/qcom/apq8016-sbc.dts
View file @ 8b276ca0
......@@ -718,14 +718,14 @@ &msmgpio {
"USR_LED_2_CTRL", /* GPIO 120 */
"SB_HS_ID";
msmgpio_leds: msmgpio-leds {
msmgpio_leds: msmgpio-leds-state {
pins = "gpio21", "gpio120";
function = "gpio";
output-low;
};
usb_id_default: usb-id-default {
usb_id_default: usb-id-default-state {
pins = "gpio121";
function = "gpio";
......@@ -734,7 +734,7 @@ usb_id_default: usb-id-default {
bias-pull-up;
};
adv7533_int_active: adv533-int-active {
adv7533_int_active: adv533-int-active-state {
pins = "gpio31";
function = "gpio";
......@@ -742,7 +742,7 @@ adv7533_int_active: adv533-int-active {
bias-disable;
};
adv7533_int_suspend: adv7533-int-suspend {
adv7533_int_suspend: adv7533-int-suspend-state {
pins = "gpio31";
function = "gpio";
......@@ -750,7 +750,7 @@ adv7533_int_suspend: adv7533-int-suspend {
bias-disable;
};
adv7533_switch_active: adv7533-switch-active {
adv7533_switch_active: adv7533-switch-active-state {
pins = "gpio32";
function = "gpio";
......@@ -758,7 +758,7 @@ adv7533_switch_active: adv7533-switch-active {
bias-disable;
};
adv7533_switch_suspend: adv7533-switch-suspend {
adv7533_switch_suspend: adv7533-switch-suspend-state {
pins = "gpio32";
function = "gpio";
......@@ -766,7 +766,7 @@ adv7533_switch_suspend: adv7533-switch-suspend {
bias-disable;
};
msm_key_volp_n_default: msm-key-volp-n-default {
msm_key_volp_n_default: msm-key-volp-n-default-state {
pins = "gpio107";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
View file @ 8b276ca0
......@@ -260,7 +260,7 @@ l18 {
};
&msmgpio {
accel_int_default: accel-int-default {
accel_int_default: accel-int-default-state {
pins = "gpio31";
function = "gpio";
......@@ -268,7 +268,7 @@ accel_int_default: accel-int-default {
bias-disable;
};
gpio_keys_default: gpio-keys-default {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107";
function = "gpio";
......@@ -276,7 +276,7 @@ gpio_keys_default: gpio-keys-default {
bias-pull-up;
};
gyro_int_default: gyro-int-default {
gyro_int_default: gyro-int-default-state {
pins = "gpio97", "gpio98";
function = "gpio";
......@@ -284,7 +284,7 @@ gyro_int_default: gyro-int-default {
bias-disable;
};
mag_reset_default: mag-reset-default {
mag_reset_default: mag-reset-default-state {
pins = "gpio8";
function = "gpio";
......@@ -292,7 +292,7 @@ mag_reset_default: mag-reset-default {
bias-disable;
};
proximity_int_default: proximity-int-default {
proximity_int_default: proximity-int-default-state {
pins = "gpio12";
function = "gpio";
......@@ -300,7 +300,7 @@ proximity_int_default: proximity-int-default {
bias-pull-up;
};
ts_int_reset_default: ts-int-reset-default {
ts_int_reset_default: ts-int-reset-default-state {
pins = "gpio13", "gpio100";
function = "gpio";
......@@ -308,7 +308,7 @@ ts_int_reset_default: ts-int-reset-default {
bias-disable;
};
usb_id_default: usb-id-default {
usb_id_default: usb-id-default-state {
pins = "gpio69";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
View file @ 8b276ca0
......@@ -263,7 +263,7 @@ l18 {
};
&msmgpio {
gpio_keys_default: gpio-keys-default {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107", "gpio117";
function = "gpio";
......@@ -271,7 +271,7 @@ gpio_keys_default: gpio-keys-default {
bias-pull-up;
};
imu_default: imu-default {
imu_default: imu-default-state {
pins = "gpio36";
function = "gpio";
......@@ -279,7 +279,7 @@ imu_default: imu-default {
bias-disable;
};
mag_reset_default: mag-reset-default {
mag_reset_default: mag-reset-default-state {
pins = "gpio112";
function = "gpio";
......@@ -287,7 +287,7 @@ mag_reset_default: mag-reset-default {
bias-disable;
};
sd_vmmc_en_default: sd-vmmc-en-default {
sd_vmmc_en_default: sd-vmmc-en-default-state {
pins = "gpio87";
function = "gpio";
......@@ -295,14 +295,16 @@ sd_vmmc_en_default: sd-vmmc-en-default {
bias-disable;
};
touchscreen_default: touchscreen-default {
pins = "gpio13";
function = "gpio";
touchscreen_default: touchscreen-default-state {
touch-pins {
pins = "gpio13";
function = "gpio";
drive-strength = <2>;
bias-pull-up;
drive-strength = <2>;
bias-pull-up;
};
reset {
reset-pins {
pins = "gpio12";
function = "gpio";
......@@ -311,7 +313,7 @@ reset {
};
};
usb_id_default: usb-id-default {
usb_id_default: usb-id-default-state {
pins = "gpio110";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
View file @ 8b276ca0
......@@ -414,7 +414,7 @@ l18 {
};
&msmgpio {
accel_irq_default: accel-irq-default {
accel_irq_default: accel-irq-default-state {
pins = "gpio115";
function = "gpio";
......@@ -422,7 +422,7 @@ accel_irq_default: accel-irq-default {
bias-disable;
};
gpio_keys_default: gpio-keys-default {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107";
function = "gpio";
......@@ -430,7 +430,7 @@ gpio_keys_default: gpio-keys-default {
bias-pull-up;
};
gpio_leds_default: gpio-leds-default {
gpio_leds_default: gpio-leds-default-state {
pins = "gpio8", "gpio9", "gpio10";
function = "gpio";
......@@ -438,7 +438,7 @@ gpio_leds_default: gpio-leds-default {
bias-disable;
};
nfc_default: nfc-default {
nfc_default: nfc-default-state {
pins = "gpio2", "gpio20", "gpio21";
function = "gpio";
......@@ -446,7 +446,7 @@ nfc_default: nfc-default {
bias-disable;
};
mag_reset_default: mag-reset-default {
mag_reset_default: mag-reset-default-state {
pins = "gpio36";
function = "gpio";
......@@ -454,7 +454,7 @@ mag_reset_default: mag-reset-default {
bias-disable;
};
prox_irq_default: prox-irq-default {
prox_irq_default: prox-irq-default-state {
pins = "gpio113";
function = "gpio";
......@@ -462,7 +462,7 @@ prox_irq_default: prox-irq-default {
bias-disable;
};
reg_lcd_en_default: reg-lcd-en-default {
reg_lcd_en_default: reg-lcd-en-default-state {
pins = "gpio32", "gpio97";
function = "gpio";
......@@ -470,7 +470,7 @@ reg_lcd_en_default: reg-lcd-en-default {
bias-disable;
};
sdhc2_cd_default: sdhc2-cd-default {
sdhc2_cd_default: sdhc2-cd-default-state {
pins = "gpio56";
function = "gpio";
......@@ -478,7 +478,7 @@ sdhc2_cd_default: sdhc2-cd-default {
bias-disable;
};
ts_irq_default: ts-irq-default {
ts_irq_default: ts-irq-default-state {
pins = "gpio13";
function = "gpio";
......@@ -486,7 +486,7 @@ ts_irq_default: ts-irq-default {
bias-disable;
};
usb_id_default: usb-id-default {
usb_id_default: usb-id-default-state {
pins = "gpio117";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
View file @ 8b276ca0
......@@ -367,7 +367,7 @@ l18 {
};
&msmgpio {
accel_int_default: accel-int-default {
accel_int_default: accel-int-default-state {
pins = "gpio116";
function = "gpio";
......@@ -375,7 +375,7 @@ accel_int_default: accel-int-default {
bias-disable;
};
camera_flash_default: camera-flash-default {
camera_flash_default: camera-flash-default-state {
pins = "gpio31", "gpio32";
function = "gpio";
......@@ -383,7 +383,7 @@ camera_flash_default: camera-flash-default {
bias-disable;
};
ctp_pwr_en_default: ctp-pwr-en-default {
ctp_pwr_en_default: ctp-pwr-en-default-state {
pins = "gpio17";
function = "gpio";
......@@ -391,7 +391,7 @@ ctp_pwr_en_default: ctp-pwr-en-default {
bias-disable;
};
gpio_keys_default: gpio-keys-default {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107";
function = "gpio";
......@@ -399,7 +399,7 @@ gpio_keys_default: gpio-keys-default {
bias-pull-up;
};
gyro_int_default: gyro-int-default {
gyro_int_default: gyro-int-default-state {
pins = "gpio22", "gpio23";
function = "gpio";
......@@ -407,7 +407,7 @@ gyro_int_default: gyro-int-default {
bias-disable;
};
light_int_default: light-int-default {
light_int_default: light-int-default-state {
pins = "gpio115";
function = "gpio";
......@@ -415,7 +415,7 @@ light_int_default: light-int-default {
bias-disable;
};
magn_int_default: magn-int-default {
magn_int_default: magn-int-default-state {
pins = "gpio113";
function = "gpio";
......@@ -423,7 +423,7 @@ magn_int_default: magn-int-default {
bias-disable;
};
tp_int_default: tp-int-default {
tp_int_default: tp-int-default-state {
pins = "gpio13";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
View file @ 8b276ca0
......@@ -234,7 +234,7 @@ l18 {
};
&msmgpio {
button_backlight_default: button-backlight-default {
button_backlight_default: button-backlight-default-state {
pins = "gpio17";
function = "gpio";
......@@ -242,7 +242,7 @@ button_backlight_default: button-backlight-default {
bias-disable;
};
gpio_keys_default: gpio-keys-default {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107";
function = "gpio";
......@@ -250,7 +250,7 @@ gpio_keys_default: gpio-keys-default {
bias-pull-up;
};
mag_reset_default: mag-reset-default {
mag_reset_default: mag-reset-default-state {
pins = "gpio111";
function = "gpio";
......@@ -258,7 +258,7 @@ mag_reset_default: mag-reset-default {
bias-disable;
};
usb_id_default: usb-id-default {
usb_id_default: usb-id-default-state {
pins = "gpio110";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
View file @ 8b276ca0
This diff is collapsed.
arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
View file @ 8b276ca0
......@@ -387,7 +387,7 @@ l18 {
};
&msmgpio {
accel_int_default: accel-int-default {
accel_int_default: accel-int-default-state {
pins = "gpio115";
function = "gpio";
......@@ -395,7 +395,7 @@ accel_int_default: accel-int-default {
bias-disable;
};
fg_alert_default: fg-alert-default {
fg_alert_default: fg-alert-default-state {
pins = "gpio121";
function = "gpio";
......@@ -403,7 +403,7 @@ fg_alert_default: fg-alert-default {
bias-disable;
};
gpio_keys_default: gpio-keys-default {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107", "gpio109";
function = "gpio";
......@@ -411,7 +411,7 @@ gpio_keys_default: gpio-keys-default {
bias-pull-up;
};
gpio_hall_sensor_default: gpio-hall-sensor-default {
gpio_hall_sensor_default: gpio-hall-sensor-default-state {
pins = "gpio52";
function = "gpio";
......@@ -419,24 +419,22 @@ gpio_hall_sensor_default: gpio-hall-sensor-default {
bias-disable;
};
mdss {
mdss_default: mdss-default {
pins = "gpio25";
function = "gpio";
mdss_default: mdss-default-state {
pins = "gpio25";
function = "gpio";
drive-strength = <8>;
bias-disable;
};
mdss_sleep: mdss-sleep {
pins = "gpio25";
function = "gpio";
drive-strength = <8>;
bias-disable;
};
mdss_sleep: mdss-sleep-state {
pins = "gpio25";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
};
drive-strength = <2>;
bias-pull-down;
};
motor_en_default: motor-en-default {
motor_en_default: motor-en-default-stae {
pins = "gpio76";
function = "gpio";
......@@ -444,12 +442,12 @@ motor_en_default: motor-en-default {
bias-disable;
};
motor_pwm_default: motor-pwm-default {
motor_pwm_default: motor-pwm-default-state {
pins = "gpio50";
function = "gcc_gp2_clk_a";
};
muic_i2c_default: muic-i2c-default {
muic_i2c_default: muic-i2c-default-state {
pins = "gpio105", "gpio106";
function = "gpio";
......@@ -457,7 +455,7 @@ muic_i2c_default: muic-i2c-default {
bias-disable;
};
muic_int_default: muic-int-default {
muic_int_default: muic-int-default-state {
pins = "gpio12";
function = "gpio";
......@@ -465,14 +463,16 @@ muic_int_default: muic-int-default {
bias-disable;
};
nfc_default: nfc-default {
pins = "gpio20", "gpio49";
function = "gpio";
nfc_default: nfc-default-state {
nfc-pins {
pins = "gpio20", "gpio49";
function = "gpio";
drive-strength = <2>;
bias-disable;
drive-strength = <2>;
bias-disable;
};
irq {
irq-pins {
pins = "gpio21";
function = "gpio";
......@@ -481,7 +481,7 @@ irq {
};
};
nfc_i2c_default: nfc-i2c-default {
nfc_i2c_default: nfc-i2c-default-state {
pins = "gpio0", "gpio1";
function = "gpio";
......@@ -489,7 +489,7 @@ nfc_i2c_default: nfc-i2c-default {
bias-disable;
};
tkey_default: tkey-default {
tkey_default: tkey-default-state {
pins = "gpio98";
function = "gpio";
......@@ -497,7 +497,7 @@ tkey_default: tkey-default {
bias-disable;
};
tkey_i2c_default: tkey-i2c-default {
tkey_i2c_default: tkey-i2c-default-state {
pins = "gpio16", "gpio17";
function = "gpio";
......@@ -505,7 +505,7 @@ tkey_i2c_default: tkey-i2c-default {
bias-disable;
};
tsp_en_default: tsp-en-default {
tsp_en_default: tsp-en-default-state {
pins = "gpio73";
function = "gpio";
......@@ -513,7 +513,7 @@ tsp_en_default: tsp-en-default {
bias-disable;
};
ts_int_default: ts-int-default {
ts_int_default: ts-int-default-state {
pins = "gpio13";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
View file @ 8b276ca0
......@@ -113,7 +113,7 @@ &vibrator {
};
&msmgpio {
panel_vdd3_default: panel-vdd3-default {
panel_vdd3_default: panel-vdd3-default-state {
pins = "gpio9";
function = "gpio";
......@@ -121,7 +121,7 @@ panel_vdd3_default: panel-vdd3-default {
bias-disable;
};
tkey_en_default: tkey-en-default {
tkey_en_default: tkey-en-default-state {
pins = "gpio86";
function = "gpio";
......@@ -129,7 +129,7 @@ tkey_en_default: tkey-en-default {
bias-disable;
};
tkey_led_en_default: tkey-led-en-default {
tkey_led_en_default: tkey-led-en-default-state {
pins = "gpio60";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
View file @ 8b276ca0
......@@ -70,7 +70,7 @@ &vibrator {
};
&msmgpio {
tkey_en_default: tkey-en-default {
tkey_en_default: tkey-en-default-state {
pins = "gpio97";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
View file @ 8b276ca0
......@@ -59,7 +59,7 @@ &touchkey {
};
&msmgpio {
tkey_en_default: tkey-en-default {
tkey_en_default: tkey-en-default-state {
pins = "gpio97";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
View file @ 8b276ca0
......@@ -46,7 +46,7 @@ &reg_touch_key {
};
&msmgpio {
gpio_leds_default: gpio-led-default {
gpio_leds_default: gpio-led-default-state {
pins = "gpio60";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
View file @ 8b276ca0
......@@ -199,7 +199,7 @@ l18 {
};
&msmgpio {
gpio_keys_default: gpio-keys-default {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107", "gpio109";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
View file @ 8b276ca0
......@@ -422,7 +422,7 @@ l18 {
};
&msmgpio {
fg_alert_default: fg-alert-default {
fg_alert_default: fg-alert-default-state {
pins = "gpio121";
function = "gpio";
......@@ -430,7 +430,7 @@ fg_alert_default: fg-alert-default {
bias-disable;
};
gpio_keys_default: gpio-keys-default {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107", "gpio109";
function = "gpio";
......@@ -438,7 +438,7 @@ gpio_keys_default: gpio-keys-default {
bias-pull-up;
};
gpio_hall_sensor_default: gpio-hall-sensor-default {
gpio_hall_sensor_default: gpio-hall-sensor-default-state {
pins = "gpio52";
function = "gpio";
......@@ -446,7 +446,7 @@ gpio_hall_sensor_default: gpio-hall-sensor-default {
bias-disable;
};
imu_irq_default: imu-irq-default {
imu_irq_default: imu-irq-default-state {
pins = "gpio115";
function = "gpio";
......@@ -454,7 +454,7 @@ imu_irq_default: imu-irq-default {
bias-disable;
};
muic_i2c_default: muic-i2c-default {
muic_i2c_default: muic-i2c-default-state {
pins = "gpio105", "gpio106";
function = "gpio";
......@@ -462,7 +462,7 @@ muic_i2c_default: muic-i2c-default {
bias-disable;
};
muic_irq_default: muic-irq-default {
muic_irq_default: muic-irq-default-state {
pins = "gpio12";
function = "gpio";
......@@ -470,14 +470,15 @@ muic_irq_default: muic-irq-default {
bias-disable;
};
nfc_default: nfc-default {
pins = "gpio20", "gpio49";
function = "gpio";
drive-strength = <2>;
bias-disable;
nfc_default: nfc-default-state {
nfc-pins {
pins = "gpio20", "gpio49";
function = "gpio";
irq {
drive-strength = <2>;
bias-disable;
};
irq-pins {
pins = "gpio21";
function = "gpio";
......@@ -486,7 +487,7 @@ irq {
};
};
nfc_i2c_default: nfc-i2c-default {
nfc_i2c_default: nfc-i2c-default-state {
pins = "gpio0", "gpio1";
function = "gpio";
......@@ -494,7 +495,7 @@ nfc_i2c_default: nfc-i2c-default {
bias-disable;
};
tkey_default: tkey-default {
tkey_default: tkey-default-state {
pins = "gpio98";
function = "gpio";
......@@ -502,7 +503,7 @@ tkey_default: tkey-default {
bias-disable;
};
tkey_en_default: tkey-en-default {
tkey_en_default: tkey-en-default-state {
pins = "gpio86";
function = "gpio";
......@@ -510,7 +511,7 @@ tkey_en_default: tkey-en-default {
bias-disable;
};
tkey_i2c_default: tkey-i2c-default {
tkey_i2c_default: tkey-i2c-default-state {
pins = "gpio16", "gpio17";
function = "gpio";
......@@ -518,7 +519,7 @@ tkey_i2c_default: tkey-i2c-default {
bias-disable;
};
tkey_led_en_default: tkey-led-en-default {
tkey_led_en_default: tkey-led-en-default-state {
pins = "gpio60";
function = "gpio";
......@@ -526,7 +527,7 @@ tkey_led_en_default: tkey-led-en-default {
bias-disable;
};
tsp_en_default: tsp-en-default {
tsp_en_default: tsp-en-default-state {
pins = "gpio73";
function = "gpio";
......@@ -534,7 +535,7 @@ tsp_en_default: tsp-en-default {
bias-disable;
};
tsp_irq_default: tsp-irq-default {
tsp_irq_default: tsp-irq-default-state {
pins = "gpio13";
function = "gpio";
......
arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
View file @ 8b276ca0
......@@ -272,7 +272,7 @@ l18 {
};
&msmgpio {
gpio_keys_default: gpio-keys-default {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107";
function = "gpio";
......@@ -280,7 +280,7 @@ gpio_keys_default: gpio-keys-default {
bias-pull-up;
};
imu_default: imu-default {
imu_default: imu-default-state {
pins = "gpio115";
function = "gpio";
......@@ -288,14 +288,15 @@ imu_default: imu-default {
bias-disable;
};
touchscreen_default: touchscreen-default {
pins = "gpio13";
function = "gpio";
drive-strength = <2>;
bias-pull-up;
touchscreen_default: touchscreen-default-state {
touchscreen-pins {
pins = "gpio13";
function = "gpio";
reset {
drive-strength = <2>;
bias-pull-up;
};
reset-pins {
pins = "gpio12";
function = "gpio";
......@@ -304,7 +305,7 @@ reset {
};
};
usb_id_default: usb-id-default {
usb_id_default: usb-id-default-state {
pins = "gpio110";
function = "gpio";
......
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