diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 8a9b0d14f5..2ba6916969 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -115,6 +115,7 @@ dtb-$(CONFIG_ARCH_IPQ9574) += ipq9574-al01-c1.dtb \ ipq9574-al02-c4.dtb \ ipq9574-al02-c7.dtb \ ipq9574-al02-c8.dtb \ + ipq9574-al02-c9.dtb \ ipq9574-al02-c10.dtb \ ipq9574-al02-c13.dtb \ ipq9574-al02-c18.dtb \ diff --git a/arch/arm/dts/ipq9574-al02-c9.dts b/arch/arm/dts/ipq9574-al02-c9.dts new file mode 100644 index 0000000000..f5497ac327 --- /dev/null +++ b/arch/arm/dts/ipq9574-al02-c9.dts @@ -0,0 +1,41 @@ +/* + * 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-al01-c1.dts" +/ { + machid = <0x8050801>; + config_name = "config@al02-c9"; + + aliases { + pci0 = "/pci@28000000"; + /delete-property/pci1; + pci2 = "/pci@20000000"; + }; + + pci2: pci@20000000 { + status = "ok"; + perst_gpio = <29>; + pci_gpio { + pci_rst { + gpio = <29>; + 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 9200230603..d01986b89a 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -1164,7 +1164,6 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_IPQ9574_AP_AL02_C5 0x8050401 #define MACH_TYPE_IPQ9574_AP_AL02_C6 0x8050501 #define MACH_TYPE_IPQ9574_AP_AL02_C8 0x8050701 -#define MACH_TYPE_IPQ9574_AP_AL02_C9 0x8050801 #define MACH_TYPE_IPQ9574_AP_AL02_C10 0x8050901 #define MACH_TYPE_IPQ9574_AP_AL02_C11 0x8050A01 #define MACH_TYPE_IPQ9574_AP_AL02_C12 0x8050B01 diff --git a/board/qca/arm/ipq9574/ipq9574.c b/board/qca/arm/ipq9574/ipq9574.c index 453cb71382..0a021005cf 100644 --- a/board/qca/arm/ipq9574/ipq9574.c +++ b/board/qca/arm/ipq9574/ipq9574.c @@ -1307,8 +1307,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_C9: - return MACH_TYPE_IPQ9574_AP_AL02_C1; case MACH_TYPE_IPQ9574_AP_AL02_C11: return MACH_TYPE_IPQ9574_AP_AL02_C13; case MACH_TYPE_IPQ9574_AP_AL02_C12: @@ -1342,9 +1340,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_C9: - config = "config@al02-c9"; - break; case MACH_TYPE_IPQ9574_AP_AL02_C11: config = "config@al02-c11"; break;