diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 12:03:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 12:03:55 -0400 |
| commit | a7726350e06401929eac0aa0677a5467106565fc (patch) | |
| tree | e189513e5014bdfccd73a3af731a6b57733743fa /arch/arm/boot/dts | |
| parent | 4d26aa305414dbb33b3c32fb205b68004cda8ffc (diff) | |
| parent | afcf7924ecab726dab0227188783c4a40d9f0eec (diff) | |
Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC cleanup from Olof Johansson:
"Here is a collection of cleanup patches. Among the pieces that stand
out are:
- The deletion of h720x platforms
- Split of at91 non-dt platforms to their own Kconfig file to keep
them separate
- General cleanups and refactoring of i.MX and MXS platforms
- Some restructuring of clock tables for OMAP
- Convertion of PMC driver for Tegra to dt-only
- Some renames of sunxi -> sun4i (Allwinner A10)
- ... plus a bunch of other stuff that I haven't mentioned"
* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits)
ARM: i.MX: remove unused ARCH_* configs
ARM i.MX53: remove platform ahci support
ARM: sunxi: Rework the restart code
irqchip: sunxi: Rename sunxi to sun4i
irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro
clocksource: sunxi: Rename sunxi to sun4i
clocksource: sunxi: make use of CLKSRC_OF
clocksource: sunxi: Cleanup the timer code
ARM: at91: remove trailing semicolon from macros
ARM: at91/setup: fix trivial typos
ARM: EXYNOS: remove "config EXYNOS_DEV_DRM"
ARM: EXYNOS: change the name of USB ohci header
ARM: SAMSUNG: Remove unnecessary code for dma
ARM: S3C24XX: Remove unused GPIO drive strength register definitions
ARM: OMAP4+: PM: Restore CPU power state to ON with clockdomain force wakeup method
ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412
ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410
ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards
ARM: SAMSUNG: Fix typo "CONFIG_SAMSUNG_DEV_RTC"
ARM: S5P64X0: Fix typo "CONFIG_S5P64X0_SETUP_SDHCI"
...
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/imx23.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx28.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra114.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/tegra30.dtsi | 4 |
5 files changed, 14 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi index 56afcf41aae0..ad2d79324cd3 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi | |||
| @@ -295,6 +295,7 @@ | |||
| 295 | }; | 295 | }; |
| 296 | 296 | ||
| 297 | digctl@8001c000 { | 297 | digctl@8001c000 { |
| 298 | compatible = "fsl,imx23-digctl"; | ||
| 298 | reg = <0x8001c000 2000>; | 299 | reg = <0x8001c000 2000>; |
| 299 | status = "disabled"; | 300 | status = "disabled"; |
| 300 | }; | 301 | }; |
| @@ -321,6 +322,7 @@ | |||
| 321 | }; | 322 | }; |
| 322 | 323 | ||
| 323 | ocotp@8002c000 { | 324 | ocotp@8002c000 { |
| 325 | compatible = "fsl,ocotp"; | ||
| 324 | reg = <0x8002c000 0x2000>; | 326 | reg = <0x8002c000 0x2000>; |
| 325 | status = "disabled"; | 327 | status = "disabled"; |
| 326 | }; | 328 | }; |
| @@ -360,7 +362,7 @@ | |||
| 360 | ranges; | 362 | ranges; |
| 361 | 363 | ||
| 362 | clks: clkctrl@80040000 { | 364 | clks: clkctrl@80040000 { |
| 363 | compatible = "fsl,imx23-clkctrl"; | 365 | compatible = "fsl,imx23-clkctrl", "fsl,clkctrl"; |
| 364 | reg = <0x80040000 0x2000>; | 366 | reg = <0x80040000 0x2000>; |
| 365 | #clock-cells = <1>; | 367 | #clock-cells = <1>; |
| 366 | }; | 368 | }; |
| @@ -426,6 +428,7 @@ | |||
| 426 | compatible = "fsl,imx23-timrot", "fsl,timrot"; | 428 | compatible = "fsl,imx23-timrot", "fsl,timrot"; |
| 427 | reg = <0x80068000 0x2000>; | 429 | reg = <0x80068000 0x2000>; |
| 428 | interrupts = <28 29 30 31>; | 430 | interrupts = <28 29 30 31>; |
| 431 | clocks = <&clks 28>; | ||
| 429 | }; | 432 | }; |
| 430 | 433 | ||
| 431 | auart0: serial@8006c000 { | 434 | auart0: serial@8006c000 { |
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 7ba49662b9bc..64af2381c1b0 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi | |||
| @@ -647,6 +647,7 @@ | |||
| 647 | }; | 647 | }; |
| 648 | 648 | ||
| 649 | digctl@8001c000 { | 649 | digctl@8001c000 { |
| 650 | compatible = "fsl,imx28-digctl"; | ||
| 650 | reg = <0x8001c000 0x2000>; | 651 | reg = <0x8001c000 0x2000>; |
| 651 | interrupts = <89>; | 652 | interrupts = <89>; |
| 652 | status = "disabled"; | 653 | status = "disabled"; |
| @@ -676,6 +677,7 @@ | |||
| 676 | }; | 677 | }; |
| 677 | 678 | ||
| 678 | ocotp@8002c000 { | 679 | ocotp@8002c000 { |
| 680 | compatible = "fsl,ocotp"; | ||
| 679 | reg = <0x8002c000 0x2000>; | 681 | reg = <0x8002c000 0x2000>; |
| 680 | status = "disabled"; | 682 | status = "disabled"; |
| 681 | }; | 683 | }; |
| @@ -755,7 +757,7 @@ | |||
| 755 | ranges; | 757 | ranges; |
| 756 | 758 | ||
| 757 | clks: clkctrl@80040000 { | 759 | clks: clkctrl@80040000 { |
| 758 | compatible = "fsl,imx28-clkctrl"; | 760 | compatible = "fsl,imx28-clkctrl", "fsl,clkctrl"; |
| 759 | reg = <0x80040000 0x2000>; | 761 | reg = <0x80040000 0x2000>; |
| 760 | #clock-cells = <1>; | 762 | #clock-cells = <1>; |
| 761 | }; | 763 | }; |
| @@ -838,6 +840,7 @@ | |||
| 838 | compatible = "fsl,imx28-timrot", "fsl,timrot"; | 840 | compatible = "fsl,imx28-timrot", "fsl,timrot"; |
| 839 | reg = <0x80068000 0x2000>; | 841 | reg = <0x80068000 0x2000>; |
| 840 | interrupts = <48 49 50 51>; | 842 | interrupts = <48 49 50 51>; |
| 843 | clocks = <&clks 26>; | ||
| 841 | }; | 844 | }; |
| 842 | 845 | ||
| 843 | auart0: serial@8006a000 { | 846 | auart0: serial@8006a000 { |
diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi index 1dfaf2874c57..e4ddeddcd437 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi | |||
| @@ -99,7 +99,7 @@ | |||
| 99 | }; | 99 | }; |
| 100 | 100 | ||
| 101 | pmc { | 101 | pmc { |
| 102 | compatible = "nvidia,tegra114-pmc", "nvidia,tegra30-pmc"; | 102 | compatible = "nvidia,tegra114-pmc"; |
| 103 | reg = <0x7000e400 0x400>; | 103 | reg = <0x7000e400 0x400>; |
| 104 | }; | 104 | }; |
| 105 | 105 | ||
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 3d3f64d2111a..ad64c8cc9da7 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi | |||
| @@ -145,6 +145,7 @@ | |||
| 145 | 0 1 0x04 | 145 | 0 1 0x04 |
| 146 | 0 41 0x04 | 146 | 0 41 0x04 |
| 147 | 0 42 0x04>; | 147 | 0 42 0x04>; |
| 148 | clocks = <&tegra_car 5>; | ||
| 148 | }; | 149 | }; |
| 149 | 150 | ||
| 150 | tegra_car: clock { | 151 | tegra_car: clock { |
| @@ -304,6 +305,7 @@ | |||
| 304 | compatible = "nvidia,tegra20-rtc"; | 305 | compatible = "nvidia,tegra20-rtc"; |
| 305 | reg = <0x7000e000 0x100>; | 306 | reg = <0x7000e000 0x100>; |
| 306 | interrupts = <0 2 0x04>; | 307 | interrupts = <0 2 0x04>; |
| 308 | clocks = <&tegra_car 4>; | ||
| 307 | }; | 309 | }; |
| 308 | 310 | ||
| 309 | i2c@7000c000 { | 311 | i2c@7000c000 { |
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index dbf46c272562..9491edf1a067 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi | |||
| @@ -148,6 +148,7 @@ | |||
| 148 | 0 42 0x04 | 148 | 0 42 0x04 |
| 149 | 0 121 0x04 | 149 | 0 121 0x04 |
| 150 | 0 122 0x04>; | 150 | 0 122 0x04>; |
| 151 | clocks = <&tegra_car 5>; | ||
| 151 | }; | 152 | }; |
| 152 | 153 | ||
| 153 | tegra_car: clock { | 154 | tegra_car: clock { |
| @@ -291,6 +292,7 @@ | |||
| 291 | compatible = "nvidia,tegra30-rtc", "nvidia,tegra20-rtc"; | 292 | compatible = "nvidia,tegra30-rtc", "nvidia,tegra20-rtc"; |
| 292 | reg = <0x7000e000 0x100>; | 293 | reg = <0x7000e000 0x100>; |
| 293 | interrupts = <0 2 0x04>; | 294 | interrupts = <0 2 0x04>; |
| 295 | clocks = <&tegra_car 4>; | ||
| 294 | }; | 296 | }; |
| 295 | 297 | ||
| 296 | i2c@7000c000 { | 298 | i2c@7000c000 { |
| @@ -423,7 +425,7 @@ | |||
| 423 | }; | 425 | }; |
| 424 | 426 | ||
| 425 | pmc { | 427 | pmc { |
| 426 | compatible = "nvidia,tegra20-pmc", "nvidia,tegra30-pmc"; | 428 | compatible = "nvidia,tegra30-pmc"; |
| 427 | reg = <0x7000e400 0x400>; | 429 | reg = <0x7000e400 0x400>; |
| 428 | }; | 430 | }; |
| 429 | 431 | ||