From: Tien Fong Chee <tien.fong.c...@intel.com>
Enhance driver to common DDR driver for supporting both DDR4 and LPDDR4.
Signed-off-by: Tien Fong Chee <tien.fong.c...@intel.com>
Signed-off-by: Jit Loon Lim <jit.loon....@intel.com>
---
arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi
b/arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi
index 502da36bd8..6c1d25fa05 100644
--- a/arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi
+++ b/arch/arm/dts/socfpga_n5x_socdk-u-boot.dtsi
@@ -15,7 +15,11 @@
memory {
/*
+<<<<<<< HEAD
* Memory type: DDR4 (non-interleaving mode)
+=======
+ * Memory type: DDR4
+>>>>>>> ddr: altera: n5x: Enhance driver to support LPDDR4
* 16GB
* <0 0x00000000 0 0x80000000>,
* <4 0x80000000 3 0x80000000>;
--
2.26.2
