diff options
author | Kevin Hilman <khilman@linaro.org> | 2013-08-22 11:10:52 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-08-22 11:11:41 -0400 |
commit | 8a75f0a07c7aa1e4454c077042ab2b56b72299b9 (patch) | |
tree | 3dc4153b8abb78e324168f46a47d5df99d1b1ec3 /arch/arm/boot/dts/exynos5250.dtsi | |
parent | 30f9c3bdcec9c810f5bd05b177367c7eeab24d90 (diff) | |
parent | 8c3736e20ee387acefffdfcac560ea23ee6fd4d8 (diff) |
Merge tag 'samsung-cleanup-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
From Kukjin Kim:
samsung cleanup for v3.12
- cleanup non-dt stuff in exynos
- remove 0x from exynos dt files
- remove unused codes
* tag 'samsung-cleanup-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: Remove unnecessary exynos4_default_sdhci*()
ARM: dts: Remove '0x's from Exynos5440 DTS file
ARM: dts: Remove '0x's from Exynos5420 DTS file
ARM: dts: Remove '0x's from Exynos5250 DTS file
ARM: dts: Remove '0x's from Exynos4x12 DTSI file
ARM: dts: Remove '0x's from Exynos4210 DTSI file
ARM: EXYNOS: Cleanup common.h file
irqchip: exynos: cleanup non-DT stuff in exynos-combiner
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/exynos5250.dtsi')
-rw-r--r-- | arch/arm/boot/dts/exynos5250.dtsi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index ef57277fc38f..24c0888dd409 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi | |||
@@ -68,17 +68,17 @@ | |||
68 | }; | 68 | }; |
69 | }; | 69 | }; |
70 | 70 | ||
71 | pd_gsc: gsc-power-domain@0x10044000 { | 71 | pd_gsc: gsc-power-domain@10044000 { |
72 | compatible = "samsung,exynos4210-pd"; | 72 | compatible = "samsung,exynos4210-pd"; |
73 | reg = <0x10044000 0x20>; | 73 | reg = <0x10044000 0x20>; |
74 | }; | 74 | }; |
75 | 75 | ||
76 | pd_mfc: mfc-power-domain@0x10044040 { | 76 | pd_mfc: mfc-power-domain@10044040 { |
77 | compatible = "samsung,exynos4210-pd"; | 77 | compatible = "samsung,exynos4210-pd"; |
78 | reg = <0x10044040 0x20>; | 78 | reg = <0x10044040 0x20>; |
79 | }; | 79 | }; |
80 | 80 | ||
81 | clock: clock-controller@0x10010000 { | 81 | clock: clock-controller@10010000 { |
82 | compatible = "samsung,exynos5250-clock"; | 82 | compatible = "samsung,exynos5250-clock"; |
83 | reg = <0x10010000 0x30000>; | 83 | reg = <0x10010000 0x30000>; |
84 | #clock-cells = <1>; | 84 | #clock-cells = <1>; |
@@ -562,7 +562,7 @@ | |||
562 | }; | 562 | }; |
563 | }; | 563 | }; |
564 | 564 | ||
565 | gsc_0: gsc@0x13e00000 { | 565 | gsc_0: gsc@13e00000 { |
566 | compatible = "samsung,exynos5-gsc"; | 566 | compatible = "samsung,exynos5-gsc"; |
567 | reg = <0x13e00000 0x1000>; | 567 | reg = <0x13e00000 0x1000>; |
568 | interrupts = <0 85 0>; | 568 | interrupts = <0 85 0>; |
@@ -571,7 +571,7 @@ | |||
571 | clock-names = "gscl"; | 571 | clock-names = "gscl"; |
572 | }; | 572 | }; |
573 | 573 | ||
574 | gsc_1: gsc@0x13e10000 { | 574 | gsc_1: gsc@13e10000 { |
575 | compatible = "samsung,exynos5-gsc"; | 575 | compatible = "samsung,exynos5-gsc"; |
576 | reg = <0x13e10000 0x1000>; | 576 | reg = <0x13e10000 0x1000>; |
577 | interrupts = <0 86 0>; | 577 | interrupts = <0 86 0>; |
@@ -580,7 +580,7 @@ | |||
580 | clock-names = "gscl"; | 580 | clock-names = "gscl"; |
581 | }; | 581 | }; |
582 | 582 | ||
583 | gsc_2: gsc@0x13e20000 { | 583 | gsc_2: gsc@13e20000 { |
584 | compatible = "samsung,exynos5-gsc"; | 584 | compatible = "samsung,exynos5-gsc"; |
585 | reg = <0x13e20000 0x1000>; | 585 | reg = <0x13e20000 0x1000>; |
586 | interrupts = <0 87 0>; | 586 | interrupts = <0 87 0>; |
@@ -589,7 +589,7 @@ | |||
589 | clock-names = "gscl"; | 589 | clock-names = "gscl"; |
590 | }; | 590 | }; |
591 | 591 | ||
592 | gsc_3: gsc@0x13e30000 { | 592 | gsc_3: gsc@13e30000 { |
593 | compatible = "samsung,exynos5-gsc"; | 593 | compatible = "samsung,exynos5-gsc"; |
594 | reg = <0x13e30000 0x1000>; | 594 | reg = <0x13e30000 0x1000>; |
595 | interrupts = <0 88 0>; | 595 | interrupts = <0 88 0>; |