arm64: dts: qcom: msm8916: Set default pinctrl for blsp1_uart1/2

Right now some device nodes set default pinctrl within msm8916.dtsi
(e.g. I2C, SPI), but for others it needs to be explicitly set in the
board-specific device tree (e.g. UART).

While it is theoretically possible that some super special board
needs different pinctrl for these, in practice pretty much every
board ends up using the common pinctrl definitions.

Make this consistent by also defining the common pinctrl properties
for blsp1_uart1 and blsp1_uart2 so we don't need to copy this for every
board. If there is really such a super special board it could just
override these properties with custom pinctrl or make minor modifications
to the common pinctrl configurations provided by msm8916-pins.dtsi.

Also move #address-cells/#size-cells for &dsi0 to msm8916.dtsi
since this is specific to the DSI node, not the board.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20200720085406.6716-10-stephan@gerhold.net
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
index 75d5667cda31eb6a0a55c28e109aae381bd879b0..d9513f779bce2c9be1fe8d34c52b2534f39ec986 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
@@ -235,19 +235,11 @@
 &blsp1_uart1 {
        status = "okay";
        label = "LS-UART0";
-
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&blsp1_uart1_default>;
-       pinctrl-1 = <&blsp1_uart1_sleep>;
 };
 
 &blsp1_uart2 {
        status = "okay";
        label = "LS-UART1";
-
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&blsp1_uart2_default>;
-       pinctrl-1 = <&blsp1_uart2_sleep>;
 };
 
 &camss {

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index 8a6a9cd4a3fe78d4dac8c52c785d38df8f2292ed..dec5e3ba7df40bd92587c2c6b43f72ecf066aad1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -54,10 +54,6 @@
 
 &blsp1_uart2 {
        status = "okay";
-
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&blsp1_uart2_default>;
-       pinctrl-1 = <&blsp1_uart2_sleep>;
 };
 
 &pm8916_resin {

diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
index 9c4926326f21688aa3b655d77ff47668ee4f4c55..1bd05046cdeba38c3abd3a9a043c05321337af4c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi
@@ -18,7 +18,4 @@
 
 &blsp1_uart2 {
        status = "okay";
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&blsp1_uart2_default>;
-       pinctrl-1 = <&blsp1_uart2_sleep>;
 };

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 f1ddb23ac3c3e6dd8996ef21a6986a214da1003d..eb667f4b0e055a3e7027f2fe98d484ff844576cb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -115,16 +115,9 @@
 
 &blsp1_uart2 {
        status = "okay";
-
-       pinctrl-names = "default", "sleep";
-       pinctrl-0 = <&blsp1_uart2_default>;
-       pinctrl-1 = <&blsp1_uart2_sleep>;
 };
 
 &dsi0 {
-       #address-cells = <1>;
-       #size-cells = <0>;
-
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&mdss_default>;
        pinctrl-1 = <&mdss_sleep>;

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 141348a927880beb27efc99c73d5491d2f6d64ed..273faffab3691711eaa74df64453323836685d14 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -487,6 +487,9 @@
                        clock-names = "core", "iface";
                        dmas = <&blsp_dma 1>, <&blsp_dma 0>;
                        dma-names = "rx", "tx";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&blsp1_uart1_default>;
+                       pinctrl-1 = <&blsp1_uart1_sleep>;
                        status = "disabled";
                };
 
@@ -513,6 +516,9 @@
                        clock-names = "core", "iface";
                        dmas = <&blsp_dma 3>, <&blsp_dma 2>;
                        dma-names = "rx", "tx";
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&blsp1_uart2_default>;
+                       pinctrl-1 = <&blsp1_uart2_sleep>;
                        status = "disabled";
                };
 
@@ -1113,6 +1119,9 @@
                                phys = <&dsi_phy0>;
                                phy-names = "dsi-phy";
 
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
                                ports {
                                        #address-cells = <1>;
                                        #size-cells = <0>;