Skip to content

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

arm64: dts: qcom: msm8994: 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.

Order the "function" and "pins" property to match other DTS.
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221018155450.39816-2-krzysztof.kozlowski@linaro.org
parent 5d76dfb8
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 70 deletions
arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi
View file @ 9d7d01da
...@@ -881,28 +881,28 @@ &sdhc2 { ...@@ -881,28 +881,28 @@ &sdhc2 {
}; };
&tlmm { &tlmm {
grip_default: grip-default { grip_default: grip-default-state {
pins = "gpio39"; pins = "gpio39";
function = "gpio"; function = "gpio";
drive-strength = <6>; drive-strength = <6>;
bias-pull-down; bias-pull-down;
}; };
grip_sleep: grip-sleep { grip_sleep: grip-sleep-state {
pins = "gpio39"; pins = "gpio39";
function = "gpio"; function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-pull-down; bias-pull-down;
}; };
hall_front_default: hall-front-default { hall_front_default: hall-front-default-state {
pins = "gpio42"; pins = "gpio42";
function = "gpio"; function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
hall_back_default: hall-back-default { hall_back_default: hall-back-default-state {
pins = "gpio75"; pins = "gpio75";
function = "gpio"; function = "gpio";
drive-strength = <2>; drive-strength = <2>;
......
arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
View file @ 9d7d01da
...@@ -477,15 +477,17 @@ &sdhc2 { ...@@ -477,15 +477,17 @@ &sdhc2 {
}; };
&tlmm { &tlmm {
ts_int_active: ts-int-active { ts_int_active: ts-int-active-state {
pins = "gpio42"; pins = "gpio42";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
input-enable; input-enable;
}; };
ts_reset_active: ts-reset-active { ts_reset_active: ts-reset-active-state {
pins = "gpio109"; pins = "gpio109";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
output-low; output-low;
......
arch/arm64/boot/dts/qcom/msm8994.dtsi
View file @ 9d7d01da
...@@ -773,254 +773,256 @@ tlmm: pinctrl@fd510000 { ...@@ -773,254 +773,256 @@ tlmm: pinctrl@fd510000 {
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
blsp1_uart2_default: blsp1-uart2-default { blsp1_uart2_default: blsp1-uart2-default-state {
function = "blsp_uart2";
pins = "gpio4", "gpio5"; pins = "gpio4", "gpio5";
function = "blsp_uart2";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;
}; };
blsp1_uart2_sleep: blsp1-uart2-sleep { blsp1_uart2_sleep: blsp1-uart2-sleep-state {
function = "gpio";
pins = "gpio4", "gpio5"; pins = "gpio4", "gpio5";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-pull-down; bias-pull-down;
}; };
blsp2_uart2_default: blsp2-uart2-default { blsp2_uart2_default: blsp2-uart2-default-state {
pins = "gpio45", "gpio46", "gpio47", "gpio48";
function = "blsp_uart8"; function = "blsp_uart8";
pins = "gpio45", "gpio46",
"gpio47", "gpio48";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;
}; };
blsp2_uart2_sleep: blsp2-uart2-sleep { blsp2_uart2_sleep: blsp2-uart2-sleep-state {
pins = "gpio45", "gpio46", "gpio47", "gpio48";
function = "gpio"; function = "gpio";
pins = "gpio45", "gpio46",
"gpio47", "gpio48";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
i2c1_default: i2c1-default { i2c1_default: i2c1-default-state {
function = "blsp_i2c1";
pins = "gpio2", "gpio3"; pins = "gpio2", "gpio3";
function = "blsp_i2c1";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
i2c1_sleep: i2c1-sleep { i2c1_sleep: i2c1-sleep-state {
function = "gpio";
pins = "gpio2", "gpio3"; pins = "gpio2", "gpio3";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
i2c2_default: i2c2-default { i2c2_default: i2c2-default-state {
function = "blsp_i2c2";
pins = "gpio6", "gpio7"; pins = "gpio6", "gpio7";
function = "blsp_i2c2";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
i2c2_sleep: i2c2-sleep { i2c2_sleep: i2c2-sleep-state {
function = "gpio";
pins = "gpio6", "gpio7"; pins = "gpio6", "gpio7";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
i2c4_default: i2c4-default { i2c4_default: i2c4-default-state {
function = "blsp_i2c4";
pins = "gpio19", "gpio20"; pins = "gpio19", "gpio20";
function = "blsp_i2c4";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
i2c4_sleep: i2c4-sleep { i2c4_sleep: i2c4-sleep-state {
function = "gpio";
pins = "gpio19", "gpio20"; pins = "gpio19", "gpio20";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-pull-down; bias-pull-down;
input-enable; input-enable;
}; };
i2c5_default: i2c5-default { i2c5_default: i2c5-default-state {
function = "blsp_i2c5";
pins = "gpio23", "gpio24"; pins = "gpio23", "gpio24";
function = "blsp_i2c5";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
i2c5_sleep: i2c5-sleep { i2c5_sleep: i2c5-sleep-state {
function = "gpio";
pins = "gpio23", "gpio24"; pins = "gpio23", "gpio24";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
i2c6_default: i2c6-default { i2c6_default: i2c6-default-state {
function = "blsp_i2c6";
pins = "gpio28", "gpio27"; pins = "gpio28", "gpio27";
function = "blsp_i2c6";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
i2c6_sleep: i2c6-sleep { i2c6_sleep: i2c6-sleep-state {
function = "gpio";
pins = "gpio28", "gpio27"; pins = "gpio28", "gpio27";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
i2c7_default: i2c7-default { i2c7_default: i2c7-default-state {
function = "blsp_i2c7";
pins = "gpio44", "gpio43"; pins = "gpio44", "gpio43";
function = "blsp_i2c7";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
i2c7_sleep: i2c7-sleep { i2c7_sleep: i2c7-sleep-state {
function = "gpio";
pins = "gpio44", "gpio43"; pins = "gpio44", "gpio43";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
blsp2_spi10_default: blsp2-spi10-default { blsp2_spi10_default: blsp2-spi10-default-state {
default { default-pins {
function = "blsp_spi10";
pins = "gpio53", "gpio54", "gpio55"; pins = "gpio53", "gpio54", "gpio55";
function = "blsp_spi10";
drive-strength = <10>; drive-strength = <10>;
bias-pull-down; bias-pull-down;
}; };
cs {
function = "gpio"; cs-pins {
pins = "gpio67"; pins = "gpio67";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
}; };
blsp2_spi10_sleep: blsp2-spi10-sleep { blsp2_spi10_sleep: blsp2-spi10-sleep-state {
pins = "gpio53", "gpio54", "gpio55"; pins = "gpio53", "gpio54", "gpio55";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
i2c11_default: i2c11-default { i2c11_default: i2c11-default-state {
function = "blsp_i2c11";
pins = "gpio83", "gpio84"; pins = "gpio83", "gpio84";
function = "blsp_i2c11";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
i2c11_sleep: i2c11-sleep { i2c11_sleep: i2c11-sleep-state {
function = "gpio";
pins = "gpio83", "gpio84"; pins = "gpio83", "gpio84";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
blsp1_spi1_default: blsp1-spi1-default { blsp1_spi1_default: blsp1-spi1-default-state {
default { default-pins {
function = "blsp_spi1";
pins = "gpio0", "gpio1", "gpio3"; pins = "gpio0", "gpio1", "gpio3";
function = "blsp_spi1";
drive-strength = <10>; drive-strength = <10>;
bias-pull-down; bias-pull-down;
}; };
cs {
function = "gpio"; cs-pins {
pins = "gpio8"; pins = "gpio8";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
}; };
blsp1_spi1_sleep: blsp1-spi1-sleep { blsp1_spi1_sleep: blsp1-spi1-sleep-state {
pins = "gpio0", "gpio1", "gpio3"; pins = "gpio0", "gpio1", "gpio3";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
sdc1_clk_on: clk-on { sdc1_clk_on: clk-on-state {
pins = "sdc1_clk"; pins = "sdc1_clk";
bias-disable; bias-disable;
drive-strength = <16>; drive-strength = <16>;
}; };
sdc1_clk_off: clk-off { sdc1_clk_off: clk-off-state {
pins = "sdc1_clk"; pins = "sdc1_clk";
bias-disable; bias-disable;
drive-strength = <2>; drive-strength = <2>;
}; };
sdc1_cmd_on: cmd-on { sdc1_cmd_on: cmd-on-state {
pins = "sdc1_cmd"; pins = "sdc1_cmd";
bias-pull-up; bias-pull-up;
drive-strength = <8>; drive-strength = <8>;
}; };
sdc1_cmd_off: cmd-off { sdc1_cmd_off: cmd-off-state {
pins = "sdc1_cmd"; pins = "sdc1_cmd";
bias-pull-up; bias-pull-up;
drive-strength = <2>; drive-strength = <2>;
}; };
sdc1_data_on: data-on { sdc1_data_on: data-on-state {
pins = "sdc1_data"; pins = "sdc1_data";
bias-pull-up; bias-pull-up;
drive-strength = <8>; drive-strength = <8>;
}; };
sdc1_data_off: data-off { sdc1_data_off: data-off-state {
pins = "sdc1_data"; pins = "sdc1_data";
bias-pull-up; bias-pull-up;
drive-strength = <2>; drive-strength = <2>;
}; };
sdc1_rclk_on: rclk-on { sdc1_rclk_on: rclk-on-state {
pins = "sdc1_rclk"; pins = "sdc1_rclk";
bias-pull-down; bias-pull-down;
}; };
sdc1_rclk_off: rclk-off { sdc1_rclk_off: rclk-off-state {
pins = "sdc1_rclk"; pins = "sdc1_rclk";
bias-pull-down; bias-pull-down;
}; };
sdc2_clk_on: sdc2-clk-on { sdc2_clk_on: sdc2-clk-on-state {
pins = "sdc2_clk"; pins = "sdc2_clk";
bias-disable; bias-disable;
drive-strength = <10>; drive-strength = <10>;
}; };
sdc2_clk_off: sdc2-clk-off { sdc2_clk_off: sdc2-clk-off-state {
pins = "sdc2_clk"; pins = "sdc2_clk";
bias-disable; bias-disable;
drive-strength = <2>; drive-strength = <2>;
}; };
sdc2_cmd_on: sdc2-cmd-on { sdc2_cmd_on: sdc2-cmd-on-state {
pins = "sdc2_cmd"; pins = "sdc2_cmd";
bias-pull-up; bias-pull-up;
drive-strength = <10>; drive-strength = <10>;
}; };
sdc2_cmd_off: sdc2-cmd-off { sdc2_cmd_off: sdc2-cmd-off-state {
pins = "sdc2_cmd"; pins = "sdc2_cmd";
bias-pull-up; bias-pull-up;
drive-strength = <2>; drive-strength = <2>;
}; };
sdc2_data_on: sdc2-data-on { sdc2_data_on: sdc2-data-on-state {
pins = "sdc2_data"; pins = "sdc2_data";
bias-pull-up; bias-pull-up;
drive-strength = <10>; drive-strength = <10>;
}; };
sdc2_data_off: sdc2-data-off { sdc2_data_off: sdc2-data-off-state {
pins = "sdc2_data"; pins = "sdc2_data";
bias-pull-up; bias-pull-up;
drive-strength = <2>; drive-strength = <2>;
......
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