mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-29 23:24:11 +08:00
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. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJXFNHtAAoJEME3ZuaGi4PX2LQP/3qB213z+yw60SbP9rzHYdkS Gh5oiuJygf6KUo2lK0uWfROiLRQ4hYpbqf41TmCCLsKuXxGppofDuXAYghXDSMh8 GhKVhNW7/zsJrXOUwl30l9irp5Ai4+5dTzhe2MVyuZ/mnhC8hz+74v/KnQclpUpc Fh3w++8Tf/hXUYThhqpo5gguEcJpWIafP1xzJ5xa9yK1MaTVuYlPt2nqba6xSjir Ti9mahQ713T0F3FYmJlZO47C3Qn4SKiZRlkCTzzs9h7czhIkTDbbGvmyddrDJHN6 sloDE6pKTCN0Hse9f+O1erP9FdmT9k/0R9r4idL/RDLRbJvi+OL/UhCP2m1FdJNr XgiYIwwrf9shVT/UfmMlFu4yU2KYeD1ELXtDdW0UAAMClIZ5TaHsNhGQpG7yslVb E0lMazmBFkCBuq1W2DZPliXd9dCDbK9kcZU0bJacZKUtjXm+AEwIkJmaxrRYp7DG hFo+EHprn/dm+9skU+oxHX3yuK+A0i17XeYeNgDRWt4JFb4CNwnX0cTRhwHOJbjq 4RQqB8ouAIdZkzCsgAZ80nior7dA5B/3WZiX5aNZfAFO4KJxNbeHTLp8+Vdujir1 H+IC7OC/1Xww8hzfIHIzvi9uV5/q9rfBBb04FMOhRdNN15pnpQ4JvJFkKMom0j/u St/R4Tj0FEQDoSj7ViCk =5P6R -----END PGP SIGNATURE----- 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.
This commit is contained in:
commit
3ba9adf019
@ -77,8 +77,8 @@
|
||||
reg = <0x10000000 0x100>;
|
||||
};
|
||||
|
||||
sromc@12570000 {
|
||||
compatible = "samsung,exynos-srom";
|
||||
memory-controller@12570000 {
|
||||
compatible = "samsung,exynos4210-srom";
|
||||
reg = <0x12570000 0x14>;
|
||||
};
|
||||
|
||||
|
@ -31,8 +31,8 @@
|
||||
reg = <0x10000000 0x100>;
|
||||
};
|
||||
|
||||
sromc@12250000 {
|
||||
compatible = "samsung,exynos-srom";
|
||||
memory-controller@12250000 {
|
||||
compatible = "samsung,exynos4210-srom";
|
||||
reg = <0x12250000 0x14>;
|
||||
};
|
||||
|
||||
|
@ -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>;
|
||||
};
|
||||
};
|
||||
|
@ -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>;
|
||||
|
Loading…
Reference in New Issue
Block a user