ARM: dts: qcom: apq8064: adhere to pinctrl dtschema

Pass dtbs_check for qcom,apq8064-pinctrl.yaml.

Signed-off-by: Rayyan Ansari <rayyan.ansari@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240711110545.31641-5-rayyan.ansari@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
This commit is contained in:
Rayyan Ansari
2024-07-11 12:01:40 +01:00
committed by Bjorn Andersson
parent 6dbec1c39d
commit c9c8f449c8
5 changed files with 182 additions and 294 deletions
@@ -188,24 +188,17 @@
};
&tlmm_pinmux {
card_detect: card_detect {
mux {
pins = "gpio26";
function = "gpio";
bias-disable;
};
card_detect: card-detect-state {
pins = "gpio26";
function = "gpio";
bias-disable;
};
pcie_pins: pcie_pinmux {
mux {
pins = "gpio27";
function = "gpio";
};
conf {
pins = "gpio27";
drive-strength = <12>;
bias-disable;
};
pcie_pins: pcie-state {
pins = "gpio27";
function = "gpio";
drive-strength = <12>;
bias-disable;
};
};
@@ -321,24 +321,17 @@
};
&tlmm_pinmux {
card_detect: card_detect {
mux {
pins = "gpio26";
function = "gpio";
bias-disable;
};
card_detect: card-detect-state {
pins = "gpio26";
function = "gpio";
bias-disable;
};
pcie_pins: pcie_pinmux {
mux {
pins = "gpio27";
function = "gpio";
};
conf {
pins = "gpio27";
drive-strength = <12>;
bias-disable;
};
pcie_pins: pcie-state {
pins = "gpio27";
function = "gpio";
drive-strength = <12>;
bias-disable;
};
};
+142 -240
View File
@@ -1,236 +1,59 @@
// SPDX-License-Identifier: GPL-2.0
&tlmm_pinmux {
sdc4_gpios: sdc4-gpios {
pios {
pins = "gpio63", "gpio64", "gpio65", "gpio66", "gpio67", "gpio68";
function = "sdc4";
};
};
sdcc1_pins: sdcc1-pin-active {
clk {
sdcc1_default_state: sdcc1-default-state {
clk-pins {
pins = "sdc1_clk";
drive-strength = <16>;
bias-disable;
};
cmd {
cmd-pins {
pins = "sdc1_cmd";
drive-strength = <10>;
bias-pull-up;
};
data {
data-pins {
pins = "sdc1_data";
drive-strength = <10>;
bias-pull-up;
};
};
sdcc3_pins: sdcc3-pin-active {
clk {
sdcc3_default_state: sdcc3-default-state {
clk-pins {
pins = "sdc3_clk";
drive-strength = <8>;
bias-disable;
};
cmd {
cmd-pins {
pins = "sdc3_cmd";
drive-strength = <8>;
bias-pull-up;
};
data {
data-pins {
pins = "sdc3_data";
drive-strength = <8>;
bias-pull-up;
};
};
ps_hold: ps_hold {
mux {
pins = "gpio78";
function = "ps_hold";
};
sdc4_default_state: sdc4-default-state {
pins = "gpio63", "gpio64", "gpio65", "gpio66", "gpio67", "gpio68";
function = "sdc4";
};
i2c1_pins: i2c1 {
mux {
pins = "gpio20", "gpio21";
function = "gsbi1";
};
pinconf {
pins = "gpio20", "gpio21";
drive-strength = <16>;
bias-disable;
};
gsbi1_uart_2pins: gsbi1-uart-2pins-state {
pins = "gpio18", "gpio19";
function = "gsbi1";
};
i2c1_pins_sleep: i2c1_pins_sleep {
mux {
pins = "gpio20", "gpio21";
function = "gpio";
};
pinconf {
pins = "gpio20", "gpio21";
drive-strength = <2>;
bias-disable;
};
};
gsbi1_uart_2pins: gsbi1_uart_2pins {
mux {
pins = "gpio18", "gpio19";
function = "gsbi1";
};
};
gsbi1_uart_4pins: gsbi1_uart_4pins {
mux {
pins = "gpio18", "gpio19", "gpio20", "gpio21";
function = "gsbi1";
};
};
i2c2_pins: i2c2 {
mux {
pins = "gpio24", "gpio25";
function = "gsbi2";
};
pinconf {
pins = "gpio24", "gpio25";
drive-strength = <16>;
bias-disable;
};
};
i2c2_pins_sleep: i2c2_pins_sleep {
mux {
pins = "gpio24", "gpio25";
function = "gpio";
};
pinconf {
pins = "gpio24", "gpio25";
drive-strength = <2>;
bias-disable;
};
};
i2c3_pins: i2c3 {
mux {
pins = "gpio8", "gpio9";
function = "gsbi3";
};
pinconf {
pins = "gpio8", "gpio9";
drive-strength = <16>;
bias-disable;
};
};
i2c3_pins_sleep: i2c3_pins_sleep {
mux {
pins = "gpio8", "gpio9";
function = "gpio";
};
pinconf {
pins = "gpio8", "gpio9";
drive-strength = <2>;
bias-disable;
};
};
i2c4_pins: i2c4 {
mux {
pins = "gpio12", "gpio13";
function = "gsbi4";
};
pinconf {
pins = "gpio12", "gpio13";
drive-strength = <16>;
bias-disable;
};
};
i2c4_pins_sleep: i2c4_pins_sleep {
mux {
pins = "gpio12", "gpio13";
function = "gpio";
};
pinconf {
pins = "gpio12", "gpio13";
drive-strength = <2>;
bias-disable;
};
};
spi5_default: spi5_default {
pinmux {
pins = "gpio51", "gpio52", "gpio54";
function = "gsbi5";
};
pinmux_cs {
function = "gpio";
pins = "gpio53";
};
pinconf {
pins = "gpio51", "gpio52", "gpio54";
drive-strength = <16>;
bias-disable;
};
pinconf_cs {
pins = "gpio53";
drive-strength = <16>;
bias-disable;
output-high;
};
};
spi5_sleep: spi5_sleep {
pinmux {
function = "gpio";
pins = "gpio51", "gpio52", "gpio53", "gpio54";
};
pinconf {
pins = "gpio51", "gpio52", "gpio53", "gpio54";
drive-strength = <2>;
bias-pull-down;
};
};
i2c6_pins: i2c6 {
mux {
pins = "gpio16", "gpio17";
function = "gsbi6";
};
pinconf {
pins = "gpio16", "gpio17";
drive-strength = <16>;
bias-disable;
};
};
i2c6_pins_sleep: i2c6_pins_sleep {
mux {
pins = "gpio16", "gpio17";
function = "gpio";
};
pinconf {
pins = "gpio16", "gpio17";
drive-strength = <2>;
bias-disable;
};
gsbi1_uart_4pins: gsbi1-uart-4pins-state {
pins = "gpio18", "gpio19", "gpio20", "gpio21";
function = "gsbi1";
};
gsbi4_uart_pin_a: gsbi4-uart-pin-active-state {
@@ -249,70 +72,147 @@
};
};
gsbi6_uart_2pins: gsbi6_uart_2pins {
mux {
pins = "gpio14", "gpio15";
function = "gsbi6";
};
gsbi6_uart_2pins: gsbi6-uart-2pins-state {
pins = "gpio14", "gpio15";
function = "gsbi6";
};
gsbi6_uart_4pins: gsbi6_uart_4pins {
mux {
pins = "gpio14", "gpio15", "gpio16", "gpio17";
function = "gsbi6";
};
gsbi6_uart_4pins: gsbi6-uart-4pins-state {
pins = "gpio14", "gpio15", "gpio16", "gpio17";
function = "gsbi6";
};
gsbi7_uart_2pins: gsbi7_uart_2pins {
mux {
pins = "gpio82", "gpio83";
function = "gsbi7";
};
gsbi7_uart_2pins: gsbi7-uart-2pins-state {
pins = "gpio82", "gpio83";
function = "gsbi7";
};
gsbi7_uart_4pins: gsbi7_uart_4pins {
mux {
pins = "gpio82", "gpio83", "gpio84", "gpio85";
function = "gsbi7";
};
gsbi7_uart_4pins: gsbi7_uart_4pins-state {
pins = "gpio82", "gpio83", "gpio84", "gpio85";
function = "gsbi7";
};
i2c7_pins: i2c7 {
mux {
pins = "gpio84", "gpio85";
function = "gsbi7";
};
i2c1_default_state: i2c1-default-state {
pins = "gpio20", "gpio21";
function = "gsbi1";
drive-strength = <16>;
bias-disable;
};
pinconf {
pins = "gpio84", "gpio85";
i2c1_sleep_state: i2c1-sleep-state {
pins = "gpio20", "gpio21";
function = "gpio";
drive-strength = <2>;
bias-disable;
};
i2c2_default_state: i2c2-default-state {
pins = "gpio24", "gpio25";
function = "gsbi2";
drive-strength = <16>;
bias-disable;
};
i2c2_sleep_state: i2c2-sleep-state {
pins = "gpio24", "gpio25";
function = "gpio";
drive-strength = <2>;
bias-disable;
};
i2c3_default_state: i2c3-default-state {
pins = "gpio8", "gpio9";
function = "gsbi3";
drive-strength = <16>;
bias-disable;
};
i2c3_sleep_state: i2c3-sleep-state {
pins = "gpio8", "gpio9";
function = "gpio";
drive-strength = <2>;
bias-disable;
};
i2c4_default_state: i2c4-default-state {
pins = "gpio12", "gpio13";
function = "gsbi4";
drive-strength = <16>;
bias-disable;
};
i2c4_sleep_state: i2c4-sleep-state {
pins = "gpio12", "gpio13";
function = "gpio";
drive-strength = <2>;
bias-disable;
};
i2c6_default_state: i2c6-default-state {
pins = "gpio16", "gpio17";
function = "gsbi6";
drive-strength = <16>;
bias-disable;
};
i2c6_sleep_state: i2c6-sleep-state {
pins = "gpio16", "gpio17";
function = "gpio";
drive-strength = <2>;
bias-disable;
};
i2c7_default_state: i2c7-default-state {
pins = "gpio84", "gpio85";
function = "gsbi7";
drive-strength = <16>;
bias-disable;
};
i2c7_sleep_state: i2c7-sleep-state {
pins = "gpio84", "gpio85";
function = "gpio";
drive-strength = <2>;
bias-disable;
};
spi5_default_state: spi5-default-state {
spi5-pins {
pins = "gpio51", "gpio52", "gpio54";
function = "gsbi5";
drive-strength = <16>;
bias-disable;
};
};
i2c7_pins_sleep: i2c7_pins_sleep {
mux {
pins = "gpio84", "gpio85";
spi5-cs-pins {
pins = "gpio53";
function = "gpio";
};
pinconf {
pins = "gpio84", "gpio85";
drive-strength = <2>;
drive-strength = <16>;
bias-disable;
output-high;
};
};
riva_fm_pin_a: riva-fm-active {
spi5_sleep_state: spi5-sleep-state {
spi5-pins {
pins = "gpio51", "gpio52", "gpio53", "gpio54";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
};
};
riva_fm_pin_a: riva-fm-active-state {
pins = "gpio14", "gpio15";
function = "riva_fm";
};
riva_bt_pin_a: riva-bt-active {
riva_bt_pin_a: riva-bt-active-state {
pins = "gpio16", "gpio17";
function = "riva_bt";
};
riva_wlan_pin_a: riva-wlan-active {
riva_wlan_pin_a: riva-wlan-active-state {
pins = "gpio64", "gpio65", "gpio66", "gpio67", "gpio68";
function = "riva_wlan";
@@ -320,22 +220,24 @@
bias-pull-down;
};
hdmi_pinctrl: hdmi-pinctrl {
mux {
pins = "gpio70", "gpio71", "gpio72";
function = "hdmi";
};
pinconf_ddc {
hdmi_pinctrl: hdmi-pinctrl-state {
ddc-pins {
pins = "gpio70", "gpio71";
function = "hdmi";
bias-pull-up;
drive-strength = <2>;
};
pinconf_hpd {
hpd-pins {
pins = "gpio72";
function = "hdmi";
bias-pull-down;
drive-strength = <16>;
};
};
ps_hold_default_state: ps-hold-default-state {
pins = "gpio78";
function = "ps_hold";
};
};
@@ -373,21 +373,21 @@
cd-gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&sdcc3_pins>, <&sdcc3_cd_pin_a>;
pinctrl-0 = <&sdcc3_default_state>, <&sdcc3_cd_pin_a>;
status = "okay";
};
&tlmm_pinmux {
gsbi5_uart_pin_a: gsbi5-uart-pin-active {
rx {
gsbi5_uart_pin_a: gsbi5-uart-pin-active-state {
rx-pins {
pins = "gpio52";
function = "gsbi5";
drive-strength = <2>;
bias-pull-up;
};
tx {
tx-pins {
pins = "gpio51";
function = "gsbi5";
drive-strength = <4>;
@@ -396,7 +396,7 @@
};
sdcc3_cd_pin_a: sdcc3-cd-pin-active {
sdcc3_cd_pin_a: sdcc3-cd-pin-active-state {
pins = "gpio26";
function = "gpio";
+17 -17
View File
@@ -302,7 +302,7 @@
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&ps_hold>;
pinctrl-0 = <&ps_hold_default_state>;
};
sfpb_wrapper_mutex: syscon@1200000 {
@@ -435,8 +435,8 @@
gsbi1_i2c: i2c@12460000 {
compatible = "qcom,i2c-qup-v1.1.1";
pinctrl-0 = <&i2c1_pins>;
pinctrl-1 = <&i2c1_pins_sleep>;
pinctrl-0 = <&i2c1_default_state>;
pinctrl-1 = <&i2c1_sleep_state>;
pinctrl-names = "default", "sleep";
reg = <0x12460000 0x1000>;
interrupts = <GIC_SPI 194 IRQ_TYPE_LEVEL_HIGH>;
@@ -465,8 +465,8 @@
gsbi2_i2c: i2c@124a0000 {
compatible = "qcom,i2c-qup-v1.1.1";
reg = <0x124a0000 0x1000>;
pinctrl-0 = <&i2c2_pins>;
pinctrl-1 = <&i2c2_pins_sleep>;
pinctrl-0 = <&i2c2_default_state>;
pinctrl-1 = <&i2c2_sleep_state>;
pinctrl-names = "default", "sleep";
interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GSBI2_QUP_CLK>, <&gcc GSBI2_H_CLK>;
@@ -489,8 +489,8 @@
ranges;
gsbi3_i2c: i2c@16280000 {
compatible = "qcom,i2c-qup-v1.1.1";
pinctrl-0 = <&i2c3_pins>;
pinctrl-1 = <&i2c3_pins_sleep>;
pinctrl-0 = <&i2c3_default_state>;
pinctrl-1 = <&i2c3_sleep_state>;
pinctrl-names = "default", "sleep";
reg = <0x16280000 0x1000>;
interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
@@ -528,8 +528,8 @@
gsbi4_i2c: i2c@16380000 {
compatible = "qcom,i2c-qup-v1.1.1";
pinctrl-0 = <&i2c4_pins>;
pinctrl-1 = <&i2c4_pins_sleep>;
pinctrl-0 = <&i2c4_default_state>;
pinctrl-1 = <&i2c4_sleep_state>;
pinctrl-names = "default", "sleep";
reg = <0x16380000 0x1000>;
interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
@@ -565,8 +565,8 @@
compatible = "qcom,spi-qup-v1.1.1";
reg = <0x1a280000 0x1000>;
interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-0 = <&spi5_default>;
pinctrl-1 = <&spi5_sleep>;
pinctrl-0 = <&spi5_default_state>;
pinctrl-1 = <&spi5_sleep_state>;
pinctrl-names = "default", "sleep";
clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>;
clock-names = "core", "iface";
@@ -599,8 +599,8 @@
gsbi6_i2c: i2c@16580000 {
compatible = "qcom,i2c-qup-v1.1.1";
pinctrl-0 = <&i2c6_pins>;
pinctrl-1 = <&i2c6_pins_sleep>;
pinctrl-0 = <&i2c6_default_state>;
pinctrl-1 = <&i2c6_sleep_state>;
pinctrl-names = "default", "sleep";
reg = <0x16580000 0x1000>;
interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
@@ -635,8 +635,8 @@
gsbi7_i2c: i2c@16680000 {
compatible = "qcom,i2c-qup-v1.1.1";
pinctrl-0 = <&i2c7_pins>;
pinctrl-1 = <&i2c7_pins_sleep>;
pinctrl-0 = <&i2c7_default_state>;
pinctrl-1 = <&i2c7_sleep_state>;
pinctrl-names = "default", "sleep";
reg = <0x16680000 0x1000>;
interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
@@ -945,7 +945,7 @@
dmas = <&sdcc4bam 2>, <&sdcc4bam 1>;
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-0 = <&sdc4_gpios>;
pinctrl-0 = <&sdc4_default_state>;
};
sdcc4bam: dma-controller@121c2000 {
@@ -962,7 +962,7 @@
status = "disabled";
compatible = "arm,pl18x", "arm,primecell";
pinctrl-names = "default";
pinctrl-0 = <&sdcc1_pins>;
pinctrl-0 = <&sdcc1_default_state>;
arm,primecell-periphid = <0x00051180>;
reg = <0x12400000 0x2000>;
interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;