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

Commit 5ba78aff authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt 

Samsung DTS ARM changes for v5.4

1. Add AHCI to Exynos5250,
2. Add camera and GPU power domains to Exynos5422,
3. Minor cleanup.

* tag 'samsung-dt-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Add CAM power domain to Exynos5422/5800
  ARM: dts: exynos: Add G3D power domain to Exynos542x
  ARM: dts: exynos: Move MSC power domain to the right (sorted) place
  ARM: dts: exynos: Add port map to Exynos5250 AHCI node
  ARM: dts: exynos: Use space after '=' in exynos4412-itop-scp-core

Link: https://lore.kernel.org/r/20190816163042.6604-2-krzk@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 170cf2cd bfb77169

arch/arm/boot/dts/exynos5250.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -346,6 +346,7 @@ 
			clock-names = "sata", "sclk_sata";

			phys = <&sata_phy>;

			phy-names = "sata-phy";

			ports-implemented = <0x1>;

			status = "disabled";

		};

arch/arm/boot/dts/exynos5420.dtsi

+10 −3
Original line number Diff line number Diff line
@@ -294,11 +294,11 @@ 
			label = "MFC";

		};



		msc_pd: power-domain@10044120 {

		g3d_pd: power-domain@10044080 {

			compatible = "samsung,exynos4210-pd";

			reg = <0x10044120 0x20>;

			reg = <0x10044080 0x20>;

			#power-domain-cells = <0>;

			label = "MSC";

			label = "G3D";

		};



		disp_pd: power-domain@100440c0 {
@@ -315,6 +315,13 @@ 
			label = "MAU";

		};



		msc_pd: power-domain@10044120 {

			compatible = "samsung,exynos4210-pd";

			reg = <0x10044120 0x20>;

			#power-domain-cells = <0>;

			label = "MSC";

		};



		pinctrl_0: pinctrl@13400000 {

			compatible = "samsung,exynos5420-pinctrl";

			reg = <0x13400000 0x1000>;

arch/arm/boot/dts/exynos5800.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -131,3 +131,12 @@ 
&mfc {

	compatible = "samsung,mfc-v8";

};



&soc {

	cam_pd: power-domain@10045100 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10045100 0x20>;

		#power-domain-cells = <0>;

		label = "CAM";

	};

};

arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi

+9 −9

File changed.

Contains only whitespace changes.