Browse Source

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.
Krzysztof Kozlowski 9 years ago
parent
commit
3ba9adf019

+ 2 - 2
arch/arm/boot/dts/exynos4.dtsi

@@ -77,8 +77,8 @@
 		reg = <0x10000000 0x100>;
 		reg = <0x10000000 0x100>;
 	};
 	};
 
 
-	sromc@12570000 {
-		compatible = "samsung,exynos-srom";
+	memory-controller@12570000 {
+		compatible = "samsung,exynos4210-srom";
 		reg = <0x12570000 0x14>;
 		reg = <0x12570000 0x14>;
 	};
 	};
 
 

+ 2 - 2
arch/arm/boot/dts/exynos5.dtsi

@@ -31,8 +31,8 @@
 		reg = <0x10000000 0x100>;
 		reg = <0x10000000 0x100>;
 	};
 	};
 
 
-	sromc@12250000 {
-		compatible = "samsung,exynos-srom";
+	memory-controller@12250000 {
+		compatible = "samsung,exynos4210-srom";
 		reg = <0x12250000 0x14>;
 		reg = <0x12250000 0x14>;
 	};
 	};
 
 

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

@@ -97,7 +97,7 @@
 		smsc,irq-push-pull;
 		smsc,irq-push-pull;
 		smsc,force-internal-phy;
 		smsc,force-internal-phy;
 
 
-		samsung,srom-page-mode = <1>;
+		samsung,srom-page-mode;
 		samsung,srom-timing = <9 12 1 9 1 1>;
 		samsung,srom-timing = <9 12 1 9 1 1>;
 	};
 	};
 };
 };

+ 2 - 2
arch/arm/boot/dts/exynos5410.dtsi

@@ -102,8 +102,8 @@
 			reg = <0x10000000 0x100>;
 			reg = <0x10000000 0x100>;
 		};
 		};
 
 
-		sromc: sromc@12250000 {
-			compatible = "samsung,exynos-srom";
+		sromc: memory-controller@12250000 {
+			compatible = "samsung,exynos4210-srom";
 			reg = <0x12250000 0x14>;
 			reg = <0x12250000 0x14>;
 			#address-cells = <2>;
 			#address-cells = <2>;
 			#size-cells = <1>;
 			#size-cells = <1>;