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

Commit 3ba9adf0 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'samsung-dt-exynos-srom-fixup-4.7' into for-v4.7/drivers-memory-exynos-srom 

DeviceTree changes for new SROM controller driver reached mainline
some time ago, before the driver was accepted (due to very late
comments). However, after these late comments, the driver expects
different bindings so we need to fix the DTS.
parents f55532a0 4d7820b0

arch/arm/boot/dts/exynos4.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ 
		reg = <0x10000000 0x100>;

	};



	sromc@12570000 {

		compatible = "samsung,exynos-srom";

	memory-controller@12570000 {

		compatible = "samsung,exynos4210-srom";

		reg = <0x12570000 0x14>;

	};

arch/arm/boot/dts/exynos5.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
		reg = <0x10000000 0x100>;

	};



	sromc@12250000 {

		compatible = "samsung,exynos-srom";

	memory-controller@12250000 {

		compatible = "samsung,exynos4210-srom";

		reg = <0x12250000 0x14>;

	};

arch/arm/boot/dts/exynos5410-smdk5410.dts

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
		smsc,irq-push-pull;

		smsc,force-internal-phy;



		samsung,srom-page-mode = <1>;

		samsung,srom-page-mode;

		samsung,srom-timing = <9 12 1 9 1 1>;

	};

};

arch/arm/boot/dts/exynos5410.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ 
			reg = <0x10000000 0x100>;

		};



		sromc: sromc@12250000 {

			compatible = "samsung,exynos-srom";

		sromc: memory-controller@12250000 {

			compatible = "samsung,exynos4210-srom";

			reg = <0x12250000 0x14>;

			#address-cells = <2>;

			#size-cells = <1>;