From: Greg Kroah-Hartman Date: Mon, 8 May 2023 08:42:47 +0000 (+0200) Subject: drop some more unneded dts churn from 6.1 X-Git-Tag: v5.15.111~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0923e7f2f270afd6641b3be5d681fd05949a4554;p=thirdparty%2Fkernel%2Fstable-queue.git drop some more unneded dts churn from 6.1 --- diff --git a/queue-6.1/arm64-dts-qcom-correct-white-space-before.patch b/queue-6.1/arm64-dts-qcom-correct-white-space-before.patch deleted file mode 100644 index e48916146fd..00000000000 --- a/queue-6.1/arm64-dts-qcom-correct-white-space-before.patch +++ /dev/null @@ -1,298 +0,0 @@ -From 9a36e5b6be011fff1a64484beca0a87a290e08be Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 19 Sep 2022 18:33:33 +0200 -Subject: arm64: dts: qcom: correct white-space before { - -From: Krzysztof Kozlowski - -[ Upstream commit c24c9d53e001a38ac1637674304987ab061a38eb ] - -Add missing space or remove redundant one before opening {. - -Signed-off-by: Krzysztof Kozlowski -Reviewed-by: Konrad Dybcio -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220919163333.129989-1-krzysztof.kozlowski@linaro.org -Stable-dep-of: d84f8f2687bd ("arm64: dts: sc7180: Rename qspi data12 as data23") -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- - arch/arm64/boot/dts/qcom/msm8998.dtsi | 8 ++++---- - arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 4 ++-- - arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 2 +- - arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 2 +- - arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 8 ++++---- - arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 6 +++--- - arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8 ++++---- - arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 4 ++-- - arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 6 +++--- - 10 files changed, 25 insertions(+), 25 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi -index 67b87915d8224..0755a6d095bb7 100644 ---- a/arch/arm64/boot/dts/qcom/msm8996.dtsi -+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi -@@ -1524,7 +1524,7 @@ - bias-disable; - }; - -- wcd_intr_default: wcd-intr-default{ -+ wcd_intr_default: wcd-intr-default { - pins = "gpio54"; - function = "gpio"; - drive-strength = <2>; -diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi -index 29c60bb56ed5f..42ce5c7ed6743 100644 ---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi -+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi -@@ -1903,7 +1903,7 @@ - - cpu = <&CPU4>; - -- port{ -+ port { - etm4_out: endpoint { - remote-endpoint = <&apss_funnel_in4>; - }; -@@ -1920,7 +1920,7 @@ - - cpu = <&CPU5>; - -- port{ -+ port { - etm5_out: endpoint { - remote-endpoint = <&apss_funnel_in5>; - }; -@@ -1937,7 +1937,7 @@ - - cpu = <&CPU6>; - -- port{ -+ port { - etm6_out: endpoint { - remote-endpoint = <&apss_funnel_in6>; - }; -@@ -1954,7 +1954,7 @@ - - cpu = <&CPU7>; - -- port{ -+ port { - etm7_out: endpoint { - remote-endpoint = <&apss_funnel_in7>; - }; -diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts -index bf8077a1cf9a7..3d1bd8e3fc73c 100644 ---- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts -+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts -@@ -1007,7 +1007,7 @@ - }; - - &swr0 { -- left_spkr: wsa8810-left{ -+ left_spkr: wsa8810-left { - compatible = "sdw10217211000"; - reg = <0 3>; - powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_HIGH>; -@@ -1016,7 +1016,7 @@ - #sound-dai-cells = <0>; - }; - -- right_spkr: wsa8810-right{ -+ right_spkr: wsa8810-right { - compatible = "sdw10217211000"; - reg = <0 4>; - powerdown-gpios = <&tlmm 130 GPIO_ACTIVE_HIGH>; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi -index 7ee407f7b6bb5..1ce73187a562a 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi -@@ -181,7 +181,7 @@ ap_ts_pen_1v8: &i2c4 { - /* PINCTRL - modifications to sc7180-trogdor.dtsi */ - - &en_pp3300_dx_edp { -- pinmux { -+ pinmux { - pins = "gpio67"; - }; - -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi -index bfab67f4a7c9c..8264b8d5e7784 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi -@@ -189,7 +189,7 @@ ap_ts_pen_1v8: &i2c4 { - }; - }; - --&sec_mi2s_active{ -+&sec_mi2s_active { - pinmux { - pins = "gpio49", "gpio50", "gpio51", "gpio52"; - function = "mi2s_1"; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi -index eae22e6e97c15..1a1c346d619c3 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi -@@ -1238,7 +1238,7 @@ ap_spi_fp: &spi10 { - }; - - ap_suspend_l_neuter: ap-suspend-l-neuter { -- pinmux { -+ pinmux { - pins = "gpio27"; - function = "gpio"; - }; -@@ -1383,7 +1383,7 @@ ap_spi_fp: &spi10 { - }; - - pen_rst_odl: pen-rst-odl { -- pinmux { -+ pinmux { - pins = "gpio18"; - function = "gpio"; - }; -@@ -1507,7 +1507,7 @@ ap_spi_fp: &spi10 { - }; - - ts_int_l: ts-int-l { -- pinmux { -+ pinmux { - pins = "gpio9"; - function = "gpio"; - }; -@@ -1519,7 +1519,7 @@ ap_spi_fp: &spi10 { - }; - - ts_reset_l: ts-reset-l { -- pinmux { -+ pinmux { - pins = "gpio8"; - function = "gpio"; - }; -diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi -index b5f11fbcc3004..5eafb556cc0cd 100644 ---- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi -+++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi -@@ -1341,7 +1341,7 @@ ap_ts_i2c: &i2c14 { - }; - - pen_rst_l: pen-rst-l { -- pinmux { -+ pinmux { - pins = "gpio23"; - function = "gpio"; - }; -@@ -1408,7 +1408,7 @@ ap_ts_i2c: &i2c14 { - }; - - ts_int_l: ts-int-l { -- pinmux { -+ pinmux { - pins = "gpio125"; - function = "gpio"; - }; -@@ -1420,7 +1420,7 @@ ap_ts_i2c: &i2c14 { - }; - - ts_reset_l: ts-reset-l { -- pinmux { -+ pinmux { - pins = "gpio118"; - function = "gpio"; - }; -diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts -index c289bf0903b45..cb239e6f6ce5a 100644 ---- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts -+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts -@@ -1076,7 +1076,7 @@ - status = "okay"; - }; - --&wcd9340{ -+&wcd9340 { - pinctrl-0 = <&wcd_intr_default>; - pinctrl-names = "default"; - clock-names = "extclk"; -@@ -1089,7 +1089,7 @@ - vdd-io-supply = <&vreg_s4a_1p8>; - - swm: swm@c85 { -- left_spkr: wsa8810-left{ -+ left_spkr: wsa8810-left { - compatible = "sdw10217201000"; - reg = <0 1>; - powerdown-gpios = <&wcdgpio 1 GPIO_ACTIVE_HIGH>; -@@ -1098,7 +1098,7 @@ - #sound-dai-cells = <0>; - }; - -- right_spkr: wsa8810-right{ -+ right_spkr: wsa8810-right { - compatible = "sdw10217201000"; - powerdown-gpios = <&wcdgpio 1 GPIO_ACTIVE_HIGH>; - reg = <0 2>; -@@ -1129,7 +1129,7 @@ - }; - }; - --&qup_uart3_default{ -+&qup_uart3_default { - pinmux { - pins = "gpio41", "gpio42", "gpio43", "gpio44"; - function = "qup3"; -diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts -index 74f43da51fa50..0c375ec795b8a 100644 ---- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts -+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts -@@ -785,7 +785,7 @@ - qcom,mbhc-headphone-vthreshold-microvolt = <50000>; - - swm: swm@c85 { -- left_spkr: wsa8810-left{ -+ left_spkr: wsa8810-left { - compatible = "sdw10217211000"; - reg = <0 3>; - powerdown-gpios = <&wcdgpio 1 GPIO_ACTIVE_HIGH>; -@@ -794,7 +794,7 @@ - #sound-dai-cells = <0>; - }; - -- right_spkr: wsa8810-right{ -+ right_spkr: wsa8810-right { - compatible = "sdw10217211000"; - powerdown-gpios = <&wcdgpio 2 GPIO_ACTIVE_HIGH>; - reg = <0 4>; -diff --git a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts -index d028a7eb364a6..dfa4857d705c8 100644 ---- a/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts -+++ b/arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts -@@ -576,7 +576,7 @@ - }; - - pen_rst_l: pen-rst-l { -- pinmux { -+ pinmux { - pins = "gpio21"; - function = "gpio"; - }; -@@ -717,7 +717,7 @@ - qcom,mbhc-headphone-vthreshold-microvolt = <50000>; - - swm: swm@c85 { -- left_spkr: wsa8810-left{ -+ left_spkr: wsa8810-left { - compatible = "sdw10217211000"; - reg = <0 3>; - powerdown-gpios = <&wcdgpio 1 GPIO_ACTIVE_HIGH>; -@@ -726,7 +726,7 @@ - #sound-dai-cells = <0>; - }; - -- right_spkr: wsa8810-right{ -+ right_spkr: wsa8810-right { - compatible = "sdw10217211000"; - powerdown-gpios = <&wcdgpio 2 GPIO_ACTIVE_HIGH>; - reg = <0 4>; --- -2.39.2 - diff --git a/queue-6.1/arm64-dts-qcom-sc7180-align-tlmm-pin-configuration-w.patch b/queue-6.1/arm64-dts-qcom-sc7180-align-tlmm-pin-configuration-w.patch deleted file mode 100644 index 0556a269c22..00000000000 --- a/queue-6.1/arm64-dts-qcom-sc7180-align-tlmm-pin-configuration-w.patch +++ /dev/null @@ -1,2806 +0,0 @@ -From c4d1a384ceddd72faa8a3ad234b4c96e76d03504 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 20 Oct 2022 18:51:35 -0400 -Subject: arm64: dts: qcom: sc7180: align TLMM pin configuration with DT schema - -From: Krzysztof Kozlowski - -[ Upstream commit 2f0300a6946702ff48f6584e0146bbe62c32abac ] - -DT schema expects TLMM pin configuration nodes to be named with -'-state' suffix and their optional children with '-pins' suffix. - -Merge subnodes named 'pinconf' and 'pinmux' into one entry, add function -where missing (required by bindings for GPIOs) and reorganize overriding -pins by boards. - -Split the SPI and UART configuration into separate nodes -1. SPI (MOSI, MISO, SCLK), SPI chip-select, SPI chip-select via GPIO, -2. UART per each pin: TX, RX and optional CTS/RTS. - -This allows each board to customize them easily without adding any new -nodes. - -Signed-off-by: Krzysztof Kozlowski -Reviewed-by: Douglas Anderson -Tested-by: Douglas Anderson -Reviewed-by: Stephen Boyd -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20221020225135.31750-4-krzysztof.kozlowski@linaro.org -Stable-dep-of: d84f8f2687bd ("arm64: dts: sc7180: Rename qspi data12 as data23") -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sc7180-idp.dts | 236 +++---- - .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 36 +- - .../dts/qcom/sc7180-trogdor-homestar.dtsi | 47 +- - .../dts/qcom/sc7180-trogdor-kingoftown-r0.dts | 16 +- - .../dts/qcom/sc7180-trogdor-kingoftown.dtsi | 8 +- - .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 16 +- - .../dts/qcom/sc7180-trogdor-mrbland-rev0.dtsi | 25 +- - .../boot/dts/qcom/sc7180-trogdor-mrbland.dtsi | 72 +- - .../qcom/sc7180-trogdor-parade-ps8640.dtsi | 32 +- - .../boot/dts/qcom/sc7180-trogdor-pazquel.dtsi | 8 +- - .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 14 +- - .../qcom/sc7180-trogdor-quackingstick.dtsi | 56 +- - .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 8 +- - .../dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 16 +- - .../qcom/sc7180-trogdor-wormdingler-rev0.dtsi | 25 +- - .../dts/qcom/sc7180-trogdor-wormdingler.dtsi | 72 +- - arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 629 +++++++----------- - arch/arm64/boot/dts/qcom/sc7180.dtsi | 597 +++++++++-------- - 18 files changed, 776 insertions(+), 1137 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts -index 9dee131b1e245..70fd9ff8dfa21 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts -+++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts -@@ -481,287 +481,261 @@ - }; - - &qspi_clk { -- pinconf { -- pins = "gpio63"; -- bias-disable; -- }; -+ bias-disable; - }; - - &qspi_cs0 { -- pinconf { -- pins = "gpio68"; -- bias-disable; -- }; -+ bias-disable; - }; - - &qspi_data01 { -- pinconf { -- pins = "gpio64", "gpio65"; -- -- /* High-Z when no transfers; nice to park the lines */ -- bias-pull-up; -- }; -+ /* High-Z when no transfers; nice to park the lines */ -+ bias-pull-up; - }; - - &qup_i2c2_default { -- pinconf { -- pins = "gpio15", "gpio16"; -- drive-strength = <2>; -+ drive-strength = <2>; - -- /* Has external pullup */ -- bias-disable; -- }; -+ /* Has external pullup */ -+ bias-disable; - }; - - &qup_i2c4_default { -- pinconf { -- pins = "gpio115", "gpio116"; -- drive-strength = <2>; -+ drive-strength = <2>; - -- /* Has external pullup */ -- bias-disable; -- }; -+ /* Has external pullup */ -+ bias-disable; - }; - - &qup_i2c7_default { -- pinconf { -- pins = "gpio6", "gpio7"; -- drive-strength = <2>; -+ drive-strength = <2>; - -- /* Has external pullup */ -- bias-disable; -- }; -+ /* Has external pullup */ -+ bias-disable; - }; - - &qup_i2c9_default { -- pinconf { -- pins = "gpio46", "gpio47"; -- drive-strength = <2>; -+ drive-strength = <2>; - -- /* Has external pullup */ -- bias-disable; -- }; -+ /* Has external pullup */ -+ bias-disable; - }; - --&qup_uart3_default { -- pinconf-cts { -- /* -- * Configure a pull-down on CTS to match the pull of -- * the Bluetooth module. -- */ -- pins = "gpio38"; -- bias-pull-down; -- }; -+&qup_uart3_cts { -+ /* -+ * Configure a pull-down on CTS to match the pull of -+ * the Bluetooth module. -+ */ -+ bias-pull-down; -+}; - -- pinconf-rts { -- /* We'll drive RTS, so no pull */ -- pins = "gpio39"; -- drive-strength = <2>; -- bias-disable; -- }; -+&qup_uart3_rts { -+ /* We'll drive RTS, so no pull */ -+ drive-strength = <2>; -+ bias-disable; -+}; - -- pinconf-tx { -- /* We'll drive TX, so no pull */ -- pins = "gpio40"; -- drive-strength = <2>; -- bias-disable; -- }; -+&qup_uart3_tx { -+ /* We'll drive TX, so no pull */ -+ drive-strength = <2>; -+ bias-disable; -+}; - -- pinconf-rx { -- /* -- * Configure a pull-up on RX. This is needed to avoid -- * garbage data when the TX pin of the Bluetooth module is -- * in tri-state (module powered off or not driving the -- * signal yet). -- */ -- pins = "gpio41"; -- bias-pull-up; -- }; -+&qup_uart3_rx { -+ /* -+ * Configure a pull-up on RX. This is needed to avoid -+ * garbage data when the TX pin of the Bluetooth module is -+ * in tri-state (module powered off or not driving the -+ * signal yet). -+ */ -+ bias-pull-up; - }; - --&qup_uart8_default { -- pinconf-tx { -- pins = "gpio44"; -- drive-strength = <2>; -- bias-disable; -- }; -+&qup_uart8_tx { -+ drive-strength = <2>; -+ bias-disable; -+}; - -- pinconf-rx { -- pins = "gpio45"; -- drive-strength = <2>; -- bias-pull-up; -- }; -+&qup_uart8_rx { -+ drive-strength = <2>; -+ bias-pull-up; - }; - --&qup_spi0_default { -- pinconf { -- pins = "gpio34", "gpio35", "gpio36", "gpio37"; -- drive-strength = <2>; -- bias-disable; -- }; -+&qup_spi0_spi { -+ drive-strength = <2>; -+ bias-disable; - }; - --&qup_spi6_default { -- pinconf { -- pins = "gpio59", "gpio60", "gpio61", "gpio62"; -- drive-strength = <2>; -- bias-disable; -- }; -+&qup_spi0_cs { -+ drive-strength = <2>; -+ bias-disable; - }; - --&qup_spi10_default { -- pinconf { -- pins = "gpio86", "gpio87", "gpio88", "gpio89"; -- drive-strength = <2>; -- bias-disable; -- }; -+&qup_spi6_spi { -+ drive-strength = <2>; -+ bias-disable; - }; - --&tlmm { -- qup_uart3_sleep: qup-uart3-sleep { -- pinmux { -- pins = "gpio38", "gpio39", -- "gpio40", "gpio41"; -- function = "gpio"; -- }; -+&qup_spi6_cs { -+ drive-strength = <2>; -+ bias-disable; -+}; -+ -+&qup_spi10_spi { -+ drive-strength = <2>; -+ bias-disable; -+}; -+ -+&qup_spi10_cs { -+ drive-strength = <2>; -+ bias-disable; -+}; - -- pinconf-cts { -+&tlmm { -+ qup_uart3_sleep: qup-uart3-sleep-state { -+ cts-pins { - /* - * Configure a pull-down on CTS to match the pull of - * the Bluetooth module. - */ - pins = "gpio38"; -+ function = "gpio"; - bias-pull-down; - }; - -- pinconf-rts { -+ rts-pins { - /* - * Configure pull-down on RTS. As RTS is active low - * signal, pull it low to indicate the BT SoC that it - * can wakeup the system anytime from suspend state by - * pulling RX low (by sending wakeup bytes). - */ -- pins = "gpio39"; -- bias-pull-down; -+ pins = "gpio39"; -+ function = "gpio"; -+ bias-pull-down; - }; - -- pinconf-tx { -+ tx-pins { - /* - * Configure pull-up on TX when it isn't actively driven - * to prevent BT SoC from receiving garbage during sleep. - */ - pins = "gpio40"; -+ function = "gpio"; - bias-pull-up; - }; - -- pinconf-rx { -+ rx-pins { - /* - * Configure a pull-up on RX. This is needed to avoid - * garbage data when the TX pin of the Bluetooth module - * is floating which may cause spurious wakeups. - */ - pins = "gpio41"; -+ function = "gpio"; - bias-pull-up; - }; - }; - -- sdc1_on: sdc1-on { -- pinconf-clk { -+ sdc1_on: sdc1-on-state { -+ clk-pins { - pins = "sdc1_clk"; - bias-disable; - drive-strength = <16>; - }; - -- pinconf-cmd { -+ cmd-pins { - pins = "sdc1_cmd"; - bias-pull-up; - drive-strength = <10>; - }; - -- pinconf-data { -+ data-pins { - pins = "sdc1_data"; - bias-pull-up; - drive-strength = <10>; - }; - -- pinconf-rclk { -+ rclk-pins { - pins = "sdc1_rclk"; - bias-pull-down; - }; - }; - -- sdc1_off: sdc1-off { -- pinconf-clk { -+ sdc1_off: sdc1-off-state { -+ clk-pins { - pins = "sdc1_clk"; - bias-disable; - drive-strength = <2>; - }; - -- pinconf-cmd { -+ cmd-pins { - pins = "sdc1_cmd"; - bias-pull-up; - drive-strength = <2>; - }; - -- pinconf-data { -+ data-pins { - pins = "sdc1_data"; - bias-pull-up; - drive-strength = <2>; - }; - -- pinconf-rclk { -+ rclk-pins { - pins = "sdc1_rclk"; - bias-pull-down; - }; - }; - -- sdc2_on: sdc2-on { -- pinconf-clk { -+ sdc2_on: sdc2-on-state { -+ clk-pins { - pins = "sdc2_clk"; - bias-disable; - drive-strength = <16>; - }; - -- pinconf-cmd { -+ cmd-pins { - pins = "sdc2_cmd"; - bias-pull-up; - drive-strength = <10>; - }; - -- pinconf-data { -+ data-pins { - pins = "sdc2_data"; - bias-pull-up; - drive-strength = <10>; - }; - -- pinconf-sd-cd { -+ sd-cd-pins { - pins = "gpio69"; -+ function = "gpio"; - bias-pull-up; - drive-strength = <2>; - }; - }; - -- sdc2_off: sdc2-off { -- pinconf-clk { -+ sdc2_off: sdc2-off-state { -+ clk-pins { - pins = "sdc2_clk"; - bias-disable; - drive-strength = <2>; - }; - -- pinconf-cmd { -+ cmd-pins { - pins = "sdc2_cmd"; - bias-pull-up; - drive-strength = <2>; - }; - -- pinconf-data { -+ data-pins { - pins = "sdc2_data"; - bias-pull-up; - drive-strength = <2>; - }; - -- pinconf-sd-cd { -+ sd-cd-pins { - pins = "gpio69"; -+ function = "gpio"; - bias-pull-up; - drive-strength = <2>; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi -index 1ce73187a562a..8b8ea8af165dc 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi -@@ -181,23 +181,15 @@ ap_ts_pen_1v8: &i2c4 { - /* PINCTRL - modifications to sc7180-trogdor.dtsi */ - - &en_pp3300_dx_edp { -- pinmux { -- pins = "gpio67"; -- }; -- -- pinconf { -- pins = "gpio67"; -- }; -+ pins = "gpio67"; - }; - - &ts_reset_l { -- pinconf { -- /* -- * We want reset state by default and it will be up to the -- * driver to disable this when it's ready. -- */ -- output-low; -- }; -+ /* -+ * We want reset state by default and it will be up to the -+ * driver to disable this when it's ready. -+ */ -+ output-low; - }; - - /* PINCTRL - board-specific pinctrl */ -@@ -327,16 +319,10 @@ ap_ts_pen_1v8: &i2c4 { - "DP_HOT_PLUG_DET", - "EC_IN_RW_ODL"; - -- dmic_clk_en: dmic_clk_en { -- pinmux { -- pins = "gpio83"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio83"; -- drive-strength = <8>; -- bias-pull-up; -- }; -+ dmic_clk_en: dmic-clk-en-state { -+ pins = "gpio83"; -+ function = "gpio"; -+ drive-strength = <8>; -+ bias-pull-up; - }; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi -index 8264b8d5e7784..70e52fdb606a6 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi -@@ -180,36 +180,19 @@ ap_ts_pen_1v8: &i2c4 { - /* PINCTRL - modifications to sc7180-trogdor.dtsi */ - - &en_pp3300_dx_edp { -- pinmux { -- pins = "gpio67"; -- }; -- -- pinconf { -- pins = "gpio67"; -- }; -+ pins = "gpio67"; - }; - - &sec_mi2s_active { -- pinmux { -- pins = "gpio49", "gpio50", "gpio51", "gpio52"; -- function = "mi2s_1"; -- }; -- -- pinconf { -- pins = "gpio49", "gpio50", "gpio51", "gpio52"; -- drive-strength = <2>; -- bias-pull-down; -- }; -+ pins = "gpio49", "gpio50", "gpio51", "gpio52"; - }; - - &ts_reset_l { -- pinconf { -- /* -- * We want reset state by default and it will be up to the -- * driver to disable this when it's ready. -- */ -- output-low; -- }; -+ /* -+ * We want reset state by default and it will be up to the -+ * driver to disable this when it's ready. -+ */ -+ output-low; - }; - - /* PINCTRL - board-specific pinctrl */ -@@ -339,16 +322,10 @@ ap_ts_pen_1v8: &i2c4 { - "DP_HOT_PLUG_DET", - "EC_IN_RW_ODL"; - -- en_pp3300_touch: en-pp3300-touch { -- pinmux { -- pins = "gpio87"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio87"; -- drive-strength = <2>; -- bias-disable; -- }; -+ en_pp3300_touch: en-pp3300-touch-state { -+ pins = "gpio87"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts -index 1a62e8d435ab3..3abd6222fe469 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r0.dts -@@ -29,16 +29,10 @@ - }; - - &tlmm { -- en_fp_rails: en-fp-rails { -- pinmux { -- pins = "gpio74"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio74"; -- drive-strength = <2>; -- bias-disable; -- }; -+ en_fp_rails: en-fp-rails-state { -+ pins = "gpio74"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dtsi -index 74f0e07ea5cfe..4156ad6dbd968 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dtsi -@@ -87,13 +87,7 @@ ap_ts_pen_1v8: &i2c4 { - /* PINCTRL - modifications to sc7180-trogdor.dtsi */ - - &en_pp3300_dx_edp { -- pinmux { -- pins = "gpio67"; -- }; -- -- pinconf { -- pins = "gpio67"; -- }; -+ pins = "gpio67"; - }; - - /* PINCTRL - board-specific pinctrl */ -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi -index 002663d752da3..269007d73162b 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi -@@ -75,21 +75,13 @@ ap_ts_pen_1v8: &i2c4 { - /* PINCTRL - modifications to sc7180-trogdor.dtsi */ - - &trackpad_int_1v8_odl { -- pinmux { -- pins = "gpio58"; -- }; -- -- pinconf { -- pins = "gpio58"; -- }; -+ pins = "gpio58"; - }; - - &ts_reset_l { -- pinconf { -- /* This pin is not connected on -rev0, pull up to park. */ -- /delete-property/bias-disable; -- bias-pull-up; -- }; -+ /* This pin is not connected on -rev0, pull up to park. */ -+ /delete-property/bias-disable; -+ bias-pull-up; - }; - - /* PINCTRL - board-specific pinctrl */ -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0.dtsi -index 7bc8402c018e5..f4c1f38136649 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland-rev0.dtsi -@@ -24,30 +24,13 @@ - - /* PINCTRL - modifications to sc7180-trogdor-mrbland.dtsi */ - &avdd_lcd_en { -- pinmux { -- pins = "gpio80"; -- }; -- -- pinconf { -- pins = "gpio80"; -- }; -+ pins = "gpio80"; - }; - - &mipi_1800_en { -- pinmux { -- pins = "gpio81"; -- }; -- -- pinconf { -- pins = "gpio81"; -- }; -+ pins = "gpio81"; - }; --&vdd_reset_1800 { -- pinmux { -- pins = "gpio76"; -- }; - -- pinconf { -- pins = "gpio76"; -- }; -+&vdd_reset_1800 { -+ pins = "gpio76"; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi -index 97cba7f8064fd..5e563655baec5 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-mrbland.dtsi -@@ -160,13 +160,7 @@ pp3300_disp_on: &pp3300_dx_edp { - */ - - tp_en: &en_pp3300_dx_edp { -- pinmux { -- pins = "gpio85"; -- }; -- -- pinconf { -- pins = "gpio85"; -- }; -+ pins = "gpio85"; - }; - - /* PINCTRL - board-specific pinctrl */ -@@ -296,55 +290,31 @@ tp_en: &en_pp3300_dx_edp { - "DP_HOT_PLUG_DET", - "EC_IN_RW_ODL"; - -- avdd_lcd_en: avdd-lcd-en { -- pinmux { -- pins = "gpio88"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio88"; -- drive-strength = <2>; -- bias-disable; -- }; -+ avdd_lcd_en: avdd-lcd-en-state { -+ pins = "gpio88"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - -- avee_lcd_en: avee-lcd-en { -- pinmux { -- pins = "gpio21"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio21"; -- drive-strength = <2>; -- bias-disable; -- }; -+ avee_lcd_en: avee-lcd-en-state { -+ pins = "gpio21"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - -- mipi_1800_en: mipi-1800-en { -- pinmux { -- pins = "gpio86"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio86"; -- drive-strength = <2>; -- bias-disable; -- }; -+ mipi_1800_en: mipi-1800-en-state { -+ pins = "gpio86"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - -- vdd_reset_1800: vdd-reset-1800 { -- pinmux { -- pins = "gpio87"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio87"; -- drive-strength = <2>; -- bias-disable; -- }; -+ vdd_reset_1800: vdd-reset-1800-state { -+ pins = "gpio87"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi -index 6a84fba178d61..070b3acb7baab 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi -@@ -83,29 +83,17 @@ edp_brij_i2c: &i2c2 { - }; - - &tlmm { -- edp_brij_ps8640_rst: edp-brij-ps8640-rst { -- pinmux { -- pins = "gpio11"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio11"; -- drive-strength = <2>; -- bias-disable; -- }; -+ edp_brij_ps8640_rst: edp-brij-ps8640-rst-state { -+ pins = "gpio11"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - -- en_pp3300_edp_brij_ps8640: en-pp3300-edp-brij-ps8640 { -- pinmux { -- pins = "gpio32"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio32"; -- drive-strength = <2>; -- bias-disable; -- }; -+ en_pp3300_edp_brij_ps8640: en-pp3300-edp-brij-ps8640-state { -+ pins = "gpio32"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi -index 2e35c69a978fb..8823edbb4d6e2 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pazquel.dtsi -@@ -84,13 +84,7 @@ - }; - - &en_pp3300_dx_edp { -- pinmux { -- pins = "gpio67"; -- }; -- -- pinconf { -- pins = "gpio67"; -- }; -+ pins = "gpio67"; - }; - - /* PINCTRL - board-specific pinctrl */ -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi -index a7582fb547eea..6c5287bd27d63 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi -@@ -312,15 +312,9 @@ ap_ts_pen_1v8: &i2c4 { - "DP_HOT_PLUG_DET", - "EC_IN_RW_ODL"; - -- dmic_sel: dmic-sel { -- pinmux { -- pins = "gpio86"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio86"; -- bias-pull-down; -- }; -+ dmic_sel: dmic-sel-state { -+ pins = "gpio86"; -+ function = "gpio"; -+ bias-pull-down; - }; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi -index 695b04fe7221f..c1367999eafba 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-quackingstick.dtsi -@@ -147,13 +147,7 @@ pp3300_disp_on: &pp3300_dx_edp { - */ - - tp_en: &en_pp3300_dx_edp { -- pinmux { -- pins = "gpio67"; -- }; -- -- pinconf { -- pins = "gpio67"; -- }; -+ pins = "gpio67"; - }; - - /* PINCTRL - board-specific pinctrl */ -@@ -283,42 +277,24 @@ tp_en: &en_pp3300_dx_edp { - "DP_HOT_PLUG_DET", - "EC_IN_RW_ODL"; - -- lcd_rst: lcd-rst { -- pinmux { -- pins = "gpio87"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio87"; -- drive-strength = <2>; -- bias-disable; -- }; -+ lcd_rst: lcd-rst-state { -+ pins = "gpio87"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - -- ppvar_lcd_en: ppvar-lcd-en { -- pinmux { -- pins = "gpio88"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio88"; -- drive-strength = <2>; -- bias-disable; -- }; -+ ppvar_lcd_en: ppvar-lcd-en-state { -+ pins = "gpio88"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - -- pp1800_disp_on: pp1800-disp-on { -- pinmux { -- pins = "gpio86"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio86"; -- drive-strength = <2>; -- bias-disable; -- }; -+ pp1800_disp_on: pp1800-disp-on-state { -+ pins = "gpio86"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts -index bc097d1b1b234..671b3691f1bb4 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts -@@ -63,13 +63,7 @@ ap_ts_pen_1v8: &i2c4 { - /* PINCTRL - modifications to sc7180-trogdor.dtsi */ - - &trackpad_int_1v8_odl { -- pinmux { -- pins = "gpio58"; -- }; -- -- pinconf { -- pins = "gpio58"; -- }; -+ pins = "gpio58"; - }; - - /* PINCTRL - board-specific pinctrl */ -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi -index f869e6a343c1b..65333709e529d 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi -@@ -76,16 +76,10 @@ edp_brij_i2c: &i2c2 { - }; - - &tlmm { -- edp_brij_irq: edp-brij-irq { -- pinmux { -- pins = "gpio11"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio11"; -- drive-strength = <2>; -- bias-pull-down; -- }; -+ edp_brij_irq: edp-brij-irq-state { -+ pins = "gpio11"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-pull-down; - }; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0.dtsi -index db29e0cba29d3..7f272c6e95f6d 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler-rev0.dtsi -@@ -24,30 +24,13 @@ - - /* PINCTRL - modifications to sc7180-trogdor-wormdingler.dtsi */ - &avdd_lcd_en { -- pinmux { -- pins = "gpio80"; -- }; -- -- pinconf { -- pins = "gpio80"; -- }; -+ pins = "gpio80"; - }; - - &mipi_1800_en { -- pinmux { -- pins = "gpio81"; -- }; -- -- pinconf { -- pins = "gpio81"; -- }; -+ pins = "gpio81"; - }; --&vdd_reset_1800 { -- pinmux { -- pins = "gpio76"; -- }; - -- pinconf { -- pins = "gpio76"; -- }; -+&vdd_reset_1800 { -+ pins = "gpio76"; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi -index 6312108e8b3ed..123989ba97e1a 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi -@@ -222,13 +222,7 @@ pp3300_disp_on: &pp3300_dx_edp { - */ - - tp_en: &en_pp3300_dx_edp { -- pinmux { -- pins = "gpio85"; -- }; -- -- pinconf { -- pins = "gpio85"; -- }; -+ pins = "gpio85"; - }; - - /* PINCTRL - board-specific pinctrl */ -@@ -358,55 +352,31 @@ tp_en: &en_pp3300_dx_edp { - "DP_HOT_PLUG_DET", - "EC_IN_RW_ODL"; - -- avdd_lcd_en: avdd-lcd-en { -- pinmux { -- pins = "gpio88"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio88"; -- drive-strength = <2>; -- bias-disable; -- }; -+ avdd_lcd_en: avdd-lcd-en-state { -+ pins = "gpio88"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - -- avee_lcd_en: avee-lcd-en { -- pinmux { -- pins = "gpio21"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio21"; -- drive-strength = <2>; -- bias-disable; -- }; -+ avee_lcd_en: avee-lcd-en-state { -+ pins = "gpio21"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - -- mipi_1800_en: mipi-1800-en { -- pinmux { -- pins = "gpio86"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio86"; -- drive-strength = <2>; -- bias-disable; -- }; -+ mipi_1800_en: mipi-1800-en-state { -+ pins = "gpio86"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - -- vdd_reset_1800: vdd-reset-1800 { -- pinmux { -- pins = "gpio87"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio87"; -- drive-strength = <2>; -- bias-disable; -- }; -+ vdd_reset_1800: vdd-reset-1800-state { -+ pins = "gpio87"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi -index 33817358ebb02..4a5ea17a15bab 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi -@@ -880,17 +880,17 @@ hp_i2c: &i2c9 { - }; - - &spi0 { -- pinctrl-0 = <&qup_spi0_cs_gpio>; -+ pinctrl-0 = <&qup_spi0_spi>, <&qup_spi0_cs_gpio>; - cs-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>; - }; - - &spi6 { -- pinctrl-0 = <&qup_spi6_cs_gpio>; -+ pinctrl-0 = <&qup_spi6_spi>, <&qup_spi6_cs_gpio>; - cs-gpios = <&tlmm 62 GPIO_ACTIVE_LOW>; - }; - - ap_spi_fp: &spi10 { -- pinctrl-0 = <&qup_spi10_cs_gpio>; -+ pinctrl-0 = <&qup_spi10_spi>, <&qup_spi10_cs_gpio>; - cs-gpios = <&tlmm 89 GPIO_ACTIVE_LOW>; - - cros_ec_fp: ec@0 { -@@ -997,175 +997,141 @@ ap_spi_fp: &spi10 { - /* PINCTRL - additions to nodes defined in sc7180.dtsi */ - - &dp_hot_plug_det { -- pinconf { -- pins = "gpio117"; -- bias-disable; -- }; -+ bias-disable; - }; - - &pri_mi2s_active { -- pinconf { -- pins = "gpio53", "gpio54", "gpio55", "gpio56"; -- drive-strength = <2>; -- bias-pull-down; -- }; -+ drive-strength = <2>; -+ bias-pull-down; - }; - - &pri_mi2s_mclk_active { -- pinconf { -- pins = "gpio57"; -- drive-strength = <2>; -- bias-pull-down; -- }; -+ drive-strength = <2>; -+ bias-pull-down; - }; - - &qspi_cs0 { -- pinconf { -- pins = "gpio68"; -- bias-disable; -- }; -+ bias-disable; - }; - - &qspi_clk { -- pinconf { -- pins = "gpio63"; -- drive-strength = <8>; -- bias-disable; -- }; -+ drive-strength = <8>; -+ bias-disable; - }; - - &qspi_data01 { -- pinconf { -- pins = "gpio64", "gpio65"; -- -- /* High-Z when no transfers; nice to park the lines */ -- bias-pull-up; -- }; -+ /* High-Z when no transfers; nice to park the lines */ -+ bias-pull-up; - }; - - &qup_i2c2_default { -- pinconf { -- pins = "gpio15", "gpio16"; -- drive-strength = <2>; -+ drive-strength = <2>; - -- /* Has external pullup */ -- bias-disable; -- }; -+ /* Has external pullup */ -+ bias-disable; - }; - - &qup_i2c4_default { -- pinconf { -- pins = "gpio115", "gpio116"; -- drive-strength = <2>; -+ drive-strength = <2>; - -- /* Has external pullup */ -- bias-disable; -- }; -+ /* Has external pullup */ -+ bias-disable; - }; - - &qup_i2c5_default { -- pinconf { -- pins = "gpio25", "gpio26"; -- drive-strength = <2>; -+ drive-strength = <2>; - -- /* Has external pullup */ -- bias-disable; -- }; -+ /* Has external pullup */ -+ bias-disable; - }; - - &qup_i2c7_default { -- pinconf { -- pins = "gpio6", "gpio7"; -- drive-strength = <2>; -+ drive-strength = <2>; - -- /* Has external pullup */ -- bias-disable; -- }; -+ /* Has external pullup */ -+ bias-disable; - }; - - &qup_i2c9_default { -- pinconf { -- pins = "gpio46", "gpio47"; -- drive-strength = <2>; -+ drive-strength = <2>; - -- /* Has external pullup */ -- bias-disable; -- }; -+ /* Has external pullup */ -+ bias-disable; -+}; -+ -+&qup_spi0_spi { -+ drive-strength = <2>; -+ bias-disable; - }; - - &qup_spi0_cs_gpio { -- pinconf { -- pins = "gpio34", "gpio35", "gpio36", "gpio37"; -- drive-strength = <2>; -- bias-disable; -- }; -+ drive-strength = <2>; -+ bias-disable; -+}; -+ -+&qup_spi6_spi { -+ drive-strength = <2>; -+ bias-disable; - }; - - &qup_spi6_cs_gpio { -- pinconf { -- pins = "gpio59", "gpio60", "gpio61", "gpio62"; -- drive-strength = <2>; -- bias-disable; -- }; -+ drive-strength = <2>; -+ bias-disable; -+}; -+ -+&qup_spi10_spi { -+ drive-strength = <2>; -+ bias-disable; - }; - - &qup_spi10_cs_gpio { -- pinconf { -- pins = "gpio86", "gpio87", "gpio88", "gpio89"; -- drive-strength = <2>; -- bias-disable; -- }; -+ drive-strength = <2>; -+ bias-disable; - }; - --&qup_uart3_default { -- pinconf-cts { -- /* -- * Configure a pull-down on CTS to match the pull of -- * the Bluetooth module. -- */ -- pins = "gpio38"; -- bias-pull-down; -- }; -+&qup_uart3_cts { -+ /* -+ * Configure a pull-down on CTS to match the pull of -+ * the Bluetooth module. -+ */ -+ bias-pull-down; -+}; - -- pinconf-rts-tx { -- /* We'll drive RTS and TX, so no pull */ -- pins = "gpio39", "gpio40"; -- drive-strength = <2>; -- bias-disable; -- }; -+&qup_uart3_rts { -+ /* We'll drive RTS, so no pull */ -+ drive-strength = <2>; -+ bias-disable; -+}; - -- pinconf-rx { -- /* -- * Configure a pull-up on RX. This is needed to avoid -- * garbage data when the TX pin of the Bluetooth module is -- * in tri-state (module powered off or not driving the -- * signal yet). -- */ -- pins = "gpio41"; -- bias-pull-up; -- }; -+&qup_uart3_tx { -+ /* We'll drive TX, so no pull */ -+ drive-strength = <2>; -+ bias-disable; - }; - --&qup_uart8_default { -- pinconf-tx { -- pins = "gpio44"; -- drive-strength = <2>; -- bias-disable; -- }; -+&qup_uart3_rx { -+ /* -+ * Configure a pull-up on RX. This is needed to avoid -+ * garbage data when the TX pin of the Bluetooth module is -+ * in tri-state (module powered off or not driving the -+ * signal yet). -+ */ -+ bias-pull-up; -+}; - -- pinconf-rx { -- pins = "gpio45"; -- drive-strength = <2>; -- bias-pull-up; -- }; -+&qup_uart8_tx { -+ drive-strength = <2>; -+ bias-disable; -+}; -+ -+&qup_uart8_rx { -+ drive-strength = <2>; -+ bias-pull-up; - }; - - &sec_mi2s_active { -- pinconf { -- pins = "gpio49", "gpio50", "gpio51"; -- drive-strength = <2>; -- bias-pull-down; -- }; -+ drive-strength = <2>; -+ bias-pull-down; - }; - - /* PINCTRL - board-specific pinctrl */ -@@ -1196,447 +1162,324 @@ ap_spi_fp: &spi10 { - pinctrl-names = "default"; - pinctrl-0 = <&bios_flash_wp_l>, <&ap_suspend_l_neuter>; - -- amp_en: amp-en { -- pinmux { -- pins = "gpio23"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio23"; -- bias-pull-down; -- }; -+ amp_en: amp-en-state { -+ pins = "gpio23"; -+ function = "gpio"; -+ bias-pull-down; - }; - -- ap_ec_int_l: ap-ec-int-l { -- pinmux { -- pins = "gpio94"; -- function = "gpio"; -- input-enable; -- }; -- -- pinconf { -- pins = "gpio94"; -- bias-pull-up; -- }; -+ ap_ec_int_l: ap-ec-int-l-state { -+ pins = "gpio94"; -+ function = "gpio"; -+ input-enable; -+ bias-pull-up; - }; - -- ap_edp_bklten: ap-edp-bklten { -- pinmux { -- pins = "gpio12"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio12"; -- drive-strength = <2>; -- bias-disable; -+ ap_edp_bklten: ap-edp-bklten-state { -+ pins = "gpio12"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - -- /* Force backlight to be disabled to match state at boot. */ -- output-low; -- }; -+ /* Force backlight to be disabled to match state at boot. */ -+ output-low; - }; - -- ap_suspend_l_neuter: ap-suspend-l-neuter { -- pinmux { -- pins = "gpio27"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio27"; -- bias-disable; -- }; -+ ap_suspend_l_neuter: ap-suspend-l-neuter-state { -+ pins = "gpio27"; -+ function = "gpio"; -+ bias-disable; - }; - -- bios_flash_wp_l: bios-flash-wp-l { -- pinmux { -- pins = "gpio66"; -- function = "gpio"; -- input-enable; -- }; -- -- pinconf { -- pins = "gpio66"; -- bias-disable; -- }; -+ bios_flash_wp_l: bios-flash-wp-l-state { -+ pins = "gpio66"; -+ function = "gpio"; -+ input-enable; -+ bias-disable; - }; - -- edp_brij_en: edp-brij-en { -- pinmux { -- pins = "gpio104"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio104"; -- drive-strength = <2>; -- bias-disable; -- }; -+ edp_brij_en: edp-brij-en-state { -+ pins = "gpio104"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - -- en_pp3300_codec: en-pp3300-codec { -- pinmux { -- pins = "gpio83"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio83"; -- drive-strength = <2>; -- bias-disable; -- }; -+ en_pp3300_codec: en-pp3300-codec-state { -+ pins = "gpio83"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - -- en_pp3300_dx_edp: en-pp3300-dx-edp { -- pinmux { -- pins = "gpio30"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio30"; -- drive-strength = <2>; -- bias-disable; -- }; -+ en_pp3300_dx_edp: en-pp3300-dx-edp-state { -+ pins = "gpio30"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - -- en_pp3300_hub: en-pp3300-hub { -- pinmux { -- pins = "gpio84"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio84"; -- drive-strength = <2>; -- bias-disable; -- }; -+ en_pp3300_hub: en-pp3300-hub-state { -+ pins = "gpio84"; -+ function = "gpio"; -+ drive-strength = <2>; -+ bias-disable; - }; - -- fp_to_ap_irq_l: fp-to-ap-irq-l { -- pinmux { -- pins = "gpio4"; -- function = "gpio"; -- input-enable; -- }; -+ fp_to_ap_irq_l: fp-to-ap-irq-l-state { -+ pins = "gpio4"; -+ function = "gpio"; -+ input-enable; - -- pinconf { -- pins = "gpio4"; -- -- /* Has external pullup */ -- bias-disable; -- }; -+ /* Has external pullup */ -+ bias-disable; - }; - -- h1_ap_int_odl: h1-ap-int-odl { -- pinmux { -- pins = "gpio42"; -- function = "gpio"; -- input-enable; -- }; -- -- pinconf { -- pins = "gpio42"; -- bias-pull-up; -- }; -+ h1_ap_int_odl: h1-ap-int-odl-state { -+ pins = "gpio42"; -+ function = "gpio"; -+ input-enable; -+ bias-pull-up; - }; - -- hp_irq: hp-irq { -- pinmux { -- pins = "gpio28"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio28"; -- bias-pull-up; -- }; -+ hp_irq: hp-irq-state { -+ pins = "gpio28"; -+ function = "gpio"; -+ bias-pull-up; - }; - -- pen_irq_l: pen-irq-l { -- pinmux { -- pins = "gpio21"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio21"; -+ pen_irq_l: pen-irq-l-state { -+ pins = "gpio21"; -+ function = "gpio"; - -- /* Has external pullup */ -- bias-disable; -- }; -+ /* Has external pullup */ -+ bias-disable; - }; - -- pen_pdct_l: pen-pdct-l { -- pinmux { -- pins = "gpio52"; -- function = "gpio"; -- }; -+ pen_pdct_l: pen-pdct-l-state-state { -+ pins = "gpio52"; -+ function = "gpio"; - -- pinconf { -- pins = "gpio52"; -- -- /* Has external pullup */ -- bias-disable; -- }; -+ /* Has external pullup */ -+ bias-disable; - }; - -- pen_rst_odl: pen-rst-odl { -- pinmux { -- pins = "gpio18"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio18"; -- bias-disable; -- drive-strength = <2>; -+ pen_rst_odl: pen-rst-odl-state { -+ pins = "gpio18"; -+ function = "gpio"; -+ bias-disable; -+ drive-strength = <2>; - -- /* -- * The pen driver doesn't currently support -- * driving this reset line. By specifying -- * 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 -- * was powered) and then we set it high here to -- * take it out of reset. Better would be if the -- * pen driver could control this and we could -- * remove "output-high" here. -- */ -- output-high; /* TODO: Remove this? */ -- }; -+ /* -+ * The pen driver doesn't currently support -+ * driving this reset line. By specifying -+ * 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 -+ * was powered) and then we set it high here to -+ * take it out of reset. Better would be if the -+ * pen driver could control this and we could -+ * remove "output-high" here. -+ */ -+ output-high; /* TODO: Remove this? */ - }; - -- p_sensor_int_l: p-sensor-int-l { -- pinmux { -- pins = "gpio24"; -- function = "gpio"; -- input-enable; -- }; -+ p_sensor_int_l: p-sensor-int-l-state { -+ pins = "gpio24"; -+ function = "gpio"; -+ input-enable; - -- pinconf { -- pins = "gpio24"; -- /* Has external pullup */ -- bias-disable; -- }; -+ /* Has external pullup */ -+ bias-disable; - }; - -- qup_uart3_sleep: qup-uart3-sleep { -- pinmux { -- pins = "gpio38", "gpio39", -- "gpio40", "gpio41"; -- function = "gpio"; -- }; -- -- pinconf-cts { -+ qup_uart3_sleep: qup-uart3-sleep-state { -+ cts-pins { - /* - * Configure a pull-down on CTS to match the pull of - * the Bluetooth module. - */ - pins = "gpio38"; -+ function = "gpio"; - bias-pull-down; - }; - -- pinconf-rts { -+ rts-pins { - /* - * Configure pull-down on RTS. As RTS is active low - * signal, pull it low to indicate the BT SoC that it - * can wakeup the system anytime from suspend state by - * pulling RX low (by sending wakeup bytes). - */ -- pins = "gpio39"; -- bias-pull-down; -+ pins = "gpio39"; -+ function = "gpio"; -+ bias-pull-down; - }; - -- pinconf-tx { -+ tx-pins { - /* - * Configure pull-up on TX when it isn't actively driven - * to prevent BT SoC from receiving garbage during sleep. - */ - pins = "gpio40"; -+ function = "gpio"; - bias-pull-up; - }; - -- pinconf-rx { -+ rx-pins { - /* - * Configure a pull-up on RX. This is needed to avoid - * garbage data when the TX pin of the Bluetooth module - * is floating which may cause spurious wakeups. - */ - pins = "gpio41"; -+ function = "gpio"; - bias-pull-up; - }; - }; - - /* Named trackpad_int_1v8_odl on earlier revision schematics */ - trackpad_int_1v8_odl: -- tp_int_odl: tp-int-odl { -- pinmux { -- pins = "gpio0"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio0"; -+ tp_int_odl: tp-int-odl-state { -+ pins = "gpio0"; -+ function = "gpio"; - -- /* Has external pullup */ -- bias-disable; -- }; -+ /* Has external pullup */ -+ bias-disable; - }; - -- ts_int_l: ts-int-l { -- pinmux { -- pins = "gpio9"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio9"; -- bias-pull-up; -- }; -+ ts_int_l: ts-int-l-state { -+ pins = "gpio9"; -+ function = "gpio"; -+ bias-pull-up; - }; - -- ts_reset_l: ts-reset-l { -- pinmux { -- pins = "gpio8"; -- function = "gpio"; -- }; -- -- pinconf { -- pins = "gpio8"; -- bias-disable; -- drive-strength = <2>; -- }; -+ ts_reset_l: ts-reset-l-state { -+ pins = "gpio8"; -+ function = "gpio"; -+ bias-disable; -+ drive-strength = <2>; - }; - -- sdc1_on: sdc1-on { -- pinconf-clk { -+ sdc1_on: sdc1-on-state { -+ clk-pins { - pins = "sdc1_clk"; - bias-disable; - drive-strength = <16>; - }; - -- pinconf-cmd { -+ cmd-pins { - pins = "sdc1_cmd"; - bias-pull-up; - drive-strength = <16>; - }; - -- pinconf-data { -+ data-pins { - pins = "sdc1_data"; - bias-pull-up; - drive-strength = <16>; - }; - -- pinconf-rclk { -+ rclk-pins { - pins = "sdc1_rclk"; - bias-pull-down; - }; - }; - -- sdc1_off: sdc1-off { -- pinconf-clk { -+ sdc1_off: sdc1-off-state { -+ clk-pins { - pins = "sdc1_clk"; - bias-disable; - drive-strength = <2>; - }; - -- pinconf-cmd { -+ cmd-pins { - pins = "sdc1_cmd"; - bias-pull-up; - drive-strength = <2>; - }; - -- pinconf-data { -+ data-pins { - pins = "sdc1_data"; - bias-pull-up; - drive-strength = <2>; - }; - -- pinconf-rclk { -+ rclk-pins { - pins = "sdc1_rclk"; - bias-pull-down; - }; - }; - -- sdc2_on: sdc2-on { -- pinconf-clk { -+ sdc2_on: sdc2-on-state { -+ clk-pins { - pins = "sdc2_clk"; - bias-disable; - drive-strength = <16>; - }; - -- pinconf-cmd { -+ cmd-pins { - pins = "sdc2_cmd"; - bias-pull-up; - drive-strength = <10>; - }; - -- pinconf-data { -+ data-pins { - pins = "sdc2_data"; - bias-pull-up; - drive-strength = <10>; - }; - -- pinconf-sd-cd { -+ sd-cd-pins { - pins = "gpio69"; -+ function = "gpio"; - bias-pull-up; - drive-strength = <2>; - }; - }; - -- sdc2_off: sdc2-off { -- pinconf-clk { -+ sdc2_off: sdc2-off-state { -+ clk-pins { - pins = "sdc2_clk"; - bias-disable; - drive-strength = <2>; - }; - -- pinconf-cmd { -+ cmd-pins { - pins = "sdc2_cmd"; - bias-pull-up; - drive-strength = <2>; - }; - -- pinconf-data { -+ data-pins { - pins = "sdc2_data"; - bias-pull-up; - drive-strength = <2>; - }; - -- pinconf-sd-cd { -+ sd-cd-pins { - pins = "gpio69"; -+ function = "gpio"; - bias-pull-up; - drive-strength = <2>; - }; - }; - -- uf_cam_en: uf-cam-en { -- pinmux { -- pins = "gpio6"; -- function = "gpio"; -- }; -+ uf_cam_en: uf-cam-en-state { -+ pins = "gpio6"; -+ function = "gpio"; -+ drive-strength = <2>; - -- pinconf { -- pins = "gpio6"; -- drive-strength = <2>; -- /* External pull down */ -- bias-disable; -- }; -+ /* External pull down */ -+ bias-disable; - }; - -- wf_cam_en: wf-cam-en { -- pinmux { -- pins = "gpio7"; -- function = "gpio"; -- }; -+ wf_cam_en: wf-cam-en-state { -+ pins = "gpio7"; -+ function = "gpio"; -+ drive-strength = <2>; - -- pinconf { -- pins = "gpio7"; -- drive-strength = <2>; -- /* External pull down */ -- bias-disable; -- }; -+ /* External pull down */ -+ bias-disable; - }; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi -index b16886f715179..199d5cdb7a4e7 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi -@@ -795,7 +795,7 @@ - clock-names = "se"; - clocks = <&gcc GCC_QUPV3_WRAP0_S0_CLK>; - pinctrl-names = "default"; -- pinctrl-0 = <&qup_spi0_default>; -+ pinctrl-0 = <&qup_spi0_spi>, <&qup_spi0_cs>; - interrupts = ; - #address-cells = <1>; - #size-cells = <0>; -@@ -849,7 +849,7 @@ - clock-names = "se"; - clocks = <&gcc GCC_QUPV3_WRAP0_S1_CLK>; - pinctrl-names = "default"; -- pinctrl-0 = <&qup_spi1_default>; -+ pinctrl-0 = <&qup_spi1_spi>, <&qup_spi1_cs>; - interrupts = ; - #address-cells = <1>; - #size-cells = <0>; -@@ -939,7 +939,7 @@ - clock-names = "se"; - clocks = <&gcc GCC_QUPV3_WRAP0_S3_CLK>; - pinctrl-names = "default"; -- pinctrl-0 = <&qup_spi3_default>; -+ pinctrl-0 = <&qup_spi3_spi>, <&qup_spi3_cs>; - interrupts = ; - #address-cells = <1>; - #size-cells = <0>; -@@ -1029,7 +1029,7 @@ - clock-names = "se"; - clocks = <&gcc GCC_QUPV3_WRAP0_S5_CLK>; - pinctrl-names = "default"; -- pinctrl-0 = <&qup_spi5_default>; -+ pinctrl-0 = <&qup_spi5_spi>, <&qup_spi5_cs>; - interrupts = ; - #address-cells = <1>; - #size-cells = <0>; -@@ -1096,7 +1096,7 @@ - clock-names = "se"; - clocks = <&gcc GCC_QUPV3_WRAP1_S0_CLK>; - pinctrl-names = "default"; -- pinctrl-0 = <&qup_spi6_default>; -+ pinctrl-0 = <&qup_spi6_spi>, <&qup_spi6_cs>; - interrupts = ; - #address-cells = <1>; - #size-cells = <0>; -@@ -1186,7 +1186,7 @@ - clock-names = "se"; - clocks = <&gcc GCC_QUPV3_WRAP1_S2_CLK>; - pinctrl-names = "default"; -- pinctrl-0 = <&qup_spi8_default>; -+ pinctrl-0 = <&qup_spi8_spi>, <&qup_spi8_cs>; - interrupts = ; - #address-cells = <1>; - #size-cells = <0>; -@@ -1276,7 +1276,7 @@ - clock-names = "se"; - clocks = <&gcc GCC_QUPV3_WRAP1_S4_CLK>; - pinctrl-names = "default"; -- pinctrl-0 = <&qup_spi10_default>; -+ pinctrl-0 = <&qup_spi10_spi>, <&qup_spi10_cs>; - interrupts = ; - #address-cells = <1>; - #size-cells = <0>; -@@ -1330,7 +1330,7 @@ - clock-names = "se"; - clocks = <&gcc GCC_QUPV3_WRAP1_S5_CLK>; - pinctrl-names = "default"; -- pinctrl-0 = <&qup_spi11_default>; -+ pinctrl-0 = <&qup_spi11_spi>, <&qup_spi11_cs>; - interrupts = ; - #address-cells = <1>; - #size-cells = <0>; -@@ -1486,410 +1486,443 @@ - gpio-ranges = <&tlmm 0 0 120>; - wakeup-parent = <&pdc>; - -- dp_hot_plug_det: dp-hot-plug-det { -- pinmux { -- pins = "gpio117"; -- function = "dp_hot"; -- }; -+ dp_hot_plug_det: dp-hot-plug-det-state { -+ pins = "gpio117"; -+ function = "dp_hot"; - }; - -- qspi_clk: qspi-clk { -- pinmux { -- pins = "gpio63"; -- function = "qspi_clk"; -- }; -+ qspi_clk: qspi-clk-state { -+ pins = "gpio63"; -+ function = "qspi_clk"; - }; - -- qspi_cs0: qspi-cs0 { -- pinmux { -- pins = "gpio68"; -- function = "qspi_cs"; -- }; -+ qspi_cs0: qspi-cs0-state { -+ pins = "gpio68"; -+ function = "qspi_cs"; - }; - -- qspi_cs1: qspi-cs1 { -- pinmux { -- pins = "gpio72"; -- function = "qspi_cs"; -- }; -+ qspi_cs1: qspi-cs1-state { -+ pins = "gpio72"; -+ function = "qspi_cs"; - }; - -- qspi_data01: qspi-data01 { -- pinmux-data { -- pins = "gpio64", "gpio65"; -- function = "qspi_data"; -- }; -+ qspi_data01: qspi-data01-state { -+ pins = "gpio64", "gpio65"; -+ function = "qspi_data"; - }; - -- qspi_data12: qspi-data12 { -- pinmux-data { -- pins = "gpio66", "gpio67"; -- function = "qspi_data"; -- }; -+ qspi_data12: qspi-data12-state { -+ pins = "gpio66", "gpio67"; -+ function = "qspi_data"; - }; - -- qup_i2c0_default: qup-i2c0-default { -- pinmux { -- pins = "gpio34", "gpio35"; -- function = "qup00"; -- }; -+ qup_i2c0_default: qup-i2c0-default-state { -+ pins = "gpio34", "gpio35"; -+ function = "qup00"; - }; - -- qup_i2c1_default: qup-i2c1-default { -- pinmux { -- pins = "gpio0", "gpio1"; -- function = "qup01"; -- }; -+ qup_i2c1_default: qup-i2c1-default-state { -+ pins = "gpio0", "gpio1"; -+ function = "qup01"; - }; - -- qup_i2c2_default: qup-i2c2-default { -- pinmux { -- pins = "gpio15", "gpio16"; -- function = "qup02_i2c"; -- }; -+ qup_i2c2_default: qup-i2c2-default-state { -+ pins = "gpio15", "gpio16"; -+ function = "qup02_i2c"; - }; - -- qup_i2c3_default: qup-i2c3-default { -- pinmux { -- pins = "gpio38", "gpio39"; -- function = "qup03"; -- }; -+ qup_i2c3_default: qup-i2c3-default-state { -+ pins = "gpio38", "gpio39"; -+ function = "qup03"; - }; - -- qup_i2c4_default: qup-i2c4-default { -- pinmux { -- pins = "gpio115", "gpio116"; -- function = "qup04_i2c"; -- }; -+ qup_i2c4_default: qup-i2c4-default-state { -+ pins = "gpio115", "gpio116"; -+ function = "qup04_i2c"; - }; - -- qup_i2c5_default: qup-i2c5-default { -- pinmux { -- pins = "gpio25", "gpio26"; -- function = "qup05"; -- }; -+ qup_i2c5_default: qup-i2c5-default-state { -+ pins = "gpio25", "gpio26"; -+ function = "qup05"; - }; - -- qup_i2c6_default: qup-i2c6-default { -- pinmux { -- pins = "gpio59", "gpio60"; -- function = "qup10"; -- }; -+ qup_i2c6_default: qup-i2c6-default-state { -+ pins = "gpio59", "gpio60"; -+ function = "qup10"; - }; - -- qup_i2c7_default: qup-i2c7-default { -- pinmux { -- pins = "gpio6", "gpio7"; -- function = "qup11_i2c"; -- }; -+ qup_i2c7_default: qup-i2c7-default-state { -+ pins = "gpio6", "gpio7"; -+ function = "qup11_i2c"; - }; - -- qup_i2c8_default: qup-i2c8-default { -- pinmux { -- pins = "gpio42", "gpio43"; -- function = "qup12"; -- }; -+ qup_i2c8_default: qup-i2c8-default-state { -+ pins = "gpio42", "gpio43"; -+ function = "qup12"; - }; - -- qup_i2c9_default: qup-i2c9-default { -- pinmux { -- pins = "gpio46", "gpio47"; -- function = "qup13_i2c"; -- }; -+ qup_i2c9_default: qup-i2c9-default-state { -+ pins = "gpio46", "gpio47"; -+ function = "qup13_i2c"; - }; - -- qup_i2c10_default: qup-i2c10-default { -- pinmux { -- pins = "gpio86", "gpio87"; -- function = "qup14"; -- }; -+ qup_i2c10_default: qup-i2c10-default-state { -+ pins = "gpio86", "gpio87"; -+ function = "qup14"; - }; - -- qup_i2c11_default: qup-i2c11-default { -- pinmux { -- pins = "gpio53", "gpio54"; -- function = "qup15"; -- }; -+ qup_i2c11_default: qup-i2c11-default-state { -+ pins = "gpio53", "gpio54"; -+ function = "qup15"; -+ }; -+ -+ qup_spi0_spi: qup-spi0-spi-state { -+ pins = "gpio34", "gpio35", "gpio36"; -+ function = "qup00"; -+ }; -+ -+ qup_spi0_cs: qup-spi0-cs-state { -+ pins = "gpio37"; -+ function = "qup00"; -+ }; -+ -+ qup_spi0_cs_gpio: qup-spi0-cs-gpio-state { -+ pins = "gpio37"; -+ function = "gpio"; -+ }; -+ -+ qup_spi1_spi: qup-spi1-spi-state { -+ pins = "gpio0", "gpio1", "gpio2"; -+ function = "qup01"; -+ }; -+ -+ qup_spi1_cs: qup-spi1-cs-state { -+ pins = "gpio3"; -+ function = "qup01"; -+ }; -+ -+ qup_spi1_cs_gpio: qup-spi1-cs-gpio-state { -+ pins = "gpio3"; -+ function = "gpio"; -+ }; -+ -+ qup_spi3_spi: qup-spi3-spi-state { -+ pins = "gpio38", "gpio39", "gpio40"; -+ function = "qup03"; -+ }; -+ -+ qup_spi3_cs: qup-spi3-cs-state { -+ pins = "gpio41"; -+ function = "qup03"; - }; - -- qup_spi0_default: qup-spi0-default { -- pinmux { -- pins = "gpio34", "gpio35", -- "gpio36", "gpio37"; -+ qup_spi3_cs_gpio: qup-spi3-cs-gpio-state { -+ pins = "gpio41"; -+ function = "gpio"; -+ }; -+ -+ qup_spi5_spi: qup-spi5-spi-state { -+ pins = "gpio25", "gpio26", "gpio27"; -+ function = "qup05"; -+ }; -+ -+ qup_spi5_cs: qup-spi5-cs-state { -+ pins = "gpio28"; -+ function = "qup05"; -+ }; -+ -+ qup_spi5_cs_gpio: qup-spi5-cs-gpio-state { -+ pins = "gpio28"; -+ function = "gpio"; -+ }; -+ -+ qup_spi6_spi: qup-spi6-spi-state { -+ pins = "gpio59", "gpio60", "gpio61"; -+ function = "qup10"; -+ }; -+ -+ qup_spi6_cs: qup-spi6-cs-state { -+ pins = "gpio62"; -+ function = "qup10"; -+ }; -+ -+ qup_spi6_cs_gpio: qup-spi6-cs-gpio-state { -+ pins = "gpio62"; -+ function = "gpio"; -+ }; -+ -+ qup_spi8_spi: qup-spi8-spi-state { -+ pins = "gpio42", "gpio43", "gpio44"; -+ function = "qup12"; -+ }; -+ -+ qup_spi8_cs: qup-spi8-cs-state { -+ pins = "gpio45"; -+ function = "qup12"; -+ }; -+ -+ qup_spi8_cs_gpio: qup-spi8-cs-gpio-state { -+ pins = "gpio45"; -+ function = "gpio"; -+ }; -+ -+ qup_spi10_spi: qup-spi10-spi-state { -+ pins = "gpio86", "gpio87", "gpio88"; -+ function = "qup14"; -+ }; -+ -+ qup_spi10_cs: qup-spi10-cs-state { -+ pins = "gpio89"; -+ function = "qup14"; -+ }; -+ -+ qup_spi10_cs_gpio: qup-spi10-cs-gpio-state { -+ pins = "gpio89"; -+ function = "gpio"; -+ }; -+ -+ qup_spi11_spi: qup-spi11-spi-state { -+ pins = "gpio53", "gpio54", "gpio55"; -+ function = "qup15"; -+ }; -+ -+ qup_spi11_cs: qup-spi11-cs-state { -+ pins = "gpio56"; -+ function = "qup15"; -+ }; -+ -+ qup_spi11_cs_gpio: qup-spi11-cs-gpio-state { -+ pins = "gpio56"; -+ function = "gpio"; -+ }; -+ -+ qup_uart0_default: qup-uart0-default-state { -+ qup_uart0_cts: cts-pins { -+ pins = "gpio34"; - function = "qup00"; - }; -- }; - -- qup_spi0_cs_gpio: qup-spi0-cs-gpio { -- pinmux { -- pins = "gpio34", "gpio35", -- "gpio36"; -+ qup_uart0_rts: rts-pins { -+ pins = "gpio35"; - function = "qup00"; - }; - -- pinmux-cs { -+ qup_uart0_tx: tx-pins { -+ pins = "gpio36"; -+ function = "qup00"; -+ }; -+ -+ qup_uart0_rx: rx-pins { - pins = "gpio37"; -- function = "gpio"; -+ function = "qup00"; - }; - }; - -- qup_spi1_default: qup-spi1-default { -- pinmux { -- pins = "gpio0", "gpio1", -- "gpio2", "gpio3"; -+ qup_uart1_default: qup-uart1-default-state { -+ qup_uart1_cts: cts-pins { -+ pins = "gpio0"; - function = "qup01"; - }; -- }; - -- qup_spi1_cs_gpio: qup-spi1-cs-gpio { -- pinmux { -- pins = "gpio0", "gpio1", -- "gpio2"; -+ qup_uart1_rts: rts-pins { -+ pins = "gpio1"; - function = "qup01"; - }; - -- pinmux-cs { -- pins = "gpio3"; -- function = "gpio"; -+ qup_uart1_tx: tx-pins { -+ pins = "gpio2"; -+ function = "qup01"; - }; -- }; - -- qup_spi3_default: qup-spi3-default { -- pinmux { -- pins = "gpio38", "gpio39", -- "gpio40", "gpio41"; -- function = "qup03"; -+ qup_uart1_rx: rx-pins { -+ pins = "gpio3"; -+ function = "qup01"; - }; - }; - -- qup_spi3_cs_gpio: qup-spi3-cs-gpio { -- pinmux { -- pins = "gpio38", "gpio39", -- "gpio40"; -- function = "qup03"; -+ qup_uart2_default: qup-uart2-default-state { -+ qup_uart2_tx: tx-pins { -+ pins = "gpio15"; -+ function = "qup02_uart"; - }; - -- pinmux-cs { -- pins = "gpio41"; -- function = "gpio"; -+ qup_uart2_rx: rx-pins { -+ pins = "gpio16"; -+ function = "qup02_uart"; - }; - }; - -- qup_spi5_default: qup-spi5-default { -- pinmux { -- pins = "gpio25", "gpio26", -- "gpio27", "gpio28"; -- function = "qup05"; -+ qup_uart3_default: qup-uart3-default-state { -+ qup_uart3_cts: cts-pins { -+ pins = "gpio38"; -+ function = "qup03"; - }; -- }; - -- qup_spi5_cs_gpio: qup-spi5-cs-gpio { -- pinmux { -- pins = "gpio25", "gpio26", -- "gpio27"; -- function = "qup05"; -+ qup_uart3_rts: rts-pins { -+ pins = "gpio39"; -+ function = "qup03"; - }; - -- pinmux-cs { -- pins = "gpio28"; -- function = "gpio"; -+ qup_uart3_tx: tx-pins { -+ pins = "gpio40"; -+ function = "qup03"; - }; -- }; - -- qup_spi6_default: qup-spi6-default { -- pinmux { -- pins = "gpio59", "gpio60", -- "gpio61", "gpio62"; -- function = "qup10"; -+ qup_uart3_rx: rx-pins { -+ pins = "gpio41"; -+ function = "qup03"; - }; - }; - -- qup_spi6_cs_gpio: qup-spi6-cs-gpio { -- pinmux { -- pins = "gpio59", "gpio60", -- "gpio61"; -- function = "qup10"; -+ qup_uart4_default: qup-uart4-default-state { -+ qup_uart4_tx: tx-pins { -+ pins = "gpio115"; -+ function = "qup04_uart"; - }; - -- pinmux-cs { -- pins = "gpio62"; -- function = "gpio"; -+ qup_uart4_rx: rx-pins { -+ pins = "gpio116"; -+ function = "qup04_uart"; - }; - }; - -- qup_spi8_default: qup-spi8-default { -- pinmux { -- pins = "gpio42", "gpio43", -- "gpio44", "gpio45"; -- function = "qup12"; -+ qup_uart5_default: qup-uart5-default-state { -+ qup_uart5_cts: cts-pins { -+ pins = "gpio25"; -+ function = "qup05"; - }; -- }; - -- qup_spi8_cs_gpio: qup-spi8-cs-gpio { -- pinmux { -- pins = "gpio42", "gpio43", -- "gpio44"; -- function = "qup12"; -+ qup_uart5_rts: rts-pins { -+ pins = "gpio26"; -+ function = "qup05"; - }; - -- pinmux-cs { -- pins = "gpio45"; -- function = "gpio"; -+ qup_uart5_tx: tx-pins { -+ pins = "gpio27"; -+ function = "qup05"; - }; -- }; - -- qup_spi10_default: qup-spi10-default { -- pinmux { -- pins = "gpio86", "gpio87", -- "gpio88", "gpio89"; -- function = "qup14"; -+ qup_uart5_rx: rx-pins { -+ pins = "gpio28"; -+ function = "qup05"; - }; - }; - -- qup_spi10_cs_gpio: qup-spi10-cs-gpio { -- pinmux { -- pins = "gpio86", "gpio87", -- "gpio88"; -- function = "qup14"; -+ qup_uart6_default: qup-uart6-default-state { -+ qup_uart6_cts: cts-pins { -+ pins = "gpio59"; -+ function = "qup10"; - }; - -- pinmux-cs { -- pins = "gpio89"; -- function = "gpio"; -+ qup_uart6_rts: rts-pins { -+ pins = "gpio60"; -+ function = "qup10"; - }; -- }; - -- qup_spi11_default: qup-spi11-default { -- pinmux { -- pins = "gpio53", "gpio54", -- "gpio55", "gpio56"; -- function = "qup15"; -+ qup_uart6_tx: tx-pins { -+ pins = "gpio61"; -+ function = "qup10"; -+ }; -+ -+ qup_uart6_rx: rx-pins { -+ pins = "gpio62"; -+ function = "qup10"; - }; - }; - -- qup_spi11_cs_gpio: qup-spi11-cs-gpio { -- pinmux { -- pins = "gpio53", "gpio54", -- "gpio55"; -- function = "qup15"; -+ qup_uart7_default: qup-uart7-default-state { -+ qup_uart7_tx: tx-pins { -+ pins = "gpio6"; -+ function = "qup11_uart"; - }; - -- pinmux-cs { -- pins = "gpio56"; -- function = "gpio"; -+ qup_uart7_rx: rx-pins { -+ pins = "gpio7"; -+ function = "qup11_uart"; - }; - }; - -- qup_uart0_default: qup-uart0-default { -- pinmux { -- pins = "gpio34", "gpio35", -- "gpio36", "gpio37"; -- function = "qup00"; -+ qup_uart8_default: qup-uart8-default-state { -+ qup_uart8_tx: tx-pins { -+ pins = "gpio44"; -+ function = "qup12"; - }; -- }; - -- qup_uart1_default: qup-uart1-default { -- pinmux { -- pins = "gpio0", "gpio1", -- "gpio2", "gpio3"; -- function = "qup01"; -+ qup_uart8_rx: rx-pins { -+ pins = "gpio45"; -+ function = "qup12"; - }; - }; - -- qup_uart2_default: qup-uart2-default { -- pinmux { -- pins = "gpio15", "gpio16"; -- function = "qup02_uart"; -+ qup_uart9_default: qup-uart9-default-state { -+ qup_uart9_tx: tx-pins { -+ pins = "gpio46"; -+ function = "qup13_uart"; - }; -- }; - -- qup_uart3_default: qup-uart3-default { -- pinmux { -- pins = "gpio38", "gpio39", -- "gpio40", "gpio41"; -- function = "qup03"; -+ qup_uart9_rx: rx-pins { -+ pins = "gpio47"; -+ function = "qup13_uart"; - }; - }; - -- qup_uart4_default: qup-uart4-default { -- pinmux { -- pins = "gpio115", "gpio116"; -- function = "qup04_uart"; -+ qup_uart10_default: qup-uart10-default-state { -+ qup_uart10_cts: cts-pins { -+ pins = "gpio86"; -+ function = "qup14"; - }; -- }; - -- qup_uart5_default: qup-uart5-default { -- pinmux { -- pins = "gpio25", "gpio26", -- "gpio27", "gpio28"; -- function = "qup05"; -+ qup_uart10_rts: rts-pins { -+ pins = "gpio87"; -+ function = "qup14"; - }; -- }; - -- qup_uart6_default: qup-uart6-default { -- pinmux { -- pins = "gpio59", "gpio60", -- "gpio61", "gpio62"; -- function = "qup10"; -+ qup_uart10_tx: tx-pins { -+ pins = "gpio88"; -+ function = "qup14"; - }; -- }; - -- qup_uart7_default: qup-uart7-default { -- pinmux { -- pins = "gpio6", "gpio7"; -- function = "qup11_uart"; -+ qup_uart10_rx: rx-pins { -+ pins = "gpio89"; -+ function = "qup14"; - }; - }; - -- qup_uart8_default: qup-uart8-default { -- pinmux { -- pins = "gpio44", "gpio45"; -- function = "qup12"; -+ qup_uart11_default: qup-uart11-default-state { -+ qup_uart11_cts: cts-pins { -+ pins = "gpio53"; -+ function = "qup15"; - }; -- }; - -- qup_uart9_default: qup-uart9-default { -- pinmux { -- pins = "gpio46", "gpio47"; -- function = "qup13_uart"; -+ qup_uart11_rts: rts-pins { -+ pins = "gpio54"; -+ function = "qup15"; - }; -- }; - -- qup_uart10_default: qup-uart10-default { -- pinmux { -- pins = "gpio86", "gpio87", -- "gpio88", "gpio89"; -- function = "qup14"; -+ qup_uart11_tx: tx-pins { -+ pins = "gpio55"; -+ function = "qup15"; - }; -- }; - -- qup_uart11_default: qup-uart11-default { -- pinmux { -- pins = "gpio53", "gpio54", -- "gpio55", "gpio56"; -+ qup_uart11_rx: rx-pins { -+ pins = "gpio56"; - function = "qup15"; - }; - }; - -- sec_mi2s_active: sec-mi2s-active { -- pinmux { -- pins = "gpio49", "gpio50", "gpio51"; -- function = "mi2s_1"; -- }; -+ sec_mi2s_active: sec-mi2s-active-state { -+ pins = "gpio49", "gpio50", "gpio51"; -+ function = "mi2s_1"; - }; - -- pri_mi2s_active: pri-mi2s-active { -- pinmux { -- pins = "gpio53", "gpio54", "gpio55", "gpio56"; -- function = "mi2s_0"; -- }; -+ pri_mi2s_active: pri-mi2s-active-state { -+ pins = "gpio53", "gpio54", "gpio55", "gpio56"; -+ function = "mi2s_0"; - }; - -- pri_mi2s_mclk_active: pri-mi2s-mclk-active { -- pinmux { -- pins = "gpio57"; -- function = "lpass_ext"; -- }; -+ pri_mi2s_mclk_active: pri-mi2s-mclk-active-state { -+ pins = "gpio57"; -+ function = "lpass_ext"; - }; - }; - --- -2.39.2 - diff --git a/queue-6.1/arm64-dts-qcom-sc7180-revert-arm64-dts-qcom-sc7180-a.patch b/queue-6.1/arm64-dts-qcom-sc7180-revert-arm64-dts-qcom-sc7180-a.patch deleted file mode 100644 index a21b0485db6..00000000000 --- a/queue-6.1/arm64-dts-qcom-sc7180-revert-arm64-dts-qcom-sc7180-a.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 87026702974e1c22d02d024551a0617cbd707f91 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 20 Oct 2022 18:51:34 -0400 -Subject: arm64: dts: qcom: sc7180: revert "arm64: dts: qcom: sc7180: Avoid - glitching SPI CS at bootup on trogdor" - -From: Krzysztof Kozlowski - -[ Upstream commit 8ddfa04de492ceac93e72063e027216bb9b07ca5 ] - -This reverts commit e440e30e26dd6b0424002ad0ddcbbcea783efd85 because it -is not a reliable way of fixing SPI CS glitch and it depends on specific -Linux kernel pin controller driver behavior. - -This behavior of kernel driver was changed in commit b991f8c3622c -("pinctrl: core: Handling pinmux and pinconf separately") thus -effectively the DTS fix stopped being effective. - -Proper solution for the glitching SPI chip select must be implemented in -the drivers, not via ordering of entries in DTS, and is already -introduced in commit d21f4b7ffc22 ("pinctrl: qcom: Avoid glitching lines -when we first mux to output"). - -Signed-off-by: Krzysztof Kozlowski -Reviewed-by: Douglas Anderson -Tested-by: Douglas Anderson -Reviewed-by: Stephen Boyd -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20221020225135.31750-3-krzysztof.kozlowski@linaro.org -Stable-dep-of: d84f8f2687bd ("arm64: dts: sc7180: Rename qspi data12 as data23") -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 27 +++----------------- - 1 file changed, 3 insertions(+), 24 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi -index 1a1c346d619c3..33817358ebb02 100644 ---- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi -@@ -880,17 +880,17 @@ hp_i2c: &i2c9 { - }; - - &spi0 { -- pinctrl-0 = <&qup_spi0_cs_gpio_init_high>, <&qup_spi0_cs_gpio>; -+ pinctrl-0 = <&qup_spi0_cs_gpio>; - cs-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>; - }; - - &spi6 { -- pinctrl-0 = <&qup_spi6_cs_gpio_init_high>, <&qup_spi6_cs_gpio>; -+ pinctrl-0 = <&qup_spi6_cs_gpio>; - cs-gpios = <&tlmm 62 GPIO_ACTIVE_LOW>; - }; - - ap_spi_fp: &spi10 { -- pinctrl-0 = <&qup_spi10_cs_gpio_init_high>, <&qup_spi10_cs_gpio>; -+ pinctrl-0 = <&qup_spi10_cs_gpio>; - cs-gpios = <&tlmm 89 GPIO_ACTIVE_LOW>; - - cros_ec_fp: ec@0 { -@@ -1422,27 +1422,6 @@ ap_spi_fp: &spi10 { - }; - }; - -- qup_spi0_cs_gpio_init_high: qup-spi0-cs-gpio-init-high { -- pinconf { -- pins = "gpio37"; -- output-high; -- }; -- }; -- -- qup_spi6_cs_gpio_init_high: qup-spi6-cs-gpio-init-high { -- pinconf { -- pins = "gpio62"; -- output-high; -- }; -- }; -- -- qup_spi10_cs_gpio_init_high: qup-spi10-cs-gpio-init-high { -- pinconf { -- pins = "gpio89"; -- output-high; -- }; -- }; -- - qup_uart3_sleep: qup-uart3-sleep { - pinmux { - pins = "gpio38", "gpio39", --- -2.39.2 - diff --git a/queue-6.1/arm64-dts-qcom-sc7280-align-tlmm-pin-configuration-w.patch b/queue-6.1/arm64-dts-qcom-sc7280-align-tlmm-pin-configuration-w.patch deleted file mode 100644 index e078976b7f9..00000000000 --- a/queue-6.1/arm64-dts-qcom-sc7280-align-tlmm-pin-configuration-w.patch +++ /dev/null @@ -1,1430 +0,0 @@ -From 9db6610c8e5342a8896af4c1852d0bac9a0cae80 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 30 Sep 2022 21:29:42 +0200 -Subject: arm64: dts: qcom: sc7280: align TLMM pin configuration with DT schema - (really) - -From: Krzysztof Kozlowski - -[ Upstream commit ec0872a68dcf9fba109fd7ac51843a49984f7586 ] - -DT schema expects TLMM pin configuration nodes to be named with -'-state' suffix and their optional children with '-pins' suffix. - -I already tried to do this in commit d801357a0573 ("arm64: dts: qcom: -sc7280: align TLMM pin configuration with DT schema") and I missed the -fact that these nodes were not part of "state" node. Bindings did not -catch these errors due to its own issues. - -Reviewed-by: Konrad Dybcio -Signed-off-by: Krzysztof Kozlowski -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220930192954.242546-5-krzysztof.kozlowski@linaro.org -Stable-dep-of: 14acf21c0d3f ("arm64: dts: sc7280: Rename qspi data12 as data23") -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts | 8 +- - .../arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 44 +-- - .../arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi | 8 +- - arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 26 +- - arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 20 +- - arch/arm64/boot/dts/qcom/sc7280.dtsi | 316 +++++++++--------- - 6 files changed, 211 insertions(+), 211 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts -index dddb505e220b5..1185141f348ee 100644 ---- a/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts -+++ b/arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts -@@ -118,25 +118,25 @@ ap_ts_pen_1v8: &i2c13 { - }; - - &tlmm { -- tp_int_odl: tp-int-odl { -+ tp_int_odl: tp-int-odl-state { - pins = "gpio7"; - function = "gpio"; - bias-disable; - }; - -- ts_int_l: ts-int-l { -+ ts_int_l: ts-int-l-state { - pins = "gpio55"; - function = "gpio"; - bias-pull-up; - }; - -- ts_reset_l: ts-reset-l { -+ ts_reset_l: ts-reset-l-state { - pins = "gpio54"; - function = "gpio"; - bias-disable; - }; - -- us_euro_hs_sel: us-euro-hs-sel { -+ us_euro_hs_sel: us-euro-hs-sel-state { - pins = "gpio81"; - function = "gpio"; - bias-pull-down; -diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi -index c11e37160f342..6a9389c401598 100644 ---- a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi -@@ -744,27 +744,27 @@ ap_ec_spi: &spi10 { - pinctrl-names = "default"; - pinctrl-0 = <&bios_flash_wp_od>; - -- amp_en: amp-en-pins { -+ amp_en: amp-en-state { - pins = "gpio63"; - function = "gpio"; - bias-disable; - drive-strength = <2>; - }; - -- ap_ec_int_l: ap-ec-int-l-pins { -+ ap_ec_int_l: ap-ec-int-l-state { - pins = "gpio18"; - function = "gpio"; - bias-pull-up; - }; - -- bios_flash_wp_od: bios-flash-wp-od-pins { -+ bios_flash_wp_od: bios-flash-wp-od-state { - pins = "gpio16"; - function = "gpio"; - /* Has external pull */ - bias-disable; - }; - -- en_fp_rails: en-fp-rails-pins { -+ en_fp_rails: en-fp-rails-state { - pins = "gpio77"; - function = "gpio"; - bias-disable; -@@ -772,60 +772,60 @@ ap_ec_spi: &spi10 { - output-high; - }; - -- en_pp3300_codec: en-pp3300-codec-pins { -+ en_pp3300_codec: en-pp3300-codec-state { - pins = "gpio105"; - function = "gpio"; - bias-disable; - drive-strength = <2>; - }; - -- en_pp3300_dx_edp: en-pp3300-dx-edp-pins { -+ en_pp3300_dx_edp: en-pp3300-dx-edp-state { - pins = "gpio80"; - function = "gpio"; - bias-disable; - drive-strength = <2>; - }; - -- fp_rst_l: fp-rst-l-pins { -+ fp_rst_l: fp-rst-l-state { - pins = "gpio78"; - function = "gpio"; - bias-disable; - drive-strength = <2>; - }; - -- fp_to_ap_irq_l: fp-to-ap-irq-l-pins { -+ fp_to_ap_irq_l: fp-to-ap-irq-l-state { - pins = "gpio61"; - function = "gpio"; - /* Has external pullup */ - bias-disable; - }; - -- fpmcu_boot0: fpmcu-boot0-pins { -+ fpmcu_boot0: fpmcu-boot0-state { - pins = "gpio68"; - function = "gpio"; - bias-disable; - }; - -- gsc_ap_int_odl: gsc-ap-int-odl-pins { -+ gsc_ap_int_odl: gsc-ap-int-odl-state { - pins = "gpio104"; - function = "gpio"; - bias-pull-up; - }; - -- hp_irq: hp-irq-pins { -+ hp_irq: hp-irq-state { - pins = "gpio101"; - function = "gpio"; - bias-pull-up; - }; - -- hub_en: hub-en-pins { -+ hub_en: hub-en-state { - pins = "gpio157"; - function = "gpio"; - bias-disable; - drive-strength = <2>; - }; - -- pe_wake_odl: pe-wake-odl-pins { -+ pe_wake_odl: pe-wake-odl-state { - pins = "gpio3"; - function = "gpio"; - /* Has external pull */ -@@ -834,45 +834,45 @@ ap_ec_spi: &spi10 { - }; - - /* For ap_spi_fp */ -- qup_spi9_cs_gpio_init_high: qup-spi9-cs-gpio-init-high-pins { -+ qup_spi9_cs_gpio_init_high: qup-spi9-cs-gpio-init-high-state { - pins = "gpio39"; - function = "gpio"; - output-high; - }; - - /* For ap_ec_spi */ -- qup_spi10_cs_gpio_init_high: qup-spi10-cs-gpio-init-high-pins { -+ qup_spi10_cs_gpio_init_high: qup-spi10-cs-gpio-init-high-state { - pins = "gpio43"; - function = "gpio"; - output-high; - }; - -- sar0_irq_odl: sar0-irq-odl-pins { -+ sar0_irq_odl: sar0-irq-odl-state { - pins = "gpio141"; - function = "gpio"; - bias-pull-up; - }; - -- sar1_irq_odl: sar1-irq-odl-pins { -+ sar1_irq_odl: sar1-irq-odl-state { - pins = "gpio140"; - function = "gpio"; - bias-pull-up; - }; - -- sd_cd_odl: sd-cd-odl-pins { -+ sd_cd_odl: sd-cd-odl-state { - pins = "gpio91"; - function = "gpio"; - bias-pull-up; - }; - -- ssd_en: ssd-en-pins { -+ ssd_en: ssd-en-state { - pins = "gpio51"; - function = "gpio"; - bias-disable; - drive-strength = <2>; - }; - -- ssd_rst_l: ssd-rst-l-pins { -+ ssd_rst_l: ssd-rst-l-state { - pins = "gpio2"; - function = "gpio"; - bias-disable; -@@ -880,14 +880,14 @@ ap_ec_spi: &spi10 { - output-low; - }; - -- tp_int_odl: tp-int-odl-pins { -+ tp_int_odl: tp-int-odl-state { - pins = "gpio7"; - function = "gpio"; - /* Has external pullup */ - bias-disable; - }; - -- wf_cam_en: wf-cam-en-pins { -+ wf_cam_en: wf-cam-en-state { - pins = "gpio119"; - function = "gpio"; - /* Has external pulldown */ -diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi -index 7f5143e9bb807..b35f3738933c4 100644 ---- a/arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi -@@ -79,26 +79,26 @@ ap_h1_spi: &spi14 { - }; - - &tlmm { -- ap_ec_int_l: ap-ec-int-l-pins { -+ ap_ec_int_l: ap-ec-int-l-state { - pins = "gpio18"; - function = "gpio"; - input-enable; - bias-pull-up; - }; - -- h1_ap_int_odl: h1-ap-int-odl-pins { -+ h1_ap_int_odl: h1-ap-int-odl-state { - pins = "gpio104"; - function = "gpio"; - input-enable; - bias-pull-up; - }; - -- qup_spi10_cs_gpio_init_high: qup-spi10-cs-gpio-init-high-pins { -+ qup_spi10_cs_gpio_init_high: qup-spi10-cs-gpio-init-high-state { - pins = "gpio43"; - output-high; - }; - -- qup_spi14_cs_gpio_init_high: qup-spi14-cs-gpio-init-high-pins { -+ qup_spi14_cs_gpio_init_high: qup-spi14-cs-gpio-init-high-state { - pins = "gpio59"; - output-high; - }; -diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi -index ca50f0ba9b815..3c5b0a5810cd4 100644 ---- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi -@@ -748,24 +748,24 @@ - }; - - &tlmm { -- amp_en: amp-en { -+ amp_en: amp-en-state { - pins = "gpio63"; - bias-pull-down; - drive-strength = <2>; - }; - -- bt_en: bt-en-pins { -+ bt_en: bt-en-state { - pins = "gpio85"; - function = "gpio"; - output-low; - bias-disable; - }; - -- nvme_pwren: nvme-pwren-pins { -+ nvme_pwren: nvme-pwren-state { - function = "gpio"; - }; - -- pcie1_reset_n: pcie1-reset-n-pins { -+ pcie1_reset_n: pcie1-reset-n-state { - pins = "gpio2"; - function = "gpio"; - -@@ -774,7 +774,7 @@ - bias-disable; - }; - -- pcie1_wake_n: pcie1-wake-n-pins { -+ pcie1_wake_n: pcie1-wake-n-state { - pins = "gpio3"; - function = "gpio"; - -@@ -782,7 +782,7 @@ - bias-pull-up; - }; - -- qup_uart7_sleep_cts: qup-uart7-sleep-cts-pins { -+ qup_uart7_sleep_cts: qup-uart7-sleep-cts-state { - pins = "gpio28"; - function = "gpio"; - /* -@@ -795,7 +795,7 @@ - bias-bus-hold; - }; - -- qup_uart7_sleep_rts: qup-uart7-sleep-rts-pins { -+ qup_uart7_sleep_rts: qup-uart7-sleep-rts-state { - pins = "gpio29"; - function = "gpio"; - /* -@@ -807,7 +807,7 @@ - bias-pull-down; - }; - -- qup_uart7_sleep_tx: qup-uart7-sleep-tx-pins { -+ qup_uart7_sleep_tx: qup-uart7-sleep-tx-state { - pins = "gpio30"; - function = "gpio"; - /* -@@ -817,7 +817,7 @@ - bias-pull-up; - }; - -- qup_uart7_sleep_rx: qup-uart7-sleep-rx-pins { -+ qup_uart7_sleep_rx: qup-uart7-sleep-rx-state { - pins = "gpio31"; - function = "gpio"; - /* -@@ -828,25 +828,25 @@ - bias-pull-up; - }; - -- sd_cd: sd-cd-pins { -+ sd_cd: sd-cd-state { - pins = "gpio91"; - function = "gpio"; - bias-pull-up; - }; - -- sw_ctrl: sw-ctrl-pins { -+ sw_ctrl: sw-ctrl-state { - pins = "gpio86"; - function = "gpio"; - bias-pull-down; - }; - -- wcd_reset_n: wcd-reset-n { -+ wcd_reset_n: wcd-reset-n-state { - pins = "gpio83"; - function = "gpio"; - drive-strength = <8>; - }; - -- wcd_reset_n_sleep: wcd-reset-n-sleep { -+ wcd_reset_n_sleep: wcd-reset-n-sleep-state { - pins = "gpio83"; - function = "gpio"; - drive-strength = <8>; -diff --git a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi -index f7665b3799233..df49564ae6dc1 100644 ---- a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi -@@ -595,7 +595,7 @@ mos_bt_uart: &uart7 { - }; - - &tlmm { -- mos_bt_en: mos-bt-en-pins { -+ mos_bt_en: mos-bt-en-state { - pins = "gpio85"; - function = "gpio"; - drive-strength = <2>; -@@ -603,7 +603,7 @@ mos_bt_uart: &uart7 { - }; - - /* For mos_bt_uart */ -- qup_uart7_sleep_cts: qup-uart7-sleep-cts-pins { -+ qup_uart7_sleep_cts: qup-uart7-sleep-cts-state { - pins = "gpio28"; - function = "gpio"; - /* -@@ -617,7 +617,7 @@ mos_bt_uart: &uart7 { - }; - - /* For mos_bt_uart */ -- qup_uart7_sleep_rts: qup-uart7-sleep-rts-pins { -+ qup_uart7_sleep_rts: qup-uart7-sleep-rts-state { - pins = "gpio29"; - function = "gpio"; - /* -@@ -630,7 +630,7 @@ mos_bt_uart: &uart7 { - }; - - /* For mos_bt_uart */ -- qup_uart7_sleep_rx: qup-uart7-sleep-rx-pins { -+ qup_uart7_sleep_rx: qup-uart7-sleep-rx-state { - pins = "gpio31"; - function = "gpio"; - /* -@@ -642,7 +642,7 @@ mos_bt_uart: &uart7 { - }; - - /* For mos_bt_uart */ -- qup_uart7_sleep_tx: qup-uart7-sleep-tx-pins { -+ qup_uart7_sleep_tx: qup-uart7-sleep-tx-state { - pins = "gpio30"; - function = "gpio"; - /* -@@ -652,32 +652,32 @@ mos_bt_uart: &uart7 { - bias-pull-up; - }; - -- ts_int_conn: ts-int-conn-pins { -+ ts_int_conn: ts-int-conn-state { - pins = "gpio55"; - function = "gpio"; - bias-pull-up; - }; - -- ts_rst_conn: ts-rst-conn-pins { -+ ts_rst_conn: ts-rst-conn-state { - pins = "gpio54"; - function = "gpio"; - drive-strength = <2>; - }; - -- us_euro_hs_sel: us-euro-hs-sel { -+ us_euro_hs_sel: us-euro-hs-sel-state { - pins = "gpio81"; - function = "gpio"; - bias-pull-down; - drive-strength = <2>; - }; - -- wcd_reset_n: wcd-reset-n { -+ wcd_reset_n: wcd-reset-n-state { - pins = "gpio83"; - function = "gpio"; - drive-strength = <8>; - }; - -- wcd_reset_n_sleep: wcd-reset-n-sleep { -+ wcd_reset_n_sleep: wcd-reset-n-sleep-state { - pins = "gpio83"; - function = "gpio"; - drive-strength = <8>; -diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi -index 67e5f8d5f44f3..dad8f5e4f9aa6 100644 ---- a/arch/arm64/boot/dts/qcom/sc7280.dtsi -+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi -@@ -4270,791 +4270,791 @@ - gpio-ranges = <&tlmm 0 0 175>; - wakeup-parent = <&pdc>; - -- dp_hot_plug_det: dp-hot-plug-det-pins { -+ dp_hot_plug_det: dp-hot-plug-det-state { - pins = "gpio47"; - function = "dp_hot"; - }; - -- edp_hot_plug_det: edp-hot-plug-det-pins { -+ edp_hot_plug_det: edp-hot-plug-det-state { - pins = "gpio60"; - function = "edp_hot"; - }; - -- mi2s0_data0: mi2s0-data0-pins { -+ mi2s0_data0: mi2s0-data0-state { - pins = "gpio98"; - function = "mi2s0_data0"; - }; - -- mi2s0_data1: mi2s0-data1-pins { -+ mi2s0_data1: mi2s0-data1-state { - pins = "gpio99"; - function = "mi2s0_data1"; - }; - -- mi2s0_mclk: mi2s0-mclk-pins { -+ mi2s0_mclk: mi2s0-mclk-state { - pins = "gpio96"; - function = "pri_mi2s"; - }; - -- mi2s0_sclk: mi2s0-sclk-pins { -+ mi2s0_sclk: mi2s0-sclk-state { - pins = "gpio97"; - function = "mi2s0_sck"; - }; - -- mi2s0_ws: mi2s0-ws-pins { -+ mi2s0_ws: mi2s0-ws-state { - pins = "gpio100"; - function = "mi2s0_ws"; - }; - -- mi2s1_data0: mi2s1-data0-pins { -+ mi2s1_data0: mi2s1-data0-state { - pins = "gpio107"; - function = "mi2s1_data0"; - }; - -- mi2s1_sclk: mi2s1-sclk-pins { -+ mi2s1_sclk: mi2s1-sclk-state { - pins = "gpio106"; - function = "mi2s1_sck"; - }; - -- mi2s1_ws: mi2s1-ws-pins { -+ mi2s1_ws: mi2s1-ws-state { - pins = "gpio108"; - function = "mi2s1_ws"; - }; - -- pcie1_clkreq_n: pcie1-clkreq-n-pins { -+ pcie1_clkreq_n: pcie1-clkreq-n-state { - pins = "gpio79"; - function = "pcie1_clkreqn"; - }; - -- qspi_clk: qspi-clk-pins { -+ qspi_clk: qspi-clk-state { - pins = "gpio14"; - function = "qspi_clk"; - }; - -- qspi_cs0: qspi-cs0-pins { -+ qspi_cs0: qspi-cs0-state { - pins = "gpio15"; - function = "qspi_cs"; - }; - -- qspi_cs1: qspi-cs1-pins { -+ qspi_cs1: qspi-cs1-state { - pins = "gpio19"; - function = "qspi_cs"; - }; - -- qspi_data01: qspi-data01-pins { -+ qspi_data01: qspi-data01-state { - pins = "gpio12", "gpio13"; - function = "qspi_data"; - }; - -- qspi_data12: qspi-data12-pins { -+ qspi_data12: qspi-data12-state { - pins = "gpio16", "gpio17"; - function = "qspi_data"; - }; - -- qup_i2c0_data_clk: qup-i2c0-data-clk-pins { -+ qup_i2c0_data_clk: qup-i2c0-data-clk-state { - pins = "gpio0", "gpio1"; - function = "qup00"; - }; - -- qup_i2c1_data_clk: qup-i2c1-data-clk-pins { -+ qup_i2c1_data_clk: qup-i2c1-data-clk-state { - pins = "gpio4", "gpio5"; - function = "qup01"; - }; - -- qup_i2c2_data_clk: qup-i2c2-data-clk-pins { -+ qup_i2c2_data_clk: qup-i2c2-data-clk-state { - pins = "gpio8", "gpio9"; - function = "qup02"; - }; - -- qup_i2c3_data_clk: qup-i2c3-data-clk-pins { -+ qup_i2c3_data_clk: qup-i2c3-data-clk-state { - pins = "gpio12", "gpio13"; - function = "qup03"; - }; - -- qup_i2c4_data_clk: qup-i2c4-data-clk-pins { -+ qup_i2c4_data_clk: qup-i2c4-data-clk-state { - pins = "gpio16", "gpio17"; - function = "qup04"; - }; - -- qup_i2c5_data_clk: qup-i2c5-data-clk-pins { -+ qup_i2c5_data_clk: qup-i2c5-data-clk-state { - pins = "gpio20", "gpio21"; - function = "qup05"; - }; - -- qup_i2c6_data_clk: qup-i2c6-data-clk-pins { -+ qup_i2c6_data_clk: qup-i2c6-data-clk-state { - pins = "gpio24", "gpio25"; - function = "qup06"; - }; - -- qup_i2c7_data_clk: qup-i2c7-data-clk-pins { -+ qup_i2c7_data_clk: qup-i2c7-data-clk-state { - pins = "gpio28", "gpio29"; - function = "qup07"; - }; - -- qup_i2c8_data_clk: qup-i2c8-data-clk-pins { -+ qup_i2c8_data_clk: qup-i2c8-data-clk-state { - pins = "gpio32", "gpio33"; - function = "qup10"; - }; - -- qup_i2c9_data_clk: qup-i2c9-data-clk-pins { -+ qup_i2c9_data_clk: qup-i2c9-data-clk-state { - pins = "gpio36", "gpio37"; - function = "qup11"; - }; - -- qup_i2c10_data_clk: qup-i2c10-data-clk-pins { -+ qup_i2c10_data_clk: qup-i2c10-data-clk-state { - pins = "gpio40", "gpio41"; - function = "qup12"; - }; - -- qup_i2c11_data_clk: qup-i2c11-data-clk-pins { -+ qup_i2c11_data_clk: qup-i2c11-data-clk-state { - pins = "gpio44", "gpio45"; - function = "qup13"; - }; - -- qup_i2c12_data_clk: qup-i2c12-data-clk-pins { -+ qup_i2c12_data_clk: qup-i2c12-data-clk-state { - pins = "gpio48", "gpio49"; - function = "qup14"; - }; - -- qup_i2c13_data_clk: qup-i2c13-data-clk-pins { -+ qup_i2c13_data_clk: qup-i2c13-data-clk-state { - pins = "gpio52", "gpio53"; - function = "qup15"; - }; - -- qup_i2c14_data_clk: qup-i2c14-data-clk-pins { -+ qup_i2c14_data_clk: qup-i2c14-data-clk-state { - pins = "gpio56", "gpio57"; - function = "qup16"; - }; - -- qup_i2c15_data_clk: qup-i2c15-data-clk-pins { -+ qup_i2c15_data_clk: qup-i2c15-data-clk-state { - pins = "gpio60", "gpio61"; - function = "qup17"; - }; - -- qup_spi0_data_clk: qup-spi0-data-clk-pins { -+ qup_spi0_data_clk: qup-spi0-data-clk-state { - pins = "gpio0", "gpio1", "gpio2"; - function = "qup00"; - }; - -- qup_spi0_cs: qup-spi0-cs-pins { -+ qup_spi0_cs: qup-spi0-cs-state { - pins = "gpio3"; - function = "qup00"; - }; - -- qup_spi0_cs_gpio: qup-spi0-cs-gpio-pins { -+ qup_spi0_cs_gpio: qup-spi0-cs-gpio-state { - pins = "gpio3"; - function = "gpio"; - }; - -- qup_spi1_data_clk: qup-spi1-data-clk-pins { -+ qup_spi1_data_clk: qup-spi1-data-clk-state { - pins = "gpio4", "gpio5", "gpio6"; - function = "qup01"; - }; - -- qup_spi1_cs: qup-spi1-cs-pins { -+ qup_spi1_cs: qup-spi1-cs-state { - pins = "gpio7"; - function = "qup01"; - }; - -- qup_spi1_cs_gpio: qup-spi1-cs-gpio-pins { -+ qup_spi1_cs_gpio: qup-spi1-cs-gpio-state { - pins = "gpio7"; - function = "gpio"; - }; - -- qup_spi2_data_clk: qup-spi2-data-clk-pins { -+ qup_spi2_data_clk: qup-spi2-data-clk-state { - pins = "gpio8", "gpio9", "gpio10"; - function = "qup02"; - }; - -- qup_spi2_cs: qup-spi2-cs-pins { -+ qup_spi2_cs: qup-spi2-cs-state { - pins = "gpio11"; - function = "qup02"; - }; - -- qup_spi2_cs_gpio: qup-spi2-cs-gpio-pins { -+ qup_spi2_cs_gpio: qup-spi2-cs-gpio-state { - pins = "gpio11"; - function = "gpio"; - }; - -- qup_spi3_data_clk: qup-spi3-data-clk-pins { -+ qup_spi3_data_clk: qup-spi3-data-clk-state { - pins = "gpio12", "gpio13", "gpio14"; - function = "qup03"; - }; - -- qup_spi3_cs: qup-spi3-cs-pins { -+ qup_spi3_cs: qup-spi3-cs-state { - pins = "gpio15"; - function = "qup03"; - }; - -- qup_spi3_cs_gpio: qup-spi3-cs-gpio-pins { -+ qup_spi3_cs_gpio: qup-spi3-cs-gpio-state { - pins = "gpio15"; - function = "gpio"; - }; - -- qup_spi4_data_clk: qup-spi4-data-clk-pins { -+ qup_spi4_data_clk: qup-spi4-data-clk-state { - pins = "gpio16", "gpio17", "gpio18"; - function = "qup04"; - }; - -- qup_spi4_cs: qup-spi4-cs-pins { -+ qup_spi4_cs: qup-spi4-cs-state { - pins = "gpio19"; - function = "qup04"; - }; - -- qup_spi4_cs_gpio: qup-spi4-cs-gpio-pins { -+ qup_spi4_cs_gpio: qup-spi4-cs-gpio-state { - pins = "gpio19"; - function = "gpio"; - }; - -- qup_spi5_data_clk: qup-spi5-data-clk-pins { -+ qup_spi5_data_clk: qup-spi5-data-clk-state { - pins = "gpio20", "gpio21", "gpio22"; - function = "qup05"; - }; - -- qup_spi5_cs: qup-spi5-cs-pins { -+ qup_spi5_cs: qup-spi5-cs-state { - pins = "gpio23"; - function = "qup05"; - }; - -- qup_spi5_cs_gpio: qup-spi5-cs-gpio-pins { -+ qup_spi5_cs_gpio: qup-spi5-cs-gpio-state { - pins = "gpio23"; - function = "gpio"; - }; - -- qup_spi6_data_clk: qup-spi6-data-clk-pins { -+ qup_spi6_data_clk: qup-spi6-data-clk-state { - pins = "gpio24", "gpio25", "gpio26"; - function = "qup06"; - }; - -- qup_spi6_cs: qup-spi6-cs-pins { -+ qup_spi6_cs: qup-spi6-cs-state { - pins = "gpio27"; - function = "qup06"; - }; - -- qup_spi6_cs_gpio: qup-spi6-cs-gpio-pins { -+ qup_spi6_cs_gpio: qup-spi6-cs-gpio-state { - pins = "gpio27"; - function = "gpio"; - }; - -- qup_spi7_data_clk: qup-spi7-data-clk-pins { -+ qup_spi7_data_clk: qup-spi7-data-clk-state { - pins = "gpio28", "gpio29", "gpio30"; - function = "qup07"; - }; - -- qup_spi7_cs: qup-spi7-cs-pins { -+ qup_spi7_cs: qup-spi7-cs-state { - pins = "gpio31"; - function = "qup07"; - }; - -- qup_spi7_cs_gpio: qup-spi7-cs-gpio-pins { -+ qup_spi7_cs_gpio: qup-spi7-cs-gpio-state { - pins = "gpio31"; - function = "gpio"; - }; - -- qup_spi8_data_clk: qup-spi8-data-clk-pins { -+ qup_spi8_data_clk: qup-spi8-data-clk-state { - pins = "gpio32", "gpio33", "gpio34"; - function = "qup10"; - }; - -- qup_spi8_cs: qup-spi8-cs-pins { -+ qup_spi8_cs: qup-spi8-cs-state { - pins = "gpio35"; - function = "qup10"; - }; - -- qup_spi8_cs_gpio: qup-spi8-cs-gpio-pins { -+ qup_spi8_cs_gpio: qup-spi8-cs-gpio-state { - pins = "gpio35"; - function = "gpio"; - }; - -- qup_spi9_data_clk: qup-spi9-data-clk-pins { -+ qup_spi9_data_clk: qup-spi9-data-clk-state { - pins = "gpio36", "gpio37", "gpio38"; - function = "qup11"; - }; - -- qup_spi9_cs: qup-spi9-cs-pins { -+ qup_spi9_cs: qup-spi9-cs-state { - pins = "gpio39"; - function = "qup11"; - }; - -- qup_spi9_cs_gpio: qup-spi9-cs-gpio-pins { -+ qup_spi9_cs_gpio: qup-spi9-cs-gpio-state { - pins = "gpio39"; - function = "gpio"; - }; - -- qup_spi10_data_clk: qup-spi10-data-clk-pins { -+ qup_spi10_data_clk: qup-spi10-data-clk-state { - pins = "gpio40", "gpio41", "gpio42"; - function = "qup12"; - }; - -- qup_spi10_cs: qup-spi10-cs-pins { -+ qup_spi10_cs: qup-spi10-cs-state { - pins = "gpio43"; - function = "qup12"; - }; - -- qup_spi10_cs_gpio: qup-spi10-cs-gpio-pins { -+ qup_spi10_cs_gpio: qup-spi10-cs-gpio-state { - pins = "gpio43"; - function = "gpio"; - }; - -- qup_spi11_data_clk: qup-spi11-data-clk-pins { -+ qup_spi11_data_clk: qup-spi11-data-clk-state { - pins = "gpio44", "gpio45", "gpio46"; - function = "qup13"; - }; - -- qup_spi11_cs: qup-spi11-cs-pins { -+ qup_spi11_cs: qup-spi11-cs-state { - pins = "gpio47"; - function = "qup13"; - }; - -- qup_spi11_cs_gpio: qup-spi11-cs-gpio-pins { -+ qup_spi11_cs_gpio: qup-spi11-cs-gpio-state { - pins = "gpio47"; - function = "gpio"; - }; - -- qup_spi12_data_clk: qup-spi12-data-clk-pins { -+ qup_spi12_data_clk: qup-spi12-data-clk-state { - pins = "gpio48", "gpio49", "gpio50"; - function = "qup14"; - }; - -- qup_spi12_cs: qup-spi12-cs-pins { -+ qup_spi12_cs: qup-spi12-cs-state { - pins = "gpio51"; - function = "qup14"; - }; - -- qup_spi12_cs_gpio: qup-spi12-cs-gpio-pins { -+ qup_spi12_cs_gpio: qup-spi12-cs-gpio-state { - pins = "gpio51"; - function = "gpio"; - }; - -- qup_spi13_data_clk: qup-spi13-data-clk-pins { -+ qup_spi13_data_clk: qup-spi13-data-clk-state { - pins = "gpio52", "gpio53", "gpio54"; - function = "qup15"; - }; - -- qup_spi13_cs: qup-spi13-cs-pins { -+ qup_spi13_cs: qup-spi13-cs-state { - pins = "gpio55"; - function = "qup15"; - }; - -- qup_spi13_cs_gpio: qup-spi13-cs-gpio-pins { -+ qup_spi13_cs_gpio: qup-spi13-cs-gpio-state { - pins = "gpio55"; - function = "gpio"; - }; - -- qup_spi14_data_clk: qup-spi14-data-clk-pins { -+ qup_spi14_data_clk: qup-spi14-data-clk-state { - pins = "gpio56", "gpio57", "gpio58"; - function = "qup16"; - }; - -- qup_spi14_cs: qup-spi14-cs-pins { -+ qup_spi14_cs: qup-spi14-cs-state { - pins = "gpio59"; - function = "qup16"; - }; - -- qup_spi14_cs_gpio: qup-spi14-cs-gpio-pins { -+ qup_spi14_cs_gpio: qup-spi14-cs-gpio-state { - pins = "gpio59"; - function = "gpio"; - }; - -- qup_spi15_data_clk: qup-spi15-data-clk-pins { -+ qup_spi15_data_clk: qup-spi15-data-clk-state { - pins = "gpio60", "gpio61", "gpio62"; - function = "qup17"; - }; - -- qup_spi15_cs: qup-spi15-cs-pins { -+ qup_spi15_cs: qup-spi15-cs-state { - pins = "gpio63"; - function = "qup17"; - }; - -- qup_spi15_cs_gpio: qup-spi15-cs-gpio-pins { -+ qup_spi15_cs_gpio: qup-spi15-cs-gpio-state { - pins = "gpio63"; - function = "gpio"; - }; - -- qup_uart0_cts: qup-uart0-cts-pins { -+ qup_uart0_cts: qup-uart0-cts-state { - pins = "gpio0"; - function = "qup00"; - }; - -- qup_uart0_rts: qup-uart0-rts-pins { -+ qup_uart0_rts: qup-uart0-rts-state { - pins = "gpio1"; - function = "qup00"; - }; - -- qup_uart0_tx: qup-uart0-tx-pins { -+ qup_uart0_tx: qup-uart0-tx-state { - pins = "gpio2"; - function = "qup00"; - }; - -- qup_uart0_rx: qup-uart0-rx-pins { -+ qup_uart0_rx: qup-uart0-rx-state { - pins = "gpio3"; - function = "qup00"; - }; - -- qup_uart1_cts: qup-uart1-cts-pins { -+ qup_uart1_cts: qup-uart1-cts-state { - pins = "gpio4"; - function = "qup01"; - }; - -- qup_uart1_rts: qup-uart1-rts-pins { -+ qup_uart1_rts: qup-uart1-rts-state { - pins = "gpio5"; - function = "qup01"; - }; - -- qup_uart1_tx: qup-uart1-tx-pins { -+ qup_uart1_tx: qup-uart1-tx-state { - pins = "gpio6"; - function = "qup01"; - }; - -- qup_uart1_rx: qup-uart1-rx-pins { -+ qup_uart1_rx: qup-uart1-rx-state { - pins = "gpio7"; - function = "qup01"; - }; - -- qup_uart2_cts: qup-uart2-cts-pins { -+ qup_uart2_cts: qup-uart2-cts-state { - pins = "gpio8"; - function = "qup02"; - }; - -- qup_uart2_rts: qup-uart2-rts-pins { -+ qup_uart2_rts: qup-uart2-rts-state { - pins = "gpio9"; - function = "qup02"; - }; - -- qup_uart2_tx: qup-uart2-tx-pins { -+ qup_uart2_tx: qup-uart2-tx-state { - pins = "gpio10"; - function = "qup02"; - }; - -- qup_uart2_rx: qup-uart2-rx-pins { -+ qup_uart2_rx: qup-uart2-rx-state { - pins = "gpio11"; - function = "qup02"; - }; - -- qup_uart3_cts: qup-uart3-cts-pins { -+ qup_uart3_cts: qup-uart3-cts-state { - pins = "gpio12"; - function = "qup03"; - }; - -- qup_uart3_rts: qup-uart3-rts-pins { -+ qup_uart3_rts: qup-uart3-rts-state { - pins = "gpio13"; - function = "qup03"; - }; - -- qup_uart3_tx: qup-uart3-tx-pins { -+ qup_uart3_tx: qup-uart3-tx-state { - pins = "gpio14"; - function = "qup03"; - }; - -- qup_uart3_rx: qup-uart3-rx-pins { -+ qup_uart3_rx: qup-uart3-rx-state { - pins = "gpio15"; - function = "qup03"; - }; - -- qup_uart4_cts: qup-uart4-cts-pins { -+ qup_uart4_cts: qup-uart4-cts-state { - pins = "gpio16"; - function = "qup04"; - }; - -- qup_uart4_rts: qup-uart4-rts-pins { -+ qup_uart4_rts: qup-uart4-rts-state { - pins = "gpio17"; - function = "qup04"; - }; - -- qup_uart4_tx: qup-uart4-tx-pins { -+ qup_uart4_tx: qup-uart4-tx-state { - pins = "gpio18"; - function = "qup04"; - }; - -- qup_uart4_rx: qup-uart4-rx-pins { -+ qup_uart4_rx: qup-uart4-rx-state { - pins = "gpio19"; - function = "qup04"; - }; - -- qup_uart5_cts: qup-uart5-cts-pins { -+ qup_uart5_cts: qup-uart5-cts-state { - pins = "gpio20"; - function = "qup05"; - }; - -- qup_uart5_rts: qup-uart5-rts-pins { -+ qup_uart5_rts: qup-uart5-rts-state { - pins = "gpio21"; - function = "qup05"; - }; - -- qup_uart5_tx: qup-uart5-tx-pins { -+ qup_uart5_tx: qup-uart5-tx-state { - pins = "gpio22"; - function = "qup05"; - }; - -- qup_uart5_rx: qup-uart5-rx-pins { -+ qup_uart5_rx: qup-uart5-rx-state { - pins = "gpio23"; - function = "qup05"; - }; - -- qup_uart6_cts: qup-uart6-cts-pins { -+ qup_uart6_cts: qup-uart6-cts-state { - pins = "gpio24"; - function = "qup06"; - }; - -- qup_uart6_rts: qup-uart6-rts-pins { -+ qup_uart6_rts: qup-uart6-rts-state { - pins = "gpio25"; - function = "qup06"; - }; - -- qup_uart6_tx: qup-uart6-tx-pins { -+ qup_uart6_tx: qup-uart6-tx-state { - pins = "gpio26"; - function = "qup06"; - }; - -- qup_uart6_rx: qup-uart6-rx-pins { -+ qup_uart6_rx: qup-uart6-rx-state { - pins = "gpio27"; - function = "qup06"; - }; - -- qup_uart7_cts: qup-uart7-cts-pins { -+ qup_uart7_cts: qup-uart7-cts-state { - pins = "gpio28"; - function = "qup07"; - }; - -- qup_uart7_rts: qup-uart7-rts-pins { -+ qup_uart7_rts: qup-uart7-rts-state { - pins = "gpio29"; - function = "qup07"; - }; - -- qup_uart7_tx: qup-uart7-tx-pins { -+ qup_uart7_tx: qup-uart7-tx-state { - pins = "gpio30"; - function = "qup07"; - }; - -- qup_uart7_rx: qup-uart7-rx-pins { -+ qup_uart7_rx: qup-uart7-rx-state { - pins = "gpio31"; - function = "qup07"; - }; - -- qup_uart8_cts: qup-uart8-cts-pins { -+ qup_uart8_cts: qup-uart8-cts-state { - pins = "gpio32"; - function = "qup10"; - }; - -- qup_uart8_rts: qup-uart8-rts-pins { -+ qup_uart8_rts: qup-uart8-rts-state { - pins = "gpio33"; - function = "qup10"; - }; - -- qup_uart8_tx: qup-uart8-tx-pins { -+ qup_uart8_tx: qup-uart8-tx-state { - pins = "gpio34"; - function = "qup10"; - }; - -- qup_uart8_rx: qup-uart8-rx-pins { -+ qup_uart8_rx: qup-uart8-rx-state { - pins = "gpio35"; - function = "qup10"; - }; - -- qup_uart9_cts: qup-uart9-cts-pins { -+ qup_uart9_cts: qup-uart9-cts-state { - pins = "gpio36"; - function = "qup11"; - }; - -- qup_uart9_rts: qup-uart9-rts-pins { -+ qup_uart9_rts: qup-uart9-rts-state { - pins = "gpio37"; - function = "qup11"; - }; - -- qup_uart9_tx: qup-uart9-tx-pins { -+ qup_uart9_tx: qup-uart9-tx-state { - pins = "gpio38"; - function = "qup11"; - }; - -- qup_uart9_rx: qup-uart9-rx-pins { -+ qup_uart9_rx: qup-uart9-rx-state { - pins = "gpio39"; - function = "qup11"; - }; - -- qup_uart10_cts: qup-uart10-cts-pins { -+ qup_uart10_cts: qup-uart10-cts-state { - pins = "gpio40"; - function = "qup12"; - }; - -- qup_uart10_rts: qup-uart10-rts-pins { -+ qup_uart10_rts: qup-uart10-rts-state { - pins = "gpio41"; - function = "qup12"; - }; - -- qup_uart10_tx: qup-uart10-tx-pins { -+ qup_uart10_tx: qup-uart10-tx-state { - pins = "gpio42"; - function = "qup12"; - }; - -- qup_uart10_rx: qup-uart10-rx-pins { -+ qup_uart10_rx: qup-uart10-rx-state { - pins = "gpio43"; - function = "qup12"; - }; - -- qup_uart11_cts: qup-uart11-cts-pins { -+ qup_uart11_cts: qup-uart11-cts-state { - pins = "gpio44"; - function = "qup13"; - }; - -- qup_uart11_rts: qup-uart11-rts-pins { -+ qup_uart11_rts: qup-uart11-rts-state { - pins = "gpio45"; - function = "qup13"; - }; - -- qup_uart11_tx: qup-uart11-tx-pins { -+ qup_uart11_tx: qup-uart11-tx-state { - pins = "gpio46"; - function = "qup13"; - }; - -- qup_uart11_rx: qup-uart11-rx-pins { -+ qup_uart11_rx: qup-uart11-rx-state { - pins = "gpio47"; - function = "qup13"; - }; - -- qup_uart12_cts: qup-uart12-cts-pins { -+ qup_uart12_cts: qup-uart12-cts-state { - pins = "gpio48"; - function = "qup14"; - }; - -- qup_uart12_rts: qup-uart12-rts-pins { -+ qup_uart12_rts: qup-uart12-rts-state { - pins = "gpio49"; - function = "qup14"; - }; - -- qup_uart12_tx: qup-uart12-tx-pins { -+ qup_uart12_tx: qup-uart12-tx-state { - pins = "gpio50"; - function = "qup14"; - }; - -- qup_uart12_rx: qup-uart12-rx-pins { -+ qup_uart12_rx: qup-uart12-rx-state { - pins = "gpio51"; - function = "qup14"; - }; - -- qup_uart13_cts: qup-uart13-cts-pins { -+ qup_uart13_cts: qup-uart13-cts-state { - pins = "gpio52"; - function = "qup15"; - }; - -- qup_uart13_rts: qup-uart13-rts-pins { -+ qup_uart13_rts: qup-uart13-rts-state { - pins = "gpio53"; - function = "qup15"; - }; - -- qup_uart13_tx: qup-uart13-tx-pins { -+ qup_uart13_tx: qup-uart13-tx-state { - pins = "gpio54"; - function = "qup15"; - }; - -- qup_uart13_rx: qup-uart13-rx-pins { -+ qup_uart13_rx: qup-uart13-rx-state { - pins = "gpio55"; - function = "qup15"; - }; - -- qup_uart14_cts: qup-uart14-cts-pins { -+ qup_uart14_cts: qup-uart14-cts-state { - pins = "gpio56"; - function = "qup16"; - }; - -- qup_uart14_rts: qup-uart14-rts-pins { -+ qup_uart14_rts: qup-uart14-rts-state { - pins = "gpio57"; - function = "qup16"; - }; - -- qup_uart14_tx: qup-uart14-tx-pins { -+ qup_uart14_tx: qup-uart14-tx-state { - pins = "gpio58"; - function = "qup16"; - }; - -- qup_uart14_rx: qup-uart14-rx-pins { -+ qup_uart14_rx: qup-uart14-rx-state { - pins = "gpio59"; - function = "qup16"; - }; - -- qup_uart15_cts: qup-uart15-cts-pins { -+ qup_uart15_cts: qup-uart15-cts-state { - pins = "gpio60"; - function = "qup17"; - }; - -- qup_uart15_rts: qup-uart15-rts-pins { -+ qup_uart15_rts: qup-uart15-rts-state { - pins = "gpio61"; - function = "qup17"; - }; - -- qup_uart15_tx: qup-uart15-tx-pins { -+ qup_uart15_tx: qup-uart15-tx-state { - pins = "gpio62"; - function = "qup17"; - }; - -- qup_uart15_rx: qup-uart15-rx-pins { -+ qup_uart15_rx: qup-uart15-rx-state { - pins = "gpio63"; - function = "qup17"; - }; - -- sdc1_clk: sdc1-clk-pins { -+ sdc1_clk: sdc1-clk-state { - pins = "sdc1_clk"; - }; - -- sdc1_cmd: sdc1-cmd-pins { -+ sdc1_cmd: sdc1-cmd-state { - pins = "sdc1_cmd"; - }; - -- sdc1_data: sdc1-data-pins { -+ sdc1_data: sdc1-data-state { - pins = "sdc1_data"; - }; - -- sdc1_rclk: sdc1-rclk-pins { -+ sdc1_rclk: sdc1-rclk-state { - pins = "sdc1_rclk"; - }; - -- sdc1_clk_sleep: sdc1-clk-sleep-pins { -+ sdc1_clk_sleep: sdc1-clk-sleep-state { - pins = "sdc1_clk"; - drive-strength = <2>; - bias-bus-hold; - }; - -- sdc1_cmd_sleep: sdc1-cmd-sleep-pins { -+ sdc1_cmd_sleep: sdc1-cmd-sleep-state { - pins = "sdc1_cmd"; - drive-strength = <2>; - bias-bus-hold; - }; - -- sdc1_data_sleep: sdc1-data-sleep-pins { -+ sdc1_data_sleep: sdc1-data-sleep-state { - pins = "sdc1_data"; - drive-strength = <2>; - bias-bus-hold; - }; - -- sdc1_rclk_sleep: sdc1-rclk-sleep-pins { -+ sdc1_rclk_sleep: sdc1-rclk-sleep-state { - pins = "sdc1_rclk"; - drive-strength = <2>; - bias-bus-hold; - }; - -- sdc2_clk: sdc2-clk-pins { -+ sdc2_clk: sdc2-clk-state { - pins = "sdc2_clk"; - }; - -- sdc2_cmd: sdc2-cmd-pins { -+ sdc2_cmd: sdc2-cmd-state { - pins = "sdc2_cmd"; - }; - -- sdc2_data: sdc2-data-pins { -+ sdc2_data: sdc2-data-state { - pins = "sdc2_data"; - }; - -- sdc2_clk_sleep: sdc2-clk-sleep-pins { -+ sdc2_clk_sleep: sdc2-clk-sleep-state { - pins = "sdc2_clk"; - drive-strength = <2>; - bias-bus-hold; - }; - -- sdc2_cmd_sleep: sdc2-cmd-sleep-pins { -+ sdc2_cmd_sleep: sdc2-cmd-sleep-state { - pins = "sdc2_cmd"; - drive-strength = <2>; - bias-bus-hold; - }; - -- sdc2_data_sleep: sdc2-data-sleep-pins { -+ sdc2_data_sleep: sdc2-data-sleep-state { - pins = "sdc2_data"; - drive-strength = <2>; - bias-bus-hold; --- -2.39.2 - diff --git a/queue-6.1/arm64-dts-sc7180-rename-qspi-data12-as-data23.patch b/queue-6.1/arm64-dts-sc7180-rename-qspi-data12-as-data23.patch index 4dcf68aa2e3..f5072da04d6 100644 --- a/queue-6.1/arm64-dts-sc7180-rename-qspi-data12-as-data23.patch +++ b/queue-6.1/arm64-dts-sc7180-rename-qspi-data12-as-data23.patch @@ -19,22 +19,17 @@ Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20230323102605.1.Ifc1b5be04653f4ab119698a5944bfecded2080d6@changeid Signed-off-by: Sasha Levin --- - arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi -index 199d5cdb7a4e7..f45e0f6af813c 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi -@@ -1511,7 +1511,7 @@ - function = "qspi_data"; +@@ -1521,7 +1521,7 @@ + }; }; -- qspi_data12: qspi-data12-state { -+ qspi_data23: qspi-data23-state { - pins = "gpio66", "gpio67"; - function = "qspi_data"; - }; --- -2.39.2 - +- qspi_data12: qspi-data12 { ++ qspi_data23: qspi-data23 { + pinmux-data { + pins = "gpio66", "gpio67"; + function = "qspi_data"; diff --git a/queue-6.1/arm64-dts-sc7280-rename-qspi-data12-as-data23.patch b/queue-6.1/arm64-dts-sc7280-rename-qspi-data12-as-data23.patch index aee4a28550d..9a081aad92b 100644 --- a/queue-6.1/arm64-dts-sc7280-rename-qspi-data12-as-data23.patch +++ b/queue-6.1/arm64-dts-sc7280-rename-qspi-data12-as-data23.patch @@ -19,22 +19,17 @@ Signed-off-by: Bjorn Andersson Link: https://lore.kernel.org/r/20230323102605.2.I4043491bb24b1e92267c5033d76cdb0fe60934da@changeid Signed-off-by: Sasha Levin --- - arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi -index dad8f5e4f9aa6..659d75b560f81 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -4345,7 +4345,7 @@ function = "qspi_data"; }; -- qspi_data12: qspi-data12-state { -+ qspi_data23: qspi-data23-state { +- qspi_data12: qspi-data12-pins { ++ qspi_data23: qspi-data23-pins { pins = "gpio16", "gpio17"; function = "qspi_data"; }; --- -2.39.2 - diff --git a/queue-6.1/series b/queue-6.1/series index 6a8a88aec70..bc5fcbf2ee0 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -218,11 +218,7 @@ regulator-core-avoid-lockdep-reports-when-resolving-.patch x86-apic-fix-atomic-update-of-offset-in-reserve_eilv.patch arm64-dts-qcom-msm8994-angler-fix-cont_splash_mem-ma.patch arm64-dts-qcom-msm8994-angler-removed-clash-with-sme.patch -arm64-dts-qcom-correct-white-space-before.patch -arm64-dts-qcom-sc7180-revert-arm64-dts-qcom-sc7180-a.patch -arm64-dts-qcom-sc7180-align-tlmm-pin-configuration-w.patch arm64-dts-sc7180-rename-qspi-data12-as-data23.patch -arm64-dts-qcom-sc7280-align-tlmm-pin-configuration-w.patch arm64-dts-sc7280-rename-qspi-data12-as-data23.patch media-mediatek-vcodec-use-4k-frame-size-when-support.patch media-mediatek-vcodec-make-mm21-the-default-capture-.patch