mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-03 03:36:42 +07:00
f333c13c9e
Commit e45600107b (Merge tag 'msm-cleanup-for-3.11' of
git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into
next/cleanup) incorrectly resolved a merge conflict, resulting in a
node address that doesn't match the register address.
Fix this node address.
Signed-off-by: David Brown <davidb@codeaurora.org>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
53 lines
1.1 KiB
Plaintext
53 lines
1.1 KiB
Plaintext
/dts-v1/;
|
|
|
|
/include/ "skeleton.dtsi"
|
|
|
|
/ {
|
|
model = "Qualcomm MSM8960 CDP";
|
|
compatible = "qcom,msm8960-cdp", "qcom,msm8960";
|
|
interrupt-parent = <&intc>;
|
|
|
|
intc: interrupt-controller@2000000 {
|
|
compatible = "qcom,msm-qgic2";
|
|
interrupt-controller;
|
|
#interrupt-cells = <3>;
|
|
reg = < 0x02000000 0x1000 >,
|
|
< 0x02002000 0x1000 >;
|
|
};
|
|
|
|
timer@200a000 {
|
|
compatible = "qcom,kpss-timer", "qcom,msm-timer";
|
|
interrupts = <1 1 0x301>,
|
|
<1 2 0x301>,
|
|
<1 3 0x301>;
|
|
reg = <0x0200a000 0x100>;
|
|
clock-frequency = <27000000>,
|
|
<32768>;
|
|
cpu-offset = <0x80000>;
|
|
};
|
|
|
|
msmgpio: gpio@fd510000 {
|
|
compatible = "qcom,msm-gpio";
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
ngpio = <150>;
|
|
interrupts = <0 32 0x4>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
reg = <0xfd510000 0x4000>;
|
|
};
|
|
|
|
serial@16440000 {
|
|
compatible = "qcom,msm-hsuart", "qcom,msm-uart";
|
|
reg = <0x16440000 0x1000>,
|
|
<0x16400000 0x1000>;
|
|
interrupts = <0 154 0x0>;
|
|
};
|
|
|
|
qcom,ssbi@500000 {
|
|
compatible = "qcom,ssbi";
|
|
reg = <0x500000 0x1000>;
|
|
qcom,controller-type = "pmic-arbiter";
|
|
};
|
|
};
|