mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-11 11:38:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "arm: dts: Rename RDP479 to MI01.12 & RDP481 to MI01.14"

Browse source
This commit is contained in:
Linux Build Service Account 2023-09-21 22:39:59 -07:00 • committed by Gerrit - the friendly Code Review server
commit 7998e7fb24
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/include/asm/mach-types.h
View file

@ -1179,8 +1179,8 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_IPQ5332_AP_MI01_3_C2 0x8060102
#define MACH_TYPE_IPQ5332_AP_MI04_1 0x8060004
#define MACH_TYPE_IPQ5332_AP_MI04_1_C2 0x8060007
#define MACH_TYPE_IPQ5332_AP_RDP_479 0x8060202
#define MACH_TYPE_IPQ5332_AP_RDP_481 0x8060302
#define MACH_TYPE_IPQ5332_AP_MI01_12 0x8060202
#define MACH_TYPE_IPQ5332_AP_MI01_14 0x8060302
#ifdef CONFIG_ARCH_EBSA110
# ifdef machine_arch_type

14
board/qca/arm/ipq5332/ipq5332.c
View file

@ -826,13 +826,11 @@ unsigned int get_dts_machid(unsigned int machid)
switch (machid)
{
case MACH_TYPE_IPQ5332_AP_MI01_3_C2:
case MACH_TYPE_IPQ5332_AP_MI01_12:
case MACH_TYPE_IPQ5332_AP_MI01_14:
return MACH_TYPE_IPQ5332_AP_MI01_3;
case MACH_TYPE_IPQ5332_AP_MI04_1_C2:
return MACH_TYPE_IPQ5332_AP_MI04_1;
case MACH_TYPE_IPQ5332_AP_RDP_479:
return MACH_TYPE_IPQ5332_AP_MI01_3;
case MACH_TYPE_IPQ5332_AP_RDP_481:
return MACH_TYPE_IPQ5332_AP_MI01_3;
default:
return machid;
}
@ -857,13 +855,13 @@ void ipq_uboot_fdt_fixup(void)
config_list[config_nos++] = "config-rdp478";
config_list[config_nos++] = "config@1";
break;
case MACH_TYPE_IPQ5332_AP_RDP_479:
config_list[config_nos++] = "config@ap-rdp479";
case MACH_TYPE_IPQ5332_AP_MI01_12:
config_list[config_nos++] = "config@mi01.12";
config_list[config_nos++] = "config@rdp479";
config_list[config_nos++] = "config-rdp479";
break;
case MACH_TYPE_IPQ5332_AP_RDP_481:
config_list[config_nos++] = "config@ap-rdp481";
case MACH_TYPE_IPQ5332_AP_MI01_14:
config_list[config_nos++] = "config@mi01.14";
config_list[config_nos++] = "config@rdp481";
config_list[config_nos++] = "config-rdp481";
break;