From: heaterC Date: Fri, 19 Feb 2021 16:11:24 +0000 (+0100) Subject: ddr: marvell: a38x: enum mv_ddr_twin_die: change order X-Git-Tag: baikal/mips/sdk5.9~34^2^2~169^2~2 X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=ed2538c7eba3ecad92bcbc7d5da2bf46d600c3f9;p=uboot.git ddr: marvell: a38x: enum mv_ddr_twin_die: change order commit 56db5d1464b44df10a02b99e615ebd6f6a35c428 upstream. @pali suggested this change In commit 6285efb ("mv_ddr: add support for twin-die combined memory device") was added support for twin-die combined memory device and default value for explicitly uninitialized structure members is zero, s also twin_die_combined is initialized to zero. Which means COMBINED value. As prior this commit there was no support for twin-die combined memory device, default value for twin_die_combined should be NOT_COMBINED. This change change order of enum mv_ddr_twin_die to ensure that NOT_COMBINED has value zero. Signed-off-by: heaterC Signed-off-by: Marek BehĂșn Tested-by: Chris Packham --- diff --git a/drivers/ddr/marvell/a38x/ddr_topology_def.h b/drivers/ddr/marvell/a38x/ddr_topology_def.h index 2cca5676a0..7f2317edfa 100644 --- a/drivers/ddr/marvell/a38x/ddr_topology_def.h +++ b/drivers/ddr/marvell/a38x/ddr_topology_def.h @@ -15,8 +15,8 @@ #define MV_DDR_MAX_IFACE_NUM 1 enum mv_ddr_twin_die { - COMBINED, NOT_COMBINED, + COMBINED, }; struct bus_params {