ipq60xx: splite Qihoo 360v6 dts file

target/linux/ipq60xx/files/arch/arm64/boot/dts/qcom/ipq6018-v6.dts

@@ -0,0 +1,208 @@
+// SPDX-License-Identifier: (GPL-2.0+)
+
+/dts-v1/;
+
+#include "ipq6018.dtsi"
+#include "ipq6018-upstreamable.dtsi"
+#include "ipq6018-ess.dtsi"
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	model = "Qihoo 360 V6";
+	compatible = "qihoo,v6", "qcom,ipq6018";
+
+	aliases {
+		serial0 = &blsp1_uart3;
+// 		led-boot = &led_power;
+// 		led-failsafe = &led_power;
+// 		led-running = &led_power;
+// 		led-upgrade = &led_power;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	keys {
+		compatible = "gpio-keys";
+
+		reset {
+			label = "reset";
+			gpios = <&tlmm 68 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+
+		wps {
+			label = "reset";
+			gpios = <&tlmm 19 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
+		};
+	};
+};
+
+&blsp1_uart3 {
+	pinctrl-0 = <&serial_3_pins>;
+	pinctrl-names = "default";
+	status = "okay";
+};
+
+&tlmm {
+
+	mdio_pins: mdio-pins {
+		mdc {
+			pins = "gpio64";
+			function = "mdc";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		mdio {
+			pins = "gpio65";
+			function = "mdio";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+	};
+};
+
+&soc {
+	dp1: dp@1 {
+		compatible = "qcom,nss-dp";
+		reg = <0x0 0x3a001000 0x0 0x200>;
+		qcom,mactype = <0>;
+		qcom,id = <1>;
+
+		phy-handle = <&phy_0>;
+		phy-mode = "sgmii";
+	};
+
+	dp2 {
+		compatible = "qcom,nss-dp";
+		reg = <0x0 0x3a001200 0x0 0x200>;
+		qcom,mactype = <0>;
+		qcom,id = <2>;
+
+		phy-handle = <&phy_1>;
+		phy-mode = "sgmii";
+	};
+
+	dp3 {
+		compatible = "qcom,nss-dp";
+		reg = <0x0 0x3a001400 0x0 0x200>;
+		qcom,mactype = <0>;
+		qcom,id = <3>;
+
+		phy-handle = <&phy_2>;
+		phy-mode = "sgmii";
+	};
+
+	dp4 {
+		compatible = "qcom,nss-dp";
+		reg = <0x0 0x3a001600 0x0 0x200>;
+		qcom,mactype = <0>;
+		qcom,id = <4>;
+
+		phy-handle = <&phy_3>;
+		phy-mode = "sgmii";
+	};
+
+	dp5 {
+		compatible = "qcom,nss-dp";
+		reg = <0x0 0x3a001800 0x0 0x200>;
+		qcom,mactype = <0>;
+		qcom,id = <5>;
+
+		phy-handle = <&phy_4>;
+		phy-mode = "sgmii";
+	};
+};
+
+&edma {
+	status = "okay";
+};
+
+&mdio {
+	status = "okay";
+	pinctrl-0 = <&mdio_pins>;
+	pinctrl-names = "default";
+	reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
+
+	phy_0: ethernet-phy@0 {
+		reg = <0>;
+// 		reset-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>;
+	};
+
+	phy_1: ethernet-phy@1 {
+		reg = <1>;
+	};
+
+	phy_2: ethernet-phy@2 {
+		reg = <2>;
+	};
+
+	phy_3: ethernet-phy@3 {
+		reg = <3>;
+	};
+
+	phy_4: ethernet-phy@4 {
+		reg = <4>;
+	};
+
+};
+
+&switch {
+	status = "okay";
+
+	switch_lan_bmp = <0x1e>;
+	switch_wan_bmp = <0x20>;
+	switch_mac_mode = <0x00>;
+	switch_mac_mode1 = <0xff>;
+	switch_mac_mode2 = <0xff>;
+
+	qcom,port_phyinfo {
+		port@0 {
+			port_id = <0x01>;
+			phy_address = <0x00>;
+		};
+		port@1 {
+			port_id = <0x02>;
+			phy_address = <0x01>;
+		};
+		port@2 {
+			port_id = <0x03>;
+			phy_address = <0x02>;
+		};
+		port@3 {
+			port_id = <0x04>;
+			phy_address = <0x03>;
+		};
+		port@4 {
+			port_id = <0x05>;
+			phy_address = <0x04>;
+		};
+	};
+};
+
+&qpic_bam {
+	status = "okay";
+};
+
+&qpic_nand {
+	status = "okay";
+
+	nand@0 {
+		reg = <0>;
+
+		nand-ecc-strength = <4>;
+		nand-ecc-step-size = <512>;
+		nand-bus-width = <8>;
+	};
+};
+
+&wifi {
+	status = "okay";
+};
+
+

target/linux/ipq60xx/image/generic.mk

@@ -47,25 +47,37 @@ define Device/linksys_mr7350
 endef
 TARGET_DEVICES += linksys_mr7350
 
-define Device/cp01-c1
-	$(call Device/FitImage)
-	DEVICE_VENDOR := Qihoo
-	DEVICE_MODEL := 360v6
-	SOC := ipq6018
-endef
-TARGET_DEVICES += cp01-c1
+#define Device/cp01-c1
+#	$(call Device/FitImage)
+#	DEVICE_VENDOR := Qualcomm Technologies
+#	DEVICE_MODEL := AP-CP01-C1
+#	SOC := ipq6018
+#endef
+#TARGET_DEVICES += cp01-c1
 
-define Device/eap610-outdoor
+#define Device/eap610-outdoor
+#	$(call Device/FitImage)
+#	$(call Device/UbiFit)
+#	DEVICE_VENDOR := TP-Link
+#	DEVICE_MODEL := EAP610-Outdoor
+#	BLOCKSIZE := 128k
+#	PAGESIZE := 2048
+#	SOC := ipq6018
+#	IMAGE/nand-factory.ubi := append-ubi | qsdk-ipq-factory-nand
+#endef
+#TARGET_DEVICES += eap610-outdoor
+
+define Device/360_v6
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
-	DEVICE_VENDOR := TP-Link
-	DEVICE_MODEL := EAP610-Outdoor
+	DEVICE_VENDOR := Qihoo 360
+	DEVICE_MODEL := V6
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
+	DEVICE_DTS_CONFIG := config@cp03-c1
 	SOC := ipq6018
-	IMAGE/nand-factory.ubi := append-ubi | qsdk-ipq-factory-nand
 endef
-TARGET_DEVICES += eap610-outdoor
+TARGET_DEVICES += 360_v6
 
 define Device/zn_m2
 	$(call Device/FitImage)

target/linux/ipq60xx/patches-5.15/1000-arm64-dts-add-OpenWrt-DTS-files.patch

@@ -14,7 +14,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
 
 --- a/arch/arm64/boot/dts/qcom/Makefile
 +++ b/arch/arm64/boot/dts/qcom/Makefile
-@@ -4,6 +4,10 @@ dtb-$(CONFIG_ARCH_QCOM)	+= apq8094-sony-
+@@ -4,6 +4,11 @@ dtb-$(CONFIG_ARCH_QCOM)	+= apq8094-sony-
  dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb
  dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-ifc6640.dtb
  dtb-$(CONFIG_ARCH_QCOM)	+= ipq6018-cp01-c1.dtb
@@ -22,6 +22,7 @@ Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
 +dtb-$(CONFIG_ARCH_QCOM)	+= ipq6018-mr7350.dtb
 +dtb-$(CONFIG_ARCH_QCOM)	+= ipq6018-ax18.dtb
 +dtb-$(CONFIG_ARCH_QCOM)	+= ipq6018-m2.dtb
++dtb-$(CONFIG_ARCH_QCOM)	+= ipq6018-v6.dtb
  dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk01.dtb
  dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk10-c1.dtb
  dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk10-c2.dtb