* [PATCH v2 0/4] Minor cleanup in msm8916 dts files
@ 2023-01-16 14:50 Nikita Travkin
2023-01-16 14:50 ` [PATCH v2 1/4] arm64: dts: qcom: msm/apq8x16-*: Move status property last Nikita Travkin
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Nikita Travkin @ 2023-01-16 14:50 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson
Cc: Rob Herring, Krzysztof Kozlowski, Konrad Dybcio, linux-arm-msm,
devicetree, linux-kernel, ~postmarketos/upstreaming,
Nikita Travkin
This series performs some minor cleanup on msm8916/apq8016 files to
bring them in line with the current standard and be closer to the new
submissions.
The series is separated into commits by each specific change made across
all files and these commits should not cause any functional difference.
Changes in v2:
- Rebase on top of newly applied upstream patches
Nikita Travkin (4):
arm64: dts: qcom: msm/apq8x16-*: Move status property last
arm64: dts: qcom: msm/apq8x16-*: Reorder the pinctrl properties.
arm64: dts: qcom: msm/apq8x16-*: Drop empty lines in pinctrl states
arm64: dts: qcom: msm/apq8x16-*: Reorder some regulator properties
arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 78 +++++++--------
.../boot/dts/qcom/msm8916-acer-a1-724.dts | 15 ++-
.../boot/dts/qcom/msm8916-alcatel-idol347.dts | 46 ++++-----
.../arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 34 +++----
.../arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 52 ++++------
.../boot/dts/qcom/msm8916-longcheer-l8150.dts | 42 ++++----
.../boot/dts/qcom/msm8916-longcheer-l8910.dts | 30 +++---
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 96 +++++--------------
.../qcom/msm8916-samsung-a2015-common.dtsi | 64 +++++--------
.../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 11 +--
.../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 5 +-
.../qcom/msm8916-samsung-e2015-common.dtsi | 5 +-
.../dts/qcom/msm8916-samsung-grandmax.dts | 3 +-
.../boot/dts/qcom/msm8916-samsung-j5.dts | 21 ++--
.../dts/qcom/msm8916-samsung-serranove.dts | 62 +++++-------
.../dts/qcom/msm8916-wingtech-wt88047.dts | 35 +++----
arch/arm64/boot/dts/qcom/msm8916.dtsi | 32 +++----
17 files changed, 245 insertions(+), 386 deletions(-)
--
2.38.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/4] arm64: dts: qcom: msm/apq8x16-*: Move status property last
2023-01-16 14:50 [PATCH v2 0/4] Minor cleanup in msm8916 dts files Nikita Travkin
@ 2023-01-16 14:50 ` Nikita Travkin
2023-01-16 14:50 ` [PATCH v2 2/4] arm64: dts: qcom: msm/apq8x16-*: Reorder the pinctrl properties Nikita Travkin
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Nikita Travkin @ 2023-01-16 14:50 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson
Cc: Rob Herring, Krzysztof Kozlowski, Konrad Dybcio, linux-arm-msm,
devicetree, linux-kernel, ~postmarketos/upstreaming,
Nikita Travkin
It's agreed that the status property should always be the last.
Move it in all msm8916 dts.
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Nikita Travkin <nikita@trvn.ru>
---
arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 44 ++++++++++---------
.../boot/dts/qcom/msm8916-alcatel-idol347.dts | 12 ++---
.../arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 9 ++--
.../arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 16 +++----
.../boot/dts/qcom/msm8916-longcheer-l8150.dts | 12 ++---
.../boot/dts/qcom/msm8916-longcheer-l8910.dts | 12 ++---
.../qcom/msm8916-samsung-a2015-common.dtsi | 12 ++---
.../boot/dts/qcom/msm8916-samsung-j5.dts | 12 ++---
.../dts/qcom/msm8916-samsung-serranove.dts | 12 ++---
.../dts/qcom/msm8916-wingtech-wt88047.dts | 12 ++---
10 files changed, 78 insertions(+), 75 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index c52d79a55d80..110d22f6968b 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -171,18 +171,16 @@ led@6 {
&blsp_i2c2 {
/* On Low speed expansion */
- status = "okay";
label = "LS-I2C0";
+ status = "okay";
};
&blsp_i2c4 {
/* On High speed expansion */
- status = "okay";
label = "HS-I2C2";
+ status = "okay";
adv_bridge: bridge@39 {
- status = "okay";
-
compatible = "adi,adv7533";
reg = <0x39>;
@@ -204,6 +202,8 @@ adv_bridge: bridge@39 {
pinctrl-1 = <&adv7533_int_suspend &adv7533_switch_suspend>;
#sound-dai-cells = <1>;
+ status = "okay";
+
ports {
#address-cells = <1>;
#size-cells = <0>;
@@ -227,34 +227,35 @@ adv7533_out: endpoint {
&blsp_i2c6 {
/* On Low speed expansion */
- status = "okay";
label = "LS-I2C1";
+ status = "okay";
};
&blsp_spi3 {
/* On High speed expansion */
- status = "okay";
label = "HS-SPI1";
+ status = "okay";
};
&blsp_spi5 {
/* On Low speed expansion */
- status = "okay";
label = "LS-SPI0";
+ status = "okay";
};
&blsp1_uart1 {
- status = "okay";
label = "LS-UART0";
+ status = "okay";
};
&blsp1_uart2 {
- status = "okay";
label = "LS-UART1";
+ status = "okay";
};
&camss {
status = "okay";
+
ports {
port@0 {
reg = <0>;
@@ -315,43 +316,41 @@ &mdss {
};
&mpss {
- status = "okay";
-
firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn";
+
+ status = "okay";
};
&pm8916_resin {
- status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
+ status = "okay";
};
&pronto {
- status = "okay";
-
firmware-name = "qcom/apq8016/wcnss.mbn";
-};
-&sdhc_1 {
status = "okay";
+};
+&sdhc_1 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
-};
-&sdhc_2 {
status = "okay";
+};
+&sdhc_2 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
-};
-&sound {
status = "okay";
+};
+&sound {
pinctrl-0 = <&cdc_pdm_lines_act &ext_sec_tlmm_lines_act &ext_mclk_tlmm_lines_act>;
pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus &ext_mclk_tlmm_lines_sus>;
pinctrl-names = "default", "sleep";
@@ -360,6 +359,8 @@ &sound {
"AMIC2", "MIC BIAS Internal2",
"AMIC3", "MIC BIAS External1";
+ status = "okay";
+
quaternary-dai-link {
link-name = "ADV7533";
cpu {
@@ -392,12 +393,13 @@ codec {
};
&usb {
- status = "okay";
extcon = <&usb_id>, <&usb_id>;
pinctrl-names = "default", "device";
pinctrl-0 = <&usb_sw_sel_pm &usb_hub_reset_pm>;
pinctrl-1 = <&usb_sw_sel_pm_device &usb_hub_reset_pm_device>;
+
+ status = "okay";
};
&usb_hs_phy {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index 701a5585d77e..20301eaa3b95 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -152,8 +152,8 @@ led@1 {
};
&pm8916_resin {
- status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
+ status = "okay";
};
&pm8916_vib {
@@ -165,26 +165,26 @@ &pronto {
};
&sdhc_1 {
- status = "okay";
-
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
-};
-&sdhc_2 {
status = "okay";
+};
+&sdhc_2 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
+
+ status = "okay";
};
&usb {
- status = "okay";
extcon = <&usb_id>, <&usb_id>;
+ status = "okay";
};
&usb_hs_phy {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
index 3618704a5330..a0f868854d53 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
@@ -133,26 +133,27 @@ &pronto {
};
&sdhc_1 {
- status = "okay";
-
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
+
+ status = "okay";
};
&sdhc_2 {
- status = "okay";
vmmc-supply = <®_sd_vmmc>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
+
+ status = "okay";
};
&usb {
- status = "okay";
extcon = <&usb_id>, <&usb_id>;
+ status = "okay";
};
&usb_hs_phy {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index 8c07eca900d3..2d266fd417f8 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -219,8 +219,8 @@ &lpass {
};
&pm8916_resin {
- status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
+ status = "okay";
};
&pm8916_vib {
@@ -232,16 +232,14 @@ &pronto {
};
&sdhc_1 {
- status = "okay";
-
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
-};
-&sdhc_2 {
status = "okay";
+};
+&sdhc_2 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdhc2_cd_default>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdhc2_cd_default>;
@@ -260,11 +258,11 @@ &sdhc_2 {
* SD card slot and forgot to re-route to gpio38.
*/
cd-gpios = <&msmgpio 56 GPIO_ACTIVE_LOW>;
-};
-&sound {
status = "okay";
+};
+&sound {
model = "msm8916";
audio-routing =
"AMIC1", "MIC BIAS External1",
@@ -275,6 +273,8 @@ &sound {
pinctrl-0 = <&cdc_pdm_lines_act>;
pinctrl-1 = <&cdc_pdm_lines_sus>;
+ status = "okay";
+
primary-dai-link {
link-name = "WCD";
cpu {
@@ -297,8 +297,8 @@ codec {
};
&usb {
- status = "okay";
extcon = <&usb_id>, <&usb_id>;
+ status = "okay";
};
&usb_hs_phy {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index d1e8cf2f50c0..f63f0fb797b4 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -219,8 +219,8 @@ &blsp1_uart2 {
};
&pm8916_resin {
- status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
+ status = "okay";
};
&pm8916_usbin {
@@ -236,27 +236,27 @@ &pronto {
};
&sdhc_1 {
- status = "okay";
-
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
-};
-&sdhc_2 {
status = "okay";
+};
+&sdhc_2 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
non-removable;
+
+ status = "okay";
};
&usb {
- status = "okay";
dr_mode = "peripheral";
extcon = <&pm8916_usbin>;
+ status = "okay";
};
&usb_hs_phy {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index 3899e11b9843..4d627d06f87b 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -91,8 +91,8 @@ &blsp1_uart2 {
};
&pm8916_resin {
- status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
+ status = "okay";
};
&pm8916_vib {
@@ -104,26 +104,26 @@ &pronto {
};
&sdhc_1 {
- status = "okay";
-
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
-};
-&sdhc_2 {
status = "okay";
+};
+&sdhc_2 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
+
+ status = "okay";
};
&usb {
- status = "okay";
extcon = <&usb_id>, <&usb_id>;
+ status = "okay";
};
&usb_hs_phy {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index d600916a0e55..13c586079e50 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -248,8 +248,8 @@ &mdss {
};
&pm8916_resin {
- status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
+ status = "okay";
};
&pronto {
@@ -257,26 +257,26 @@ &pronto {
};
&sdhc_1 {
- status = "okay";
-
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
-};
-&sdhc_2 {
status = "okay";
+};
+&sdhc_2 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
+
+ status = "okay";
};
&usb {
- status = "okay";
extcon = <&muic>, <&muic>;
+ status = "okay";
};
&usb_hs_phy {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
index 7ac49a021563..8eb68bb6607c 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
@@ -53,8 +53,8 @@ &blsp1_uart2 {
};
&pm8916_resin {
- status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
+ status = "okay";
};
/* FIXME: Replace with SM5703 MUIC when driver is available */
@@ -67,27 +67,27 @@ &pronto {
};
&sdhc_1 {
- status = "okay";
-
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
-};
-&sdhc_2 {
status = "okay";
+};
+&sdhc_2 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
+
+ status = "okay";
};
&usb {
- status = "okay";
dr_mode = "peripheral";
extcon = <&pm8916_usbin>;
+ status = "okay";
};
&usb_hs_phy {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
index d4984b3af802..34bee5211413 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
@@ -264,8 +264,8 @@ &blsp1_uart2 {
};
&pm8916_resin {
- status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
+ status = "okay";
};
&pm8916_vib {
@@ -281,16 +281,14 @@ iris {
};
&sdhc_1 {
- status = "okay";
-
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
-};
-&sdhc_2 {
status = "okay";
+};
+&sdhc_2 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
@@ -309,11 +307,13 @@ &sdhc_2 {
* (without tuning), so maybe only tuning is broken?
*/
no-1-8-v;
+
+ status = "okay";
};
&usb {
- status = "okay";
extcon = <&muic>, <&muic>;
+ status = "okay";
};
&usb_hs_phy {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
index a87be1d95b14..24a5c3486beb 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
@@ -145,8 +145,8 @@ &blsp1_uart2 {
};
&pm8916_resin {
- status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
+ status = "okay";
};
&pm8916_vib {
@@ -158,26 +158,26 @@ &pronto {
};
&sdhc_1 {
- status = "okay";
-
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
-};
-&sdhc_2 {
status = "okay";
+};
+&sdhc_2 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
non-removable;
+
+ status = "okay";
};
&usb {
- status = "okay";
extcon = <&usb_id>, <&usb_id>;
+ status = "okay";
};
&usb_hs_phy {
--
2.38.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 2/4] arm64: dts: qcom: msm/apq8x16-*: Reorder the pinctrl properties.
2023-01-16 14:50 [PATCH v2 0/4] Minor cleanup in msm8916 dts files Nikita Travkin
2023-01-16 14:50 ` [PATCH v2 1/4] arm64: dts: qcom: msm/apq8x16-*: Move status property last Nikita Travkin
@ 2023-01-16 14:50 ` Nikita Travkin
2023-01-16 14:50 ` [PATCH v2 3/4] arm64: dts: qcom: msm/apq8x16-*: Drop empty lines in pinctrl states Nikita Travkin
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Nikita Travkin @ 2023-01-16 14:50 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson
Cc: Rob Herring, Krzysztof Kozlowski, Konrad Dybcio, linux-arm-msm,
devicetree, linux-kernel, ~postmarketos/upstreaming,
Nikita Travkin
With other property lists that have -names properties, the -names is put
last. However pinctrl-names in most msm8916 dts files was first instead.
Reorder the pinctrl properties to be in line with other lists.
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Nikita Travkin <nikita@trvn.ru>
---
arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 18 +++++------
.../boot/dts/qcom/msm8916-acer-a1-724.dts | 12 +++----
.../boot/dts/qcom/msm8916-alcatel-idol347.dts | 22 ++++++-------
.../arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 16 +++++-----
.../arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 24 +++++++-------
.../boot/dts/qcom/msm8916-longcheer-l8150.dts | 20 ++++++------
.../boot/dts/qcom/msm8916-longcheer-l8910.dts | 12 +++----
.../qcom/msm8916-samsung-a2015-common.dtsi | 32 +++++++++----------
.../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 8 ++---
.../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 4 +--
.../qcom/msm8916-samsung-e2015-common.dtsi | 4 +--
.../dts/qcom/msm8916-samsung-grandmax.dts | 2 +-
.../boot/dts/qcom/msm8916-samsung-j5.dts | 6 ++--
.../dts/qcom/msm8916-samsung-serranove.dts | 32 +++++++++----------
.../dts/qcom/msm8916-wingtech-wt88047.dts | 14 ++++----
arch/arm64/boot/dts/qcom/msm8916.dtsi | 32 +++++++++----------
16 files changed, 129 insertions(+), 129 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index 110d22f6968b..6203ed92e4c0 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -76,8 +76,8 @@ usb2513 {
usb_id: usb-id {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&msmgpio 121 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>;
+ pinctrl-names = "default";
};
hdmi-out {
@@ -95,8 +95,8 @@ gpio-keys {
compatible = "gpio-keys";
autorepeat;
- pinctrl-names = "default";
pinctrl-0 = <&msm_key_volp_n_default>;
+ pinctrl-names = "default";
button {
label = "Volume Up";
@@ -106,10 +106,10 @@ button {
};
leds {
- pinctrl-names = "default";
pinctrl-0 = <&msmgpio_leds>,
<&pm8916_gpios_leds>,
<&pm8916_mpps_leds>;
+ pinctrl-names = "default";
compatible = "gpio-leds";
@@ -197,9 +197,9 @@ adv_bridge: bridge@39 {
v1p2-supply = <&pm8916_l6>;
v3p3-supply = <&pm8916_l17>;
- pinctrl-names = "default","sleep";
pinctrl-0 = <&adv7533_int_active &adv7533_switch_active>;
pinctrl-1 = <&adv7533_int_suspend &adv7533_switch_suspend>;
+ pinctrl-names = "default","sleep";
#sound-dai-cells = <1>;
status = "okay";
@@ -279,8 +279,8 @@ camera_rear@3b {
enable-gpios = <&msmgpio 34 GPIO_ACTIVE_HIGH>;
reset-gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>;
- pinctrl-names = "default";
pinctrl-0 = <&camera_rear_default>;
+ pinctrl-names = "default";
clocks = <&gcc GCC_CAMSS_MCLK0_CLK>;
clock-names = "xclk";
@@ -333,17 +333,17 @@ &pronto {
};
&sdhc_1 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
+ pinctrl-names = "default", "sleep";
status = "okay";
};
&sdhc_2 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
+ pinctrl-names = "default", "sleep";
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
@@ -395,9 +395,9 @@ codec {
&usb {
extcon = <&usb_id>, <&usb_id>;
- pinctrl-names = "default", "device";
pinctrl-0 = <&usb_sw_sel_pm &usb_hub_reset_pm>;
pinctrl-1 = <&usb_sw_sel_pm_device &usb_hub_reset_pm_device>;
+ pinctrl-names = "default", "device";
status = "okay";
};
@@ -829,8 +829,8 @@ &pm8916_mpps {
"BT_LED_CTRL",
"GPIO-F"; /* LS_EXP_GPIO_F, LSEC pin 28 */
- pinctrl-names = "default";
pinctrl-0 = <&ls_exp_gpio_f>;
+ pinctrl-names = "default";
ls_exp_gpio_f: pm8916-mpp4-state {
pins = "mpp4";
diff --git a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
index ed3fa7b3575b..04bbdc76889c 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
@@ -32,8 +32,8 @@ chosen {
gpio-keys {
compatible = "gpio-keys";
- pinctrl-names = "default";
pinctrl-0 = <&gpio_keys_default>;
+ pinctrl-names = "default";
label = "GPIO Buttons";
@@ -47,8 +47,8 @@ button-volume-up {
usb_id: usb-id {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&msmgpio 110 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>;
+ pinctrl-names = "default";
};
};
@@ -64,8 +64,8 @@ accelerometer@10 {
vdd-supply = <&pm8916_l17>;
vddio-supply = <&pm8916_l6>;
- pinctrl-names = "default";
pinctrl-0 = <&accel_int_default>;
+ pinctrl-names = "default";
mount-matrix = "0", "-1", "0",
"-1", "0", "0",
@@ -100,8 +100,8 @@ touchscreen@38 {
touchscreen-size-x = <720>;
touchscreen-size-y = <1280>;
- pinctrl-names = "default";
pinctrl-0 = <&touchscreen_default>;
+ pinctrl-names = "default";
};
};
@@ -123,17 +123,17 @@ &pronto {
};
&sdhc_1 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
+ pinctrl-names = "default", "sleep";
status = "okay";
};
&sdhc_2 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
+ pinctrl-names = "default", "sleep";
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_HIGH>;
diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index 20301eaa3b95..a5690354a2dd 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -23,8 +23,8 @@ chosen {
gpio-keys {
compatible = "gpio-keys";
- pinctrl-names = "default";
pinctrl-0 = <&gpio_keys_default>;
+ pinctrl-names = "default";
label = "GPIO Buttons";
@@ -38,8 +38,8 @@ button-volume-up {
gpio-leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
pinctrl-0 = <&gpio_leds_default>;
+ pinctrl-names = "default";
led-0 {
gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
@@ -51,8 +51,8 @@ led-0 {
usb_id: usb-id {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&msmgpio 69 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>;
+ pinctrl-names = "default";
};
};
@@ -69,8 +69,8 @@ touchscreen@26 {
interrupt-parent = <&msmgpio>;
interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
reset-gpios = <&msmgpio 100 GPIO_ACTIVE_LOW>;
- pinctrl-names = "default";
pinctrl-0 = <&ts_int_reset_default>;
+ pinctrl-names = "default";
vdd-supply = <&pm8916_l17>;
vddio-supply = <&pm8916_l5>;
touchscreen-size-x = <2048>;
@@ -87,8 +87,8 @@ magnetometer@c {
vdd-supply = <&pm8916_l17>;
vid-supply = <&pm8916_l6>;
reset-gpios = <&msmgpio 8 GPIO_ACTIVE_LOW>;
- pinctrl-names = "default";
pinctrl-0 = <&mag_reset_default>;
+ pinctrl-names = "default";
mount-matrix = "0", "1", "0",
"-1", "0", "0",
"0", "0", "1";
@@ -101,8 +101,8 @@ accelerometer@f {
vddio-supply = <&pm8916_l6>;
interrupt-parent = <&msmgpio>;
interrupts = <31 IRQ_TYPE_EDGE_RISING>;
- pinctrl-names = "default";
pinctrl-0 = <&accel_int_default>;
+ pinctrl-names = "default";
mount-matrix = "-1", "0", "0",
"0", "1", "0",
"0", "0", "-1";
@@ -113,8 +113,8 @@ proximity@48 {
reg = <0x48>;
interrupt-parent = <&msmgpio>;
interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
- pinctrl-names = "default";
pinctrl-0 = <&proximity_int_default>;
+ pinctrl-names = "default";
};
gyroscope@68 {
@@ -125,8 +125,8 @@ gyroscope@68 {
interrupt-parent = <&msmgpio>;
interrupts = <97 IRQ_TYPE_EDGE_RISING>,
<98 IRQ_TYPE_EDGE_RISING>;
- pinctrl-names = "default";
pinctrl-0 = <&gyro_int_default>;
+ pinctrl-names = "default";
};
};
@@ -137,8 +137,8 @@ led-controller@68 {
compatible = "si-en,sn3190";
reg = <0x68>;
shutdown-gpios = <&msmgpio 89 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&led_enable_default &led_shutdown_default>;
+ pinctrl-names = "default";
#address-cells = <1>;
#size-cells = <0>;
@@ -165,17 +165,17 @@ &pronto {
};
&sdhc_1 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
+ pinctrl-names = "default", "sleep";
status = "okay";
};
&sdhc_2 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
+ pinctrl-names = "default", "sleep";
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
index a0f868854d53..9b6265d428ce 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
@@ -23,8 +23,8 @@ chosen {
gpio-keys {
compatible = "gpio-keys";
- pinctrl-names = "default";
pinctrl-0 = <&gpio_keys_default>;
+ pinctrl-names = "default";
label = "GPIO Buttons";
@@ -54,15 +54,15 @@ reg_sd_vmmc: regulator-sdcard-vmmc {
startup-delay-us = <200>;
- pinctrl-names = "default";
pinctrl-0 = <&sd_vmmc_en_default>;
+ pinctrl-names = "default";
};
usb_id: usb-id {
compatible = "linux,extcon-usb-gpio";
id-gpios = <&msmgpio 110 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>;
+ pinctrl-names = "default";
};
};
@@ -78,8 +78,8 @@ magnetometer@c {
reset-gpios = <&msmgpio 112 GPIO_ACTIVE_LOW>;
- pinctrl-names = "default";
pinctrl-0 = <&mag_reset_default>;
+ pinctrl-names = "default";
};
imu@68 {
@@ -92,8 +92,8 @@ imu@68 {
vdd-supply = <&pm8916_l17>;
vddio-supply = <&pm8916_l6>;
- pinctrl-names = "default";
pinctrl-0 = <&imu_default>;
+ pinctrl-names = "default";
mount-matrix = "1", "0", "0",
"0", "-1", "0",
@@ -119,8 +119,8 @@ touchscreen@38 {
touchscreen-size-x = <720>;
touchscreen-size-y = <1280>;
- pinctrl-names = "default";
pinctrl-0 = <&touchscreen_default>;
+ pinctrl-names = "default";
};
};
@@ -133,9 +133,9 @@ &pronto {
};
&sdhc_1 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
+ pinctrl-names = "default", "sleep";
status = "okay";
};
@@ -143,9 +143,9 @@ &sdhc_1 {
&sdhc_2 {
vmmc-supply = <®_sd_vmmc>;
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
+ pinctrl-names = "default", "sleep";
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
status = "okay";
diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index 2d266fd417f8..ac8b80de1a31 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -36,8 +36,8 @@ chosen {
gpio-keys {
compatible = "gpio-keys";
- pinctrl-names = "default";
pinctrl-0 = <&gpio_keys_default>;
+ pinctrl-names = "default";
label = "GPIO Buttons";
@@ -51,8 +51,8 @@ button-volume-up {
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
pinctrl-0 = <&gpio_leds_default>;
+ pinctrl-names = "default";
led-0 {
gpios = <&msmgpio 8 GPIO_ACTIVE_HIGH>;
@@ -79,8 +79,8 @@ led-2 {
usb_id: usb-id {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&msmgpio 117 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>;
+ pinctrl-names = "default";
};
};
@@ -96,8 +96,8 @@ magnetometer@c {
reset-gpios = <&msmgpio 36 GPIO_ACTIVE_LOW>;
- pinctrl-names = "default";
pinctrl-0 = <&mag_reset_default>;
+ pinctrl-names = "default";
};
accelerometer@1e {
@@ -110,8 +110,8 @@ accelerometer@1e {
vdd-supply = <&pm8916_l17>;
vddio-supply = <&pm8916_l6>;
- pinctrl-names = "default";
pinctrl-0 = <&accel_irq_default>;
+ pinctrl-names = "default";
mount-matrix = "-1", "0", "0",
"0", "1", "0",
@@ -131,16 +131,16 @@ proximity@39 {
led-max-microamp = <100000>;
amstaos,proximity-diodes = <1>;
- pinctrl-names = "default";
pinctrl-0 = <&prox_irq_default>;
+ pinctrl-names = "default";
};
regulator@3e {
compatible = "ti,tps65132";
reg = <0x3e>;
- pinctrl-names = "default";
pinctrl-0 = <®_lcd_en_default>;
+ pinctrl-names = "default";
reg_lcd_pos: outp {
regulator-name = "outp";
@@ -175,8 +175,8 @@ rmi4@70 {
vdd-supply = <&pm8916_l17>;
vio-supply = <&pm8916_l16>;
- pinctrl-names = "default";
pinctrl-0 = <&ts_irq_default>;
+ pinctrl-names = "default";
syna,startup-delay-ms = <100>;
@@ -205,8 +205,8 @@ nfc@28 {
enable-gpios = <&msmgpio 20 GPIO_ACTIVE_HIGH>;
firmware-gpios = <&msmgpio 2 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&nfc_default>;
+ pinctrl-names = "default";
};
};
@@ -232,17 +232,17 @@ &pronto {
};
&sdhc_1 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
+ pinctrl-names = "default", "sleep";
status = "okay";
};
&sdhc_2 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdhc2_cd_default>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdhc2_cd_default>;
+ pinctrl-names = "default", "sleep";
/*
* The Huawei device tree sets cd-gpios = <&msmgpio 38 GPIO_ACTIVE_HIGH>.
@@ -269,9 +269,9 @@ &sound {
"AMIC2", "MIC BIAS External2",
"AMIC3", "MIC BIAS External1";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&cdc_pdm_lines_act>;
pinctrl-1 = <&cdc_pdm_lines_sus>;
+ pinctrl-names = "default", "sleep";
status = "okay";
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index f63f0fb797b4..8fbbfc98900d 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -34,8 +34,8 @@ wcnss_mem: wcnss@8b600000 {
gpio-keys {
compatible = "gpio-keys";
- pinctrl-names = "default";
pinctrl-0 = <&gpio_keys_default>;
+ pinctrl-names = "default";
label = "GPIO Buttons";
@@ -56,8 +56,8 @@ reg_ctp: regulator-ctp {
gpio = <&msmgpio 17 GPIO_ACTIVE_HIGH>;
enable-active-high;
- pinctrl-names = "default";
pinctrl-0 = <&ctp_pwr_en_default>;
+ pinctrl-names = "default";
};
flash-led-controller {
@@ -65,8 +65,8 @@ flash-led-controller {
flash-gpios = <&msmgpio 31 GPIO_ACTIVE_HIGH>;
enable-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&camera_flash_default>;
+ pinctrl-names = "default";
flash_led: led {
function = LED_FUNCTION_FLASH;
@@ -126,8 +126,8 @@ accelerometer@10 {
* interrupts = <116 IRQ_TYPE_EDGE_RISING>;
*/
- pinctrl-names = "default";
pinctrl-0 = <&accel_int_default>;
+ pinctrl-names = "default";
vdd-supply = <&pm8916_l17>;
vddio-supply = <&pm8916_l6>;
@@ -144,8 +144,8 @@ magnetometer@12 {
interrupt-parent = <&msmgpio>;
interrupts = <113 IRQ_TYPE_EDGE_RISING>;
- pinctrl-names = "default";
pinctrl-0 = <&magn_int_default>;
+ pinctrl-names = "default";
vdd-supply = <&pm8916_l17>;
vddio-supply = <&pm8916_l6>;
@@ -159,8 +159,8 @@ light-sensor@23 {
interrupt-parent = <&msmgpio>;
interrupts = <115 IRQ_TYPE_EDGE_FALLING>;
- pinctrl-names = "default";
pinctrl-0 = <&light_int_default>;
+ pinctrl-names = "default";
vdd-supply = <&pm8916_l17>;
vio-supply = <&pm8916_l6>;
@@ -174,8 +174,8 @@ gyroscope@68 {
interrupts = <23 IRQ_TYPE_EDGE_RISING>,
<22 IRQ_TYPE_EDGE_RISING>;
- pinctrl-names = "default";
pinctrl-0 = <&gyro_int_default>;
+ pinctrl-names = "default";
vdd-supply = <&pm8916_l17>;
vddio-supply = <&pm8916_l6>;
@@ -197,8 +197,8 @@ rmi4@20 {
vdd-supply = <®_ctp>;
vio-supply = <&pm8916_l6>;
- pinctrl-names = "default";
pinctrl-0 = <&tp_int_default>;
+ pinctrl-names = "default";
syna,startup-delay-ms = <10>;
@@ -236,17 +236,17 @@ &pronto {
};
&sdhc_1 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
+ pinctrl-names = "default", "sleep";
status = "okay";
};
&sdhc_2 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
+ pinctrl-names = "default", "sleep";
non-removable;
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index 4d627d06f87b..b776a2b4a317 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -23,8 +23,8 @@ chosen {
gpio-keys {
compatible = "gpio-keys";
- pinctrl-names = "default";
pinctrl-0 = <&gpio_keys_default>;
+ pinctrl-names = "default";
label = "GPIO Buttons";
@@ -44,16 +44,16 @@ led-0 {
default-state = "off";
function = LED_FUNCTION_KBD_BACKLIGHT;
- pinctrl-names = "default";
pinctrl-0 = <&button_backlight_default>;
+ pinctrl-names = "default";
};
};
usb_id: usb-id {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&msmgpio 110 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>;
+ pinctrl-names = "default";
};
};
@@ -69,8 +69,8 @@ magnetometer@d {
reset-gpios = <&msmgpio 111 GPIO_ACTIVE_LOW>;
- pinctrl-names = "default";
pinctrl-0 = <&mag_reset_default>;
+ pinctrl-names = "default";
};
imu@68 {
@@ -104,17 +104,17 @@ &pronto {
};
&sdhc_1 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
+ pinctrl-names = "default", "sleep";
status = "okay";
};
&sdhc_2 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
+ pinctrl-names = "default", "sleep";
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index 13c586079e50..dd0e2e586ac1 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -29,16 +29,16 @@ clk_pwm: pwm {
clocks = <&gcc GCC_GP2_CLK>;
- pinctrl-names = "default";
pinctrl-0 = <&motor_pwm_default>;
+ pinctrl-names = "default";
status = "disabled";
};
gpio-keys {
compatible = "gpio-keys";
- pinctrl-names = "default";
pinctrl-0 = <&gpio_keys_default>;
+ pinctrl-names = "default";
label = "GPIO Buttons";
@@ -58,8 +58,8 @@ button-home {
gpio-hall-sensor {
compatible = "gpio-keys";
- pinctrl-names = "default";
pinctrl-0 = <&gpio_hall_sensor_default>;
+ pinctrl-names = "default";
label = "GPIO Hall Effect Sensor";
@@ -86,8 +86,8 @@ reg_motor_vdd: regulator-motor-vdd {
gpio = <&msmgpio 76 GPIO_ACTIVE_HIGH>;
enable-active-high;
- pinctrl-names = "default";
pinctrl-0 = <&motor_en_default>;
+ pinctrl-names = "default";
};
reg_vdd_tsp_a: regulator-vdd-tsp-a {
@@ -99,8 +99,8 @@ reg_vdd_tsp_a: regulator-vdd-tsp-a {
gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>;
enable-active-high;
- pinctrl-names = "default";
pinctrl-0 = <&tsp_en_default>;
+ pinctrl-names = "default";
};
i2c-muic {
@@ -108,8 +108,8 @@ i2c-muic {
sda-gpios = <&msmgpio 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&msmgpio 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
- pinctrl-names = "default";
pinctrl-0 = <&muic_i2c_default>;
+ pinctrl-names = "default";
#address-cells = <1>;
#size-cells = <0>;
@@ -121,8 +121,8 @@ muic: extcon@25 {
interrupt-parent = <&msmgpio>;
interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
- pinctrl-names = "default";
pinctrl-0 = <&muic_int_default>;
+ pinctrl-names = "default";
};
};
@@ -131,8 +131,8 @@ i2c-tkey {
sda-gpios = <&msmgpio 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&msmgpio 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
- pinctrl-names = "default";
pinctrl-0 = <&tkey_i2c_default>;
+ pinctrl-names = "default";
#address-cells = <1>;
#size-cells = <0>;
@@ -150,8 +150,8 @@ touchkey: touchkey@20 {
linux,keycodes = <KEY_APPSELECT KEY_BACK>;
- pinctrl-names = "default";
pinctrl-0 = <&tkey_default>;
+ pinctrl-names = "default";
};
};
@@ -160,8 +160,8 @@ i2c-nfc {
sda-gpios = <&msmgpio 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&msmgpio 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
- pinctrl-names = "default";
pinctrl-0 = <&nfc_i2c_default>;
+ pinctrl-names = "default";
#address-cells = <1>;
#size-cells = <0>;
@@ -178,8 +178,8 @@ nfc@27 {
clocks = <&rpmcc RPM_SMD_BB_CLK2_PIN>;
- pinctrl-names = "default";
pinctrl-0 = <&nfc_default &nfc_clk_req>;
+ pinctrl-names = "default";
};
};
@@ -206,8 +206,8 @@ accelerometer: accelerometer@10 {
vdd-supply = <&pm8916_l17>;
vddio-supply = <&pm8916_l5>;
- pinctrl-names = "default";
pinctrl-0 = <&accel_int_default>;
+ pinctrl-names = "default";
};
magnetometer@12 {
@@ -228,8 +228,8 @@ battery@35 {
interrupt-parent = <&msmgpio>;
interrupts = <121 IRQ_TYPE_EDGE_BOTH>;
- pinctrl-names = "default";
pinctrl-0 = <&fg_alert_default>;
+ pinctrl-names = "default";
};
};
@@ -238,9 +238,9 @@ &blsp1_uart2 {
};
&dsi0 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&mdss_default>;
pinctrl-1 = <&mdss_sleep>;
+ pinctrl-names = "default", "sleep";
};
&mdss {
@@ -257,17 +257,17 @@ &pronto {
};
&sdhc_1 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
+ pinctrl-names = "default", "sleep";
status = "okay";
};
&sdhc_2 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
+ pinctrl-names = "default", "sleep";
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
index c691cca2eb45..2eb06cf626dc 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
@@ -18,8 +18,8 @@ reg_panel_vdd3: regulator-panel-vdd3 {
gpio = <&msmgpio 9 GPIO_ACTIVE_HIGH>;
enable-active-high;
- pinctrl-names = "default";
pinctrl-0 = <&panel_vdd3_default>;
+ pinctrl-names = "default";
};
reg_touch_key: regulator-touch-key {
@@ -31,8 +31,8 @@ reg_touch_key: regulator-touch-key {
gpio = <&msmgpio 86 GPIO_ACTIVE_HIGH>;
enable-active-high;
- pinctrl-names = "default";
pinctrl-0 = <&tkey_en_default>;
+ pinctrl-names = "default";
};
reg_key_led: regulator-key-led {
@@ -44,8 +44,8 @@ reg_key_led: regulator-key-led {
gpio = <&msmgpio 60 GPIO_ACTIVE_HIGH>;
enable-active-high;
- pinctrl-names = "default";
pinctrl-0 = <&tkey_led_en_default>;
+ pinctrl-names = "default";
};
};
@@ -76,8 +76,8 @@ touchscreen@20 {
vcca-supply = <®_vdd_tsp_a>;
vdd-supply = <&pm8916_l6>;
- pinctrl-names = "default";
pinctrl-0 = <&ts_int_default>;
+ pinctrl-names = "default";
};
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
index 3dd819458785..179c872091d8 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
@@ -18,8 +18,8 @@ reg_touch_key: regulator-touch-key {
gpio = <&msmgpio 97 GPIO_ACTIVE_HIGH>;
enable-active-high;
- pinctrl-names = "default";
pinctrl-0 = <&tkey_en_default>;
+ pinctrl-names = "default";
};
};
@@ -45,8 +45,8 @@ touchscreen@48 {
avdd-supply = <®_vdd_tsp_a>;
vdd-supply = <&pm8916_l6>;
- pinctrl-names = "default";
pinctrl-0 = <&ts_int_default>;
+ pinctrl-names = "default";
};
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
index c95f0b4bc61f..6c04ca97e98a 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
@@ -21,8 +21,8 @@ muic: extcon@14 {
interrupt-parent = <&msmgpio>;
interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
- pinctrl-names = "default";
pinctrl-0 = <&muic_int_default>;
+ pinctrl-names = "default";
};
};
@@ -35,8 +35,8 @@ reg_touch_key: regulator-touch-key {
gpio = <&msmgpio 97 GPIO_ACTIVE_HIGH>;
enable-active-high;
- pinctrl-names = "default";
pinctrl-0 = <&tkey_en_default>;
+ pinctrl-names = "default";
};
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
index 4cbd68b89448..f5ca2d30881f 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
@@ -35,8 +35,8 @@ led-keyled {
gpios = <&msmgpio 60 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&gpio_leds_default>;
+ pinctrl-names = "default";
};
};
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
index 8eb68bb6607c..882ed9c65d88 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
@@ -29,8 +29,8 @@ tz-apps@85500000 {
gpio-keys {
compatible = "gpio-keys";
- pinctrl-names = "default";
pinctrl-0 = <&gpio_keys_default>;
+ pinctrl-names = "default";
label = "GPIO Buttons";
@@ -67,17 +67,17 @@ &pronto {
};
&sdhc_1 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
+ pinctrl-names = "default", "sleep";
status = "okay";
};
&sdhc_2 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
+ pinctrl-names = "default", "sleep";
cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
index 34bee5211413..249519635ba6 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
@@ -46,8 +46,8 @@ tz-apps@85500000 {
gpio-keys {
compatible = "gpio-keys";
- pinctrl-names = "default";
pinctrl-0 = <&gpio_keys_default>;
+ pinctrl-names = "default";
label = "GPIO Buttons";
@@ -67,8 +67,8 @@ button-home {
gpio-hall-sensor {
compatible = "gpio-keys";
- pinctrl-names = "default";
pinctrl-0 = <&gpio_hall_sensor_default>;
+ pinctrl-names = "default";
label = "GPIO Hall Effect Sensor";
@@ -90,8 +90,8 @@ reg_vdd_tsp: regulator-vdd-tsp {
gpio = <&msmgpio 73 GPIO_ACTIVE_HIGH>;
enable-active-high;
- pinctrl-names = "default";
pinctrl-0 = <&tsp_en_default>;
+ pinctrl-names = "default";
};
reg_touch_key: regulator-touch-key {
@@ -103,8 +103,8 @@ reg_touch_key: regulator-touch-key {
gpio = <&msmgpio 86 GPIO_ACTIVE_HIGH>;
enable-active-high;
- pinctrl-names = "default";
pinctrl-0 = <&tkey_en_default>;
+ pinctrl-names = "default";
};
reg_key_led: regulator-key-led {
@@ -116,8 +116,8 @@ reg_key_led: regulator-key-led {
gpio = <&msmgpio 60 GPIO_ACTIVE_HIGH>;
enable-active-high;
- pinctrl-names = "default";
pinctrl-0 = <&tkey_led_en_default>;
+ pinctrl-names = "default";
};
i2c-muic {
@@ -125,8 +125,8 @@ i2c-muic {
sda-gpios = <&msmgpio 105 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&msmgpio 106 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
- pinctrl-names = "default";
pinctrl-0 = <&muic_i2c_default>;
+ pinctrl-names = "default";
#address-cells = <1>;
#size-cells = <0>;
@@ -138,8 +138,8 @@ muic: extcon@14 {
interrupt-parent = <&msmgpio>;
interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
- pinctrl-names = "default";
pinctrl-0 = <&muic_irq_default>;
+ pinctrl-names = "default";
};
};
@@ -148,8 +148,8 @@ i2c-tkey {
sda-gpios = <&msmgpio 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&msmgpio 17 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
- pinctrl-names = "default";
pinctrl-0 = <&tkey_i2c_default>;
+ pinctrl-names = "default";
#address-cells = <1>;
#size-cells = <0>;
@@ -167,8 +167,8 @@ touchkey@20 {
linux,keycodes = <KEY_APPSELECT KEY_BACK>;
- pinctrl-names = "default";
pinctrl-0 = <&tkey_default>;
+ pinctrl-names = "default";
};
};
@@ -177,8 +177,8 @@ i2c-nfc {
sda-gpios = <&msmgpio 0 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&msmgpio 1 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
- pinctrl-names = "default";
pinctrl-0 = <&nfc_i2c_default>;
+ pinctrl-names = "default";
#address-cells = <1>;
#size-cells = <0>;
@@ -193,8 +193,8 @@ nfc@2b {
enable-gpios = <&msmgpio 20 GPIO_ACTIVE_HIGH>;
firmware-gpios = <&msmgpio 49 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&nfc_default>;
+ pinctrl-names = "default";
};
};
};
@@ -209,8 +209,8 @@ imu@6b {
interrupt-parent = <&msmgpio>;
interrupts = <115 IRQ_TYPE_EDGE_RISING>;
- pinctrl-names = "default";
pinctrl-0 = <&imu_irq_default>;
+ pinctrl-names = "default";
};
magnetometer@2e {
@@ -233,8 +233,8 @@ battery@35 {
interrupt-parent = <&msmgpio>;
interrupts = <121 IRQ_TYPE_EDGE_FALLING>;
- pinctrl-names = "default";
pinctrl-0 = <&fg_alert_default>;
+ pinctrl-names = "default";
};
};
@@ -254,8 +254,8 @@ touchscreen@20 {
vdd-supply = <®_vdd_tsp>;
vddo-supply = <&pm8916_l6>;
- pinctrl-names = "default";
pinctrl-0 = <&tsp_irq_default>;
+ pinctrl-names = "default";
};
};
@@ -281,17 +281,17 @@ iris {
};
&sdhc_1 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
+ pinctrl-names = "default", "sleep";
status = "okay";
};
&sdhc_2 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
+ pinctrl-names = "default", "sleep";
non-removable;
diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
index 24a5c3486beb..e542b48a4fad 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
@@ -28,8 +28,8 @@ flash-led-controller {
enable-gpios = <&msmgpio 31 GPIO_ACTIVE_HIGH>;
flash-gpios = <&msmgpio 32 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&camera_flash_default>;
+ pinctrl-names = "default";
flash_led: led {
function = LED_FUNCTION_FLASH;
@@ -40,8 +40,8 @@ flash_led: led {
gpio-keys {
compatible = "gpio-keys";
- pinctrl-names = "default";
pinctrl-0 = <&gpio_keys_default>;
+ pinctrl-names = "default";
label = "GPIO Buttons";
@@ -55,8 +55,8 @@ button-volume-up {
usb_id: usb-id {
compatible = "linux,extcon-usb-gpio";
id-gpio = <&msmgpio 110 GPIO_ACTIVE_HIGH>;
- pinctrl-names = "default";
pinctrl-0 = <&usb_id_default>;
+ pinctrl-names = "default";
};
};
@@ -73,8 +73,8 @@ imu@68 {
vdd-supply = <&pm8916_l17>;
vddio-supply = <&pm8916_l6>;
- pinctrl-names = "default";
pinctrl-0 = <&imu_default>;
+ pinctrl-names = "default";
mount-matrix = "1", "0", "0",
"0", "-1", "0",
@@ -101,8 +101,8 @@ touchscreen@38 {
touchscreen-size-x = <720>;
touchscreen-size-y = <1280>;
- pinctrl-names = "default";
pinctrl-0 = <&touchscreen_default>;
+ pinctrl-names = "default";
};
};
@@ -158,17 +158,17 @@ &pronto {
};
&sdhc_1 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
+ pinctrl-names = "default", "sleep";
status = "okay";
};
&sdhc_2 {
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>;
pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
+ pinctrl-names = "default", "sleep";
non-removable;
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index cf248e10660b..aeae56f88ed6 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1182,8 +1182,8 @@ cci: cci@1b0c000 {
assigned-clocks = <&gcc GCC_CAMSS_CCI_AHB_CLK>,
<&gcc GCC_CAMSS_CCI_CLK>;
assigned-clock-rates = <80000000>, <19200000>;
- pinctrl-names = "default";
pinctrl-0 = <&cci0_default>;
+ pinctrl-names = "default";
status = "disabled";
cci_i2c0: i2c-bus@0 {
@@ -1532,9 +1532,9 @@ blsp1_uart1: serial@78af000 {
clock-names = "core", "iface";
dmas = <&blsp_dma 0>, <&blsp_dma 1>;
dma-names = "tx", "rx";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&blsp1_uart1_default>;
pinctrl-1 = <&blsp1_uart1_sleep>;
+ pinctrl-names = "default", "sleep";
status = "disabled";
};
@@ -1546,9 +1546,9 @@ blsp1_uart2: serial@78b0000 {
clock-names = "core", "iface";
dmas = <&blsp_dma 2>, <&blsp_dma 3>;
dma-names = "tx", "rx";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&blsp1_uart2_default>;
pinctrl-1 = <&blsp1_uart2_sleep>;
+ pinctrl-names = "default", "sleep";
status = "disabled";
};
@@ -1561,9 +1561,9 @@ blsp_i2c1: i2c@78b5000 {
clock-names = "core", "iface";
dmas = <&blsp_dma 4>, <&blsp_dma 5>;
dma-names = "tx", "rx";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&i2c1_default>;
pinctrl-1 = <&i2c1_sleep>;
+ pinctrl-names = "default", "sleep";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -1578,9 +1578,9 @@ blsp_spi1: spi@78b5000 {
clock-names = "core", "iface";
dmas = <&blsp_dma 4>, <&blsp_dma 5>;
dma-names = "tx", "rx";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi1_default>;
pinctrl-1 = <&spi1_sleep>;
+ pinctrl-names = "default", "sleep";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -1595,9 +1595,9 @@ blsp_i2c2: i2c@78b6000 {
clock-names = "core", "iface";
dmas = <&blsp_dma 6>, <&blsp_dma 7>;
dma-names = "tx", "rx";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&i2c2_default>;
pinctrl-1 = <&i2c2_sleep>;
+ pinctrl-names = "default", "sleep";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -1612,9 +1612,9 @@ blsp_spi2: spi@78b6000 {
clock-names = "core", "iface";
dmas = <&blsp_dma 6>, <&blsp_dma 7>;
dma-names = "tx", "rx";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi2_default>;
pinctrl-1 = <&spi2_sleep>;
+ pinctrl-names = "default", "sleep";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -1629,9 +1629,9 @@ blsp_i2c3: i2c@78b7000 {
clock-names = "core", "iface";
dmas = <&blsp_dma 8>, <&blsp_dma 9>;
dma-names = "tx", "rx";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&i2c3_default>;
pinctrl-1 = <&i2c3_sleep>;
+ pinctrl-names = "default", "sleep";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -1646,9 +1646,9 @@ blsp_spi3: spi@78b7000 {
clock-names = "core", "iface";
dmas = <&blsp_dma 8>, <&blsp_dma 9>;
dma-names = "tx", "rx";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi3_default>;
pinctrl-1 = <&spi3_sleep>;
+ pinctrl-names = "default", "sleep";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -1663,9 +1663,9 @@ blsp_i2c4: i2c@78b8000 {
clock-names = "core", "iface";
dmas = <&blsp_dma 10>, <&blsp_dma 11>;
dma-names = "tx", "rx";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&i2c4_default>;
pinctrl-1 = <&i2c4_sleep>;
+ pinctrl-names = "default", "sleep";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -1680,9 +1680,9 @@ blsp_spi4: spi@78b8000 {
clock-names = "core", "iface";
dmas = <&blsp_dma 10>, <&blsp_dma 11>;
dma-names = "tx", "rx";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi4_default>;
pinctrl-1 = <&spi4_sleep>;
+ pinctrl-names = "default", "sleep";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -1697,9 +1697,9 @@ blsp_i2c5: i2c@78b9000 {
clock-names = "core", "iface";
dmas = <&blsp_dma 12>, <&blsp_dma 13>;
dma-names = "tx", "rx";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&i2c5_default>;
pinctrl-1 = <&i2c5_sleep>;
+ pinctrl-names = "default", "sleep";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -1714,9 +1714,9 @@ blsp_spi5: spi@78b9000 {
clock-names = "core", "iface";
dmas = <&blsp_dma 12>, <&blsp_dma 13>;
dma-names = "tx", "rx";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi5_default>;
pinctrl-1 = <&spi5_sleep>;
+ pinctrl-names = "default", "sleep";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -1731,9 +1731,9 @@ blsp_i2c6: i2c@78ba000 {
clock-names = "core", "iface";
dmas = <&blsp_dma 14>, <&blsp_dma 15>;
dma-names = "tx", "rx";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&i2c6_default>;
pinctrl-1 = <&i2c6_sleep>;
+ pinctrl-names = "default", "sleep";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -1748,9 +1748,9 @@ blsp_spi6: spi@78ba000 {
clock-names = "core", "iface";
dmas = <&blsp_dma 14>, <&blsp_dma 15>;
dma-names = "tx", "rx";
- pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi6_default>;
pinctrl-1 = <&spi6_sleep>;
+ pinctrl-names = "default", "sleep";
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
@@ -1818,8 +1818,8 @@ pronto: remoteproc@a21b000 {
qcom,smem-states = <&wcnss_smp2p_out 0>;
qcom,smem-state-names = "stop";
- pinctrl-names = "default";
pinctrl-0 = <&wcnss_pin_a>;
+ pinctrl-names = "default";
status = "disabled";
--
2.38.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 3/4] arm64: dts: qcom: msm/apq8x16-*: Drop empty lines in pinctrl states
2023-01-16 14:50 [PATCH v2 0/4] Minor cleanup in msm8916 dts files Nikita Travkin
2023-01-16 14:50 ` [PATCH v2 1/4] arm64: dts: qcom: msm/apq8x16-*: Move status property last Nikita Travkin
2023-01-16 14:50 ` [PATCH v2 2/4] arm64: dts: qcom: msm/apq8x16-*: Reorder the pinctrl properties Nikita Travkin
@ 2023-01-16 14:50 ` Nikita Travkin
2023-01-16 14:50 ` [PATCH v2 4/4] arm64: dts: qcom: msm/apq8x16-*: Reorder some regulator properties Nikita Travkin
2023-01-19 3:34 ` [PATCH v2 0/4] Minor cleanup in msm8916 dts files Bjorn Andersson
4 siblings, 0 replies; 7+ messages in thread
From: Nikita Travkin @ 2023-01-16 14:50 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson
Cc: Rob Herring, Krzysztof Kozlowski, Konrad Dybcio, linux-arm-msm,
devicetree, linux-kernel, ~postmarketos/upstreaming,
Nikita Travkin
These empty lines are meaningless. Drop them to not provide a bad
example for new submissions.
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Nikita Travkin <nikita@trvn.ru>
---
arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 14 ---
.../boot/dts/qcom/msm8916-acer-a1-724.dts | 3 -
.../boot/dts/qcom/msm8916-alcatel-idol347.dts | 10 --
.../arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 7 --
.../arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 10 --
.../boot/dts/qcom/msm8916-longcheer-l8150.dts | 8 --
.../boot/dts/qcom/msm8916-longcheer-l8910.dts | 4 -
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 96 +++++--------------
.../qcom/msm8916-samsung-a2015-common.dtsi | 18 +---
.../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 3 -
.../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 1 -
.../qcom/msm8916-samsung-e2015-common.dtsi | 1 -
.../dts/qcom/msm8916-samsung-grandmax.dts | 1 -
.../boot/dts/qcom/msm8916-samsung-j5.dts | 1 -
.../dts/qcom/msm8916-samsung-serranove.dts | 16 +---
.../dts/qcom/msm8916-wingtech-wt88047.dts | 7 +-
16 files changed, 28 insertions(+), 172 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index 6203ed92e4c0..f0abb40d0c98 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -719,14 +719,12 @@ &msmgpio {
msmgpio_leds: msmgpio-leds-state {
pins = "gpio21", "gpio120";
function = "gpio";
-
output-low;
};
usb_id_default: usb-id-default-state {
pins = "gpio121";
function = "gpio";
-
drive-strength = <8>;
input-enable;
bias-pull-up;
@@ -735,7 +733,6 @@ usb_id_default: usb-id-default-state {
adv7533_int_active: adv533-int-active-state {
pins = "gpio31";
function = "gpio";
-
drive-strength = <16>;
bias-disable;
};
@@ -743,7 +740,6 @@ adv7533_int_active: adv533-int-active-state {
adv7533_int_suspend: adv7533-int-suspend-state {
pins = "gpio31";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -751,7 +747,6 @@ adv7533_int_suspend: adv7533-int-suspend-state {
adv7533_switch_active: adv7533-switch-active-state {
pins = "gpio32";
function = "gpio";
-
drive-strength = <16>;
bias-disable;
};
@@ -759,7 +754,6 @@ adv7533_switch_active: adv7533-switch-active-state {
adv7533_switch_suspend: adv7533-switch-suspend-state {
pins = "gpio32";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -767,7 +761,6 @@ adv7533_switch_suspend: adv7533-switch-suspend-state {
msm_key_volp_n_default: msm-key-volp-n-default-state {
pins = "gpio107";
function = "gpio";
-
drive-strength = <8>;
input-enable;
bias-pull-up;
@@ -784,7 +777,6 @@ &pm8916_gpios {
usb_hub_reset_pm: usb-hub-reset-pm-state {
pins = "gpio3";
function = PMIC_GPIO_FUNC_NORMAL;
-
input-disable;
output-high;
};
@@ -792,14 +784,12 @@ usb_hub_reset_pm: usb-hub-reset-pm-state {
usb_hub_reset_pm_device: usb-hub-reset-pm-device-state {
pins = "gpio3";
function = PMIC_GPIO_FUNC_NORMAL;
-
output-low;
};
usb_sw_sel_pm: usb-sw-sel-pm-state {
pins = "gpio4";
function = PMIC_GPIO_FUNC_NORMAL;
-
power-source = <PM8916_GPIO_VPH>;
input-disable;
output-high;
@@ -808,7 +798,6 @@ usb_sw_sel_pm: usb-sw-sel-pm-state {
usb_sw_sel_pm_device: usb-sw-sel-pm-device-state {
pins = "gpio4";
function = PMIC_GPIO_FUNC_NORMAL;
-
power-source = <PM8916_GPIO_VPH>;
input-disable;
output-low;
@@ -817,7 +806,6 @@ usb_sw_sel_pm_device: usb-sw-sel-pm-device-state {
pm8916_gpios_leds: pm8916-gpios-leds-state {
pins = "gpio1", "gpio2";
function = PMIC_GPIO_FUNC_NORMAL;
-
output-low;
};
};
@@ -835,7 +823,6 @@ &pm8916_mpps {
ls_exp_gpio_f: pm8916-mpp4-state {
pins = "mpp4";
function = "digital";
-
output-low;
power-source = <PM8916_MPP_L5>; /* 1.8V */
};
@@ -843,7 +830,6 @@ ls_exp_gpio_f: pm8916-mpp4-state {
pm8916_mpps_leds: pm8916-mpps-state {
pins = "mpp2", "mpp3";
function = "digital";
-
output-low;
};
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
index 04bbdc76889c..cccd0a95e77f 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
@@ -256,7 +256,6 @@ &msmgpio {
accel_int_default: accel-int-default-state {
pins = "gpio115";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -264,7 +263,6 @@ accel_int_default: accel-int-default-state {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107";
function = "gpio";
-
drive-strength = <2>;
bias-pull-up;
};
@@ -288,7 +286,6 @@ touchscreen-pins {
usb_id_default: usb-id-default-state {
pins = "gpio110";
function = "gpio";
-
drive-strength = <8>;
bias-pull-up;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index a5690354a2dd..bc40721e4cbf 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -298,7 +298,6 @@ &msmgpio {
accel_int_default: accel-int-default-state {
pins = "gpio31";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -306,7 +305,6 @@ accel_int_default: accel-int-default-state {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107";
function = "gpio";
-
drive-strength = <2>;
bias-pull-up;
};
@@ -314,7 +312,6 @@ gpio_keys_default: gpio-keys-default-state {
gpio_leds_default: gpio-leds-default-state {
pins = "gpio32";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -322,7 +319,6 @@ gpio_leds_default: gpio-leds-default-state {
gyro_int_default: gyro-int-default-state {
pins = "gpio97", "gpio98";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -336,7 +332,6 @@ gyro_int_default: gyro-int-default-state {
led_enable_default: led-enable-default-state {
pins = "gpio102";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
output-high;
@@ -345,7 +340,6 @@ led_enable_default: led-enable-default-state {
led_shutdown_default: led-shutdown-default-state {
pins = "gpio89";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -353,7 +347,6 @@ led_shutdown_default: led-shutdown-default-state {
mag_reset_default: mag-reset-default-state {
pins = "gpio8";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -361,7 +354,6 @@ mag_reset_default: mag-reset-default-state {
proximity_int_default: proximity-int-default-state {
pins = "gpio12";
function = "gpio";
-
drive-strength = <6>;
bias-pull-up;
};
@@ -369,7 +361,6 @@ proximity_int_default: proximity-int-default-state {
ts_int_reset_default: ts-int-reset-default-state {
pins = "gpio13", "gpio100";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -377,7 +368,6 @@ ts_int_reset_default: ts-int-reset-default-state {
usb_id_default: usb-id-default-state {
pins = "gpio69";
function = "gpio";
-
drive-strength = <8>;
bias-pull-up;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
index 9b6265d428ce..13b51d310940 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
@@ -267,7 +267,6 @@ &msmgpio {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107", "gpio117";
function = "gpio";
-
drive-strength = <2>;
bias-pull-up;
};
@@ -275,7 +274,6 @@ gpio_keys_default: gpio-keys-default-state {
imu_default: imu-default-state {
pins = "gpio36";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -283,7 +281,6 @@ imu_default: imu-default-state {
mag_reset_default: mag-reset-default-state {
pins = "gpio112";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -291,7 +288,6 @@ mag_reset_default: mag-reset-default-state {
sd_vmmc_en_default: sd-vmmc-en-default-state {
pins = "gpio87";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -300,7 +296,6 @@ touchscreen_default: touchscreen-default-state {
touch-pins {
pins = "gpio13";
function = "gpio";
-
drive-strength = <2>;
bias-pull-up;
};
@@ -308,7 +303,6 @@ touch-pins {
reset-pins {
pins = "gpio12";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -317,7 +311,6 @@ reset-pins {
usb_id_default: usb-id-default-state {
pins = "gpio110";
function = "gpio";
-
drive-strength = <8>;
bias-pull-up;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index ac8b80de1a31..a4dfb2ce7893 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -419,7 +419,6 @@ &msmgpio {
accel_irq_default: accel-irq-default-state {
pins = "gpio115";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -427,7 +426,6 @@ accel_irq_default: accel-irq-default-state {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107";
function = "gpio";
-
drive-strength = <2>;
bias-pull-up;
};
@@ -435,7 +433,6 @@ gpio_keys_default: gpio-keys-default-state {
gpio_leds_default: gpio-leds-default-state {
pins = "gpio8", "gpio9", "gpio10";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -443,7 +440,6 @@ gpio_leds_default: gpio-leds-default-state {
nfc_default: nfc-default-state {
pins = "gpio2", "gpio20", "gpio21";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -451,7 +447,6 @@ nfc_default: nfc-default-state {
mag_reset_default: mag-reset-default-state {
pins = "gpio36";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -459,7 +454,6 @@ mag_reset_default: mag-reset-default-state {
prox_irq_default: prox-irq-default-state {
pins = "gpio113";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -467,7 +461,6 @@ prox_irq_default: prox-irq-default-state {
reg_lcd_en_default: reg-lcd-en-default-state {
pins = "gpio32", "gpio97";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -475,7 +468,6 @@ reg_lcd_en_default: reg-lcd-en-default-state {
sdhc2_cd_default: sdhc2-cd-default-state {
pins = "gpio56";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -483,7 +475,6 @@ sdhc2_cd_default: sdhc2-cd-default-state {
ts_irq_default: ts-irq-default-state {
pins = "gpio13";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -491,7 +482,6 @@ ts_irq_default: ts-irq-default-state {
usb_id_default: usb-id-default-state {
pins = "gpio117";
function = "gpio";
-
drive-strength = <8>;
bias-pull-up;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index 8fbbfc98900d..2596896e4a61 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -370,7 +370,6 @@ &msmgpio {
accel_int_default: accel-int-default-state {
pins = "gpio116";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -378,7 +377,6 @@ accel_int_default: accel-int-default-state {
camera_flash_default: camera-flash-default-state {
pins = "gpio31", "gpio32";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -386,7 +384,6 @@ camera_flash_default: camera-flash-default-state {
ctp_pwr_en_default: ctp-pwr-en-default-state {
pins = "gpio17";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -394,7 +391,6 @@ ctp_pwr_en_default: ctp-pwr-en-default-state {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107";
function = "gpio";
-
drive-strength = <2>;
bias-pull-up;
};
@@ -402,7 +398,6 @@ gpio_keys_default: gpio-keys-default-state {
gyro_int_default: gyro-int-default-state {
pins = "gpio22", "gpio23";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -410,7 +405,6 @@ gyro_int_default: gyro-int-default-state {
light_int_default: light-int-default-state {
pins = "gpio115";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -418,7 +412,6 @@ light_int_default: light-int-default-state {
magn_int_default: magn-int-default-state {
pins = "gpio113";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -426,7 +419,6 @@ magn_int_default: magn-int-default-state {
tp_int_default: tp-int-default-state {
pins = "gpio13";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index b776a2b4a317..135b38c67da1 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -237,7 +237,6 @@ &msmgpio {
button_backlight_default: button-backlight-default-state {
pins = "gpio17";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -245,7 +244,6 @@ button_backlight_default: button-backlight-default-state {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107";
function = "gpio";
-
drive-strength = <2>;
bias-pull-up;
};
@@ -253,7 +251,6 @@ gpio_keys_default: gpio-keys-default-state {
mag_reset_default: mag-reset-default-state {
pins = "gpio111";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -261,7 +258,6 @@ mag_reset_default: mag-reset-default-state {
usb_id_default: usb-id-default-state {
pins = "gpio110";
function = "gpio";
-
drive-strength = <8>;
bias-pull-up;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
index 33dfcf318a81..4e9138daa05a 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
@@ -4,12 +4,10 @@
*/
&msmgpio {
-
blsp1_uart1_default: blsp1-uart1-default-state {
/* TX, RX, CTS_N, RTS_N */
pins = "gpio0", "gpio1", "gpio2", "gpio3";
function = "blsp_uart1";
-
drive-strength = <16>;
bias-disable;
};
@@ -17,7 +15,6 @@ blsp1_uart1_default: blsp1-uart1-default-state {
blsp1_uart1_sleep: blsp1-uart1-sleep-state {
pins = "gpio0", "gpio1", "gpio2", "gpio3";
function = "gpio";
-
drive-strength = <2>;
bias-pull-down;
};
@@ -25,7 +22,6 @@ blsp1_uart1_sleep: blsp1-uart1-sleep-state {
blsp1_uart2_default: blsp1-uart2-default-state {
pins = "gpio4", "gpio5";
function = "blsp_uart2";
-
drive-strength = <16>;
bias-disable;
};
@@ -33,7 +29,6 @@ blsp1_uart2_default: blsp1-uart2-default-state {
blsp1_uart2_sleep: blsp1-uart2-sleep-state {
pins = "gpio4", "gpio5";
function = "gpio";
-
drive-strength = <2>;
bias-pull-down;
};
@@ -42,14 +37,13 @@ spi1_default: spi1-default-state {
spi-pins {
pins = "gpio0", "gpio1", "gpio3";
function = "blsp_spi1";
-
drive-strength = <12>;
bias-disable;
};
+
cs-pins {
pins = "gpio2";
function = "gpio";
-
drive-strength = <16>;
bias-disable;
output-high;
@@ -59,7 +53,6 @@ cs-pins {
spi1_sleep: spi1-sleep-state {
pins = "gpio0", "gpio1", "gpio2", "gpio3";
function = "gpio";
-
drive-strength = <2>;
bias-pull-down;
};
@@ -68,14 +61,13 @@ spi2_default: spi2-default-state {
spi-pins {
pins = "gpio4", "gpio5", "gpio7";
function = "blsp_spi2";
-
drive-strength = <12>;
bias-disable;
};
+
cs-pins {
pins = "gpio6";
function = "gpio";
-
drive-strength = <16>;
bias-disable;
output-high;
@@ -85,7 +77,6 @@ cs-pins {
spi2_sleep: spi2-sleep-state {
pins = "gpio4", "gpio5", "gpio6", "gpio7";
function = "gpio";
-
drive-strength = <2>;
bias-pull-down;
};
@@ -94,14 +85,13 @@ spi3_default: spi3-default-state {
spi-pins {
pins = "gpio8", "gpio9", "gpio11";
function = "blsp_spi3";
-
drive-strength = <12>;
bias-disable;
};
+
cs-pins {
pins = "gpio10";
function = "gpio";
-
drive-strength = <16>;
bias-disable;
output-high;
@@ -111,7 +101,6 @@ cs-pins {
spi3_sleep: spi3-sleep-state {
pins = "gpio8", "gpio9", "gpio10", "gpio11";
function = "gpio";
-
drive-strength = <2>;
bias-pull-down;
};
@@ -120,14 +109,13 @@ spi4_default: spi4-default-state {
spi-pins {
pins = "gpio12", "gpio13", "gpio15";
function = "blsp_spi4";
-
drive-strength = <12>;
bias-disable;
};
+
cs-pins {
pins = "gpio14";
function = "gpio";
-
drive-strength = <16>;
bias-disable;
output-high;
@@ -137,7 +125,6 @@ cs-pins {
spi4_sleep: spi4-sleep-state {
pins = "gpio12", "gpio13", "gpio14", "gpio15";
function = "gpio";
-
drive-strength = <2>;
bias-pull-down;
};
@@ -146,14 +133,13 @@ spi5_default: spi5-default-state {
spi-pins {
pins = "gpio16", "gpio17", "gpio19";
function = "blsp_spi5";
-
drive-strength = <12>;
bias-disable;
};
+
cs-pins {
pins = "gpio18";
function = "gpio";
-
drive-strength = <16>;
bias-disable;
output-high;
@@ -163,7 +149,6 @@ cs-pins {
spi5_sleep: spi5-sleep-state {
pins = "gpio16", "gpio17", "gpio18", "gpio19";
function = "gpio";
-
drive-strength = <2>;
bias-pull-down;
};
@@ -172,14 +157,13 @@ spi6_default: spi6-default-state {
spi-pins {
pins = "gpio20", "gpio21", "gpio23";
function = "blsp_spi6";
-
drive-strength = <12>;
bias-disable;
};
+
cs-pins {
pins = "gpio22";
function = "gpio";
-
drive-strength = <16>;
bias-disable;
output-high;
@@ -189,7 +173,6 @@ cs-pins {
spi6_sleep: spi6-sleep-state {
pins = "gpio20", "gpio21", "gpio22", "gpio23";
function = "gpio";
-
drive-strength = <2>;
bias-pull-down;
};
@@ -197,7 +180,6 @@ spi6_sleep: spi6-sleep-state {
i2c1_default: i2c1-default-state {
pins = "gpio2", "gpio3";
function = "blsp_i2c1";
-
drive-strength = <2>;
bias-disable;
};
@@ -205,7 +187,6 @@ i2c1_default: i2c1-default-state {
i2c1_sleep: i2c1-sleep-state {
pins = "gpio2", "gpio3";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -213,7 +194,6 @@ i2c1_sleep: i2c1-sleep-state {
i2c2_default: i2c2-default-state {
pins = "gpio6", "gpio7";
function = "blsp_i2c2";
-
drive-strength = <2>;
bias-disable;
};
@@ -221,7 +201,6 @@ i2c2_default: i2c2-default-state {
i2c2_sleep: i2c2-sleep-state {
pins = "gpio6", "gpio7";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -229,7 +208,6 @@ i2c2_sleep: i2c2-sleep-state {
i2c3_default: i2c3-default-state {
pins = "gpio10", "gpio11";
function = "blsp_i2c3";
-
drive-strength = <2>;
bias-disable;
};
@@ -237,7 +215,6 @@ i2c3_default: i2c3-default-state {
i2c3_sleep: i2c3-sleep-state {
pins = "gpio10", "gpio11";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -245,7 +222,6 @@ i2c3_sleep: i2c3-sleep-state {
i2c4_default: i2c4-default-state {
pins = "gpio14", "gpio15";
function = "blsp_i2c4";
-
drive-strength = <2>;
bias-disable;
};
@@ -253,7 +229,6 @@ i2c4_default: i2c4-default-state {
i2c4_sleep: i2c4-sleep-state {
pins = "gpio14", "gpio15";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -261,7 +236,6 @@ i2c4_sleep: i2c4-sleep-state {
i2c5_default: i2c5-default-state {
pins = "gpio18", "gpio19";
function = "blsp_i2c5";
-
drive-strength = <2>;
bias-disable;
};
@@ -269,7 +243,6 @@ i2c5_default: i2c5-default-state {
i2c5_sleep: i2c5-sleep-state {
pins = "gpio18", "gpio19";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -277,7 +250,6 @@ i2c5_sleep: i2c5-sleep-state {
i2c6_default: i2c6-default-state {
pins = "gpio22", "gpio23";
function = "blsp_i2c6";
-
drive-strength = <2>;
bias-disable;
};
@@ -285,7 +257,6 @@ i2c6_default: i2c6-default-state {
i2c6_sleep: i2c6-sleep-state {
pins = "gpio22", "gpio23";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -293,13 +264,12 @@ i2c6_sleep: i2c6-sleep-state {
pmx-sdc1-clk-state {
sdc1_clk_on: clk-on-pins {
pins = "sdc1_clk";
-
bias-disable;
drive-strength = <16>;
};
+
sdc1_clk_off: clk-off-pins {
pins = "sdc1_clk";
-
bias-disable;
drive-strength = <2>;
};
@@ -308,13 +278,12 @@ sdc1_clk_off: clk-off-pins {
pmx-sdc1-cmd-state {
sdc1_cmd_on: cmd-on-pins {
pins = "sdc1_cmd";
-
bias-pull-up;
drive-strength = <10>;
};
+
sdc1_cmd_off: cmd-off-pins {
pins = "sdc1_cmd";
-
bias-pull-up;
drive-strength = <2>;
};
@@ -323,13 +292,12 @@ sdc1_cmd_off: cmd-off-pins {
pmx-sdc1-data-state {
sdc1_data_on: data-on-pins {
pins = "sdc1_data";
-
bias-pull-up;
drive-strength = <10>;
};
+
sdc1_data_off: data-off-pins {
pins = "sdc1_data";
-
bias-pull-up;
drive-strength = <2>;
};
@@ -338,13 +306,12 @@ sdc1_data_off: data-off-pins {
pmx-sdc2-clk-state {
sdc2_clk_on: clk-on-pins {
pins = "sdc2_clk";
-
bias-disable;
drive-strength = <16>;
};
+
sdc2_clk_off: clk-off-pins {
pins = "sdc2_clk";
-
bias-disable;
drive-strength = <2>;
};
@@ -353,13 +320,12 @@ sdc2_clk_off: clk-off-pins {
pmx-sdc2-cmd-state {
sdc2_cmd_on: cmd-on-pins {
pins = "sdc2_cmd";
-
bias-pull-up;
drive-strength = <10>;
};
+
sdc2_cmd_off: cmd-off-pins {
pins = "sdc2_cmd";
-
bias-pull-up;
drive-strength = <2>;
};
@@ -368,13 +334,12 @@ sdc2_cmd_off: cmd-off-pins {
pmx-sdc2-data-state {
sdc2_data_on: data-on-pins {
pins = "sdc2_data";
-
bias-pull-up;
drive-strength = <10>;
};
+
sdc2_data_off: data-off-pins {
pins = "sdc2_data";
-
bias-pull-up;
drive-strength = <2>;
};
@@ -384,14 +349,13 @@ pmx-sdc2-cd-pin-state {
sdc2_cd_on: cd-on-pins {
pins = "gpio38";
function = "gpio";
-
drive-strength = <2>;
bias-pull-up;
};
+
sdc2_cd_off: cd-off-pins {
pins = "gpio38";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -402,15 +366,14 @@ cdc_pdm_lines_act: pdm-lines-on-pins {
pins = "gpio63", "gpio64", "gpio65", "gpio66",
"gpio67", "gpio68";
function = "cdc_pdm0";
-
drive-strength = <8>;
bias-disable;
};
+
cdc_pdm_lines_sus: pdm-lines-off-pins {
pins = "gpio63", "gpio64", "gpio65", "gpio66",
"gpio67", "gpio68";
function = "cdc_pdm0";
-
drive-strength = <2>;
bias-pull-down;
};
@@ -420,14 +383,13 @@ ext-pri-tlmm-lines-state {
ext_pri_tlmm_lines_act: ext-pa-on-pins {
pins = "gpio113", "gpio114", "gpio115", "gpio116";
function = "pri_mi2s";
-
drive-strength = <8>;
bias-disable;
};
+
ext_pri_tlmm_lines_sus: ext-pa-off-pins {
pins = "gpio113", "gpio114", "gpio115", "gpio116";
function = "pri_mi2s";
-
drive-strength = <2>;
bias-disable;
};
@@ -437,14 +399,13 @@ ext-pri-ws-line-state {
ext_pri_ws_act: ext-pa-on-pins {
pins = "gpio110";
function = "pri_mi2s_ws";
-
drive-strength = <8>;
bias-disable;
};
+
ext_pri_ws_sus: ext-pa-off-pins {
pins = "gpio110";
function = "pri_mi2s_ws";
-
drive-strength = <2>;
bias-disable;
};
@@ -454,14 +415,13 @@ ext-mclk-tlmm-lines-state {
ext_mclk_tlmm_lines_act: mclk-lines-on-pins {
pins = "gpio116";
function = "pri_mi2s";
-
drive-strength = <8>;
bias-disable;
};
+
ext_mclk_tlmm_lines_sus: mclk-lines-off-pins {
pins = "gpio116";
function = "pri_mi2s";
-
drive-strength = <2>;
bias-disable;
};
@@ -472,14 +432,13 @@ ext-sec-tlmm-lines-state {
ext_sec_tlmm_lines_act: tlmm-lines-on-pins {
pins = "gpio112", "gpio117", "gpio118", "gpio119";
function = "sec_mi2s";
-
drive-strength = <8>;
bias-disable;
};
+
ext_sec_tlmm_lines_sus: tlmm-lines-off-pins {
pins = "gpio112", "gpio117", "gpio118", "gpio119";
function = "sec_mi2s";
-
drive-strength = <2>;
bias-disable;
};
@@ -489,28 +448,27 @@ cdc_dmic_lines_act: cdc-dmic-lines-on-state {
clk-pins {
pins = "gpio0";
function = "dmic0_clk";
-
drive-strength = <8>;
};
+
data-pins {
pins = "gpio1";
function = "dmic0_data";
-
drive-strength = <8>;
};
};
+
cdc_dmic_lines_sus: cdc-dmic-lines-off-state {
clk-pins {
pins = "gpio0";
function = "dmic0_clk";
-
drive-strength = <2>;
bias-disable;
};
+
data-pins {
pins = "gpio1";
function = "dmic0_data";
-
drive-strength = <2>;
bias-disable;
};
@@ -519,7 +477,6 @@ data-pins {
wcnss_pin_a: wcnss-active-state {
pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44";
function = "wcss_wlan";
-
drive-strength = <6>;
bias-pull-up;
};
@@ -527,7 +484,6 @@ wcnss_pin_a: wcnss-active-state {
cci0_default: cci0-default-state {
pins = "gpio29", "gpio30";
function = "cci_i2c";
-
drive-strength = <16>;
bias-disable;
};
@@ -536,21 +492,20 @@ camera_front_default: camera-front-default-state {
pwdn-pins {
pins = "gpio33";
function = "gpio";
-
drive-strength = <16>;
bias-disable;
};
+
rst-pins {
pins = "gpio28";
function = "gpio";
-
drive-strength = <16>;
bias-disable;
};
+
mclk1-pins {
pins = "gpio27";
function = "cam_mclk1";
-
drive-strength = <16>;
bias-disable;
};
@@ -560,21 +515,20 @@ camera_rear_default: camera-rear-default-state {
pwdn-pins {
pins = "gpio34";
function = "gpio";
-
drive-strength = <16>;
bias-disable;
};
+
rst-pins {
pins = "gpio35";
function = "gpio";
-
drive-strength = <16>;
bias-disable;
};
+
mclk0-pins {
pins = "gpio26";
function = "cam_mclk0";
-
drive-strength = <16>;
bias-disable;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index dd0e2e586ac1..d59587d42c0a 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -390,7 +390,6 @@ &msmgpio {
accel_int_default: accel-int-default-state {
pins = "gpio115";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -398,7 +397,6 @@ accel_int_default: accel-int-default-state {
fg_alert_default: fg-alert-default-state {
pins = "gpio121";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -406,7 +404,6 @@ fg_alert_default: fg-alert-default-state {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107", "gpio109";
function = "gpio";
-
drive-strength = <2>;
bias-pull-up;
};
@@ -414,7 +411,6 @@ gpio_keys_default: gpio-keys-default-state {
gpio_hall_sensor_default: gpio-hall-sensor-default-state {
pins = "gpio52";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -422,14 +418,13 @@ gpio_hall_sensor_default: gpio-hall-sensor-default-state {
mdss_default: mdss-default-state {
pins = "gpio25";
function = "gpio";
-
drive-strength = <8>;
bias-disable;
};
+
mdss_sleep: mdss-sleep-state {
pins = "gpio25";
function = "gpio";
-
drive-strength = <2>;
bias-pull-down;
};
@@ -437,7 +432,6 @@ mdss_sleep: mdss-sleep-state {
motor_en_default: motor-en-default-stae {
pins = "gpio76";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -450,7 +444,6 @@ motor_pwm_default: motor-pwm-default-state {
muic_i2c_default: muic-i2c-default-state {
pins = "gpio105", "gpio106";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -458,7 +451,6 @@ muic_i2c_default: muic-i2c-default-state {
muic_int_default: muic-int-default-state {
pins = "gpio12";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -467,7 +459,6 @@ nfc_default: nfc-default-state {
nfc-pins {
pins = "gpio20", "gpio49";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -475,7 +466,6 @@ nfc-pins {
irq-pins {
pins = "gpio21";
function = "gpio";
-
drive-strength = <2>;
bias-pull-down;
};
@@ -484,7 +474,6 @@ irq-pins {
nfc_i2c_default: nfc-i2c-default-state {
pins = "gpio0", "gpio1";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -492,7 +481,6 @@ nfc_i2c_default: nfc-i2c-default-state {
tkey_default: tkey-default-state {
pins = "gpio98";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -500,7 +488,6 @@ tkey_default: tkey-default-state {
tkey_i2c_default: tkey-i2c-default-state {
pins = "gpio16", "gpio17";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -508,7 +495,6 @@ tkey_i2c_default: tkey-i2c-default-state {
tsp_en_default: tsp-en-default-state {
pins = "gpio73";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -516,7 +502,6 @@ tsp_en_default: tsp-en-default-state {
ts_int_default: ts-int-default-state {
pins = "gpio13";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -526,7 +511,6 @@ &pm8916_gpios {
nfc_clk_req: nfc-clk-req-state {
pins = "gpio2";
function = "func1";
-
input-enable;
bias-disable;
power-source = <PM8916_GPIO_L2>;
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
index 2eb06cf626dc..5d6bcdab5e64 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a3u-eur.dts
@@ -116,7 +116,6 @@ &msmgpio {
panel_vdd3_default: panel-vdd3-default-state {
pins = "gpio9";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -124,7 +123,6 @@ panel_vdd3_default: panel-vdd3-default-state {
tkey_en_default: tkey-en-default-state {
pins = "gpio86";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -132,7 +130,6 @@ tkey_en_default: tkey-en-default-state {
tkey_led_en_default: tkey-led-en-default-state {
pins = "gpio60";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
index 179c872091d8..8e2951cddb11 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a5u-eur.dts
@@ -73,7 +73,6 @@ &msmgpio {
tkey_en_default: tkey-en-default-state {
pins = "gpio97";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
index 6c04ca97e98a..8af5a6f3c98a 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-e2015-common.dtsi
@@ -62,7 +62,6 @@ &msmgpio {
tkey_en_default: tkey-en-default-state {
pins = "gpio97";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
index f5ca2d30881f..6f41e29fef91 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandmax.dts
@@ -53,7 +53,6 @@ &msmgpio {
gpio_leds_default: gpio-led-default-state {
pins = "gpio60";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
index 882ed9c65d88..9d5d84c0f9f6 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
@@ -202,7 +202,6 @@ &msmgpio {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107", "gpio109";
function = "gpio";
-
drive-strength = <2>;
bias-pull-up;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
index 249519635ba6..84a4713886c1 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
@@ -427,7 +427,6 @@ &msmgpio {
fg_alert_default: fg-alert-default-state {
pins = "gpio121";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -435,7 +434,6 @@ fg_alert_default: fg-alert-default-state {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107", "gpio109";
function = "gpio";
-
drive-strength = <2>;
bias-pull-up;
};
@@ -443,7 +441,6 @@ gpio_keys_default: gpio-keys-default-state {
gpio_hall_sensor_default: gpio-hall-sensor-default-state {
pins = "gpio52";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -451,7 +448,6 @@ gpio_hall_sensor_default: gpio-hall-sensor-default-state {
imu_irq_default: imu-irq-default-state {
pins = "gpio115";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -459,7 +455,6 @@ imu_irq_default: imu-irq-default-state {
muic_i2c_default: muic-i2c-default-state {
pins = "gpio105", "gpio106";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -467,7 +462,6 @@ muic_i2c_default: muic-i2c-default-state {
muic_irq_default: muic-irq-default-state {
pins = "gpio12";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -476,14 +470,13 @@ nfc_default: nfc-default-state {
nfc-pins {
pins = "gpio20", "gpio49";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
+
irq-pins {
pins = "gpio21";
function = "gpio";
-
drive-strength = <2>;
bias-pull-down;
};
@@ -492,7 +485,6 @@ irq-pins {
nfc_i2c_default: nfc-i2c-default-state {
pins = "gpio0", "gpio1";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -500,7 +492,6 @@ nfc_i2c_default: nfc-i2c-default-state {
tkey_default: tkey-default-state {
pins = "gpio98";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -508,7 +499,6 @@ tkey_default: tkey-default-state {
tkey_en_default: tkey-en-default-state {
pins = "gpio86";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -516,7 +506,6 @@ tkey_en_default: tkey-en-default-state {
tkey_i2c_default: tkey-i2c-default-state {
pins = "gpio16", "gpio17";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -524,7 +513,6 @@ tkey_i2c_default: tkey-i2c-default-state {
tkey_led_en_default: tkey-led-en-default-state {
pins = "gpio60";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -532,7 +520,6 @@ tkey_led_en_default: tkey-led-en-default-state {
tsp_en_default: tsp-en-default-state {
pins = "gpio73";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -540,7 +527,6 @@ tsp_en_default: tsp-en-default-state {
tsp_irq_default: tsp-irq-default-state {
pins = "gpio13";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
index e542b48a4fad..9e3351ceb752 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
@@ -291,7 +291,6 @@ &msmgpio {
camera_flash_default: camera-flash-default-state {
pins = "gpio31", "gpio32";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -299,7 +298,6 @@ camera_flash_default: camera-flash-default-state {
gpio_keys_default: gpio-keys-default-state {
pins = "gpio107";
function = "gpio";
-
drive-strength = <2>;
bias-pull-up;
};
@@ -307,7 +305,6 @@ gpio_keys_default: gpio-keys-default-state {
imu_default: imu-default-state {
pins = "gpio115";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -316,14 +313,13 @@ touchscreen_default: touchscreen-default-state {
touchscreen-pins {
pins = "gpio13";
function = "gpio";
-
drive-strength = <2>;
bias-pull-up;
};
+
reset-pins {
pins = "gpio12";
function = "gpio";
-
drive-strength = <2>;
bias-disable;
};
@@ -332,7 +328,6 @@ reset-pins {
usb_id_default: usb-id-default-state {
pins = "gpio110";
function = "gpio";
-
drive-strength = <8>;
bias-pull-up;
};
--
2.38.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 4/4] arm64: dts: qcom: msm/apq8x16-*: Reorder some regulator properties
2023-01-16 14:50 [PATCH v2 0/4] Minor cleanup in msm8916 dts files Nikita Travkin
` (2 preceding siblings ...)
2023-01-16 14:50 ` [PATCH v2 3/4] arm64: dts: qcom: msm/apq8x16-*: Drop empty lines in pinctrl states Nikita Travkin
@ 2023-01-16 14:50 ` Nikita Travkin
2023-01-19 3:34 ` [PATCH v2 0/4] Minor cleanup in msm8916 dts files Bjorn Andersson
4 siblings, 0 replies; 7+ messages in thread
From: Nikita Travkin @ 2023-01-16 14:50 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson
Cc: Rob Herring, Krzysztof Kozlowski, Konrad Dybcio, linux-arm-msm,
devicetree, linux-kernel, ~postmarketos/upstreaming,
Nikita Travkin
It's agreed that these properties should be ordered in the
reverse-Christmas-tree order. Reorder them to give a better example.
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Nikita Travkin <nikita@trvn.ru>
---
arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi | 2 +-
arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index f0abb40d0c98..9dfe175607dc 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -506,8 +506,8 @@ l10 {
l11 {
regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <3337000>;
- regulator-allow-set-load;
regulator-system-load = <200000>;
+ regulator-allow-set-load;
};
l12 {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index bc40721e4cbf..2555e920d7fd 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -254,8 +254,8 @@ l10 {
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
- regulator-allow-set-load;
regulator-system-load = <200000>;
+ regulator-allow-set-load;
};
l12 {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
index 13b51d310940..c99aa80e52dc 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
@@ -223,8 +223,8 @@ l10 {
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
- regulator-allow-set-load;
regulator-system-load = <200000>;
+ regulator-allow-set-load;
};
l12 {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index a4dfb2ce7893..b1d01f7cc316 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -375,8 +375,8 @@ l10 {
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
- regulator-allow-set-load;
regulator-system-load = <200000>;
+ regulator-allow-set-load;
};
l12 {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index 2596896e4a61..b0b2634b7f1d 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -326,8 +326,8 @@ l10 {
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
- regulator-allow-set-load;
regulator-system-load = <200000>;
+ regulator-allow-set-load;
};
l12 {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index 135b38c67da1..fc5e846dad3b 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -193,8 +193,8 @@ l10 {
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
- regulator-allow-set-load;
regulator-system-load = <200000>;
+ regulator-allow-set-load;
};
l12 {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index d59587d42c0a..11e0930b1764 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -346,8 +346,8 @@ l10 {
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
- regulator-allow-set-load;
regulator-system-load = <200000>;
+ regulator-allow-set-load;
};
l12 {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
index 9d5d84c0f9f6..6a4a40ca9dca 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
@@ -158,8 +158,8 @@ l10 {
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
- regulator-allow-set-load;
regulator-system-load = <200000>;
+ regulator-allow-set-load;
};
l12 {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
index 84a4713886c1..98e63d414974 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
@@ -383,8 +383,8 @@ l10 {
l11 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
- regulator-allow-set-load;
regulator-system-load = <200000>;
+ regulator-allow-set-load;
};
l12 {
diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
index 9e3351ceb752..6610cd0f8a0b 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
@@ -247,8 +247,8 @@ l10 {
l11 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
- regulator-allow-set-load;
regulator-system-load = <200000>;
+ regulator-allow-set-load;
};
l12 {
--
2.38.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 0/4] Minor cleanup in msm8916 dts files
2023-01-16 14:50 [PATCH v2 0/4] Minor cleanup in msm8916 dts files Nikita Travkin
` (3 preceding siblings ...)
2023-01-16 14:50 ` [PATCH v2 4/4] arm64: dts: qcom: msm/apq8x16-*: Reorder some regulator properties Nikita Travkin
@ 2023-01-19 3:34 ` Bjorn Andersson
2023-01-19 11:10 ` Konrad Dybcio
4 siblings, 1 reply; 7+ messages in thread
From: Bjorn Andersson @ 2023-01-19 3:34 UTC (permalink / raw)
To: Nikita Travkin
Cc: Andy Gross, Rob Herring, Krzysztof Kozlowski, Konrad Dybcio,
linux-arm-msm, devicetree, linux-kernel,
~postmarketos/upstreaming
On Mon, Jan 16, 2023 at 07:50:49PM +0500, Nikita Travkin wrote:
> This series performs some minor cleanup on msm8916/apq8016 files to
> bring them in line with the current standard and be closer to the new
> submissions.
>
> The series is separated into commits by each specific change made across
> all files and these commits should not cause any functional difference.
>
> Changes in v2:
> - Rebase on top of newly applied upstream patches
>
The first patch looks pretty reasonable, but without documenting the
guidelines and tools to help others maintain the ordering this
unfortunately just moves things around arbitrarily.
Forgive me, but I will ignore this series until this is finalized and
documented.
Thanks,
Bjorn
> Nikita Travkin (4):
> arm64: dts: qcom: msm/apq8x16-*: Move status property last
> arm64: dts: qcom: msm/apq8x16-*: Reorder the pinctrl properties.
> arm64: dts: qcom: msm/apq8x16-*: Drop empty lines in pinctrl states
> arm64: dts: qcom: msm/apq8x16-*: Reorder some regulator properties
>
> arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 78 +++++++--------
> .../boot/dts/qcom/msm8916-acer-a1-724.dts | 15 ++-
> .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 46 ++++-----
> .../arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 34 +++----
> .../arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 52 ++++------
> .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 42 ++++----
> .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 30 +++---
> arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 96 +++++--------------
> .../qcom/msm8916-samsung-a2015-common.dtsi | 64 +++++--------
> .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 11 +--
> .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 5 +-
> .../qcom/msm8916-samsung-e2015-common.dtsi | 5 +-
> .../dts/qcom/msm8916-samsung-grandmax.dts | 3 +-
> .../boot/dts/qcom/msm8916-samsung-j5.dts | 21 ++--
> .../dts/qcom/msm8916-samsung-serranove.dts | 62 +++++-------
> .../dts/qcom/msm8916-wingtech-wt88047.dts | 35 +++----
> arch/arm64/boot/dts/qcom/msm8916.dtsi | 32 +++----
> 17 files changed, 245 insertions(+), 386 deletions(-)
>
> --
> 2.38.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 0/4] Minor cleanup in msm8916 dts files
2023-01-19 3:34 ` [PATCH v2 0/4] Minor cleanup in msm8916 dts files Bjorn Andersson
@ 2023-01-19 11:10 ` Konrad Dybcio
0 siblings, 0 replies; 7+ messages in thread
From: Konrad Dybcio @ 2023-01-19 11:10 UTC (permalink / raw)
To: Bjorn Andersson, Nikita Travkin
Cc: Andy Gross, Rob Herring, Krzysztof Kozlowski, linux-arm-msm,
devicetree, linux-kernel, ~postmarketos/upstreaming
On 19.01.2023 04:34, Bjorn Andersson wrote:
> On Mon, Jan 16, 2023 at 07:50:49PM +0500, Nikita Travkin wrote:
>> This series performs some minor cleanup on msm8916/apq8016 files to
>> bring them in line with the current standard and be closer to the new
>> submissions.
>>
>> The series is separated into commits by each specific change made across
>> all files and these commits should not cause any functional difference.
>>
>> Changes in v2:
>> - Rebase on top of newly applied upstream patches
>>
>
> The first patch looks pretty reasonable, but without documenting the
> guidelines and tools to help others maintain the ordering this
> unfortunately just moves things around arbitrarily.
>
> Forgive me, but I will ignore this series until this is finalized and
> documented.
Ack, the idea is good, but I rushed enforcing it.
Konrad
>
> Thanks,
> Bjorn
>
>> Nikita Travkin (4):
>> arm64: dts: qcom: msm/apq8x16-*: Move status property last
>> arm64: dts: qcom: msm/apq8x16-*: Reorder the pinctrl properties.
>> arm64: dts: qcom: msm/apq8x16-*: Drop empty lines in pinctrl states
>> arm64: dts: qcom: msm/apq8x16-*: Reorder some regulator properties
>>
>> arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 78 +++++++--------
>> .../boot/dts/qcom/msm8916-acer-a1-724.dts | 15 ++-
>> .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 46 ++++-----
>> .../arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 34 +++----
>> .../arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 52 ++++------
>> .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 42 ++++----
>> .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 30 +++---
>> arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 96 +++++--------------
>> .../qcom/msm8916-samsung-a2015-common.dtsi | 64 +++++--------
>> .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 11 +--
>> .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 5 +-
>> .../qcom/msm8916-samsung-e2015-common.dtsi | 5 +-
>> .../dts/qcom/msm8916-samsung-grandmax.dts | 3 +-
>> .../boot/dts/qcom/msm8916-samsung-j5.dts | 21 ++--
>> .../dts/qcom/msm8916-samsung-serranove.dts | 62 +++++-------
>> .../dts/qcom/msm8916-wingtech-wt88047.dts | 35 +++----
>> arch/arm64/boot/dts/qcom/msm8916.dtsi | 32 +++----
>> 17 files changed, 245 insertions(+), 386 deletions(-)
>>
>> --
>> 2.38.1
>>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-01-19 11:11 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-16 14:50 [PATCH v2 0/4] Minor cleanup in msm8916 dts files Nikita Travkin
2023-01-16 14:50 ` [PATCH v2 1/4] arm64: dts: qcom: msm/apq8x16-*: Move status property last Nikita Travkin
2023-01-16 14:50 ` [PATCH v2 2/4] arm64: dts: qcom: msm/apq8x16-*: Reorder the pinctrl properties Nikita Travkin
2023-01-16 14:50 ` [PATCH v2 3/4] arm64: dts: qcom: msm/apq8x16-*: Drop empty lines in pinctrl states Nikita Travkin
2023-01-16 14:50 ` [PATCH v2 4/4] arm64: dts: qcom: msm/apq8x16-*: Reorder some regulator properties Nikita Travkin
2023-01-19 3:34 ` [PATCH v2 0/4] Minor cleanup in msm8916 dts files Bjorn Andersson
2023-01-19 11:10 ` Konrad Dybcio
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.