diff options
| author | Andy Gross <agross@codeaurora.org> | 2015-04-06 15:23:08 -0500 |
|---|---|---|
| committer | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2015-04-07 10:30:32 +0100 |
| commit | 1ff618a4b9d9cf243e2fde07a6f718344fe62847 (patch) | |
| tree | 386edc7c225150d141df59090cbcb70bc7582cb6 | |
| parent | 2a0efe0d74be7c943150cb3b7de3c56e88a2fc79 (diff) | |
arm64: dts: qcom: msm8916: Reorder rpm/regulators
This patch reorders the regulators so that the clock driver won't have issues if
it consumes a rpm regulator. If this is not done, the clock driver will probe
defer and fail to bring up the console.
Signed-off-by: Andy Gross <agross@codeaurora.org>
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8916.dtsi | 135 |
1 files changed, 67 insertions, 68 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index a9ccb0f4b1e9..0eee77387962 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -530,6 +530,73 @@ }; + qcom,ipc-spinlock@1905000 { + compatible = "qcom,ipc-spinlock-sfpb"; + reg = <0x1905000 0x8000>; + qcom,num-locks = <8>; + }; + + qcom,smem@86300000 { + compatible = "qcom,smem"; + reg = <0x86300000 0x100000>, + <0x0b011008 0x4>, + <0x60000 0x8000>, + <0x193D000 0x8>; + reg-names = "smem", "irq-reg-base", "aux-mem1", "smem_targ_info_reg"; + qcom,mpu-enabled; + + qcom,smd-modem { + compatible = "qcom,smd"; + qcom,smd-edge = <0>; + qcom,smd-irq-offset = <0x0>; + qcom,smd-irq-bitmask = <0x1000>; + interrupts = <0 25 1>; + label = "modem"; + }; + + qcom,smsm-modem { + compatible = "qcom,smsm"; + qcom,smsm-edge = <0>; + qcom,smsm-irq-offset = <0x0>; + qcom,smsm-irq-bitmask = <0x2000>; + interrupts = <0 26 1>; + }; + + qcom,smd-wcnss { + compatible = "qcom,smd"; + qcom,smd-edge = <6>; + qcom,smd-irq-offset = <0x0>; + qcom,smd-irq-bitmask = <0x20000>; + interrupts = <0 142 1>; + label = "wcnss"; + }; + + qcom,smsm-wcnss { + compatible = "qcom,smsm"; + qcom,smsm-edge = <6>; + qcom,smsm-irq-offset = <0x0>; + qcom,smsm-irq-bitmask = <0x80000>; + interrupts = <0 144 1>; + }; + + qcom,smd-rpm { + compatible = "qcom,smd"; + qcom,smd-edge = <15>; + qcom,smd-irq-offset = <0x0>; + qcom,smd-irq-bitmask = <0x1>; + interrupts = <0 168 1>; + label = "rpm"; + qcom,irq-no-suspend; + qcom,not-loadable; + }; + }; + + rpm_bus: qcom,rpm-smd { + compatible = "qcom,rpm-smd"; + rpm-channel-name = "rpm_requests"; + rpm-channel-type = <15>; /* SMD_APPS_RPM */ + }; + gcc: qcom,gcc@1800000 { compatible = "qcom,gcc-msm8916"; #clock-cells = <1>; @@ -753,74 +820,6 @@ status = "disabled"; }; - - qcom,ipc-spinlock@1905000 { - compatible = "qcom,ipc-spinlock-sfpb"; - reg = <0x1905000 0x8000>; - qcom,num-locks = <8>; - }; - - qcom,smem@86300000 { - compatible = "qcom,smem"; - reg = <0x86300000 0x100000>, - <0x0b011008 0x4>, - <0x60000 0x8000>, - <0x193D000 0x8>; - reg-names = "smem", "irq-reg-base", "aux-mem1", "smem_targ_info_reg"; - qcom,mpu-enabled; - - qcom,smd-modem { - compatible = "qcom,smd"; - qcom,smd-edge = <0>; - qcom,smd-irq-offset = <0x0>; - qcom,smd-irq-bitmask = <0x1000>; - interrupts = <0 25 1>; - label = "modem"; - }; - - qcom,smsm-modem { - compatible = "qcom,smsm"; - qcom,smsm-edge = <0>; - qcom,smsm-irq-offset = <0x0>; - qcom,smsm-irq-bitmask = <0x2000>; - interrupts = <0 26 1>; - }; - - qcom,smd-wcnss { - compatible = "qcom,smd"; - qcom,smd-edge = <6>; - qcom,smd-irq-offset = <0x0>; - qcom,smd-irq-bitmask = <0x20000>; - interrupts = <0 142 1>; - label = "wcnss"; - }; - - qcom,smsm-wcnss { - compatible = "qcom,smsm"; - qcom,smsm-edge = <6>; - qcom,smsm-irq-offset = <0x0>; - qcom,smsm-irq-bitmask = <0x80000>; - interrupts = <0 144 1>; - }; - - qcom,smd-rpm { - compatible = "qcom,smd"; - qcom,smd-edge = <15>; - qcom,smd-irq-offset = <0x0>; - qcom,smd-irq-bitmask = <0x1>; - interrupts = <0 168 1>; - label = "rpm"; - qcom,irq-no-suspend; - qcom,not-loadable; - }; - }; - - rpm_bus: qcom,rpm-smd { - compatible = "qcom,rpm-smd"; - rpm-channel-name = "rpm_requests"; - rpm-channel-type = <15>; /* SMD_APPS_RPM */ - }; - spmi_bus: qcom,spmi@200f000 { compatible = "qcom,spmi-pmic-arb"; reg = <0x200f000 0x1000>, |