From 727c6f32d0c7a932b0f3bd09af324c273b1679f5 Mon Sep 17 00:00:00 2001 From: Hariharan K Date: Fri, 23 Sep 2022 12:40:37 +0530 Subject: [PATCH] arm: dts: ipq9574: Add new board variant AP.AL02-C18 Same as AP.AL02-C4 RDP, with support for 10G PHY or 10G fiber in UNIPHY0 Change-Id: Ic3935a2cdc0033ed4c7478ae14abd3cf61aef797 Signed-off-by: Hariharan K --- arch/arm/dts/Makefile | 3 +- arch/arm/dts/ipq9574-al02-c18.dts | 48 +++++++++++++++++++++++++++++++ tools/pack.py | 4 +-- 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 arch/arm/dts/ipq9574-al02-c18.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 7edd109bc2..47a790ceef 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -114,12 +114,13 @@ dtb-$(CONFIG_ARCH_IPQ9574) += ipq9574-al01-c1.dtb \ ipq9574-al02-c8.dtb \ ipq9574-al02-c10.dtb \ ipq9574-al02-c13.dtb \ + ipq9574-al02-c18.dtb \ ipq9574-db-al01-c1.dtb \ ipq9574-db-al01-c2.dtb \ ipq9574-db-al01-c3.dtb \ ipq9574-db-al02-c1.dtb \ ipq9574-db-al02-c2.dtb \ - ipq9574-db-al02-c3.dtb \ + ipq9574-db-al02-c3.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-firefly.dtb \ diff --git a/arch/arm/dts/ipq9574-al02-c18.dts b/arch/arm/dts/ipq9574-al02-c18.dts new file mode 100644 index 0000000000..5751c36c7d --- /dev/null +++ b/arch/arm/dts/ipq9574-al02-c18.dts @@ -0,0 +1,48 @@ +/* + * 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 = <0x8051101>; + config_name = "config@al02-c18"; + + ess-switch { + switch_mac_mode0 = ; + /delete-property/qca807x_gpio; + /delete-property/qca807x_gpio_cnt; + tdm_mode = <1>; + sfp_gpio = <60>; + sfp_gpio_cnt = <1>; + sfp_port = <0>; + sfp_port_cnt = <1>; + port_phyinfo { + port@0 { + /delete-property/phy_address; + phy_type = ; + }; + port@1 { + /delete-property/phy_address; + phy_type = ; + }; + port@2 { + /delete-property/phy_address; + phy_type = ; + }; + port@3 { + /delete-property/phy_address; + phy_type = ; + }; + }; + }; +}; diff --git a/tools/pack.py b/tools/pack.py index 0adca08adb..60475a013c 100644 --- a/tools/pack.py +++ b/tools/pack.py @@ -2256,7 +2256,7 @@ class Pack(object): flinfo.chipsize, blocksize, chipsize, root_part) self.partitions = mibib_qcn9224.get_parts() - script.append('if test "$machid" = "8050301" || test "$machid" = "8050501" || test "$machid" = "8050601" || test "$machid" = "8050701" || test "$machid" = "8050801" || test "$machid" = "8050901" || test "$machid" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01" || test "$machid" = "8050d01" || test "$machid" = "8050e01" || test "$machid" = "8050f01" || test "$machid" = "8050002" || test "$machid" = "8050102"; then\n', fatal=False) + script.append('if test "$machid" = "8050301" || test "$machid" = "8050501" || test "$machid" = "8050601" || test "$machid" = "8050701" || test "$machid" = "8050801" || test "$machid" = "8050901" || test "$machid" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01" || test "$machid" = "8050d01" || test "$machid" = "8050e01" || test "$machid" = "8050f01" || test "$machid" = "0x8051101" || test "$machid" = "8050002" || test "$machid" = "8050102"; then\n', fatal=False) ret = self.__gen_flash_script(script, flinfo, root, True) if ret == 0: return 0 #Issue in packing al+wkk single-image @@ -2282,7 +2282,7 @@ class Pack(object): gpt = GPT(part_fname_qcn9224, flinfo.pagesize, flinfo.blocksize, flinfo.chipsize) self.partitions = gpt.get_parts() - script.append('if test "$machid" = "8050301" || test "$machid" = "8050501" || test "$machid" = "8050601" || test "$machid" = "8050701" || test "$machid" = "8050801" || test "$machid" = "8050901" || test "$machid" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01" || test "$machid" = "8050d01" || test "$machid" = "8050e01" || test "$machid" = "8050f01" || test "$machid" = "8050002" || test "$machid" = "8050102"; then\n', fatal=False) + script.append('if test "$machid" = "8050301" || test "$machid" = "8050501" || test "$machid" = "8050601" || test "$machid" = "8050701" || test "$machid" = "8050801" || test "$machid" = "8050901" || test "$machid" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01" || test "$machid" = "8050d01" || test "$machid" = "8050e01" || test "$machid" = "8050f01" || test "$machid" = "0x8051101" || test "$machid" = "8050002" || test "$machid" = "8050102"; then\n', fatal=False) ret = self.__gen_flash_script(script, flinfo, root, True) if ret == 0: return 0 #Issue in packing al+wkk single-image