diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-02-19 16:38:51 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-19 16:38:51 -0500 |
commit | 89dfe564b5926297ee29b973fe75e25c83c5e615 (patch) | |
tree | 8fe514cf39525f65ed5b0fbc1659120267bc0874 /arch/arm | |
parent | bb366da87d5921cb578211916d7a67ee8984ca3b (diff) | |
parent | 527fad1bc519df8eedd397482febb51526e5d987 (diff) |
Merge tag 'tegra-for-3.9-soc-ccf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt
ARM: tegra: common clock framework fixes
A number of small fixes are included to the new Tegra common clock
driver. These are: Missing locking, definition of device tree clock IDs
not matching the binding, a static cleanup, missing initialization of
some UART clocks.
This branch is based on Tegra's previous pull request tegra-for-3.9-dt.
This dependency is caused by the one patch that edits the device tree.
If this causes a problem, I can drop the final two patches in this pull
request for now, and rebase it onto previous tegra-for-3.9-soc-ccf
instead.
* tag 'tegra-for-3.9-soc-ccf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
clk: tegra: initialise parent of uart clocks
ARM: tegra: remove clock-frequency properties from serial nodes
clk: tegra: fix driver to match DT binding
clk: tegra: local arrays should be static
clk: tegra: Add missing spinlock for hclk and pclk
clk: tegra: Implement locking for super clock
clk: tegra: fix wrong clock index between se to sata_cold
(applied to next/dt branch rather than next/soc because of the
dependency)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra30.dtsi | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index cdb8da0b6983..9a428931d042 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi | |||
@@ -247,7 +247,6 @@ | |||
247 | reg = <0x70006000 0x40>; | 247 | reg = <0x70006000 0x40>; |
248 | reg-shift = <2>; | 248 | reg-shift = <2>; |
249 | interrupts = <0 36 0x04>; | 249 | interrupts = <0 36 0x04>; |
250 | clock-frequency = <216000000>; | ||
251 | nvidia,dma-request-selector = <&apbdma 8>; | 250 | nvidia,dma-request-selector = <&apbdma 8>; |
252 | clocks = <&tegra_car 6>; | 251 | clocks = <&tegra_car 6>; |
253 | status = "disabled"; | 252 | status = "disabled"; |
@@ -258,7 +257,6 @@ | |||
258 | reg = <0x70006040 0x40>; | 257 | reg = <0x70006040 0x40>; |
259 | reg-shift = <2>; | 258 | reg-shift = <2>; |
260 | interrupts = <0 37 0x04>; | 259 | interrupts = <0 37 0x04>; |
261 | clock-frequency = <216000000>; | ||
262 | nvidia,dma-request-selector = <&apbdma 9>; | 260 | nvidia,dma-request-selector = <&apbdma 9>; |
263 | clocks = <&tegra_car 96>; | 261 | clocks = <&tegra_car 96>; |
264 | status = "disabled"; | 262 | status = "disabled"; |
@@ -269,7 +267,6 @@ | |||
269 | reg = <0x70006200 0x100>; | 267 | reg = <0x70006200 0x100>; |
270 | reg-shift = <2>; | 268 | reg-shift = <2>; |
271 | interrupts = <0 46 0x04>; | 269 | interrupts = <0 46 0x04>; |
272 | clock-frequency = <216000000>; | ||
273 | nvidia,dma-request-selector = <&apbdma 10>; | 270 | nvidia,dma-request-selector = <&apbdma 10>; |
274 | clocks = <&tegra_car 55>; | 271 | clocks = <&tegra_car 55>; |
275 | status = "disabled"; | 272 | status = "disabled"; |
@@ -280,7 +277,6 @@ | |||
280 | reg = <0x70006300 0x100>; | 277 | reg = <0x70006300 0x100>; |
281 | reg-shift = <2>; | 278 | reg-shift = <2>; |
282 | interrupts = <0 90 0x04>; | 279 | interrupts = <0 90 0x04>; |
283 | clock-frequency = <216000000>; | ||
284 | nvidia,dma-request-selector = <&apbdma 19>; | 280 | nvidia,dma-request-selector = <&apbdma 19>; |
285 | clocks = <&tegra_car 65>; | 281 | clocks = <&tegra_car 65>; |
286 | status = "disabled"; | 282 | status = "disabled"; |
@@ -291,7 +287,6 @@ | |||
291 | reg = <0x70006400 0x100>; | 287 | reg = <0x70006400 0x100>; |
292 | reg-shift = <2>; | 288 | reg-shift = <2>; |
293 | interrupts = <0 91 0x04>; | 289 | interrupts = <0 91 0x04>; |
294 | clock-frequency = <216000000>; | ||
295 | nvidia,dma-request-selector = <&apbdma 20>; | 290 | nvidia,dma-request-selector = <&apbdma 20>; |
296 | clocks = <&tegra_car 66>; | 291 | clocks = <&tegra_car 66>; |
297 | status = "disabled"; | 292 | status = "disabled"; |
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index 572a45bab93b..767803e1fd55 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi | |||
@@ -234,7 +234,6 @@ | |||
234 | reg = <0x70006000 0x40>; | 234 | reg = <0x70006000 0x40>; |
235 | reg-shift = <2>; | 235 | reg-shift = <2>; |
236 | interrupts = <0 36 0x04>; | 236 | interrupts = <0 36 0x04>; |
237 | clock-frequency = <408000000>; | ||
238 | nvidia,dma-request-selector = <&apbdma 8>; | 237 | nvidia,dma-request-selector = <&apbdma 8>; |
239 | clocks = <&tegra_car 6>; | 238 | clocks = <&tegra_car 6>; |
240 | status = "disabled"; | 239 | status = "disabled"; |
@@ -244,7 +243,6 @@ | |||
244 | compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; | 243 | compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; |
245 | reg = <0x70006040 0x40>; | 244 | reg = <0x70006040 0x40>; |
246 | reg-shift = <2>; | 245 | reg-shift = <2>; |
247 | clock-frequency = <408000000>; | ||
248 | interrupts = <0 37 0x04>; | 246 | interrupts = <0 37 0x04>; |
249 | nvidia,dma-request-selector = <&apbdma 9>; | 247 | nvidia,dma-request-selector = <&apbdma 9>; |
250 | clocks = <&tegra_car 160>; | 248 | clocks = <&tegra_car 160>; |
@@ -255,7 +253,6 @@ | |||
255 | compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; | 253 | compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; |
256 | reg = <0x70006200 0x100>; | 254 | reg = <0x70006200 0x100>; |
257 | reg-shift = <2>; | 255 | reg-shift = <2>; |
258 | clock-frequency = <408000000>; | ||
259 | interrupts = <0 46 0x04>; | 256 | interrupts = <0 46 0x04>; |
260 | nvidia,dma-request-selector = <&apbdma 10>; | 257 | nvidia,dma-request-selector = <&apbdma 10>; |
261 | clocks = <&tegra_car 55>; | 258 | clocks = <&tegra_car 55>; |
@@ -266,7 +263,6 @@ | |||
266 | compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; | 263 | compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; |
267 | reg = <0x70006300 0x100>; | 264 | reg = <0x70006300 0x100>; |
268 | reg-shift = <2>; | 265 | reg-shift = <2>; |
269 | clock-frequency = <408000000>; | ||
270 | interrupts = <0 90 0x04>; | 266 | interrupts = <0 90 0x04>; |
271 | nvidia,dma-request-selector = <&apbdma 19>; | 267 | nvidia,dma-request-selector = <&apbdma 19>; |
272 | clocks = <&tegra_car 65>; | 268 | clocks = <&tegra_car 65>; |
@@ -277,7 +273,6 @@ | |||
277 | compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; | 273 | compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; |
278 | reg = <0x70006400 0x100>; | 274 | reg = <0x70006400 0x100>; |
279 | reg-shift = <2>; | 275 | reg-shift = <2>; |
280 | clock-frequency = <408000000>; | ||
281 | interrupts = <0 91 0x04>; | 276 | interrupts = <0 91 0x04>; |
282 | nvidia,dma-request-selector = <&apbdma 20>; | 277 | nvidia,dma-request-selector = <&apbdma 20>; |
283 | clocks = <&tegra_car 66>; | 278 | clocks = <&tegra_car 66>; |