diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-05 17:19:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-05 17:19:54 -0400 |
commit | ff050ad12c551233e546506409c89eb2f640d9f3 (patch) | |
tree | 8ae29fece122a91cbd6160fb2ca34c0ea82c3df9 /arch/arm/boot | |
parent | dfc25e4503aef6b82a1de4a0fbe19aafa8648fbe (diff) | |
parent | 9233087dc468f75bdeb7830c694c09dc74be88c4 (diff) |
Merge tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC specific changes from Arnd Bergmann:
"Lots of changes specific to one of the SoC families. Some that stick
out are:
- mach-qcom gains new features, most importantly SMP support for the
newer chips (Stephen Boyd, Rohit Vaswani)
- mvebu gains support for three new SoCs: Armada 375, 380 and 385
(Thomas Petazzoni and Free-electrons team)
- SMP support for Rockchips (Heiko Stübner)
- Lots of i.MX changes (Shawn Guo)
- Added support for BCM5301x SoC (Hauke Mehrtens)
- Multiplatform support for Marvell Kirkwood and Dove (Andrew Lunn
and Sebastian Hesselbarth doing the final part of a long journey)
- Unify davinci platforms and remove obsolete ones (Sekhar Nori, Arnd
Bergmann)"
* tag 'soc-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (126 commits)
ARM: sunxi: Select HAVE_ARM_ARCH_TIMER
ARM: cache-tauros2: remove ARMv6 code
ARM: mvebu: don't select CONFIG_NEON
ARM: davinci: fix DT booting with default defconfig
ARM: configs: bcm_defconfig: enable bcm590xx regulator support
ARM: davinci: remove tnetv107x support
MAINTAINERS: Update ARM STi maintainers
ARM: restrict BCM_KONA_UART to ARCH_BCM_MOBILE
ARM: bcm21664: Add board support.
ARM: sunxi: Add the new watchog compatibles to the reboot code
ARM: enable ARM_HAS_SG_CHAIN for multiplatform
ARM: davinci: remove da8xx_omapl_defconfig
ARM: davinci: da8xx: fix multiple watchdog device registration
ARM: davinci: add da8xx specific configs to davinci_all_defconfig
ARM: davinci: enable da8xx build concurrently with older devices
ARM: BCM5301X: workaround suppress fault
ARM: BCM5301X: add early debugging support
ARM: BCM5301X: initial support for the BCM5301X/BCM470X SoCs with ARM CPU
ARM: mach-bcm: Remove GENERIC_TIME
ARM: shmobile: APMU: Fix warnings due to improper printk formats
...
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 9 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 62 | ||||
-rw-r--r-- | arch/arm/boot/dts/qcom-msm8960.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/qcom-msm8974.dtsi | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/rk3066a.dtsi | 13 | ||||
-rw-r--r-- | arch/arm/boot/dts/rk3188.dtsi | 13 | ||||
-rw-r--r-- | arch/arm/boot/dts/rk3xxx.dtsi | 10 |
7 files changed, 115 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index ec4dd7c3ed37..112813a80b71 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
@@ -59,7 +59,7 @@ dtb-$(CONFIG_ARCH_BERLIN) += \ | |||
59 | berlin2cd-google-chromecast.dtb | 59 | berlin2cd-google-chromecast.dtb |
60 | dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \ | 60 | dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \ |
61 | da850-evm.dtb | 61 | da850-evm.dtb |
62 | dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \ | 62 | dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \ |
63 | dove-cubox.dtb \ | 63 | dove-cubox.dtb \ |
64 | dove-d2plug.dtb \ | 64 | dove-d2plug.dtb \ |
65 | dove-d3plug.dtb \ | 65 | dove-d3plug.dtb \ |
@@ -86,8 +86,8 @@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \ | |||
86 | ecx-2000.dtb | 86 | ecx-2000.dtb |
87 | dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ | 87 | dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ |
88 | integratorcp.dtb | 88 | integratorcp.dtb |
89 | dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb | 89 | kirkwood := \ |
90 | dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ | 90 | kirkwood-cloudbox.dtb \ |
91 | kirkwood-db-88f6281.dtb \ | 91 | kirkwood-db-88f6281.dtb \ |
92 | kirkwood-db-88f6282.dtb \ | 92 | kirkwood-db-88f6282.dtb \ |
93 | kirkwood-dns320.dtb \ | 93 | kirkwood-dns320.dtb \ |
@@ -121,6 +121,9 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ | |||
121 | kirkwood-topkick.dtb \ | 121 | kirkwood-topkick.dtb \ |
122 | kirkwood-ts219-6281.dtb \ | 122 | kirkwood-ts219-6281.dtb \ |
123 | kirkwood-ts219-6282.dtb | 123 | kirkwood-ts219-6282.dtb |
124 | dtb-$(CONFIG_ARCH_KIRKWOOD) += $(kirkwood) | ||
125 | dtb-$(CONFIG_MACH_KIRKWOOD) += $(kirkwood) | ||
126 | dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb | ||
124 | dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb | 127 | dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb |
125 | dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb | 128 | dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb |
126 | dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ | 129 | dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ |
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts index dc86429756d7..2cb0dc529165 100644 --- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts +++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | |||
@@ -122,4 +122,66 @@ | |||
122 | gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; | 122 | gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; |
123 | }; | 123 | }; |
124 | }; | 124 | }; |
125 | |||
126 | dsa@0 { | ||
127 | compatible = "marvell,dsa"; | ||
128 | #address-cells = <2>; | ||
129 | #size-cells = <0>; | ||
130 | |||
131 | dsa,ethernet = <ð0>; | ||
132 | dsa,mii-bus = <ðphy0>; | ||
133 | |||
134 | switch@0 { | ||
135 | #address-cells = <1>; | ||
136 | #size-cells = <0>; | ||
137 | reg = <0 0>; /* MDIO address 0, switch 0 in tree */ | ||
138 | |||
139 | port@0 { | ||
140 | reg = <0>; | ||
141 | label = "lan1"; | ||
142 | }; | ||
143 | |||
144 | port@1 { | ||
145 | reg = <1>; | ||
146 | label = "lan2"; | ||
147 | }; | ||
148 | |||
149 | port@2 { | ||
150 | reg = <2>; | ||
151 | label = "lan3"; | ||
152 | }; | ||
153 | |||
154 | port@3 { | ||
155 | reg = <3>; | ||
156 | label = "lan4"; | ||
157 | }; | ||
158 | |||
159 | port@4 { | ||
160 | reg = <4>; | ||
161 | label = "wan"; | ||
162 | }; | ||
163 | |||
164 | port@5 { | ||
165 | reg = <5>; | ||
166 | label = "cpu"; | ||
167 | }; | ||
168 | }; | ||
169 | }; | ||
170 | }; | ||
171 | |||
172 | &mdio { | ||
173 | status = "okay"; | ||
174 | |||
175 | ethphy0: ethernet-phy@ff { | ||
176 | reg = <0xff>; /* No phy attached */ | ||
177 | speed = <1000>; | ||
178 | duplex = <1>; | ||
179 | }; | ||
180 | }; | ||
181 | |||
182 | ð0 { | ||
183 | status = "okay"; | ||
184 | ethernet0-port@0 { | ||
185 | phy-handle = <ðphy0>; | ||
186 | }; | ||
125 | }; | 187 | }; |
diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi index ff002826552a..3a9c3caa9aad 100644 --- a/arch/arm/boot/dts/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi | |||
@@ -9,6 +9,12 @@ | |||
9 | compatible = "qcom,msm8960"; | 9 | compatible = "qcom,msm8960"; |
10 | interrupt-parent = <&intc>; | 10 | interrupt-parent = <&intc>; |
11 | 11 | ||
12 | cpu-pmu { | ||
13 | compatible = "qcom,krait-pmu"; | ||
14 | interrupts = <1 10 0x304>; | ||
15 | qcom,no-pc-write; | ||
16 | }; | ||
17 | |||
12 | intc: interrupt-controller@2000000 { | 18 | intc: interrupt-controller@2000000 { |
13 | compatible = "qcom,msm-qgic2"; | 19 | compatible = "qcom,msm-qgic2"; |
14 | interrupt-controller; | 20 | interrupt-controller; |
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index 9e5dadb101eb..1eff4130cde0 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi | |||
@@ -9,6 +9,11 @@ | |||
9 | compatible = "qcom,msm8974"; | 9 | compatible = "qcom,msm8974"; |
10 | interrupt-parent = <&intc>; | 10 | interrupt-parent = <&intc>; |
11 | 11 | ||
12 | cpu-pmu { | ||
13 | compatible = "qcom,krait-pmu"; | ||
14 | interrupts = <1 7 0xf04>; | ||
15 | }; | ||
16 | |||
12 | soc: soc { | 17 | soc: soc { |
13 | #address-cells = <1>; | 18 | #address-cells = <1>; |
14 | #size-cells = <1>; | 19 | #size-cells = <1>; |
diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi index be5d2b09a363..4d4dfbb59f4b 100644 --- a/arch/arm/boot/dts/rk3066a.dtsi +++ b/arch/arm/boot/dts/rk3066a.dtsi | |||
@@ -64,6 +64,19 @@ | |||
64 | clock-names = "timer", "pclk"; | 64 | clock-names = "timer", "pclk"; |
65 | }; | 65 | }; |
66 | 66 | ||
67 | sram: sram@10080000 { | ||
68 | compatible = "mmio-sram"; | ||
69 | reg = <0x10080000 0x10000>; | ||
70 | #address-cells = <1>; | ||
71 | #size-cells = <1>; | ||
72 | ranges = <0 0x10080000 0x10000>; | ||
73 | |||
74 | smp-sram@0 { | ||
75 | compatible = "rockchip,rk3066-smp-sram"; | ||
76 | reg = <0x0 0x50>; | ||
77 | }; | ||
78 | }; | ||
79 | |||
67 | pinctrl@20008000 { | 80 | pinctrl@20008000 { |
68 | compatible = "rockchip,rk3066a-pinctrl"; | 81 | compatible = "rockchip,rk3066a-pinctrl"; |
69 | reg = <0x20008000 0x150>; | 82 | reg = <0x20008000 0x150>; |
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi index 1a26b03b3649..bb36596ea205 100644 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi | |||
@@ -60,6 +60,19 @@ | |||
60 | interrupts = <GIC_PPI 13 0xf04>; | 60 | interrupts = <GIC_PPI 13 0xf04>; |
61 | }; | 61 | }; |
62 | 62 | ||
63 | sram: sram@10080000 { | ||
64 | compatible = "mmio-sram"; | ||
65 | reg = <0x10080000 0x8000>; | ||
66 | #address-cells = <1>; | ||
67 | #size-cells = <1>; | ||
68 | ranges = <0 0x10080000 0x8000>; | ||
69 | |||
70 | smp-sram@0 { | ||
71 | compatible = "rockchip,rk3066-smp-sram"; | ||
72 | reg = <0x0 0x50>; | ||
73 | }; | ||
74 | }; | ||
75 | |||
63 | pinctrl@20008000 { | 76 | pinctrl@20008000 { |
64 | compatible = "rockchip,rk3188-pinctrl"; | 77 | compatible = "rockchip,rk3188-pinctrl"; |
65 | reg = <0x20008000 0xa0>, | 78 | reg = <0x20008000 0xa0>, |
diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi index 0fcbcfd67de2..26e5a968d49d 100644 --- a/arch/arm/boot/dts/rk3xxx.dtsi +++ b/arch/arm/boot/dts/rk3xxx.dtsi | |||
@@ -26,6 +26,16 @@ | |||
26 | compatible = "simple-bus"; | 26 | compatible = "simple-bus"; |
27 | ranges; | 27 | ranges; |
28 | 28 | ||
29 | scu@1013c000 { | ||
30 | compatible = "arm,cortex-a9-scu"; | ||
31 | reg = <0x1013c000 0x100>; | ||
32 | }; | ||
33 | |||
34 | pmu@20004000 { | ||
35 | compatible = "rockchip,rk3066-pmu"; | ||
36 | reg = <0x20004000 0x100>; | ||
37 | }; | ||
38 | |||
29 | gic: interrupt-controller@1013d000 { | 39 | gic: interrupt-controller@1013d000 { |
30 | compatible = "arm,cortex-a9-gic"; | 40 | compatible = "arm,cortex-a9-gic"; |
31 | interrupt-controller; | 41 | interrupt-controller; |