* [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8974: convert to dtschema
@ 2022-10-17 1:22 Krzysztof Kozlowski
2022-10-17 1:22 ` [PATCH 2/2] ARM: dts: qcom: msm8974: align TLMM pin configuration with DT schema Krzysztof Kozlowski
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-17 1:22 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Linus Walleij,
Rob Herring, Krzysztof Kozlowski, linux-arm-msm, linux-gpio,
devicetree, linux-kernel
Cc: Krzysztof Kozlowski
Convert Qualcomm MSM8974 pin controller bindings to DT schema. Keep the
parsing of pin configuration subnodes consistent with other Qualcomm
schemas (children named with '-state' suffix, their children with
'-pins').
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
.../bindings/pinctrl/qcom,msm8974-pinctrl.txt | 121 ------------
.../pinctrl/qcom,msm8974-pinctrl.yaml | 179 ++++++++++++++++++
2 files changed, 179 insertions(+), 121 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.yaml
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt
deleted file mode 100644
index 004056506679..000000000000
--- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-Qualcomm MSM8974 TLMM block
-
-Required properties:
-- compatible: "qcom,msm8974-pinctrl"
-- reg: Should be the base address and length of the TLMM block.
-- interrupts: Should be the parent IRQ of the TLMM block.
-- interrupt-controller: Marks the device node as an interrupt controller.
-- #interrupt-cells: Should be two.
-- gpio-controller: Marks the device node as a GPIO controller.
-- #gpio-cells : Should be two.
- The first cell is the gpio pin number and the
- second cell is used for optional parameters.
-- gpio-ranges: see ../gpio/gpio.txt
-
-Optional properties:
-
-- gpio-reserved-ranges: see ../gpio/gpio.txt
-
-Please refer to ../gpio/gpio.txt and ../interrupt-controller/interrupts.txt for
-a general description of GPIO and interrupt bindings.
-
-Please refer to pinctrl-bindings.txt in this directory for details of the
-common pinctrl bindings used by client devices, including the meaning of the
-phrase "pin configuration node".
-
-Qualcomm's pin configuration nodes act as a container for an arbitrary number of
-subnodes. Each of these subnodes represents some desired configuration for a
-pin, a group, or a list of pins or groups. This configuration can include the
-mux function to select on those pin(s)/group(s), and various pin configuration
-parameters, such as pull-up, drive strength, etc.
-
-The name of each subnode is not important; all subnodes should be enumerated
-and processed purely based on their content.
-
-Each subnode only affects those parameters that are explicitly listed. In
-other words, a subnode that lists a mux function but no pin configuration
-parameters implies no information about any pin configuration parameters.
-Similarly, a pin subnode that describes a pullup parameter implies no
-information about e.g. the mux function.
-
-
-The following generic properties as defined in pinctrl-bindings.txt are valid
-to specify in a pin configuration subnode:
- pins, function, bias-disable, bias-pull-down, bias-pull-up, drive-strength.
-
-Non-empty subnodes must specify the 'pins' property.
-Note that not all properties are valid for all pins.
-
-
-Valid values for pins are:
- gpio0-gpio145
- Supports mux, bias and drive-strength
-
- sdc1_clk, sdc1_cmd, sdc1_data, sdc2_clk, sdc2_cmd, sdc2_data
- Supports bias and drive-strength
-
- hsic_data, hsic_strobe
- Supports only mux
-
-Valid values for function are:
- cci_i2c0, cci_i2c1, uim1, uim2, uim_batt_alarm,
- blsp_uim1, blsp_uart1, blsp_i2c1, blsp_spi1,
- blsp_uim2, blsp_uart2, blsp_i2c2, blsp_spi2,
- blsp_uim3, blsp_uart3, blsp_i2c3, blsp_spi3,
- blsp_uim4, blsp_uart4, blsp_i2c4, blsp_spi4,
- blsp_uim5, blsp_uart5, blsp_i2c5, blsp_spi5,
- blsp_uim6, blsp_uart6, blsp_i2c6, blsp_spi6,
- blsp_uim7, blsp_uart7, blsp_i2c7, blsp_spi7,
- blsp_uim8, blsp_uart8, blsp_i2c8, blsp_spi8,
- blsp_uim9, blsp_uart9, blsp_i2c9, blsp_spi9,
- blsp_uim10, blsp_uart10, blsp_i2c10, blsp_spi10,
- blsp_uim11, blsp_uart11, blsp_i2c11, blsp_spi11,
- blsp_uim12, blsp_uart12, blsp_i2c12, blsp_spi12,
- blsp_spi1_cs1, blsp_spi2_cs2, blsp_spi_cs3, blsp_spi2_cs1, blsp_spi2_cs2
- blsp_spi2_cs3, blsp_spi10_cs1, blsp_spi10_cs2, blsp_spi10_cs3,
- sdc3, sdc4, gcc_gp_clk1, gcc_gp_clk2, gcc_gp_clk3, cci_timer0, cci_timer1,
- cci_timer2, cci_timer3, cci_async_in0, cci_async_in1, cci_async_in2,
- cam_mckl0, cam_mclk1, cam_mclk2, cam_mclk3, mdp_vsync, hdmi_cec, hdmi_ddc,
- hdmi_hpd, edp_hpd, gp_pdm0, gp_pdm1, gp_pdm2, gp_pdm3, gp0_clk, gp1_clk,
- gp_mn, tsif1, tsif2, hsic, grfc, audio_ref_clk, qua_mi2s, pri_mi2s, spkr_mi2s,
- ter_mi2s, sec_mi2s, bt, fm, wlan, slimbus, hsic_ctl, gpio
-
- (Note that this is not yet the complete list of functions)
-
-
-
-Example:
-
- msmgpio: pinctrl@fd510000 {
- compatible = "qcom,msm8974-pinctrl";
- reg = <0xfd510000 0x4000>;
-
- gpio-controller;
- #gpio-cells = <2>;
- gpio-ranges = <&msmgpio 0 0 146>;
- interrupt-controller;
- #interrupt-cells = <2>;
- interrupts = <0 208 0>;
-
- pinctrl-names = "default";
- pinctrl-0 = <&uart2_default>;
-
- uart2_default: uart2_default {
- mux {
- pins = "gpio4", "gpio5";
- function = "blsp_uart2";
- };
-
- tx {
- pins = "gpio4";
- drive-strength = <4>;
- bias-disable;
- };
-
- rx {
- pins = "gpio5";
- drive-strength = <2>;
- bias-pull-up;
- };
- };
- };
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.yaml
new file mode 100644
index 000000000000..9287cbbff711
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.yaml
@@ -0,0 +1,179 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/pinctrl/qcom,msm8974-pinctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm MSM8974 TLMM pin controller
+
+maintainers:
+ - Bjorn Andersson <andersson@kernel.org>
+ - Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+
+description:
+ Top Level Mode Multiplexer pin controller in Qualcomm MSM8974 SoC.
+
+properties:
+ compatible:
+ const: qcom,msm8974-pinctrl
+
+ reg:
+ maxItems: 1
+
+ interrupts: true
+ interrupt-controller: true
+ "#interrupt-cells": true
+ gpio-controller: true
+ "#gpio-cells": true
+ gpio-ranges: true
+ wakeup-parent: true
+
+ gpio-reserved-ranges:
+ minItems: 1
+ maxItems: 73
+
+ gpio-line-names:
+ maxItems: 146
+
+patternProperties:
+ "-state$":
+ oneOf:
+ - $ref: "#/$defs/qcom-msm8974-tlmm-state"
+ - patternProperties:
+ "-pins$":
+ $ref: "#/$defs/qcom-msm8974-tlmm-state"
+ additionalProperties: false
+
+$defs:
+ qcom-msm8974-tlmm-state:
+ type: object
+ description:
+ Pinctrl node's client devices use subnodes for desired pin configuration.
+ Client device subnodes use below standard properties.
+ $ref: qcom,tlmm-common.yaml#/$defs/qcom-tlmm-state
+
+ properties:
+ pins:
+ description:
+ List of gpio pins affected by the properties specified in this
+ subnode.
+ items:
+ oneOf:
+ - pattern: "^gpio([0-9]|[1-9][0-9]|1[0-3][0-9]|14[0-5])$"
+ - enum: [ hsic_data, hsic_strobe, sdc1_clk, sdc1_cmd, sdc1_data,
+ sdc2_clk, sdc2_cmd, sdc2_data ]
+ minItems: 1
+ maxItems: 36
+
+ function:
+ description:
+ Specify the alternative function to be configured for the specified
+ pins.
+
+ enum: [ gpio, cci_i2c0, cci_i2c1, uim1, uim2, uim_batt_alarm,
+ blsp_uim1, blsp_uart1, blsp_i2c1, blsp_spi1, blsp_uim2,
+ blsp_uart2, blsp_i2c2, blsp_spi2, blsp_uim3, blsp_uart3,
+ blsp_i2c3, blsp_spi3, blsp_uim4, blsp_uart4, blsp_i2c4,
+ blsp_spi4, blsp_uim5, blsp_uart5, blsp_i2c5, blsp_spi5,
+ blsp_uim6, blsp_uart6, blsp_i2c6, blsp_spi6, blsp_uim7,
+ blsp_uart7, blsp_i2c7, blsp_spi7, blsp_uim8, blsp_uart8,
+ blsp_i2c8, blsp_spi8, blsp_uim9, blsp_uart9, blsp_i2c9,
+ blsp_spi9, blsp_uim10, blsp_uart10, blsp_i2c10, blsp_spi10,
+ blsp_uim11, blsp_uart11, blsp_i2c11, blsp_spi11, blsp_uim12,
+ blsp_uart12, blsp_i2c12, blsp_spi12, blsp_spi1_cs1,
+ blsp_spi2_cs2, blsp_spi_cs3, blsp_spi2_cs1, blsp_spi2_cs2
+ blsp_spi2_cs3, blsp_spi10_cs1, blsp_spi10_cs2, blsp_spi10_cs3,
+ sdc3, sdc4, gcc_gp_clk1, gcc_gp_clk2, gcc_gp_clk3, cci_timer0,
+ cci_timer1, cci_timer2, cci_timer3, cci_async_in0,
+ cci_async_in1, cci_async_in2, cam_mckl0, cam_mclk1, cam_mclk2,
+ cam_mclk3, mdp_vsync, hdmi_cec, hdmi_ddc, hdmi_hpd, edp_hpd,
+ gp_pdm0, gp_pdm1, gp_pdm2, gp_pdm3, gp0_clk, gp1_clk, gp_mn,
+ tsif1, tsif2, hsic, grfc, audio_ref_clk, qua_mi2s, pri_mi2s,
+ spkr_mi2s, ter_mi2s, sec_mi2s, bt, fm, wlan, slimbus, hsic_ctl ]
+
+ bias-pull-down: true
+ bias-pull-up: true
+ bias-disable: true
+ drive-strength: true
+ input-enable: true
+ output-high: true
+ output-low: true
+
+ required:
+ - pins
+
+ allOf:
+ - if:
+ properties:
+ pins:
+ contains:
+ enum:
+ - hsic_data
+ - hsic_strobe
+ required:
+ - pins
+ then:
+ properties:
+ bias-pull-down: false
+ bias-pull-up: false
+ bias-disable: false
+ drive-strength: false
+ input-enable: false
+ output-high: false
+ output-low: false
+
+ additionalProperties: false
+
+allOf:
+ - $ref: /schemas/pinctrl/qcom,tlmm-common.yaml#
+
+required:
+ - compatible
+ - reg
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ tlmm: pinctrl@fd510000 {
+ compatible = "qcom,msm8974-pinctrl";
+ reg = <0xfd510000 0x4000>;
+ gpio-controller;
+ gpio-ranges = <&tlmm 0 0 146>;
+ #gpio-cells = <2>;
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
+
+ sdc1-off-state {
+ clk-pins {
+ pins = "sdc1_clk";
+ bias-disable;
+ drive-strength = <2>;
+ };
+
+ cmd-pins {
+ pins = "sdc1_cmd";
+ bias-pull-up;
+ drive-strength = <2>;
+ };
+
+ data-pins {
+ pins = "sdc1_data";
+ bias-pull-up;
+ drive-strength = <2>;
+ };
+ };
+
+ blsp2-uart1-sleep-state {
+ pins = "gpio41", "gpio42", "gpio43", "gpio44";
+ function = "gpio";
+ drive-strength = <2>;
+ bias-pull-down;
+ };
+
+ hsic-state {
+ pins = "hsic_data", "hsic_strobe";
+ };
+ };
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM: dts: qcom: msm8974: align TLMM pin configuration with DT schema
2022-10-17 1:22 [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8974: convert to dtschema Krzysztof Kozlowski
@ 2022-10-17 1:22 ` Krzysztof Kozlowski
2022-10-17 11:33 ` konrad.dybcio
2022-10-17 18:38 ` [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8974: convert to dtschema Rob Herring
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-17 1:22 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Linus Walleij,
Rob Herring, Krzysztof Kozlowski, linux-arm-msm, linux-gpio,
devicetree, linux-kernel
Cc: Krzysztof Kozlowski
DT schema expects TLMM pin configuration nodes to be named with
'-state' suffix and their optional children with '-pins' suffix. All
nodes for GPIOs must also define the function property.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
.../arm/boot/dts/qcom-apq8074-dragonboard.dts | 14 ++--
.../dts/qcom-msm8974-sony-xperia-rhine.dtsi | 16 ++--
arch/arm/boot/dts/qcom-msm8974.dtsi | 77 ++++++++++---------
.../dts/qcom-msm8974pro-fairphone-fp2.dts | 20 ++---
.../boot/dts/qcom-msm8974pro-samsung-klte.dts | 36 ++++-----
...-msm8974pro-sony-xperia-shinano-castor.dts | 31 ++++----
6 files changed, 98 insertions(+), 96 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
index 91716298ec5e..dc04f315026d 100644
--- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
@@ -272,34 +272,34 @@ &sdhc_2 {
};
&tlmm {
- sdc1_on: sdc1-on {
- clk {
+ sdc1_on: sdc1-on-state {
+ clk-pins {
pins = "sdc1_clk";
drive-strength = <16>;
bias-disable;
};
- cmd-data {
+ cmd-data-pins {
pins = "sdc1_cmd", "sdc1_data";
drive-strength = <10>;
bias-pull-up;
};
};
- sdc2_on: sdc2-on {
- clk {
+ sdc2_on: sdc2-on-state {
+ clk-pins {
pins = "sdc2_clk";
drive-strength = <10>;
bias-disable;
};
- cmd-data {
+ cmd-data-pins {
pins = "sdc2_cmd", "sdc2_data";
drive-strength = <6>;
bias-pull-up;
};
- cd {
+ cd-pins {
pins = "gpio62";
function = "gpio";
drive-strength = <2>;
diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
index 5a70683d9103..221a11e1d17d 100644
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
@@ -442,7 +442,7 @@ &smbb {
};
&tlmm {
- ts_int_pin: touch-int {
+ ts_int_pin: touch-int-state {
pins = "gpio61";
function = "gpio";
drive-strength = <2>;
@@ -450,34 +450,34 @@ ts_int_pin: touch-int {
input-enable;
};
- sdc1_on: sdc1-on {
- clk {
+ sdc1_on: sdc1-on-state {
+ clk-pins {
pins = "sdc1_clk";
drive-strength = <16>;
bias-disable;
};
- cmd-data {
+ cmd-data-pins {
pins = "sdc1_cmd", "sdc1_data";
drive-strength = <10>;
bias-pull-up;
};
};
- sdc2_on: sdc-on {
- clk {
+ sdc2_on: sdc-on-state {
+ clk-pins {
pins = "sdc2_clk";
drive-strength = <10>;
bias-disable;
};
- cmd-data {
+ cmd-data-pins {
pins = "sdc2_cmd", "sdc2_data";
drive-strength = <6>;
bias-pull-up;
};
- cd {
+ cd-pins {
pins = "gpio62";
function = "gpio";
drive-strength = <2>;
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 7a9be0acf3f5..3b0072f13a97 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -1253,61 +1253,62 @@ tlmm: pinctrl@fd510000 {
#interrupt-cells = <2>;
interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
- sdc1_off: sdc1-off {
- clk {
+ sdc1_off: sdc1-off-state {
+ clk-pins {
pins = "sdc1_clk";
bias-disable;
drive-strength = <2>;
};
- cmd {
+ cmd-pins {
pins = "sdc1_cmd";
bias-pull-up;
drive-strength = <2>;
};
- data {
+ data-pins {
pins = "sdc1_data";
bias-pull-up;
drive-strength = <2>;
};
};
- sdc2_off: sdc2-off {
- clk {
+ sdc2_off: sdc2-off-state {
+ clk-pins {
pins = "sdc2_clk";
bias-disable;
drive-strength = <2>;
};
- cmd {
+ cmd-pins {
pins = "sdc2_cmd";
bias-pull-up;
drive-strength = <2>;
};
- data {
+ data-pins {
pins = "sdc2_data";
bias-pull-up;
drive-strength = <2>;
};
- cd {
+ cd-pins {
pins = "gpio54";
+ function = "gpio";
bias-disable;
drive-strength = <2>;
};
};
- blsp1_uart2_default: blsp1-uart2-default {
- rx {
+ blsp1_uart2_default: blsp1-uart2-default-state {
+ rx-pins {
pins = "gpio5";
function = "blsp_uart2";
drive-strength = <2>;
bias-pull-up;
};
- tx {
+ tx-pins {
pins = "gpio4";
function = "blsp_uart2";
drive-strength = <4>;
@@ -1315,15 +1316,15 @@ tx {
};
};
- blsp2_uart1_default: blsp2-uart1-default {
- tx-rts {
+ blsp2_uart1_default: blsp2-uart1-default-state {
+ tx-rts-pins {
pins = "gpio41", "gpio44";
function = "blsp_uart7";
drive-strength = <2>;
bias-disable;
};
- rx-cts {
+ rx-cts-pins {
pins = "gpio42", "gpio43";
function = "blsp_uart7";
drive-strength = <2>;
@@ -1331,22 +1332,22 @@ rx-cts {
};
};
- blsp2_uart1_sleep: blsp2-uart1-sleep {
+ blsp2_uart1_sleep: blsp2-uart1-sleep-state {
pins = "gpio41", "gpio42", "gpio43", "gpio44";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
};
- blsp2_uart4_default: blsp2-uart4-default {
- tx-rts {
+ blsp2_uart4_default: blsp2-uart4-default-state {
+ tx-rts-pins {
pins = "gpio53", "gpio56";
function = "blsp_uart10";
drive-strength = <2>;
bias-disable;
};
- rx-cts {
+ rx-cts-pins {
pins = "gpio54", "gpio55";
function = "blsp_uart10";
drive-strength = <2>;
@@ -1354,42 +1355,42 @@ rx-cts {
};
};
- blsp1_i2c1_default: blsp1-i2c1-default {
+ blsp1_i2c1_default: blsp1-i2c1-default-state {
pins = "gpio2", "gpio3";
function = "blsp_i2c1";
drive-strength = <2>;
bias-disable;
};
- blsp1_i2c1_sleep: blsp1-i2c1-sleep {
+ blsp1_i2c1_sleep: blsp1-i2c1-sleep-state {
pins = "gpio2", "gpio3";
function = "blsp_i2c1";
drive-strength = <2>;
bias-pull-up;
};
- blsp1_i2c2_default: blsp1-i2c2-default {
+ blsp1_i2c2_default: blsp1-i2c2-default-state {
pins = "gpio6", "gpio7";
function = "blsp_i2c2";
drive-strength = <2>;
bias-disable;
};
- blsp1_i2c2_sleep: blsp1-i2c2-sleep {
+ blsp1_i2c2_sleep: blsp1-i2c2-sleep-state {
pins = "gpio6", "gpio7";
function = "blsp_i2c2";
drive-strength = <2>;
bias-pull-up;
};
- blsp1_i2c3_default: blsp1-i2c3-default {
+ blsp1_i2c3_default: blsp1-i2c3-default-state {
pins = "gpio10", "gpio11";
function = "blsp_i2c3";
drive-strength = <2>;
bias-disable;
};
- blsp1_i2c3_sleep: blsp1-i2c3-sleep {
+ blsp1_i2c3_sleep: blsp1-i2c3-sleep-state {
pins = "gpio10", "gpio11";
function = "blsp_i2c3";
drive-strength = <2>;
@@ -1400,14 +1401,14 @@ blsp1_i2c3_sleep: blsp1-i2c3-sleep {
/* BLSP1_I2C5 info is missing */
- blsp1_i2c6_default: blsp1-i2c6-default {
+ blsp1_i2c6_default: blsp1-i2c6-default-state {
pins = "gpio29", "gpio30";
function = "blsp_i2c6";
drive-strength = <2>;
bias-disable;
};
- blsp1_i2c6_sleep: blsp1-i2c6-sleep {
+ blsp1_i2c6_sleep: blsp1-i2c6-sleep-state {
pins = "gpio29", "gpio30";
function = "blsp_i2c6";
drive-strength = <2>;
@@ -1417,14 +1418,14 @@ blsp1_i2c6_sleep: blsp1-i2c6-sleep {
/* BLSP2_I2C1 info is missing */
- blsp2_i2c2_default: blsp2-i2c2-default {
+ blsp2_i2c2_default: blsp2-i2c2-default-state {
pins = "gpio47", "gpio48";
function = "blsp_i2c8";
drive-strength = <2>;
bias-disable;
};
- blsp2_i2c2_sleep: blsp2-i2c2-sleep {
+ blsp2_i2c2_sleep: blsp2-i2c2-sleep-state {
pins = "gpio47", "gpio48";
function = "blsp_i2c8";
drive-strength = <2>;
@@ -1435,48 +1436,48 @@ blsp2_i2c2_sleep: blsp2-i2c2-sleep {
/* BLSP2_I2C4 info is missing */
- blsp2_i2c5_default: blsp2-i2c5-default {
+ blsp2_i2c5_default: blsp2-i2c5-default-state {
pins = "gpio83", "gpio84";
function = "blsp_i2c11";
drive-strength = <2>;
bias-disable;
};
- blsp2_i2c5_sleep: blsp2-i2c5-sleep {
+ blsp2_i2c5_sleep: blsp2-i2c5-sleep-state {
pins = "gpio83", "gpio84";
function = "blsp_i2c11";
drive-strength = <2>;
bias-pull-up;
};
- blsp2_i2c6_default: blsp2-i2c6-default {
+ blsp2_i2c6_default: blsp2-i2c6-default-state {
pins = "gpio87", "gpio88";
function = "blsp_i2c12";
drive-strength = <2>;
bias-disable;
};
- blsp2_i2c6_sleep: blsp2-i2c6-sleep {
+ blsp2_i2c6_sleep: blsp2-i2c6-sleep-state {
pins = "gpio87", "gpio88";
function = "blsp_i2c12";
drive-strength = <2>;
bias-pull-up;
};
- spi8_default: spi8_default {
- mosi {
+ spi8_default: spi8_default-state {
+ mosi-pins {
pins = "gpio45";
function = "blsp_spi8";
};
- miso {
+ miso-pins {
pins = "gpio46";
function = "blsp_spi8";
};
- cs {
+ cs-pins {
pins = "gpio47";
function = "blsp_spi8";
};
- clk {
+ clk-pins {
pins = "gpio48";
function = "blsp_spi8";
};
diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
index ff6e0066768b..3e32685d8cf8 100644
--- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
@@ -408,36 +408,36 @@ &smbb {
};
&tlmm {
- sdc1_on: sdc1-on {
- clk {
+ sdc1_on: sdc1-on-state {
+ clk-pins {
pins = "sdc1_clk";
drive-strength = <16>;
bias-disable;
};
- cmd-data {
+ cmd-data-pins {
pins = "sdc1_cmd", "sdc1_data";
drive-strength = <10>;
bias-pull-up;
};
};
- sdc2_on: sdc2-on {
- clk {
+ sdc2_on: sdc2-on-state {
+ clk-pins {
pins = "sdc2_clk";
drive-strength = <10>;
bias-disable;
};
- cmd-data {
+ cmd-data-pins {
pins = "sdc2_cmd", "sdc2_data";
drive-strength = <6>;
bias-pull-up;
};
};
- wcnss_pin_a: wcnss-pin-active {
- wlan {
+ wcnss_pin_a: wcnss-pin-active-state {
+ wlan-pins {
pins = "gpio36", "gpio37", "gpio38", "gpio39", "gpio40";
function = "wlan";
@@ -445,7 +445,7 @@ wlan {
bias-pull-down;
};
- bt {
+ bt-pins {
pins = "gpio35", "gpio43", "gpio44";
function = "bt";
@@ -453,7 +453,7 @@ bt {
bias-pull-down;
};
- fm {
+ fm-pins {
pins = "gpio41", "gpio42";
function = "fm";
diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
index 983e10c3d863..5bbdd5eb183b 100644
--- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
@@ -706,57 +706,57 @@ &sdhc_3 {
&tlmm {
/* This seems suspicious, but somebody with this device should look into it. */
- blsp2_uart2_pins_active: blsp2-uart2-pins-active {
+ blsp2_uart2_pins_active: blsp2-uart2-pins-active-state {
pins = "gpio45", "gpio46", "gpio47", "gpio48";
function = "blsp_uart8";
drive-strength = <8>;
bias-disable;
};
- blsp2_uart2_pins_sleep: blsp2-uart2-pins-sleep {
+ blsp2_uart2_pins_sleep: blsp2-uart2-pins-sleep-state {
pins = "gpio45", "gpio46", "gpio47", "gpio48";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
};
- bt_pins: bt-pins {
- hostwake {
+ bt_pins: bt-pins-state {
+ hostwake-pins {
pins = "gpio75";
function = "gpio";
drive-strength = <16>;
input-enable;
};
- devwake {
+ devwake-pins {
pins = "gpio91";
function = "gpio";
drive-strength = <2>;
};
};
- sdc1_on: sdhc1-on {
- clk {
+ sdc1_on: sdhc1-on-state {
+ clk-pins {
pins = "sdc1_clk";
drive-strength = <4>;
bias-disable;
};
- cmd-data {
+ cmd-data-pins {
pins = "sdc1_cmd", "sdc1_data";
drive-strength = <4>;
bias-pull-up;
};
};
- sdc3_on: sdc3-on {
+ sdc3_on: sdc3-on-state {
pins = "gpio35", "gpio36", "gpio37", "gpio38", "gpio39", "gpio40";
function = "sdc3";
drive-strength = <8>;
bias-disable;
};
- sdhc3_cd_pin: sdc3-cd-on {
+ sdhc3_cd_pin: sdc3-cd-on-state {
pins = "gpio62";
function = "gpio";
@@ -764,49 +764,49 @@ sdhc3_cd_pin: sdc3-cd-on {
bias-disable;
};
- sdc2_on: sdhc2-on {
- clk {
+ sdc2_on: sdhc2-on-state {
+ clk-pins {
pins = "sdc2_clk";
drive-strength = <6>;
bias-disable;
};
- cmd-data {
+ cmd-data-pins {
pins = "sdc2_cmd", "sdc2_data";
drive-strength = <6>;
bias-pull-up;
};
};
- i2c_touchkey_pins: i2c-touchkey {
+ i2c_touchkey_pins: i2c-touchkey-state {
pins = "gpio95", "gpio96";
function = "gpio";
input-enable;
bias-pull-up;
};
- i2c_led_gpioex_pins: i2c-led-gpioex {
+ i2c_led_gpioex_pins: i2c-led-gpioex-state {
pins = "gpio120", "gpio121";
function = "gpio";
input-enable;
bias-pull-down;
};
- gpioex_pin: gpioex {
+ gpioex_pin: gpioex-state {
pins = "gpio145";
function = "gpio";
bias-pull-up;
drive-strength = <2>;
};
- wifi_pin: wifi {
+ wifi_pin: wifi-state {
pins = "gpio92";
function = "gpio";
input-enable;
bias-pull-down;
};
- panel_te_pin: panel {
+ panel_te_pin: panel-state {
pins = "gpio12";
function = "mdp_vsync";
drive-strength = <2>;
diff --git a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
index 3f45f5c5d37b..d446ac1f75ea 100644
--- a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
@@ -548,41 +548,42 @@ &smbb {
};
&tlmm {
- lcd_backlight_en_pin_a: lcd-backlight-vddio {
+ lcd_backlight_en_pin_a: lcd-backlight-vddio-state {
pins = "gpio69";
+ function = "gpio";
drive-strength = <10>;
output-low;
bias-disable;
};
- sdc1_on: sdc1-on {
- clk {
+ sdc1_on: sdc1-on-state {
+ clk-pins {
pins = "sdc1_clk";
drive-strength = <16>;
bias-disable;
};
- cmd-data {
+ cmd-data-pins {
pins = "sdc1_cmd", "sdc1_data";
drive-strength = <10>;
bias-pull-up;
};
};
- sdc2_on: sdc2-on {
- clk {
+ sdc2_on: sdc2-on-state {
+ clk-pins {
pins = "sdc2_clk";
drive-strength = <6>;
bias-disable;
};
- cmd-data {
+ cmd-data-pins {
pins = "sdc2_cmd", "sdc2_data";
drive-strength = <6>;
bias-pull-up;
};
- cd {
+ cd-pins {
pins = "gpio62";
function = "gpio";
drive-strength = <2>;
@@ -590,22 +591,22 @@ cd {
};
};
- sdc3_on: sdc3-on {
- clk {
+ sdc3_on: sdc3-on-state {
+ clk-pins {
pins = "gpio40";
function = "sdc3";
drive-strength = <10>;
bias-disable;
};
- cmd {
+ cmd-pins {
pins = "gpio39";
function = "sdc3";
drive-strength = <10>;
bias-pull-up;
};
- data {
+ data-pins {
pins = "gpio35", "gpio36", "gpio37", "gpio38";
function = "sdc3";
drive-strength = <10>;
@@ -613,7 +614,7 @@ data {
};
};
- ts_int_pin: ts-int-pin {
+ ts_int_pin: ts-int-pin-state {
pins = "gpio86";
function = "gpio";
drive-strength = <2>;
@@ -621,7 +622,7 @@ ts_int_pin: ts-int-pin {
input-enable;
};
- bt_host_wake_pin: bt-host-wake {
+ bt_host_wake_pin: bt-host-wake-state {
pins = "gpio95";
function = "gpio";
drive-strength = <2>;
@@ -629,7 +630,7 @@ bt_host_wake_pin: bt-host-wake {
output-low;
};
- bt_dev_wake_pin: bt-dev-wake {
+ bt_dev_wake_pin: bt-dev-wake-state {
pins = "gpio96";
function = "gpio";
drive-strength = <2>;
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ARM: dts: qcom: msm8974: align TLMM pin configuration with DT schema
2022-10-17 1:22 ` [PATCH 2/2] ARM: dts: qcom: msm8974: align TLMM pin configuration with DT schema Krzysztof Kozlowski
@ 2022-10-17 11:33 ` konrad.dybcio
0 siblings, 0 replies; 6+ messages in thread
From: konrad.dybcio @ 2022-10-17 11:33 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio, Linus Walleij,
Rob Herring, Krzysztof Kozlowski, linux-arm-msm, linux-gpio,
devicetree, linux-kernel
On 2022-10-17 03:22, Krzysztof Kozlowski wrote:
> DT schema expects TLMM pin configuration nodes to be named with
> '-state' suffix and their optional children with '-pins' suffix. All
> nodes for GPIOs must also define the function property.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Konrad
> .../arm/boot/dts/qcom-apq8074-dragonboard.dts | 14 ++--
> .../dts/qcom-msm8974-sony-xperia-rhine.dtsi | 16 ++--
> arch/arm/boot/dts/qcom-msm8974.dtsi | 77 ++++++++++---------
> .../dts/qcom-msm8974pro-fairphone-fp2.dts | 20 ++---
> .../boot/dts/qcom-msm8974pro-samsung-klte.dts | 36 ++++-----
> ...-msm8974pro-sony-xperia-shinano-castor.dts | 31 ++++----
> 6 files changed, 98 insertions(+), 96 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
> b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
> index 91716298ec5e..dc04f315026d 100644
> --- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
> +++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
> @@ -272,34 +272,34 @@ &sdhc_2 {
> };
>
> &tlmm {
> - sdc1_on: sdc1-on {
> - clk {
> + sdc1_on: sdc1-on-state {
> + clk-pins {
> pins = "sdc1_clk";
> drive-strength = <16>;
> bias-disable;
> };
>
> - cmd-data {
> + cmd-data-pins {
> pins = "sdc1_cmd", "sdc1_data";
> drive-strength = <10>;
> bias-pull-up;
> };
> };
>
> - sdc2_on: sdc2-on {
> - clk {
> + sdc2_on: sdc2-on-state {
> + clk-pins {
> pins = "sdc2_clk";
> drive-strength = <10>;
> bias-disable;
> };
>
> - cmd-data {
> + cmd-data-pins {
> pins = "sdc2_cmd", "sdc2_data";
> drive-strength = <6>;
> bias-pull-up;
> };
>
> - cd {
> + cd-pins {
> pins = "gpio62";
> function = "gpio";
> drive-strength = <2>;
> diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
> b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
> index 5a70683d9103..221a11e1d17d 100644
> --- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
> +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
> @@ -442,7 +442,7 @@ &smbb {
> };
>
> &tlmm {
> - ts_int_pin: touch-int {
> + ts_int_pin: touch-int-state {
> pins = "gpio61";
> function = "gpio";
> drive-strength = <2>;
> @@ -450,34 +450,34 @@ ts_int_pin: touch-int {
> input-enable;
> };
>
> - sdc1_on: sdc1-on {
> - clk {
> + sdc1_on: sdc1-on-state {
> + clk-pins {
> pins = "sdc1_clk";
> drive-strength = <16>;
> bias-disable;
> };
>
> - cmd-data {
> + cmd-data-pins {
> pins = "sdc1_cmd", "sdc1_data";
> drive-strength = <10>;
> bias-pull-up;
> };
> };
>
> - sdc2_on: sdc-on {
> - clk {
> + sdc2_on: sdc-on-state {
> + clk-pins {
> pins = "sdc2_clk";
> drive-strength = <10>;
> bias-disable;
> };
>
> - cmd-data {
> + cmd-data-pins {
> pins = "sdc2_cmd", "sdc2_data";
> drive-strength = <6>;
> bias-pull-up;
> };
>
> - cd {
> + cd-pins {
> pins = "gpio62";
> function = "gpio";
> drive-strength = <2>;
> diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi
> b/arch/arm/boot/dts/qcom-msm8974.dtsi
> index 7a9be0acf3f5..3b0072f13a97 100644
> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
> @@ -1253,61 +1253,62 @@ tlmm: pinctrl@fd510000 {
> #interrupt-cells = <2>;
> interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
>
> - sdc1_off: sdc1-off {
> - clk {
> + sdc1_off: sdc1-off-state {
> + clk-pins {
> pins = "sdc1_clk";
> bias-disable;
> drive-strength = <2>;
> };
>
> - cmd {
> + cmd-pins {
> pins = "sdc1_cmd";
> bias-pull-up;
> drive-strength = <2>;
> };
>
> - data {
> + data-pins {
> pins = "sdc1_data";
> bias-pull-up;
> drive-strength = <2>;
> };
> };
>
> - sdc2_off: sdc2-off {
> - clk {
> + sdc2_off: sdc2-off-state {
> + clk-pins {
> pins = "sdc2_clk";
> bias-disable;
> drive-strength = <2>;
> };
>
> - cmd {
> + cmd-pins {
> pins = "sdc2_cmd";
> bias-pull-up;
> drive-strength = <2>;
> };
>
> - data {
> + data-pins {
> pins = "sdc2_data";
> bias-pull-up;
> drive-strength = <2>;
> };
>
> - cd {
> + cd-pins {
> pins = "gpio54";
> + function = "gpio";
> bias-disable;
> drive-strength = <2>;
> };
> };
>
> - blsp1_uart2_default: blsp1-uart2-default {
> - rx {
> + blsp1_uart2_default: blsp1-uart2-default-state {
> + rx-pins {
> pins = "gpio5";
> function = "blsp_uart2";
> drive-strength = <2>;
> bias-pull-up;
> };
>
> - tx {
> + tx-pins {
> pins = "gpio4";
> function = "blsp_uart2";
> drive-strength = <4>;
> @@ -1315,15 +1316,15 @@ tx {
> };
> };
>
> - blsp2_uart1_default: blsp2-uart1-default {
> - tx-rts {
> + blsp2_uart1_default: blsp2-uart1-default-state {
> + tx-rts-pins {
> pins = "gpio41", "gpio44";
> function = "blsp_uart7";
> drive-strength = <2>;
> bias-disable;
> };
>
> - rx-cts {
> + rx-cts-pins {
> pins = "gpio42", "gpio43";
> function = "blsp_uart7";
> drive-strength = <2>;
> @@ -1331,22 +1332,22 @@ rx-cts {
> };
> };
>
> - blsp2_uart1_sleep: blsp2-uart1-sleep {
> + blsp2_uart1_sleep: blsp2-uart1-sleep-state {
> pins = "gpio41", "gpio42", "gpio43", "gpio44";
> function = "gpio";
> drive-strength = <2>;
> bias-pull-down;
> };
>
> - blsp2_uart4_default: blsp2-uart4-default {
> - tx-rts {
> + blsp2_uart4_default: blsp2-uart4-default-state {
> + tx-rts-pins {
> pins = "gpio53", "gpio56";
> function = "blsp_uart10";
> drive-strength = <2>;
> bias-disable;
> };
>
> - rx-cts {
> + rx-cts-pins {
> pins = "gpio54", "gpio55";
> function = "blsp_uart10";
> drive-strength = <2>;
> @@ -1354,42 +1355,42 @@ rx-cts {
> };
> };
>
> - blsp1_i2c1_default: blsp1-i2c1-default {
> + blsp1_i2c1_default: blsp1-i2c1-default-state {
> pins = "gpio2", "gpio3";
> function = "blsp_i2c1";
> drive-strength = <2>;
> bias-disable;
> };
>
> - blsp1_i2c1_sleep: blsp1-i2c1-sleep {
> + blsp1_i2c1_sleep: blsp1-i2c1-sleep-state {
> pins = "gpio2", "gpio3";
> function = "blsp_i2c1";
> drive-strength = <2>;
> bias-pull-up;
> };
>
> - blsp1_i2c2_default: blsp1-i2c2-default {
> + blsp1_i2c2_default: blsp1-i2c2-default-state {
> pins = "gpio6", "gpio7";
> function = "blsp_i2c2";
> drive-strength = <2>;
> bias-disable;
> };
>
> - blsp1_i2c2_sleep: blsp1-i2c2-sleep {
> + blsp1_i2c2_sleep: blsp1-i2c2-sleep-state {
> pins = "gpio6", "gpio7";
> function = "blsp_i2c2";
> drive-strength = <2>;
> bias-pull-up;
> };
>
> - blsp1_i2c3_default: blsp1-i2c3-default {
> + blsp1_i2c3_default: blsp1-i2c3-default-state {
> pins = "gpio10", "gpio11";
> function = "blsp_i2c3";
> drive-strength = <2>;
> bias-disable;
> };
>
> - blsp1_i2c3_sleep: blsp1-i2c3-sleep {
> + blsp1_i2c3_sleep: blsp1-i2c3-sleep-state {
> pins = "gpio10", "gpio11";
> function = "blsp_i2c3";
> drive-strength = <2>;
> @@ -1400,14 +1401,14 @@ blsp1_i2c3_sleep: blsp1-i2c3-sleep {
>
> /* BLSP1_I2C5 info is missing */
>
> - blsp1_i2c6_default: blsp1-i2c6-default {
> + blsp1_i2c6_default: blsp1-i2c6-default-state {
> pins = "gpio29", "gpio30";
> function = "blsp_i2c6";
> drive-strength = <2>;
> bias-disable;
> };
>
> - blsp1_i2c6_sleep: blsp1-i2c6-sleep {
> + blsp1_i2c6_sleep: blsp1-i2c6-sleep-state {
> pins = "gpio29", "gpio30";
> function = "blsp_i2c6";
> drive-strength = <2>;
> @@ -1417,14 +1418,14 @@ blsp1_i2c6_sleep: blsp1-i2c6-sleep {
>
> /* BLSP2_I2C1 info is missing */
>
> - blsp2_i2c2_default: blsp2-i2c2-default {
> + blsp2_i2c2_default: blsp2-i2c2-default-state {
> pins = "gpio47", "gpio48";
> function = "blsp_i2c8";
> drive-strength = <2>;
> bias-disable;
> };
>
> - blsp2_i2c2_sleep: blsp2-i2c2-sleep {
> + blsp2_i2c2_sleep: blsp2-i2c2-sleep-state {
> pins = "gpio47", "gpio48";
> function = "blsp_i2c8";
> drive-strength = <2>;
> @@ -1435,48 +1436,48 @@ blsp2_i2c2_sleep: blsp2-i2c2-sleep {
>
> /* BLSP2_I2C4 info is missing */
>
> - blsp2_i2c5_default: blsp2-i2c5-default {
> + blsp2_i2c5_default: blsp2-i2c5-default-state {
> pins = "gpio83", "gpio84";
> function = "blsp_i2c11";
> drive-strength = <2>;
> bias-disable;
> };
>
> - blsp2_i2c5_sleep: blsp2-i2c5-sleep {
> + blsp2_i2c5_sleep: blsp2-i2c5-sleep-state {
> pins = "gpio83", "gpio84";
> function = "blsp_i2c11";
> drive-strength = <2>;
> bias-pull-up;
> };
>
> - blsp2_i2c6_default: blsp2-i2c6-default {
> + blsp2_i2c6_default: blsp2-i2c6-default-state {
> pins = "gpio87", "gpio88";
> function = "blsp_i2c12";
> drive-strength = <2>;
> bias-disable;
> };
>
> - blsp2_i2c6_sleep: blsp2-i2c6-sleep {
> + blsp2_i2c6_sleep: blsp2-i2c6-sleep-state {
> pins = "gpio87", "gpio88";
> function = "blsp_i2c12";
> drive-strength = <2>;
> bias-pull-up;
> };
>
> - spi8_default: spi8_default {
> - mosi {
> + spi8_default: spi8_default-state {
> + mosi-pins {
> pins = "gpio45";
> function = "blsp_spi8";
> };
> - miso {
> + miso-pins {
> pins = "gpio46";
> function = "blsp_spi8";
> };
> - cs {
> + cs-pins {
> pins = "gpio47";
> function = "blsp_spi8";
> };
> - clk {
> + clk-pins {
> pins = "gpio48";
> function = "blsp_spi8";
> };
> diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
> b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
> index ff6e0066768b..3e32685d8cf8 100644
> --- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
> +++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
> @@ -408,36 +408,36 @@ &smbb {
> };
>
> &tlmm {
> - sdc1_on: sdc1-on {
> - clk {
> + sdc1_on: sdc1-on-state {
> + clk-pins {
> pins = "sdc1_clk";
> drive-strength = <16>;
> bias-disable;
> };
>
> - cmd-data {
> + cmd-data-pins {
> pins = "sdc1_cmd", "sdc1_data";
> drive-strength = <10>;
> bias-pull-up;
> };
> };
>
> - sdc2_on: sdc2-on {
> - clk {
> + sdc2_on: sdc2-on-state {
> + clk-pins {
> pins = "sdc2_clk";
> drive-strength = <10>;
> bias-disable;
> };
>
> - cmd-data {
> + cmd-data-pins {
> pins = "sdc2_cmd", "sdc2_data";
> drive-strength = <6>;
> bias-pull-up;
> };
> };
>
> - wcnss_pin_a: wcnss-pin-active {
> - wlan {
> + wcnss_pin_a: wcnss-pin-active-state {
> + wlan-pins {
> pins = "gpio36", "gpio37", "gpio38", "gpio39", "gpio40";
> function = "wlan";
>
> @@ -445,7 +445,7 @@ wlan {
> bias-pull-down;
> };
>
> - bt {
> + bt-pins {
> pins = "gpio35", "gpio43", "gpio44";
> function = "bt";
>
> @@ -453,7 +453,7 @@ bt {
> bias-pull-down;
> };
>
> - fm {
> + fm-pins {
> pins = "gpio41", "gpio42";
> function = "fm";
>
> diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
> b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
> index 983e10c3d863..5bbdd5eb183b 100644
> --- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
> +++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
> @@ -706,57 +706,57 @@ &sdhc_3 {
>
> &tlmm {
> /* This seems suspicious, but somebody with this device should look
> into it. */
> - blsp2_uart2_pins_active: blsp2-uart2-pins-active {
> + blsp2_uart2_pins_active: blsp2-uart2-pins-active-state {
> pins = "gpio45", "gpio46", "gpio47", "gpio48";
> function = "blsp_uart8";
> drive-strength = <8>;
> bias-disable;
> };
>
> - blsp2_uart2_pins_sleep: blsp2-uart2-pins-sleep {
> + blsp2_uart2_pins_sleep: blsp2-uart2-pins-sleep-state {
> pins = "gpio45", "gpio46", "gpio47", "gpio48";
> function = "gpio";
> drive-strength = <2>;
> bias-pull-down;
> };
>
> - bt_pins: bt-pins {
> - hostwake {
> + bt_pins: bt-pins-state {
> + hostwake-pins {
> pins = "gpio75";
> function = "gpio";
> drive-strength = <16>;
> input-enable;
> };
>
> - devwake {
> + devwake-pins {
> pins = "gpio91";
> function = "gpio";
> drive-strength = <2>;
> };
> };
>
> - sdc1_on: sdhc1-on {
> - clk {
> + sdc1_on: sdhc1-on-state {
> + clk-pins {
> pins = "sdc1_clk";
> drive-strength = <4>;
> bias-disable;
> };
>
> - cmd-data {
> + cmd-data-pins {
> pins = "sdc1_cmd", "sdc1_data";
> drive-strength = <4>;
> bias-pull-up;
> };
> };
>
> - sdc3_on: sdc3-on {
> + sdc3_on: sdc3-on-state {
> pins = "gpio35", "gpio36", "gpio37", "gpio38", "gpio39", "gpio40";
> function = "sdc3";
> drive-strength = <8>;
> bias-disable;
> };
>
> - sdhc3_cd_pin: sdc3-cd-on {
> + sdhc3_cd_pin: sdc3-cd-on-state {
> pins = "gpio62";
> function = "gpio";
>
> @@ -764,49 +764,49 @@ sdhc3_cd_pin: sdc3-cd-on {
> bias-disable;
> };
>
> - sdc2_on: sdhc2-on {
> - clk {
> + sdc2_on: sdhc2-on-state {
> + clk-pins {
> pins = "sdc2_clk";
> drive-strength = <6>;
> bias-disable;
> };
>
> - cmd-data {
> + cmd-data-pins {
> pins = "sdc2_cmd", "sdc2_data";
> drive-strength = <6>;
> bias-pull-up;
> };
> };
>
> - i2c_touchkey_pins: i2c-touchkey {
> + i2c_touchkey_pins: i2c-touchkey-state {
> pins = "gpio95", "gpio96";
> function = "gpio";
> input-enable;
> bias-pull-up;
> };
>
> - i2c_led_gpioex_pins: i2c-led-gpioex {
> + i2c_led_gpioex_pins: i2c-led-gpioex-state {
> pins = "gpio120", "gpio121";
> function = "gpio";
> input-enable;
> bias-pull-down;
> };
>
> - gpioex_pin: gpioex {
> + gpioex_pin: gpioex-state {
> pins = "gpio145";
> function = "gpio";
> bias-pull-up;
> drive-strength = <2>;
> };
>
> - wifi_pin: wifi {
> + wifi_pin: wifi-state {
> pins = "gpio92";
> function = "gpio";
> input-enable;
> bias-pull-down;
> };
>
> - panel_te_pin: panel {
> + panel_te_pin: panel-state {
> pins = "gpio12";
> function = "mdp_vsync";
> drive-strength = <2>;
> diff --git
> a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> index 3f45f5c5d37b..d446ac1f75ea 100644
> --- a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> +++ b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
> @@ -548,41 +548,42 @@ &smbb {
> };
>
> &tlmm {
> - lcd_backlight_en_pin_a: lcd-backlight-vddio {
> + lcd_backlight_en_pin_a: lcd-backlight-vddio-state {
> pins = "gpio69";
> + function = "gpio";
> drive-strength = <10>;
> output-low;
> bias-disable;
> };
>
> - sdc1_on: sdc1-on {
> - clk {
> + sdc1_on: sdc1-on-state {
> + clk-pins {
> pins = "sdc1_clk";
> drive-strength = <16>;
> bias-disable;
> };
>
> - cmd-data {
> + cmd-data-pins {
> pins = "sdc1_cmd", "sdc1_data";
> drive-strength = <10>;
> bias-pull-up;
> };
> };
>
> - sdc2_on: sdc2-on {
> - clk {
> + sdc2_on: sdc2-on-state {
> + clk-pins {
> pins = "sdc2_clk";
> drive-strength = <6>;
> bias-disable;
> };
>
> - cmd-data {
> + cmd-data-pins {
> pins = "sdc2_cmd", "sdc2_data";
> drive-strength = <6>;
> bias-pull-up;
> };
>
> - cd {
> + cd-pins {
> pins = "gpio62";
> function = "gpio";
> drive-strength = <2>;
> @@ -590,22 +591,22 @@ cd {
> };
> };
>
> - sdc3_on: sdc3-on {
> - clk {
> + sdc3_on: sdc3-on-state {
> + clk-pins {
> pins = "gpio40";
> function = "sdc3";
> drive-strength = <10>;
> bias-disable;
> };
>
> - cmd {
> + cmd-pins {
> pins = "gpio39";
> function = "sdc3";
> drive-strength = <10>;
> bias-pull-up;
> };
>
> - data {
> + data-pins {
> pins = "gpio35", "gpio36", "gpio37", "gpio38";
> function = "sdc3";
> drive-strength = <10>;
> @@ -613,7 +614,7 @@ data {
> };
> };
>
> - ts_int_pin: ts-int-pin {
> + ts_int_pin: ts-int-pin-state {
> pins = "gpio86";
> function = "gpio";
> drive-strength = <2>;
> @@ -621,7 +622,7 @@ ts_int_pin: ts-int-pin {
> input-enable;
> };
>
> - bt_host_wake_pin: bt-host-wake {
> + bt_host_wake_pin: bt-host-wake-state {
> pins = "gpio95";
> function = "gpio";
> drive-strength = <2>;
> @@ -629,7 +630,7 @@ bt_host_wake_pin: bt-host-wake {
> output-low;
> };
>
> - bt_dev_wake_pin: bt-dev-wake {
> + bt_dev_wake_pin: bt-dev-wake-state {
> pins = "gpio96";
> function = "gpio";
> drive-strength = <2>;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8974: convert to dtschema
2022-10-17 1:22 [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8974: convert to dtschema Krzysztof Kozlowski
2022-10-17 1:22 ` [PATCH 2/2] ARM: dts: qcom: msm8974: align TLMM pin configuration with DT schema Krzysztof Kozlowski
@ 2022-10-17 18:38 ` Rob Herring
2022-10-19 14:44 ` (subset) " Krzysztof Kozlowski
2022-11-07 3:12 ` Bjorn Andersson
3 siblings, 0 replies; 6+ messages in thread
From: Rob Herring @ 2022-10-17 18:38 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: linux-arm-msm, Bjorn Andersson, Konrad Dybcio, Andy Gross,
linux-gpio, Krzysztof Kozlowski, devicetree, linux-kernel,
Linus Walleij, Rob Herring
On Sun, 16 Oct 2022 21:22:24 -0400, Krzysztof Kozlowski wrote:
> Convert Qualcomm MSM8974 pin controller bindings to DT schema. Keep the
> parsing of pin configuration subnodes consistent with other Qualcomm
> schemas (children named with '-state' suffix, their children with
> '-pins').
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
> .../bindings/pinctrl/qcom,msm8974-pinctrl.txt | 121 ------------
> .../pinctrl/qcom,msm8974-pinctrl.yaml | 179 ++++++++++++++++++
> 2 files changed, 179 insertions(+), 121 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt
> create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.yaml
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: (subset) [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8974: convert to dtschema
2022-10-17 1:22 [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8974: convert to dtschema Krzysztof Kozlowski
2022-10-17 1:22 ` [PATCH 2/2] ARM: dts: qcom: msm8974: align TLMM pin configuration with DT schema Krzysztof Kozlowski
2022-10-17 18:38 ` [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8974: convert to dtschema Rob Herring
@ 2022-10-19 14:44 ` Krzysztof Kozlowski
2022-11-07 3:12 ` Bjorn Andersson
3 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-19 14:44 UTC (permalink / raw)
To: devicetree, linux-arm-msm, Andy Gross, Linus Walleij,
Konrad Dybcio, Rob Herring, linux-gpio, Krzysztof Kozlowski,
Bjorn Andersson, linux-kernel, Krzysztof Kozlowski
On Sun, 16 Oct 2022 21:22:24 -0400, Krzysztof Kozlowski wrote:
> Convert Qualcomm MSM8974 pin controller bindings to DT schema. Keep the
> parsing of pin configuration subnodes consistent with other Qualcomm
> schemas (children named with '-state' suffix, their children with
> '-pins').
>
>
Applied, thanks!
[1/2] dt-bindings: pinctrl: qcom,msm8974: convert to dtschema
https://git.kernel.org/krzk/linux-dt/c/6f3ff1689448448a955af4e0bd7a210ca7aafed9
Best regards,
--
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: (subset) [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8974: convert to dtschema
2022-10-17 1:22 [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8974: convert to dtschema Krzysztof Kozlowski
` (2 preceding siblings ...)
2022-10-19 14:44 ` (subset) " Krzysztof Kozlowski
@ 2022-11-07 3:12 ` Bjorn Andersson
3 siblings, 0 replies; 6+ messages in thread
From: Bjorn Andersson @ 2022-11-07 3:12 UTC (permalink / raw)
To: krzysztof.kozlowski+dt, devicetree, Rob Herring, linux-arm-msm,
linux-gpio, konrad.dybcio, Krzysztof Kozlowski, linux-kernel,
linus.walleij, Andy Gross
On Sun, 16 Oct 2022 21:22:24 -0400, Krzysztof Kozlowski wrote:
> Convert Qualcomm MSM8974 pin controller bindings to DT schema. Keep the
> parsing of pin configuration subnodes consistent with other Qualcomm
> schemas (children named with '-state' suffix, their children with
> '-pins').
>
>
Applied, thanks!
[2/2] ARM: dts: qcom: msm8974: align TLMM pin configuration with DT schema
commit: d6e437c5895e09c0e6876a6809b604c411d37c4d
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-11-07 3:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-17 1:22 [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8974: convert to dtschema Krzysztof Kozlowski
2022-10-17 1:22 ` [PATCH 2/2] ARM: dts: qcom: msm8974: align TLMM pin configuration with DT schema Krzysztof Kozlowski
2022-10-17 11:33 ` konrad.dybcio
2022-10-17 18:38 ` [PATCH 1/2] dt-bindings: pinctrl: qcom,msm8974: convert to dtschema Rob Herring
2022-10-19 14:44 ` (subset) " Krzysztof Kozlowski
2022-11-07 3:12 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).