From 6018a83564a0dd4236b9b89423be74e8b5f9435e Mon Sep 17 00:00:00 2001 From: Akash Asthana Date: Sat, 15 Aug 2020 17:05:27 +0530 Subject: [PATCH] ARM: dts: msm: Define console before other QUP devices QUP core clock is shared among all the SE drivers, during earlybootup if any SE driver turn off the clock before real console gets probe, 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: I341940fd56890b9c6b316fd767eb79d384948efd --- qcom/holi-qupv3.dtsi | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/qcom/holi-qupv3.dtsi b/qcom/holi-qupv3.dtsi index ee0331614cc4..a24f54a1d308 100644 --- a/qcom/holi-qupv3.dtsi +++ b/qcom/holi-qupv3.dtsi @@ -56,6 +56,23 @@ status = "ok"; }; + /* Debug UART Instance */ + qupv3_se9_2uart: qcom,qup_uart@4c8c000 { + compatible = "qcom,msm-geni-console"; + reg = <0x4c8c000 0x4000>; + reg-names = "se_phys"; + interrupts = ; + clock-names = "se-clk", "m-ahb", "s-ahb"; + clocks = <&gcc GCC_QUPV3_WRAP1_S3_CLK>, + <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>, + <&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&qupv3_se9_2uart_active>; + pinctrl-1 = <&qupv3_se9_2uart_sleep>; + qcom,wrapper-core = <&qupv3_1>; + status = "disabled"; + }; + qupv3_se0_i2c: i2c@4a80000 { compatible = "qcom,i2c-geni"; reg = <0x4a80000 0x4000>; @@ -285,23 +302,6 @@ status = "disabled"; }; - /* Debug UART Instance */ - qupv3_se9_2uart: qcom,qup_uart@4c8c000 { - compatible = "qcom,msm-geni-console"; - reg = <0x4c8c000 0x4000>; - reg-names = "se_phys"; - interrupts = ; - clock-names = "se-clk", "m-ahb", "s-ahb"; - clocks = <&gcc GCC_QUPV3_WRAP1_S3_CLK>, - <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>, - <&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>; - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&qupv3_se9_2uart_active>; - pinctrl-1 = <&qupv3_se9_2uart_sleep>; - qcom,wrapper-core = <&qupv3_1>; - status = "disabled"; - }; - qupv3_se10_i2c: i2c@4c90000 { compatible = "qcom,i2c-geni"; reg = <0x4c90000 0x4000>;