Skip to content

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

arm64: dts: qcom: sdm845: 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 avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221222151319.122398-3-krzysztof.kozlowski@linaro.org
parent e5011447
Hide whitespace changes
Inline Side-by-side
Showing with 701 additions and 1081 deletions
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
View file @ d05e3428
...@@ -995,104 +995,69 @@ &wifi { ...@@ -995,104 +995,69 @@ &wifi {
/* PINCTRL - additions to nodes defined in sdm845.dtsi */ /* PINCTRL - additions to nodes defined in sdm845.dtsi */
&qspi_cs0 { &qspi_cs0 {
pinconf { bias-disable;
pins = "gpio90";
bias-disable;
};
}; };
&qspi_clk { &qspi_clk {
pinconf { bias-disable;
pins = "gpio95";
bias-disable;
};
}; };
&qspi_data01 { &qspi_data01 {
pinconf { /* High-Z when no transfers; nice to park the lines */
pins = "gpio91", "gpio92"; bias-pull-up;
/* High-Z when no transfers; nice to park the lines */
bias-pull-up;
};
}; };
&qup_i2c3_default { &qup_i2c3_default {
pinconf { drive-strength = <2>;
pins = "gpio41", "gpio42";
drive-strength = <2>;
/* Has external pullup */ /* Has external pullup */
bias-disable; bias-disable;
};
}; };
&qup_i2c11_default { &qup_i2c11_default {
pinconf { drive-strength = <2>;
pins = "gpio31", "gpio32";
drive-strength = <2>;
/* Has external pullup */ /* Has external pullup */
bias-disable; bias-disable;
};
}; };
&qup_i2c12_default { &qup_i2c12_default {
pinconf { drive-strength = <2>;
pins = "gpio49", "gpio50";
drive-strength = <2>;
/* Has external pullup */ /* Has external pullup */
bias-disable; bias-disable;
};
}; };
&qup_i2c14_default { &qup_i2c14_default {
pinconf { drive-strength = <2>;
pins = "gpio33", "gpio34";
drive-strength = <2>;
/* Has external pullup */ /* Has external pullup */
bias-disable; bias-disable;
};
}; };
&qup_spi0_default { &qup_spi0_default {
pinconf { drive-strength = <2>;
pins = "gpio0", "gpio1", "gpio2", "gpio3"; bias-disable;
drive-strength = <2>;
bias-disable;
};
}; };
&qup_spi5_default { &qup_spi5_default {
pinconf { drive-strength = <2>;
pins = "gpio85", "gpio86", "gpio87", "gpio88"; bias-disable;
drive-strength = <2>;
bias-disable;
};
}; };
&qup_spi10_default { &qup_spi10_default {
pinconf { drive-strength = <2>;
pins = "gpio53", "gpio54", "gpio55", "gpio56"; bias-disable;
drive-strength = <2>;
bias-disable;
};
}; };
&qup_uart9_default { &qup_uart9_rx {
pinconf-tx { drive-strength = <2>;
pins = "gpio4"; bias-pull-up;
drive-strength = <2>; };
bias-disable;
};
pinconf-rx { &qup_uart9_tx {
pins = "gpio5"; drive-strength = <2>;
drive-strength = <2>; bias-disable;
bias-pull-up;
};
}; };
/* PINCTRL - board-specific pinctrl */ /* PINCTRL - board-specific pinctrl */
...@@ -1180,243 +1145,153 @@ ap-suspend-l-hog { ...@@ -1180,243 +1145,153 @@ ap-suspend-l-hog {
output-low; output-low;
}; };
ap_edp_bklten: ap-edp-bklten { ap_edp_bklten: ap-edp-bklten-state {
pinmux { pins = "gpio37";
pins = "gpio37"; function = "gpio";
function = "gpio"; drive-strength = <2>;
}; bias-disable;
pinconf {
pins = "gpio37";
drive-strength = <2>;
bias-disable;
};
}; };
bios_flash_wp_r_l: bios-flash-wp-r-l { bios_flash_wp_r_l: bios-flash-wp-r-l-state {
pinmux { pins = "gpio128";
pins = "gpio128"; function = "gpio";
function = "gpio"; input-enable;
input-enable; bias-disable;
};
pinconf {
pins = "gpio128";
bias-disable;
};
}; };
ec_ap_int_l: ec-ap-int-l { ec_ap_int_l: ec-ap-int-l-state {
pinmux { pins = "gpio122";
pins = "gpio122"; function = "gpio";
function = "gpio"; input-enable;
input-enable; bias-pull-up;
};
pinconf {
pins = "gpio122";
bias-pull-up;
};
}; };
edp_brij_en: edp-brij-en { edp_brij_en: edp-brij-en-state {
pinmux { pins = "gpio102";
pins = "gpio102"; function = "gpio";
function = "gpio"; drive-strength = <2>;
}; bias-disable;
pinconf {
pins = "gpio102";
drive-strength = <2>;
bias-disable;
};
}; };
edp_brij_irq: edp-brij-irq { edp_brij_irq: edp-brij-irq-state {
pinmux { pins = "gpio10";
pins = "gpio10"; function = "gpio";
function = "gpio"; drive-strength = <2>;
}; bias-pull-down;
pinconf {
pins = "gpio10";
drive-strength = <2>;
bias-pull-down;
};
}; };
en_pp3300_dx_edp: en-pp3300-dx-edp { en_pp3300_dx_edp: en-pp3300-dx-edp-state {
pinmux { pins = "gpio43";
pins = "gpio43"; function = "gpio";
function = "gpio"; drive-strength = <2>;
}; bias-disable;
pinconf {
pins = "gpio43";
drive-strength = <2>;
bias-disable;
};
}; };
h1_ap_int_odl: h1-ap-int-odl { h1_ap_int_odl: h1-ap-int-odl-state {
pinmux { pins = "gpio129";
pins = "gpio129"; function = "gpio";
function = "gpio"; input-enable;
input-enable; bias-pull-up;
};
pinconf {
pins = "gpio129";
bias-pull-up;
};
}; };
pen_eject_odl: pen-eject-odl { pen_eject_odl: pen-eject-odl-state {
pinmux { pins = "gpio119";
pins = "gpio119"; function = "gpio";
function = "gpio"; bias-pull-up;
bias-pull-up;
};
}; };
pen_irq_l: pen-irq-l { pen_irq_l: pen-irq-l-state {
pinmux { pins = "gpio24";
pins = "gpio24"; function = "gpio";
function = "gpio";
};
pinconf { /* Has external pullup */
pins = "gpio24"; bias-disable;
/* Has external pullup */
bias-disable;
};
}; };
pen_pdct_l: pen-pdct-l { pen_pdct_l: pen-pdct-l-state {
pinmux { pins = "gpio63";
pins = "gpio63"; function = "gpio";
function = "gpio";
};
pinconf {
pins = "gpio63";
/* Has external pullup */ /* Has external pullup */
bias-disable; bias-disable;
};
}; };
pen_rst_l: pen-rst-l { pen_rst_l: pen-rst-l-state {
pinmux { pins = "gpio23";
pins = "gpio23"; function = "gpio";
function = "gpio"; bias-disable;
}; drive-strength = <2>;
pinconf {
pins = "gpio23";
bias-disable;
drive-strength = <2>;
/* /*
* The pen driver doesn't currently support * The pen driver doesn't currently support
* driving this reset line. By specifying * driving this reset line. By specifying
* output-high here we're relying on the fact * output-high here we're relying on the fact
* that this pin has a default pulldown at boot * that this pin has a default pulldown at boot
* (which makes sure the pen was in reset if it * (which makes sure the pen was in reset if it
* was powered) and then we set it high here to * was powered) and then we set it high here to
* take it out of reset. Better would be if the * take it out of reset. Better would be if the
* pen driver could control this and we could * pen driver could control this and we could
* remove "output-high" here. * remove "output-high" here.
*/ */
output-high; output-high;
};
}; };
sdc2_clk: sdc2-clk { sdc2_clk: sdc2-clk-state {
pinconf { pins = "sdc2_clk";
pins = "sdc2_clk"; bias-disable;
bias-disable;
/* /*
* It seems that mmc_test reports errors if drive * It seems that mmc_test reports errors if drive
* strength is not 16. * strength is not 16.
*/ */
drive-strength = <16>; drive-strength = <16>;
};
}; };
sdc2_cmd: sdc2-cmd { sdc2_cmd: sdc2-cmd-state {
pinconf { pins = "sdc2_cmd";
pins = "sdc2_cmd"; bias-pull-up;
bias-pull-up; drive-strength = <16>;
drive-strength = <16>;
};
}; };
sdc2_data: sdc2-data { sdc2_data: sdc2-data-state {
pinconf { pins = "sdc2_data";
pins = "sdc2_data"; bias-pull-up;
bias-pull-up; drive-strength = <16>;
drive-strength = <16>;
};
}; };
sd_cd_odl: sd-cd-odl { sd_cd_odl: sd-cd-odl-state {
pinmux { pins = "gpio44";
pins = "gpio44"; function = "gpio";
function = "gpio"; bias-pull-up;
};
pinconf {
pins = "gpio44";
bias-pull-up;
};
}; };
ts_int_l: ts-int-l { ts_int_l: ts-int-l-state {
pinmux { pins = "gpio125";
pins = "gpio125"; function = "gpio";
function = "gpio"; bias-pull-up;
};
pinconf {
pins = "gpio125";
bias-pull-up;
};
}; };
ts_reset_l: ts-reset-l { ts_reset_l: ts-reset-l-state {
pinmux { pins = "gpio118";
pins = "gpio118"; function = "gpio";
function = "gpio"; bias-disable;
}; drive-strength = <2>;
pinconf {
pins = "gpio118";
bias-disable;
drive-strength = <2>;
};
}; };
ap_suspend_l_assert: ap_suspend_l_assert { ap_suspend_l_assert: ap-suspend-l-assert-state {
config { pins = "gpio126";
pins = "gpio126"; function = "gpio";
function = "gpio"; bias-disable;
bias-disable; drive-strength = <2>;
drive-strength = <2>; output-low;
output-low;
};
}; };
ap_suspend_l_deassert: ap_suspend_l_deassert { ap_suspend_l_deassert: ap-suspend-l-deassert-state {
config { pins = "gpio126";
pins = "gpio126"; function = "gpio";
function = "gpio"; bias-disable;
bias-disable; drive-strength = <2>;
drive-strength = <2>; output-high;
output-high;
};
}; };
}; };
......
arch/arm64/boot/dts/qcom/sdm845-db845c.dts
View file @ d05e3428
...@@ -825,8 +825,8 @@ &spi2 { ...@@ -825,8 +825,8 @@ &spi2 {
}; };
&tlmm { &tlmm {
cam0_default: cam0_default { cam0_default: cam0-default-state {
rst { rst-pins {
pins = "gpio9"; pins = "gpio9";
function = "gpio"; function = "gpio";
...@@ -834,7 +834,7 @@ rst { ...@@ -834,7 +834,7 @@ rst {
bias-disable; bias-disable;
}; };
mclk0 { mclk0-pins {
pins = "gpio13"; pins = "gpio13";
function = "cam_mclk"; function = "cam_mclk";
...@@ -843,8 +843,8 @@ mclk0 { ...@@ -843,8 +843,8 @@ mclk0 {
}; };
}; };
cam3_default: cam3_default { cam3_default: cam3-default-state {
rst { rst-pins {
function = "gpio"; function = "gpio";
pins = "gpio21"; pins = "gpio21";
...@@ -852,7 +852,7 @@ rst { ...@@ -852,7 +852,7 @@ rst {
bias-disable; bias-disable;
}; };
mclk3 { mclk3-pins {
function = "cam_mclk"; function = "cam_mclk";
pins = "gpio16"; pins = "gpio16";
...@@ -861,7 +861,7 @@ mclk3 { ...@@ -861,7 +861,7 @@ mclk3 {
}; };
}; };
dsi_sw_sel: dsi-sw-sel { dsi_sw_sel: dsi-sw-sel-state {
pins = "gpio120"; pins = "gpio120";
function = "gpio"; function = "gpio";
...@@ -870,20 +870,20 @@ dsi_sw_sel: dsi-sw-sel { ...@@ -870,20 +870,20 @@ dsi_sw_sel: dsi-sw-sel {
output-high; output-high;
}; };
lt9611_irq_pin: lt9611-irq { lt9611_irq_pin: lt9611-irq-state {
pins = "gpio84"; pins = "gpio84";
function = "gpio"; function = "gpio";
bias-disable; bias-disable;
}; };
pcie0_default_state: pcie0-default { pcie0_default_state: pcie0-default-state {
clkreq { clkreq-pins {
pins = "gpio36"; pins = "gpio36";
function = "pci_e0"; function = "pci_e0";
bias-pull-up; bias-pull-up;
}; };
reset-n { reset-n-pins {
pins = "gpio35"; pins = "gpio35";
function = "gpio"; function = "gpio";
...@@ -892,7 +892,7 @@ reset-n { ...@@ -892,7 +892,7 @@ reset-n {
bias-pull-down; bias-pull-down;
}; };
wake-n { wake-n-pins {
pins = "gpio37"; pins = "gpio37";
function = "gpio"; function = "gpio";
...@@ -901,7 +901,7 @@ wake-n { ...@@ -901,7 +901,7 @@ wake-n {
}; };
}; };
pcie0_pwren_state: pcie0-pwren { pcie0_pwren_state: pcie0-pwren-state {
pins = "gpio90"; pins = "gpio90";
function = "gpio"; function = "gpio";
...@@ -909,8 +909,8 @@ pcie0_pwren_state: pcie0-pwren { ...@@ -909,8 +909,8 @@ pcie0_pwren_state: pcie0-pwren {
bias-disable; bias-disable;
}; };
pcie1_default_state: pcie1-default { pcie1_default_state: pcie1-default-state {
perst-n { perst-n-pins {
pins = "gpio102"; pins = "gpio102";
function = "gpio"; function = "gpio";
...@@ -918,13 +918,13 @@ perst-n { ...@@ -918,13 +918,13 @@ perst-n {
bias-disable; bias-disable;
}; };
clkreq { clkreq-pins {
pins = "gpio103"; pins = "gpio103";
function = "pci_e1"; function = "pci_e1";
bias-pull-up; bias-pull-up;
}; };
wake-n { wake-n-pins {
pins = "gpio11"; pins = "gpio11";
function = "gpio"; function = "gpio";
...@@ -932,7 +932,7 @@ wake-n { ...@@ -932,7 +932,7 @@ wake-n {
bias-pull-up; bias-pull-up;
}; };
reset-n { reset-n-pins {
pins = "gpio75"; pins = "gpio75";
function = "gpio"; function = "gpio";
...@@ -942,8 +942,8 @@ reset-n { ...@@ -942,8 +942,8 @@ reset-n {
}; };
}; };
sdc2_default_state: sdc2-default { sdc2_default_state: sdc2-default-state {
clk { clk-pins {
pins = "sdc2_clk"; pins = "sdc2_clk";
bias-disable; bias-disable;
...@@ -954,26 +954,26 @@ clk { ...@@ -954,26 +954,26 @@ clk {
drive-strength = <16>; drive-strength = <16>;
}; };
cmd { cmd-pins {
pins = "sdc2_cmd"; pins = "sdc2_cmd";
bias-pull-up; bias-pull-up;
drive-strength = <10>; drive-strength = <10>;
}; };
data { data-pins {
pins = "sdc2_data"; pins = "sdc2_data";
bias-pull-up; bias-pull-up;
drive-strength = <10>; drive-strength = <10>;
}; };
}; };
sdc2_card_det_n: sd-card-det-n { sdc2_card_det_n: sd-card-det-n-state {
pins = "gpio126"; pins = "gpio126";
function = "gpio"; function = "gpio";
bias-pull-up; bias-pull-up;
}; };
wcd_intr_default: wcd_intr_default { wcd_intr_default: wcd-intr-default-state {
pins = "gpio54"; pins = "gpio54";
function = "gpio"; function = "gpio";
...@@ -985,6 +985,8 @@ wcd_intr_default: wcd_intr_default { ...@@ -985,6 +985,8 @@ wcd_intr_default: wcd_intr_default {
&uart3 { &uart3 {
label = "LS-UART0"; label = "LS-UART0";
pinctrl-0 = <&qup_uart3_4pin>;
status = "disabled"; status = "disabled";
}; };
...@@ -1130,39 +1132,22 @@ &wifi { ...@@ -1130,39 +1132,22 @@ &wifi {
/* PINCTRL - additions to nodes defined in sdm845.dtsi */ /* PINCTRL - additions to nodes defined in sdm845.dtsi */
&qup_spi2_default { &qup_spi2_default {
pinconf { drive-strength = <16>;
pins = "gpio27", "gpio28", "gpio29", "gpio30";
drive-strength = <16>;
};
};
&qup_uart3_default {
pinmux {
pins = "gpio41", "gpio42", "gpio43", "gpio44";
function = "qup3";
};
}; };
&qup_i2c10_default { &qup_i2c10_default {
pinconf { drive-strength = <2>;
pins = "gpio55", "gpio56"; bias-disable;
drive-strength = <2>;
bias-disable;
};
}; };
&qup_uart9_default { &qup_uart9_rx {
pinconf-tx { drive-strength = <2>;
pins = "gpio4"; bias-pull-up;
drive-strength = <2>; };
bias-disable;
};
pinconf-rx { &qup_uart9_tx {
pins = "gpio5"; drive-strength = <2>;
drive-strength = <2>; bias-disable;
bias-pull-up;
};
}; };
&pm8998_gpios { &pm8998_gpios {
...@@ -1171,8 +1156,6 @@ &pm8998_gpios { ...@@ -1171,8 +1156,6 @@ &pm8998_gpios {
/* PINCTRL - additions to nodes defined in sdm845.dtsi */ /* PINCTRL - additions to nodes defined in sdm845.dtsi */
&qup_spi0_default { &qup_spi0_default {
config { drive-strength = <6>;
drive-strength = <6>; bias-disable;
bias-disable;
};
}; };
arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
View file @ d05e3428
...@@ -553,48 +553,36 @@ &usb_1_qmpphy { ...@@ -553,48 +553,36 @@ &usb_1_qmpphy {
&tlmm { &tlmm {
gpio-reserved-ranges = <28 4>, <81 4>; gpio-reserved-ranges = <28 4>, <81 4>;
sdc2_clk: sdc2-clk { sdc2_clk: sdc2-clk-state {
pinconf { pins = "sdc2_clk";
pins = "sdc2_clk"; bias-disable;
bias-disable;
/*
/* * It seems that mmc_test reports errors if drive
* It seems that mmc_test reports errors if drive * strength is not 16 on clk, cmd, and data pins.
* strength is not 16 on clk, cmd, and data pins. *
* * TODO: copy-pasted from mtp, try other values
* TODO: copy-pasted from mtp, try other values * on these devices.
* on these devices. */
*/ drive-strength = <16>;
drive-strength = <16>;
};
}; };
sdc2_cmd: sdc2-cmd { sdc2_cmd: sdc2-cmd-state {
pinconf { pins = "sdc2_cmd";
pins = "sdc2_cmd"; bias-pull-up;
bias-pull-up; drive-strength = <16>;
drive-strength = <16>;
};
}; };
sdc2_data: sdc2-data { sdc2_data: sdc2-data-state {
pinconf { pins = "sdc2_data";
pins = "sdc2_data"; bias-pull-up;
bias-pull-up; drive-strength = <16>;
drive-strength = <16>;
};
}; };
sd_card_det_n: sd-card-det-n { sd_card_det_n: sd-card-det-n-state {
pinmux { pins = "gpio126";
pins = "gpio126"; function = "gpio";
function = "gpio"; bias-pull-up;
};
pinconf {
pins = "gpio126";
bias-pull-up;
};
}; };
}; };
......
arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts
View file @ d05e3428
...@@ -58,7 +58,7 @@ &mss_pil { ...@@ -58,7 +58,7 @@ &mss_pil {
}; };
&tlmm { &tlmm {
thinq_key_default: thinq-key-default { thinq_key_default: thinq-key-default-state {
pins = "gpio89"; pins = "gpio89";
function = "gpio"; function = "gpio";
......
arch/arm64/boot/dts/qcom/sdm845-mtp.dts
View file @ d05e3428
...@@ -719,68 +719,49 @@ &wifi { ...@@ -719,68 +719,49 @@ &wifi {
/* PINCTRL - additions to nodes defined in sdm845.dtsi */ /* PINCTRL - additions to nodes defined in sdm845.dtsi */
&qup_i2c10_default { &qup_i2c10_default {
pinconf { drive-strength = <2>;
pins = "gpio55", "gpio56"; bias-disable;
drive-strength = <2>;
bias-disable;
};
}; };
&qup_uart9_default { &qup_uart9_rx {
pinconf-tx { drive-strength = <2>;
pins = "gpio4"; bias-pull-up;
drive-strength = <2>; };
bias-disable;
};
pinconf-rx { &qup_uart9_tx {
pins = "gpio5"; drive-strength = <2>;
drive-strength = <2>; bias-disable;
bias-pull-up;
};
}; };
&tlmm { &tlmm {
gpio-reserved-ranges = <0 4>, <81 4>; gpio-reserved-ranges = <0 4>, <81 4>;
sdc2_clk: sdc2-clk { sdc2_clk: sdc2-clk-state {
pinconf { pins = "sdc2_clk";
pins = "sdc2_clk"; bias-disable;
bias-disable;
/* /*
* It seems that mmc_test reports errors if drive * It seems that mmc_test reports errors if drive
* strength is not 16 on clk, cmd, and data pins. * strength is not 16 on clk, cmd, and data pins.
*/ */
drive-strength = <16>; drive-strength = <16>;
};
}; };
sdc2_cmd: sdc2-cmd { sdc2_cmd: sdc2-cmd-state {
pinconf { pins = "sdc2_cmd";
pins = "sdc2_cmd"; bias-pull-up;
bias-pull-up; drive-strength = <16>;
drive-strength = <16>;
};
}; };
sdc2_data: sdc2-data { sdc2_data: sdc2-data-state {
pinconf { pins = "sdc2_data";
pins = "sdc2_data"; bias-pull-up;
bias-pull-up; drive-strength = <16>;
drive-strength = <16>;
};
}; };
sd_card_det_n: sd-card-det-n { sd_card_det_n: sd-card-det-n-state {
pinmux { pins = "gpio126";
pins = "gpio126"; function = "gpio";
function = "gpio"; bias-pull-up;
};
pinconf {
pins = "gpio126";
bias-pull-up;
};
}; };
}; };
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
View file @ d05e3428
...@@ -474,35 +474,24 @@ &qupv3_id_0 { ...@@ -474,35 +474,24 @@ &qupv3_id_0 {
status = "okay"; status = "okay";
}; };
&qup_i2c12_default { &qup_i2c10_default {
mux { drive-strength = <2>;
pins = "gpio49", "gpio50"; bias-disable;
function = "qup12";
drive-strength = <2>;
bias-disable;
};
}; };
&qup_i2c10_default { &qup_i2c12_default {
pinconf { drive-strength = <2>;
pins = "gpio55", "gpio56"; bias-disable;
drive-strength = <2>;
bias-disable;
};
}; };
&qup_uart9_default { &qup_uart9_rx {
pinconf-tx { drive-strength = <2>;
pins = "gpio4"; bias-pull-up;
drive-strength = <2>; };
bias-disable;
};
pinconf-rx { &qup_uart9_tx {
pins = "gpio5"; drive-strength = <2>;
drive-strength = <2>; bias-disable;
bias-pull-up;
};
}; };
&uart6 { &uart6 {
...@@ -588,51 +577,41 @@ &usb_1_hsphy { ...@@ -588,51 +577,41 @@ &usb_1_hsphy {
&tlmm { &tlmm {
gpio-reserved-ranges = <0 4>, <81 4>; gpio-reserved-ranges = <0 4>, <81 4>;
tri_state_key_default: tri_state_key_default { tri_state_key_default: tri-state-key-default-state {
mux { pins = "gpio40", "gpio42", "gpio26";
pins = "gpio40", "gpio42", "gpio26"; function = "gpio";
function = "gpio"; drive-strength = <2>;
drive-strength = <2>; bias-disable;
bias-disable;
};
}; };
ts_default_pins: ts-int { ts_default_pins: ts-int-state {
mux { pins = "gpio99", "gpio125";
pins = "gpio99", "gpio125"; function = "gpio";
function = "gpio"; drive-strength = <16>;
drive-strength = <16>; bias-pull-up;
bias-pull-up;
};
}; };
panel_reset_pins: panel-reset { panel_reset_pins: panel-reset-state {
mux { pins = "gpio6", "gpio25", "gpio26";
pins = "gpio6", "gpio25", "gpio26"; function = "gpio";
function = "gpio"; drive-strength = <8>;
drive-strength = <8>; bias-disable;
bias-disable;
};
}; };
panel_te_pin: panel-te { panel_te_pin: panel-te-state {
mux { pins = "gpio10";
pins = "gpio10"; function = "mdp_vsync";
function = "mdp_vsync"; drive-strength = <2>;
drive-strength = <2>; bias-disable;
bias-disable; input-enable;
input-enable;
};
}; };
panel_esd_pin: panel-esd { panel_esd_pin: panel-esd-state {
mux { pins = "gpio30";
pins = "gpio30"; function = "gpio";
function = "gpio"; drive-strength = <2>;
drive-strength = <2>; bias-pull-down;
bias-pull-down; input-enable;
input-enable;
};
}; };
}; };
......
arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
View file @ d05e3428
...@@ -554,18 +554,14 @@ led@5 { ...@@ -554,18 +554,14 @@ led@5 {
}; };
}; };
&qup_uart9_default { &qup_uart9_rx {
pinconf-rx { drive-strength = <2>;
pins = "gpio5"; bias-pull-up;
drive-strength = <2>; };
bias-pull-up;
};
pinconf-tx { &qup_uart9_tx {
pins = "gpio4"; drive-strength = <2>;
drive-strength = <2>; bias-disable;
bias-disable;
};
}; };
&qupv3_id_0 { &qupv3_id_0 {
...@@ -579,110 +575,62 @@ &qupv3_id_1 { ...@@ -579,110 +575,62 @@ &qupv3_id_1 {
&tlmm { &tlmm {
gpio-reserved-ranges = <0 4>, <81 4>; gpio-reserved-ranges = <0 4>, <81 4>;
sde_dsi_active: sde-dsi-active { sde_dsi_active: sde-dsi-active-state {
mux { pins = "gpio6", "gpio11";
pins = "gpio6", "gpio11"; function = "gpio";
function = "gpio"; drive-strength = <8>;
}; bias-disable;
config {
pins = "gpio6", "gpio11";
drive-strength = <8>;
bias-disable;
};
}; };
sde_dsi_suspend: sde-dsi-suspend { sde_dsi_suspend: sde-dsi-suspend-state {
mux { pins = "gpio6", "gpio11";
pins = "gpio6", "gpio11"; function = "gpio";
function = "gpio"; drive-strength = <2>;
}; bias-pull-down;
config {
pins = "gpio6", "gpio11";
drive-strength = <2>;
bias-pull-down;
};
}; };
sde_te_active: sde-te-active { sde_te_active: sde-te-active-state {
mux { pins = "gpio10";
pins = "gpio10"; function = "mdp_vsync";
function = "mdp_vsync"; drive-strength = <2>;
}; bias-pull-down;
config {
pins = "gpio10";
drive-strength = <2>;
bias-pull-down;
};
}; };
sde_te_suspend: sde-te-suspend { sde_te_suspend: sde-te-suspend-state {
mux { pins = "gpio10";
pins = "gpio10"; function = "mdp_vsync";
function = "mdp_vsync"; drive-strength = <2>;
}; bias-pull-down;
config {
pins = "gpio10";
drive-strength = <2>;
bias-pull-down;
};
}; };
ts_int_active: ts-int-active { ts_int_active: ts-int-active-state {
mux { pins = "gpio125";
pins = "gpio125"; function = "gpio";
function = "gpio"; drive-strength = <8>;
}; bias-pull-up;
input-enable;
config {
pins = "gpio125";
drive-strength = <8>;
bias-pull-up;
input-enable;
};
}; };
ts_int_suspend: ts-int-suspend { ts_int_suspend: ts-int-suspend-state {
mux { pins = "gpio125";
pins = "gpio125"; function = "gpio";
function = "gpio"; drive-strength = <2>;
}; bias-pull-down;
input-enable;
config {
pins = "gpio125";
drive-strength = <2>;
bias-pull-down;
input-enable;
};
}; };
ts_reset_active: ts-reset-active { ts_reset_active: ts-reset-active-state {
mux { pins = "gpio99";
pins = "gpio99"; function = "gpio";
function = "gpio"; drive-strength = <8>;
}; bias-pull-up;
config {
pins = "gpio99";
drive-strength = <8>;
bias-pull-up;
};
}; };
ts_reset_suspend: ts-reset-suspend { ts_reset_suspend: ts-reset-suspend-state {
mux { pins = "gpio99";
pins = "gpio99"; function = "gpio";
function = "gpio"; drive-strength = <2>;
}; bias-pull-down;
config {
pins = "gpio99";
drive-strength = <2>;
bias-pull-down;
};
}; };
}; };
......
arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
View file @ d05e3428
...@@ -383,19 +383,19 @@ &tlmm { ...@@ -383,19 +383,19 @@ &tlmm {
gpio-reserved-ranges = <0 4>, <81 4>; gpio-reserved-ranges = <0 4>, <81 4>;
sdc2_default_state: sdc2-default-state { sdc2_default_state: sdc2-default-state {
clk { clk-pins {
pins = "sdc2_clk"; pins = "sdc2_clk";
drive-strength = <16>; drive-strength = <16>;
bias-disable; bias-disable;
}; };
cmd { cmd-pins {
pins = "sdc2_cmd"; pins = "sdc2_cmd";
drive-strength = <10>; drive-strength = <10>;
bias-pull-up; bias-pull-up;
}; };
data { data-pins {
pins = "sdc2_data"; pins = "sdc2_data";
drive-strength = <10>; drive-strength = <10>;
bias-pull-up; bias-pull-up;
......
arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
View file @ d05e3428
...@@ -440,33 +440,33 @@ codec { ...@@ -440,33 +440,33 @@ codec {
&tlmm { &tlmm {
gpio-reserved-ranges = <0 4>, <81 4>; gpio-reserved-ranges = <0 4>, <81 4>;
sdc2_default_state: sdc2-default { sdc2_default_state: sdc2-default-state {
clk { clk-pins {
pins = "sdc2_clk"; pins = "sdc2_clk";
bias-disable; bias-disable;
drive-strength = <16>; drive-strength = <16>;
}; };
cmd { cmd-pins {
pins = "sdc2_cmd"; pins = "sdc2_cmd";
bias-pull-up; bias-pull-up;
drive-strength = <10>; drive-strength = <10>;
}; };
data { data-pins {
pins = "sdc2_data"; pins = "sdc2_data";
bias-pull-up; bias-pull-up;
drive-strength = <10>; drive-strength = <10>;
}; };
}; };
sdc2_card_det_n: sd-card-det-n { sdc2_card_det_n: sd-card-det-n-state {
pins = "gpio126"; pins = "gpio126";
function = "gpio"; function = "gpio";
bias-pull-up; bias-pull-up;
}; };
wcd_intr_default: wcd_intr_default { wcd_intr_default: wcd-intr-default-state {
pins = "gpio54"; pins = "gpio54";
function = "gpio"; function = "gpio";
......
arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
View file @ d05e3428
...@@ -565,24 +565,21 @@ &qupv3_id_1 { ...@@ -565,24 +565,21 @@ &qupv3_id_1 {
}; };
&qup_i2c14_default { &qup_i2c14_default {
pinconf { drive-strength = <2>;
pins = "gpio33", "gpio34"; bias-disable;
drive-strength = <2>;
bias-disable;
};
}; };
&tlmm { &tlmm {
gpio-reserved-ranges = <0 4>, <81 4>; gpio-reserved-ranges = <0 4>, <81 4>;
ts_reset_default: ts-reset-default { ts_reset_default: ts-reset-default-state {
pins = "gpio99"; pins = "gpio99";
function = "gpio"; function = "gpio";
drive-strength = <16>; drive-strength = <16>;
output-high; output-high;
}; };
ts_int_default: ts-int-default { ts_int_default: ts-int-default-state {
pins = "gpio125"; pins = "gpio125";
function = "gpio"; function = "gpio";
bias-pull-down; bias-pull-down;
...@@ -590,14 +587,14 @@ ts_int_default: ts-int-default { ...@@ -590,14 +587,14 @@ ts_int_default: ts-int-default {
input-enable; input-enable;
}; };
ts_reset_sleep: ts-reset-sleep { ts_reset_sleep: ts-reset-sleep-state {
pins = "gpio99"; pins = "gpio99";
function = "gpio"; function = "gpio";
bias-disable; bias-disable;
drive-strength = <2>; drive-strength = <2>;
}; };
ts_int_sleep: ts-int-sleep { ts_int_sleep: ts-int-sleep-state {
pins = "gpio125"; pins = "gpio125";
function = "gpio"; function = "gpio";
bias-pull-down; bias-pull-down;
...@@ -605,21 +602,21 @@ ts_int_sleep: ts-int-sleep { ...@@ -605,21 +602,21 @@ ts_int_sleep: ts-int-sleep {
input-enable; input-enable;
}; };
sde_dsi_active: sde-dsi-active { sde_dsi_active: sde-dsi-active-state {
pins = "gpio6", "gpio10"; pins = "gpio6", "gpio10";
function = "gpio"; function = "gpio";
drive-strength = <8>; drive-strength = <8>;
bias-disable; bias-disable;
}; };
sde_dsi_suspend: sde-dsi-suspend { sde_dsi_suspend: sde-dsi-suspend-state {
pins = "gpio6", "gpio10"; pins = "gpio6", "gpio10";
function = "gpio"; function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-pull-down; bias-pull-down;
}; };
wcd_intr_default: wcd-intr-default { wcd_intr_default: wcd-intr-default-state {
pins = "gpio54"; pins = "gpio54";
function = "gpio"; function = "gpio";
input-enable; input-enable;
......
arch/arm64/boot/dts/qcom/sdm845.dtsi
View file @ d05e3428
...@@ -2709,7 +2709,7 @@ tlmm: pinctrl@3400000 { ...@@ -2709,7 +2709,7 @@ tlmm: pinctrl@3400000 {
gpio-ranges = <&tlmm 0 0 151>; gpio-ranges = <&tlmm 0 0 151>;
wakeup-parent = <&pdc_intc>; wakeup-parent = <&pdc_intc>;
cci0_default: cci0-default { cci0_default: cci0-default-state {
/* SDA, SCL */ /* SDA, SCL */
pins = "gpio17", "gpio18"; pins = "gpio17", "gpio18";
function = "cci_i2c"; function = "cci_i2c";
...@@ -2718,7 +2718,7 @@ cci0_default: cci0-default { ...@@ -2718,7 +2718,7 @@ cci0_default: cci0-default {
drive-strength = <2>; /* 2 mA */ drive-strength = <2>; /* 2 mA */
}; };
cci0_sleep: cci0-sleep { cci0_sleep: cci0-sleep-state {
/* SDA, SCL */ /* SDA, SCL */
pins = "gpio17", "gpio18"; pins = "gpio17", "gpio18";
function = "cci_i2c"; function = "cci_i2c";
...@@ -2727,7 +2727,7 @@ cci0_sleep: cci0-sleep { ...@@ -2727,7 +2727,7 @@ cci0_sleep: cci0-sleep {
bias-pull-down; bias-pull-down;
}; };
cci1_default: cci1-default { cci1_default: cci1-default-state {
/* SDA, SCL */ /* SDA, SCL */
pins = "gpio19", "gpio20"; pins = "gpio19", "gpio20";
function = "cci_i2c"; function = "cci_i2c";
...@@ -2736,7 +2736,7 @@ cci1_default: cci1-default { ...@@ -2736,7 +2736,7 @@ cci1_default: cci1-default {
drive-strength = <2>; /* 2 mA */ drive-strength = <2>; /* 2 mA */
}; };
cci1_sleep: cci1-sleep { cci1_sleep: cci1-sleep-state {
/* SDA, SCL */ /* SDA, SCL */
pins = "gpio19", "gpio20"; pins = "gpio19", "gpio20";
function = "cci_i2c"; function = "cci_i2c";
...@@ -2745,556 +2745,497 @@ cci1_sleep: cci1-sleep { ...@@ -2745,556 +2745,497 @@ cci1_sleep: cci1-sleep {
bias-pull-down; bias-pull-down;
}; };
qspi_clk: qspi-clk { qspi_clk: qspi-clk-state {
pinmux { pins = "gpio95";
pins = "gpio95"; function = "qspi_clk";
function = "qspi_clk";
};
}; };
qspi_cs0: qspi-cs0 { qspi_cs0: qspi-cs0-state {
pinmux { pins = "gpio90";
pins = "gpio90"; function = "qspi_cs";
function = "qspi_cs";
};
}; };
qspi_cs1: qspi-cs1 { qspi_cs1: qspi-cs1-state {
pinmux { pins = "gpio89";
pins = "gpio89"; function = "qspi_cs";
function = "qspi_cs";
};
}; };
qspi_data01: qspi-data01 { qspi_data01: qspi-data01-state {
pinmux-data { pins = "gpio91", "gpio92";
pins = "gpio91", "gpio92"; function = "qspi_data";
function = "qspi_data";
};
}; };
qspi_data12: qspi-data12 { qspi_data12: qspi-data12-state {
pinmux-data { pins = "gpio93", "gpio94";
pins = "gpio93", "gpio94"; function = "qspi_data";
function = "qspi_data";
};
}; };
qup_i2c0_default: qup-i2c0-default { qup_i2c0_default: qup-i2c0-default-state {
pinmux { pins = "gpio0", "gpio1";
pins = "gpio0", "gpio1"; function = "qup0";
function = "qup0";
};
}; };
qup_i2c1_default: qup-i2c1-default { qup_i2c1_default: qup-i2c1-default-state {
pinmux { pins = "gpio17", "gpio18";
pins = "gpio17", "gpio18"; function = "qup1";
function = "qup1";
};
}; };
qup_i2c2_default: qup-i2c2-default { qup_i2c2_default: qup-i2c2-default-state {
pinmux { pins = "gpio27", "gpio28";
pins = "gpio27", "gpio28"; function = "qup2";
function = "qup2";
};
}; };
qup_i2c3_default: qup-i2c3-default { qup_i2c3_default: qup-i2c3-default-state {
pinmux { pins = "gpio41", "gpio42";
pins = "gpio41", "gpio42"; function = "qup3";
function = "qup3";
};
}; };
qup_i2c4_default: qup-i2c4-default { qup_i2c4_default: qup-i2c4-default-state {
pinmux { pins = "gpio89", "gpio90";
pins = "gpio89", "gpio90"; function = "qup4";
function = "qup4";
};
}; };
qup_i2c5_default: qup-i2c5-default { qup_i2c5_default: qup-i2c5-default-state {
pinmux { pins = "gpio85", "gpio86";
pins = "gpio85", "gpio86"; function = "qup5";
function = "qup5";
};
}; };
qup_i2c6_default: qup-i2c6-default { qup_i2c6_default: qup-i2c6-default-state {
pinmux { pins = "gpio45", "gpio46";
pins = "gpio45", "gpio46"; function = "qup6";
function = "qup6";
};
}; };
qup_i2c7_default: qup-i2c7-default { qup_i2c7_default: qup-i2c7-default-state {
pinmux { pins = "gpio93", "gpio94";
pins = "gpio93", "gpio94"; function = "qup7";
function = "qup7";
};
}; };
qup_i2c8_default: qup-i2c8-default { qup_i2c8_default: qup-i2c8-default-state {
pinmux { pins = "gpio65", "gpio66";
pins = "gpio65", "gpio66"; function = "qup8";
function = "qup8";
};
}; };
qup_i2c9_default: qup-i2c9-default { qup_i2c9_default: qup-i2c9-default-state {
pinmux { pins = "gpio6", "gpio7";
pins = "gpio6", "gpio7"; function = "qup9";
function = "qup9";
};
}; };
qup_i2c10_default: qup-i2c10-default { qup_i2c10_default: qup-i2c10-default-state {
pinmux { pins = "gpio55", "gpio56";
pins = "gpio55", "gpio56"; function = "qup10";
function = "qup10";
};
}; };
qup_i2c11_default: qup-i2c11-default { qup_i2c11_default: qup-i2c11-default-state {
pinmux { pins = "gpio31", "gpio32";
pins = "gpio31", "gpio32"; function = "qup11";
function = "qup11";
};
}; };
qup_i2c12_default: qup-i2c12-default { qup_i2c12_default: qup-i2c12-default-state {
pinmux { pins = "gpio49", "gpio50";
pins = "gpio49", "gpio50"; function = "qup12";
function = "qup12";
};
}; };
qup_i2c13_default: qup-i2c13-default { qup_i2c13_default: qup-i2c13-default-state {
pinmux { pins = "gpio105", "gpio106";
pins = "gpio105", "gpio106"; function = "qup13";
function = "qup13";
};
}; };
qup_i2c14_default: qup-i2c14-default { qup_i2c14_default: qup-i2c14-default-state {
pinmux { pins = "gpio33", "gpio34";
pins = "gpio33", "gpio34"; function = "qup14";
function = "qup14";
};
}; };
qup_i2c15_default: qup-i2c15-default { qup_i2c15_default: qup-i2c15-default-state {
pinmux { pins = "gpio81", "gpio82";
pins = "gpio81", "gpio82"; function = "qup15";
function = "qup15";
};
}; };
qup_spi0_default: qup-spi0-default { qup_spi0_default: qup-spi0-default-state {
pinmux { pins = "gpio0", "gpio1", "gpio2", "gpio3";
pins = "gpio0", "gpio1", function = "qup0";
"gpio2", "gpio3"; drive-strength = <6>;
function = "qup0"; bias-disable;
}; };
config { qup_spi1_default: qup-spi1-default-state {
pins = "gpio0", "gpio1", pins = "gpio17", "gpio18", "gpio19", "gpio20";
"gpio2", "gpio3"; function = "qup1";
drive-strength = <6>;
bias-disable;
};
}; };
qup_spi1_default: qup-spi1-default { qup_spi2_default: qup-spi2-default-state {
pinmux { pins = "gpio27", "gpio28", "gpio29", "gpio30";
pins = "gpio17", "gpio18", function = "qup2";
"gpio19", "gpio20";
function = "qup1";
};
}; };
qup_spi2_default: qup-spi2-default { qup_spi3_default: qup-spi3-default-state {
pinmux { pins = "gpio41", "gpio42", "gpio43", "gpio44";
pins = "gpio27", "gpio28", function = "qup3";
"gpio29", "gpio30";
function = "qup2";
};
}; };
qup_spi3_default: qup-spi3-default { qup_spi4_default: qup-spi4-default-state {
pinmux { pins = "gpio89", "gpio90", "gpio91", "gpio92";
pins = "gpio41", "gpio42", function = "qup4";
"gpio43", "gpio44";
function = "qup3";
};
}; };
qup_spi4_default: qup-spi4-default { qup_spi5_default: qup-spi5-default-state {
pinmux { pins = "gpio85", "gpio86", "gpio87", "gpio88";
pins = "gpio89", "gpio90", function = "qup5";
"gpio91", "gpio92";
function = "qup4";
};
}; };
qup_spi5_default: qup-spi5-default { qup_spi6_default: qup-spi6-default-state {
pinmux { pins = "gpio45", "gpio46", "gpio47", "gpio48";
pins = "gpio85", "gpio86", function = "qup6";
"gpio87", "gpio88";
function = "qup5";
};
}; };
qup_spi6_default: qup-spi6-default { qup_spi7_default: qup-spi7-default-state {
pinmux { pins = "gpio93", "gpio94", "gpio95", "gpio96";
pins = "gpio45", "gpio46", function = "qup7";
"gpio47", "gpio48";
function = "qup6";
};
}; };
qup_spi7_default: qup-spi7-default { qup_spi8_default: qup-spi8-default-state {
pinmux { pins = "gpio65", "gpio66", "gpio67", "gpio68";
pins = "gpio93", "gpio94", function = "qup8";
"gpio95", "gpio96";
function = "qup7";
};
}; };
qup_spi8_default: qup-spi8-default { qup_spi9_default: qup-spi9-default-state {
pinmux { pins = "gpio6", "gpio7", "gpio4", "gpio5";
pins = "gpio65", "gpio66", function = "qup9";
"gpio67", "gpio68";
function = "qup8";
};
}; };
qup_spi9_default: qup-spi9-default { qup_spi10_default: qup-spi10-default-state {
pinmux { pins = "gpio55", "gpio56", "gpio53", "gpio54";
pins = "gpio6", "gpio7", function = "qup10";
"gpio4", "gpio5";
function = "qup9";
};
}; };
qup_spi10_default: qup-spi10-default { qup_spi11_default: qup-spi11-default-state {
pinmux { pins = "gpio31", "gpio32", "gpio33", "gpio34";
pins = "gpio55", "gpio56", function = "qup11";
"gpio53", "gpio54";
function = "qup10";
};
}; };
qup_spi11_default: qup-spi11-default { qup_spi12_default: qup-spi12-default-state {
pinmux { pins = "gpio49", "gpio50", "gpio51", "gpio52";
pins = "gpio31", "gpio32", function = "qup12";
"gpio33", "gpio34";
function = "qup11";
};
}; };
qup_spi12_default: qup-spi12-default { qup_spi13_default: qup-spi13-default-state {
pinmux { pins = "gpio105", "gpio106", "gpio107", "gpio108";
pins = "gpio49", "gpio50", function = "qup13";
"gpio51", "gpio52";
function = "qup12";
};
}; };
qup_spi13_default: qup-spi13-default { qup_spi14_default: qup-spi14-default-state {
pinmux { pins = "gpio33", "gpio34", "gpio31", "gpio32";
pins = "gpio105", "gpio106", function = "qup14";
"gpio107", "gpio108";
function = "qup13";
};
}; };
qup_spi14_default: qup-spi14-default { qup_spi15_default: qup-spi15-default-state {
pinmux { pins = "gpio81", "gpio82", "gpio83", "gpio84";
pins = "gpio33", "gpio34", function = "qup15";
"gpio31", "gpio32";
function = "qup14";
};
}; };
qup_spi15_default: qup-spi15-default { qup_uart0_default: qup-uart0-default-state {
pinmux { qup_uart0_tx: tx-pins {
pins = "gpio81", "gpio82", pins = "gpio2";
"gpio83", "gpio84"; function = "qup0";
function = "qup15";
}; };
};
qup_uart0_default: qup-uart0-default { qup_uart0_rx: rx-pins {
pinmux { pins = "gpio3";
pins = "gpio2", "gpio3";
function = "qup0"; function = "qup0";
}; };
}; };
qup_uart1_default: qup-uart1-default { qup_uart1_default: qup-uart1-default-state {
pinmux { qup_uart1_tx: tx-pins {
pins = "gpio19", "gpio20"; pins = "gpio19";
function = "qup1";
};
qup_uart1_rx: rx-pins {
pins = "gpio20";
function = "qup1"; function = "qup1";
}; };
}; };
qup_uart2_default: qup-uart2-default { qup_uart2_default: qup-uart2-default-state {
pinmux { qup_uart2_tx: tx-pins {
pins = "gpio29", "gpio30"; pins = "gpio29";
function = "qup2"; function = "qup2";
}; };
qup_uart2_rx: rx-pins {
pins = "gpio30";
function = "qup2";
};
};
qup_uart3_default: qup-uart3-default-state {
qup_uart3_tx: tx-pins {
pins = "gpio43";
function = "qup3";
};
qup_uart3_rx: rx-pins {
pins = "gpio44";
function = "qup3";
};
}; };
qup_uart3_default: qup-uart3-default { qup_uart3_4pin: qup-uart3-4pin-state {
pinmux { qup_uart3_4pin_cts: cts-pins {
pins = "gpio43", "gpio44"; pins = "gpio41";
function = "qup3";
};
qup_uart3_4pin_rts_tx: rts-tx-pins {
pins = "gpio42", "gpio43";
function = "qup3";
};
qup_uart3_4pin_rx: rx-pins {
pins = "gpio44";
function = "qup3"; function = "qup3";
}; };
}; };
qup_uart4_default: qup-uart4-default { qup_uart4_default: qup-uart4-default-state {
pinmux { qup_uart4_tx: tx-pins {
pins = "gpio91", "gpio92"; pins = "gpio91";
function = "qup4";
};
qup_uart4_rx: rx-pins {
pins = "gpio92";
function = "qup4"; function = "qup4";
}; };
}; };
qup_uart5_default: qup-uart5-default { qup_uart5_default: qup-uart5-default-state {
pinmux { qup_uart5_tx: tx-pins {
pins = "gpio87", "gpio88"; pins = "gpio87";
function = "qup5";
};
qup_uart5_rx: rx-pins {
pins = "gpio88";
function = "qup5"; function = "qup5";
}; };
}; };
qup_uart6_default: qup-uart6-default { qup_uart6_default: qup-uart6-default-state {
pinmux { qup_uart6_tx: tx-pins {
pins = "gpio47", "gpio48"; pins = "gpio47";
function = "qup6";
};
qup_uart6_rx: rx-pins {
pins = "gpio48";
function = "qup6"; function = "qup6";
}; };
}; };
qup_uart6_4pin: qup-uart6-4pin-state { qup_uart6_4pin: qup-uart6-4pin-state {
qup_uart6_4pin_cts: cts-pins {
cts-pins {
pins = "gpio45"; pins = "gpio45";
function = "qup6"; function = "qup6";
bias-pull-down; bias-pull-down;
}; };
rts-tx-pins { qup_uart6_4pin_rts_tx: rts-tx-pins {
pins = "gpio46", "gpio47"; pins = "gpio46", "gpio47";
function = "qup6"; function = "qup6";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
rx-pins { qup_uart6_4pin_rx: rx-pins {
pins = "gpio48"; pins = "gpio48";
function = "qup6"; function = "qup6";
bias-pull-up; bias-pull-up;
}; };
}; };
qup_uart7_default: qup-uart7-default { qup_uart7_default: qup-uart7-default-state {
pinmux { qup_uart7_tx: tx-pins {
pins = "gpio95", "gpio96"; pins = "gpio95";
function = "qup7"; function = "qup7";
}; };
};
qup_uart8_default: qup-uart8-default { qup_uart7_rx: rx-pins {
pinmux { pins = "gpio96";
pins = "gpio67", "gpio68"; function = "qup7";
function = "qup8";
};
};
qup_uart9_default: qup-uart9-default {
pinmux {
pins = "gpio4", "gpio5";
function = "qup9";
}; };
}; };
qup_uart10_default: qup-uart10-default { qup_uart8_default: qup-uart8-default-state {
pinmux { qup_uart8_tx: tx-pins {
pins = "gpio53", "gpio54"; pins = "gpio67";
function = "qup10"; function = "qup8";
}; };
};
qup_uart11_default: qup-uart11-default { qup_uart8_rx: rx-pins {
pinmux { pins = "gpio68";
pins = "gpio33", "gpio34"; function = "qup8";
function = "qup11";
}; };
}; };
qup_uart12_default: qup-uart12-default { qup_uart9_default: qup-uart9-default-state {
pinmux { qup_uart9_tx: tx-pins {
pins = "gpio51", "gpio52"; pins = "gpio4";
function = "qup12"; function = "qup9";
}; };
};
qup_uart13_default: qup-uart13-default { qup_uart9_rx: rx-pins {
pinmux { pins = "gpio5";
pins = "gpio107", "gpio108"; function = "qup9";
function = "qup13";
}; };
}; };
qup_uart14_default: qup-uart14-default { qup_uart10_default: qup-uart10-default-state {
pinmux { qup_uart10_tx: tx-pins {
pins = "gpio31", "gpio32"; pins = "gpio53";
function = "qup14"; function = "qup10";
}; };
};
qup_uart15_default: qup-uart15-default { qup_uart10_rx: rx-pins {
pinmux { pins = "gpio54";
pins = "gpio83", "gpio84"; function = "qup10";
function = "qup15";
}; };
}; };
quat_mi2s_sleep: quat_mi2s_sleep { qup_uart11_default: qup-uart11-default-state {
mux { qup_uart11_tx: tx-pins {
pins = "gpio58", "gpio59"; pins = "gpio33";
function = "gpio"; function = "qup11";
}; };
config { qup_uart11_rx: rx-pins {
pins = "gpio58", "gpio59"; pins = "gpio34";
drive-strength = <2>; function = "qup11";
bias-pull-down;
input-enable;
}; };
}; };
quat_mi2s_active: quat_mi2s_active { qup_uart12_default: qup-uart12-default-state {
mux { qup_uart12_tx: tx-pins {
pins = "gpio58", "gpio59"; pins = "gpio51";
function = "qua_mi2s"; function = "qup0";
}; };
config { qup_uart12_rx: rx-pins {
pins = "gpio58", "gpio59"; pins = "gpio52";
drive-strength = <8>; function = "qup0";
bias-disable;
output-high;
}; };
}; };
quat_mi2s_sd0_sleep: quat_mi2s_sd0_sleep { qup_uart13_default: qup-uart13-default-state {
mux { qup_uart13_tx: tx-pins {
pins = "gpio60"; pins = "gpio107";
function = "gpio"; function = "qup13";
}; };
config { qup_uart13_rx: rx-pins {
pins = "gpio60"; pins = "gpio108";
drive-strength = <2>; function = "qup13";
bias-pull-down;
input-enable;
}; };
}; };
quat_mi2s_sd0_active: quat_mi2s_sd0_active { qup_uart14_default: qup-uart14-default-state {
mux { qup_uart14_tx: tx-pins {
pins = "gpio60"; pins = "gpio31";
function = "qua_mi2s"; function = "qup14";
}; };
config { qup_uart14_rx: rx-pins {
pins = "gpio60"; pins = "gpio32";
drive-strength = <8>; function = "qup14";
bias-disable;
}; };
}; };
quat_mi2s_sd1_sleep: quat_mi2s_sd1_sleep { qup_uart15_default: qup-uart15-default-state {
mux { qup_uart15_tx: tx-pins {
pins = "gpio61"; pins = "gpio83";
function = "gpio"; function = "qup15";
}; };
config { qup_uart15_rx: rx-pins {
pins = "gpio61"; pins = "gpio84";
drive-strength = <2>; function = "qup15";
bias-pull-down;
input-enable;
}; };
}; };
quat_mi2s_sd1_active: quat_mi2s_sd1_active { quat_mi2s_sleep: quat-mi2s-sleep-state {
mux { pins = "gpio58", "gpio59";
pins = "gpio61"; function = "gpio";
function = "qua_mi2s"; drive-strength = <2>;
}; bias-pull-down;
input-enable;
};
config { quat_mi2s_active: quat-mi2s-active-state {
pins = "gpio61"; pins = "gpio58", "gpio59";
drive-strength = <8>; function = "qua_mi2s";
bias-disable; drive-strength = <8>;
}; bias-disable;
output-high;
}; };
quat_mi2s_sd2_sleep: quat_mi2s_sd2_sleep { quat_mi2s_sd0_sleep: quat-mi2s-sd0-sleep-state {
mux { pins = "gpio60";
pins = "gpio62"; function = "gpio";
function = "gpio"; drive-strength = <2>;
}; bias-pull-down;
input-enable;
};
config { quat_mi2s_sd0_active: quat-mi2s-sd0-active-state {
pins = "gpio62"; pins = "gpio60";
drive-strength = <2>; function = "qua_mi2s";
bias-pull-down; drive-strength = <8>;
input-enable; bias-disable;
};
}; };
quat_mi2s_sd2_active: quat_mi2s_sd2_active { quat_mi2s_sd1_sleep: quat-mi2s-sd1-sleep-state {
mux { pins = "gpio61";
pins = "gpio62"; function = "gpio";
function = "qua_mi2s"; drive-strength = <2>;
}; bias-pull-down;
input-enable;
};
config { quat_mi2s_sd1_active: quat-mi2s-sd1-active-state {
pins = "gpio62"; pins = "gpio61";
drive-strength = <8>; function = "qua_mi2s";
bias-disable; drive-strength = <8>;
}; bias-disable;
}; };
quat_mi2s_sd3_sleep: quat_mi2s_sd3_sleep { quat_mi2s_sd2_sleep: quat-mi2s-sd2-sleep-state {
mux { pins = "gpio62";
pins = "gpio63"; function = "gpio";
function = "gpio"; drive-strength = <2>;
}; bias-pull-down;
input-enable;
};
config { quat_mi2s_sd2_active: quat-mi2s-sd2-active-state {
pins = "gpio63"; pins = "gpio62";
drive-strength = <2>; function = "qua_mi2s";
bias-pull-down; drive-strength = <8>;
input-enable; bias-disable;
};
}; };
quat_mi2s_sd3_active: quat_mi2s_sd3_active { quat_mi2s_sd3_sleep: quat-mi2s-sd3-sleep-state {
mux { pins = "gpio63";
pins = "gpio63"; function = "gpio";
function = "qua_mi2s"; drive-strength = <2>;
}; bias-pull-down;
input-enable;
};
config { quat_mi2s_sd3_active: quat-mi2s-sd3-active-state {
pins = "gpio63"; pins = "gpio63";
drive-strength = <8>; function = "qua_mi2s";
bias-disable; drive-strength = <8>;
}; bias-disable;
}; };
}; };
......
arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
View file @ d05e3428
...@@ -479,41 +479,13 @@ &mss_pil { ...@@ -479,41 +479,13 @@ &mss_pil {
}; };
&qup_i2c10_default { &qup_i2c10_default {
pinconf { drive-strength = <2>;
pins = "gpio55", "gpio56"; bias-disable;
drive-strength = <2>;
bias-disable;
};
}; };
&qup_i2c12_default { &qup_i2c12_default {
pinmux { drive-strength = <2>;
drive-strength = <2>; bias-disable;
bias-disable;
};
};
&qup_uart6_default {
pinmux {
pins = "gpio45", "gpio46", "gpio47", "gpio48";
function = "qup6";
};
cts {
pins = "gpio45";
bias-pull-down;
};
rts-tx {
pins = "gpio46", "gpio47";
drive-strength = <2>;
bias-disable;
};
rx {
pins = "gpio48";
bias-pull-up;
};
}; };
&qupv3_id_0 { &qupv3_id_0 {
...@@ -621,13 +593,14 @@ codec { ...@@ -621,13 +593,14 @@ codec {
&tlmm { &tlmm {
gpio-reserved-ranges = <0 4>, <81 4>; gpio-reserved-ranges = <0 4>, <81 4>;
sn65dsi86_pin_active: sn65dsi86-enable { sn65dsi86_pin_active: sn65dsi86-enable-state {
pins = "gpio96"; pins = "gpio96";
function = "gpio";
drive-strength = <2>; drive-strength = <2>;
bias-disable; bias-disable;
}; };
i2c3_hid_active: i2c2-hid-active { i2c3_hid_active: i2c2-hid-active-state {
pins = "gpio37"; pins = "gpio37";
function = "gpio"; function = "gpio";
...@@ -636,7 +609,7 @@ i2c3_hid_active: i2c2-hid-active { ...@@ -636,7 +609,7 @@ i2c3_hid_active: i2c2-hid-active {
drive-strength = <2>; drive-strength = <2>;
}; };
i2c5_hid_active: i2c5-hid-active { i2c5_hid_active: i2c5-hid-active-state {
pins = "gpio125"; pins = "gpio125";
function = "gpio"; function = "gpio";
...@@ -645,7 +618,7 @@ i2c5_hid_active: i2c5-hid-active { ...@@ -645,7 +618,7 @@ i2c5_hid_active: i2c5-hid-active {
drive-strength = <2>; drive-strength = <2>;
}; };
i2c11_hid_active: i2c11-hid-active { i2c11_hid_active: i2c11-hid-active-state {
pins = "gpio92"; pins = "gpio92";
function = "gpio"; function = "gpio";
...@@ -654,7 +627,7 @@ i2c11_hid_active: i2c11-hid-active { ...@@ -654,7 +627,7 @@ i2c11_hid_active: i2c11-hid-active {
drive-strength = <2>; drive-strength = <2>;
}; };
wcd_intr_default: wcd_intr_default { wcd_intr_default: wcd-intr-default-state {
pins = "gpio54"; pins = "gpio54";
function = "gpio"; function = "gpio";
...@@ -663,7 +636,7 @@ wcd_intr_default: wcd_intr_default { ...@@ -663,7 +636,7 @@ wcd_intr_default: wcd_intr_default {
drive-strength = <2>; drive-strength = <2>;
}; };
lid_pin_active: lid-pin { lid_pin_active: lid-pin-state {
pins = "gpio124"; pins = "gpio124";
function = "gpio"; function = "gpio";
...@@ -671,7 +644,7 @@ lid_pin_active: lid-pin { ...@@ -671,7 +644,7 @@ lid_pin_active: lid-pin {
bias-disable; bias-disable;
}; };
mode_pin_active: mode-pin { mode_pin_active: mode-pin-state {
pins = "gpio95"; pins = "gpio95";
function = "gpio"; function = "gpio";
...@@ -681,6 +654,8 @@ mode_pin_active: mode-pin { ...@@ -681,6 +654,8 @@ mode_pin_active: mode-pin {
}; };
&uart6 { &uart6 {
pinctrl-names = "default";
pinctrl-0 = <&qup_uart6_4pin>;
status = "okay"; status = "okay";
bluetooth { bluetooth {
......
arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts
View file @ d05e3428
...@@ -399,49 +399,18 @@ &mss_pil { ...@@ -399,49 +399,18 @@ &mss_pil {
}; };
&qup_i2c10_default { &qup_i2c10_default {
pinconf { drive-strength = <2>;
pins = "gpio55", "gpio56"; bias-disable;
drive-strength = <2>;
bias-disable;
};
}; };
&qup_i2c11_default { &qup_i2c11_default {
pinconf { drive-strength = <2>;
pins = "gpio31", "gpio32"; bias-disable;
drive-strength = <2>;
bias-disable;
};
}; };
&qup_i2c12_default { &qup_i2c12_default {
pinmux { drive-strength = <2>;
drive-strength = <2>; bias-disable;
bias-disable;
};
};
&qup_uart6_default {
pinmux {
pins = "gpio45", "gpio46", "gpio47", "gpio48";
function = "qup6";
};
cts {
pins = "gpio45";
bias-pull-down;
};
rts-tx {
pins = "gpio46", "gpio47";
drive-strength = <2>;
bias-disable;
};
rx {
pins = "gpio48";
bias-pull-up;
};
}; };
&qupv3_id_0 { &qupv3_id_0 {
...@@ -549,59 +518,41 @@ codec { ...@@ -549,59 +518,41 @@ codec {
&tlmm { &tlmm {
gpio-reserved-ranges = <0 6>, <85 4>; gpio-reserved-ranges = <0 6>, <85 4>;
pen_irq_l: pen-irq-l { pen_irq_l: pen-irq-l-state {
pinmux { pins = "gpio119";
pins = "gpio119"; function = "gpio";
function = "gpio"; bias-disable;
};
pinconf {
pins = "gpio119";
bias-disable;
};
}; };
pen_pdct_l: pen-pdct-l { pen_pdct_l: pen-pdct-l-state {
pinmux { pins = "gpio124";
pins = "gpio124"; function = "gpio";
function = "gpio"; bias-disable;
}; drive-strength = <2>;
output-high;
pinconf {
pins = "gpio124";
bias-disable;
drive-strength = <2>;
output-high;
};
}; };
pen_rst_l: pen-rst-l { pen_rst_l: pen-rst-l-state {
pinmux { pins = "gpio21";
pins = "gpio21"; function = "gpio";
function = "gpio"; bias-disable;
}; drive-strength = <2>;
pinconf { /*
pins = "gpio21"; * The pen driver doesn't currently support
bias-disable; * driving this reset line. By specifying
drive-strength = <2>; * output-high here we're relying on the fact
* that this pin has a default pulldown at boot
/* * (which makes sure the pen was in reset if it
* The pen driver doesn't currently support * was powered) and then we set it high here to
* driving this reset line. By specifying * take it out of reset. Better would be if the
* output-high here we're relying on the fact * pen driver could control this and we could
* that this pin has a default pulldown at boot * remove "output-high" here.
* (which makes sure the pen was in reset if it */
* was powered) and then we set it high here to output-high;
* take it out of reset. Better would be if the
* pen driver could control this and we could
* remove "output-high" here.
*/
output-high;
};
}; };
wcd_intr_default: wcd_intr_default { wcd_intr_default: wcd-intr-default-state {
pins = "gpio54"; pins = "gpio54";
function = "gpio"; function = "gpio";
...@@ -612,6 +563,8 @@ wcd_intr_default: wcd_intr_default { ...@@ -612,6 +563,8 @@ wcd_intr_default: wcd_intr_default {
}; };
&uart6 { &uart6 {
pinctrl-names = "default";
pinctrl-0 = <&qup_uart6_4pin>;
status = "okay"; status = "okay";
bluetooth { bluetooth {
......
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