Message ID | 20221122011345.14286-1-jit.loon.lim@intel.com |
---|---|
State | Needs Review / ACK, archived |
Delegated to: | Marek Vasut |
Headers | show |
Series | ddr: altera: n5x: Enhance driver to support LPDDR4 | expand |
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>;