diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 4871cdeeeb..f473e335c8 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -101,7 +101,6 @@ dtb-$(CONFIG_ARCH_IPQ9574) += ipq9574-al01-c1.dtb \ ipq9574-al02-c1.dtb \ ipq9574-al02-c2.dtb \ ipq9574-al02-c3.dtb \ - ipq9574-al02-c4.dtb \ ipq9574-db-al01-c1.dtb \ ipq9574-db-al01-c2.dtb \ ipq9574-db-al01-c3.dtb \ diff --git a/arch/arm/dts/ipq9574-al02-c4.dts b/arch/arm/dts/ipq9574-al02-c4.dts deleted file mode 100644 index deac7ee7e7..0000000000 --- a/arch/arm/dts/ipq9574-al02-c4.dts +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved. - * Copyright (c) 2021 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-c1.dts" -/ { - machid = <0x8050301>; - config_name = "config@al02-c4"; - - aliases { - pci1 = "/pci@10000000"; - }; - - pci1: pci@10000000 { - status = "ok"; - perst_gpio = <26>; - pci_gpio { - pci_rst { - gpio = <26>; - func = <0>; - pull = ; - oe = ; - od_en = ; - drvstr = ; - }; - }; - }; -}; diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index 16e88426db..1e02ab37ec 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -1159,10 +1159,8 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_IPQ807x_AP_HK12_C1 0x8010013 #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_C4 0x8050301 #define MACH_TYPE_IPQ9574_AP_AL02_C5 0x8050401 -#define MACH_TYPE_IPQ9574_AP_AL02_C6 0x8050501 #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 4992f7b7b3..24d4262e7f 100644 --- a/board/qca/arm/ipq9574/ipq9574.c +++ b/board/qca/arm/ipq9574/ipq9574.c @@ -1472,8 +1472,6 @@ unsigned int get_dts_machid(unsigned int machid) return MACH_TYPE_IPQ9574_EMULATION; case MACH_TYPE_IPQ9574_AP_AL02_C5: return MACH_TYPE_IPQ9574_AP_AL02_C4; - case MACH_TYPE_IPQ9574_AP_AL02_C6: - return MACH_TYPE_IPQ9574_AP_AL02_C1; default: return machid; } @@ -1492,9 +1490,6 @@ void ipq_uboot_fdt_fixup(void) case MACH_TYPE_IPQ9574_AP_AL02_C5: config = "config@al02-c5"; break; - case MACH_TYPE_IPQ9574_AP_AL02_C6: - config = "config@al02-c6"; - break; } if (config != NULL)