Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a75f0a0 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'samsung-cleanup-1' of... 

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: default avatarKevin Hilman <khilman@linaro.org>
parents 30f9c3bd 8c3736e2

arch/arm/boot/dts/exynos4210.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
		};

	};



	clock: clock-controller@0x10030000 {

	clock: clock-controller@10030000 {

		compatible = "samsung,exynos4210-clock";

		reg = <0x10030000 0x20000>;

		#clock-cells = <1>;

arch/arm/boot/dts/exynos4x12.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
		pinctrl3 = &pinctrl_3;

	};



	clock: clock-controller@0x10030000 {

	clock: clock-controller@10030000 {

		compatible = "samsung,exynos4412-clock";

		reg = <0x10030000 0x20000>;

		#clock-cells = <1>;

arch/arm/boot/dts/exynos5250.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -68,17 +68,17 @@ 
		};

	};



	pd_gsc: gsc-power-domain@0x10044000 {

	pd_gsc: gsc-power-domain@10044000 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10044000 0x20>;

	};



	pd_mfc: mfc-power-domain@0x10044040 {

	pd_mfc: mfc-power-domain@10044040 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10044040 0x20>;

	};



	clock: clock-controller@0x10010000 {

	clock: clock-controller@10010000 {

		compatible = "samsung,exynos5250-clock";

		reg = <0x10010000 0x30000>;

		#clock-cells = <1>;
@@ -562,7 +562,7 @@ 
		};

	};



	gsc_0:  gsc@0x13e00000 {

	gsc_0:  gsc@13e00000 {

		compatible = "samsung,exynos5-gsc";

		reg = <0x13e00000 0x1000>;

		interrupts = <0 85 0>;
@@ -571,7 +571,7 @@ 
		clock-names = "gscl";

	};



	gsc_1:  gsc@0x13e10000 {

	gsc_1:  gsc@13e10000 {

		compatible = "samsung,exynos5-gsc";

		reg = <0x13e10000 0x1000>;

		interrupts = <0 86 0>;
@@ -580,7 +580,7 @@ 
		clock-names = "gscl";

	};



	gsc_2:  gsc@0x13e20000 {

	gsc_2:  gsc@13e20000 {

		compatible = "samsung,exynos5-gsc";

		reg = <0x13e20000 0x1000>;

		interrupts = <0 87 0>;
@@ -589,7 +589,7 @@ 
		clock-names = "gscl";

	};



	gsc_3:  gsc@0x13e30000 {

	gsc_3:  gsc@13e30000 {

		compatible = "samsung,exynos5-gsc";

		reg = <0x13e30000 0x1000>;

		interrupts = <0 88 0>;

arch/arm/boot/dts/exynos5420.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
		};

	};



	clock: clock-controller@0x10010000 {

	clock: clock-controller@10010000 {

		compatible = "samsung,exynos5420-clock";

		reg = <0x10010000 0x30000>;

		#clock-cells = <1>;

arch/arm/boot/dts/exynos5440.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
		spi0 = &spi_0;

	};



	clock: clock-controller@0x160000 {

	clock: clock-controller@160000 {

		compatible = "samsung,exynos5440-clock";

		reg = <0x160000 0x1000>;

		#clock-cells = <1>;