From 72811cba6fad442e4f92e86c3bdf337191443caa Mon Sep 17 00:00:00 2001 From: Prudhvi Yarlagadda Date: Mon, 17 Aug 2020 17:42:42 +0530 Subject: [PATCH] ARM: dts: msm: Define console before other QUP devices on shima QUP core clock is shared among all the SE drivers, during earlybootup if any SE driver turn off the clock before real console gets probed, then the device will crash because of unclocked access by earlycon. In order to fix this move the console device definition up in DT file this ensures that console probe is called before other SE drivers. Change-Id: Ida298693b4383ba02475b89eb7891ed4aa6f02e1 --- qcom/shima-qupv3.dtsi | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/qcom/shima-qupv3.dtsi b/qcom/shima-qupv3.dtsi index d1d54be460b5..3c5999d267ac 100644 --- a/qcom/shima-qupv3.dtsi +++ b/qcom/shima-qupv3.dtsi @@ -60,6 +60,23 @@ status = "ok"; }; + /* Debug UART Instance */ + qupv3_se13_2uart: qcom,qup_uart@994000 { + compatible = "qcom,msm-geni-console"; + reg = <0x994000 0x4000>; + reg-names = "se_phys"; + interrupts = ; + clock-names = "se-clk", "m-ahb", "s-ahb"; + clocks = <&gcc GCC_QUPV3_WRAP0_S5_CLK>, + <&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>, + <&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&qupv3_se13_2uart_active>; + pinctrl-1 = <&qupv3_se13_2uart_sleep>; + qcom,wrapper-core = <&qupv3_0>; + status = "ok"; + }; + qupv3_se8_i2c: i2c@980000 { compatible = "qcom,i2c-geni"; reg = <0x980000 0x4000>; @@ -270,23 +287,6 @@ status = "disabled"; }; - /* Debug UART Instance */ - qupv3_se13_2uart: qcom,qup_uart@994000 { - compatible = "qcom,msm-geni-console"; - reg = <0x994000 0x4000>; - reg-names = "se_phys"; - interrupts = ; - clock-names = "se-clk", "m-ahb", "s-ahb"; - clocks = <&gcc GCC_QUPV3_WRAP0_S5_CLK>, - <&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>, - <&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>; - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&qupv3_se13_2uart_active>; - pinctrl-1 = <&qupv3_se13_2uart_sleep>; - qcom,wrapper-core = <&qupv3_0>; - status = "ok"; - }; - qupv3_se14_i2c: i2c@998000 { compatible = "qcom,i2c-geni"; reg = <0x998000 0x4000>;