diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index b2e0537e94..3d3eec1d4a 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -103,6 +103,7 @@ dtb-$(CONFIG_ARCH_IPQ9574) += ipq9574-al01-c1.dtb \ ipq9574-al02-c3.dtb \ ipq9574-al02-c4.dtb \ ipq9574-al02-c7.dtb \ + ipq9574-al02-c8.dtb \ ipq9574-db-al01-c1.dtb \ ipq9574-db-al01-c2.dtb \ ipq9574-db-al01-c3.dtb \ diff --git a/arch/arm/dts/ipq9574-al02-c8.dts b/arch/arm/dts/ipq9574-al02-c8.dts new file mode 100644 index 0000000000..b49ebad73c --- /dev/null +++ b/arch/arm/dts/ipq9574-al02-c8.dts @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; +#include "ipq9574-al02-c4.dts" +/ { + machid = <0x8050701>; + config_name = "config@al02-c8"; +}; diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index 9291b03805..16e88426db 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -1160,11 +1160,9 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_IPQ807x_AP_HK10_C2 0x801010E #define MACH_TYPE_IPQ9574_EMULATION 0xF050000 #define MACH_TYPE_IPQ9574_AP_AL02_C1 0x8050001 -#define MACH_TYPE_IPQ9574_AP_AL02_C2 0x8050101 #define MACH_TYPE_IPQ9574_AP_AL02_C4 0x8050301 #define MACH_TYPE_IPQ9574_AP_AL02_C5 0x8050401 #define MACH_TYPE_IPQ9574_AP_AL02_C6 0x8050501 -#define MACH_TYPE_IPQ9574_AP_AL02_C8 0x8050701 #ifdef CONFIG_ARCH_EBSA110 # ifdef machine_arch_type diff --git a/board/qca/arm/ipq9574/ipq9574.c b/board/qca/arm/ipq9574/ipq9574.c index 37cb1507a3..bccdff321a 100644 --- a/board/qca/arm/ipq9574/ipq9574.c +++ b/board/qca/arm/ipq9574/ipq9574.c @@ -1498,8 +1498,6 @@ unsigned int get_dts_machid(unsigned int machid) return MACH_TYPE_IPQ9574_AP_AL02_C4; case MACH_TYPE_IPQ9574_AP_AL02_C6: return MACH_TYPE_IPQ9574_AP_AL02_C1; - case MACH_TYPE_IPQ9574_AP_AL02_C8: - return MACH_TYPE_IPQ9574_AP_AL02_C2; default: return machid; } @@ -1521,9 +1519,6 @@ void ipq_uboot_fdt_fixup(void) case MACH_TYPE_IPQ9574_AP_AL02_C6: config = "config@al02-c6"; break; - case MACH_TYPE_IPQ9574_AP_AL02_C8: - config = "config@al02-c8"; - break; } if (config != NULL)