mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 16:15:11 +00:00
e45600107b
These are a handful of cleanups to the MSM tree. The gpio cleanups get us closer to having proper pinmux and gpio support. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAABAgAGBQJRu1dSAAoJEOa6n1xeVN+CbG4QAMxPKNDgBcX+UHRLMBh5YkbP ePoWz8QhQ/OWo3Oef6IBEwA3n2jfSF3hTYnXJI/LqRibL8yCDWKlSI6b52/vZsDg r2J4FMiHtBc0Wk+JGhKszdS+eLnljOljz49L5YEMCRglFVMveXqbKeTvbzfaGR6u SAJca3roEVo2Vgdf36CnYEHNxHrfK6yMzPVqiVgasPWnst10WguV+dhX9+REwT2p kp99U8wBEAp84nb2KzoVwKpzUpWWPcFWiaB1/EE6jB5+d3U0CLBWp+6E12m9tOTU L8Hx417zmwV/YvNfVb//SnTnBGYMybXDVlIzRQUuJimPm96SFw1Uw6+0+V+sAv3N T7WmyiyZ6UaDyQB1VCQNzIqEOq8qBacRaXH6kxk6T8UW8l08tSuSf/piiSw5wZLD 6QJ1RFkjrcEulh0DDOcf6Fg34jVk3hjQFF86sBN+JTQfIQ1VBHDLSGuF+RjYk5LW gNN5xGuqHjDdbK/HNvMhIF8MN/B64Wm4PsOHRsN5RP9EXVIB5kEGUMwEEEa/jO8m rhWUPjFq7nE4BNNvrhKShjxtKJGi5OmYx5GYw189rJ5bzVQH68ZSIAGTh8TySpfB N/G82J+bGXz0xq8z81dKRsru+kdv2MkNL9mlJzYNbKhQP64ukD1XMmrWlH8DxtzY CPNWs8m5QCI4R1WiaP2W =9wS3 -----END PGP SIGNATURE----- Merge tag 'msm-cleanup-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup From David Brown: Cleanups for MSM for 3.11 These are a handful of cleanups to the MSM tree. The gpio cleanups get us closer to having proper pinmux and gpio support. * tag 'msm-cleanup-for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm: mfd: ssbi: Use devm_* and simplify code gpio: msm: Add device tree and irqdomain support for gpio-msm-v2 ARM: msm: Remove gpiomux-v2 and re-organize MSM_GPIOMUX configs msm: iomap: Remove unused bases and mappings msm: Remove unused file core.h ARM: msm: Remove init_irq declaration in machine description Signed-off-by: Olof Johansson <olof@lixom.net> Conflicts: arch/arm/boot/dts/msm8660-surf.dts arch/arm/boot/dts/msm8960-cdp.dts
52 lines
1.1 KiB
Text
52 lines
1.1 KiB
Text
/dts-v1/;
|
|
|
|
/include/ "skeleton.dtsi"
|
|
|
|
/ {
|
|
model = "Qualcomm MSM8660 SURF";
|
|
compatible = "qcom,msm8660-surf", "qcom,msm8660";
|
|
interrupt-parent = <&intc>;
|
|
|
|
intc: interrupt-controller@2080000 {
|
|
compatible = "qcom,msm-8660-qgic";
|
|
interrupt-controller;
|
|
#interrupt-cells = <3>;
|
|
reg = < 0x02080000 0x1000 >,
|
|
< 0x02081000 0x1000 >;
|
|
};
|
|
|
|
timer@2000000 {
|
|
compatible = "qcom,scss-timer", "qcom,msm-timer";
|
|
interrupts = <1 0 0x301>,
|
|
<1 1 0x301>,
|
|
<1 2 0x301>;
|
|
reg = <0x02000000 0x100>;
|
|
clock-frequency = <27000000>,
|
|
<32768>;
|
|
cpu-offset = <0x40000>;
|
|
};
|
|
|
|
msmgpio: gpio@800000 {
|
|
compatible = "qcom,msm-gpio";
|
|
reg = <0x00800000 0x1000>;
|
|
gpio-controller;
|
|
#gpio-cells = <2>;
|
|
ngpio = <173>;
|
|
interrupts = <0 32 0x4>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
};
|
|
|
|
serial@19c40000 {
|
|
compatible = "qcom,msm-hsuart", "qcom,msm-uart";
|
|
reg = <0x19c40000 0x1000>,
|
|
<0x19c00000 0x1000>;
|
|
interrupts = <0 195 0x0>;
|
|
};
|
|
|
|
qcom,ssbi@500000 {
|
|
compatible = "qcom,ssbi";
|
|
reg = <0x500000 0x1000>;
|
|
qcom,controller-type = "pmic-arbiter";
|
|
};
|
|
};
|