diff --git a/feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network b/feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network index 6a3f42fbf..de56708e8 100755 --- a/feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network +++ b/feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network @@ -35,6 +35,7 @@ qcom_setup_interfaces() yuncore,ax840|\ motorola,q14|\ sercomm,wallaby|\ + plasmacloud,pax1800-v1|\ plasmacloud,pax1800-v2) ucidef_set_interface_lan "eth0" ucidef_set_interface_wan "eth1" diff --git a/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata b/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata index 4b9cf53b1..8ee0de144 100755 --- a/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata +++ b/feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata @@ -108,6 +108,7 @@ case "$FIRMWARE" in qcom,ipq6018-cp01|\ xiaomi,ax1800|\ glinet,ax1800|\ + plasmacloud,pax1800-v1|\ plasmacloud,pax1800-v2) caldata_extract "0:ART" 0x1000 0x20000 ;; @@ -175,6 +176,7 @@ ath11k-macs) cig,wf194c) ath11k_generate_macs_wf194 ;; + plasmacloud,pax1800-v1|\ plasmacloud,pax1800-v2) ath11k_generate_macs_pax1800 ;; diff --git a/feeds/ipq807x/ipq807x/base-files/lib/upgrade/dualboot_datachk.sh b/feeds/ipq807x/ipq807x/base-files/lib/upgrade/dualboot_datachk.sh index 72e92a030..c7c473a38 100644 --- a/feeds/ipq807x/ipq807x/base-files/lib/upgrade/dualboot_datachk.sh +++ b/feeds/ipq807x/ipq807x/base-files/lib/upgrade/dualboot_datachk.sh @@ -63,6 +63,7 @@ platform_do_upgrade_dualboot_datachk() { # boot anymore to Linux until it was reflashed with ap51-flash. local next_boot_part="1" case "$(board_name)" in + plasmacloud,pax1800-v1|\ plasmacloud,pax1800-v2) primary_kernel_mtd=9 ;; diff --git a/feeds/ipq807x/ipq807x/base-files/lib/upgrade/platform.sh b/feeds/ipq807x/ipq807x/base-files/lib/upgrade/platform.sh index d8d931816..abce88455 100755 --- a/feeds/ipq807x/ipq807x/base-files/lib/upgrade/platform.sh +++ b/feeds/ipq807x/ipq807x/base-files/lib/upgrade/platform.sh @@ -84,6 +84,7 @@ platform_check_image() { edgecore,eap106|\ hfcl,ion4xi|\ hfcl,ion4xe|\ + plasmacloud,pax1800-v1|\ plasmacloud,pax1800-v2|\ tplink,ex227|\ tplink,ex447|\ @@ -162,6 +163,7 @@ platform_do_upgrade() { fi nand_upgrade_tar "$1" ;; + plasmacloud,pax1800-v1|\ plasmacloud,pax1800-v2) PART_NAME="inactive" platform_do_upgrade_dualboot_datachk "$1" diff --git a/feeds/ipq807x/ipq807x/files/arch/arm/boot/dts/qcom-ipq6018-pax1800-v1.dts b/feeds/ipq807x/ipq807x/files/arch/arm/boot/dts/qcom-ipq6018-pax1800-v1.dts new file mode 100644 index 000000000..9fff320cc --- /dev/null +++ b/feeds/ipq807x/ipq807x/files/arch/arm/boot/dts/qcom-ipq6018-pax1800-v1.dts @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2019, The Linux Foundation. All rights reserved. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include "../../../arm64/boot/dts/qcom/qcom-ipq6018-pax1800-v1.dts" +#include "qcom-ipq6018.dtsi" diff --git a/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-pax1800-v1.dts b/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-pax1800-v1.dts new file mode 100644 index 000000000..eb3e45b99 --- /dev/null +++ b/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-pax1800-v1.dts @@ -0,0 +1,23 @@ +/dts-v1/; +/* + * Copyright (c) 2019, The Linux Foundation. All rights reserved. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include "qcom-ipq6018-pax1800.dtsi" + +/ { + model = "Plasma Cloud PAX1800 v1"; + compatible = "plasmacloud,pax1800-v1", "qcom,ipq6018-cp03", "qcom,ipq6018"; +}; diff --git a/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-pax1800-v2.dts b/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-pax1800-v2.dts index b9570b7af..53e6b3999 100644 --- a/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-pax1800-v2.dts +++ b/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-pax1800-v2.dts @@ -15,304 +15,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "qcom-ipq6018.dtsi" -#include "qcom-ipq6018-rpm-regulator.dtsi" -#include "qcom-ipq6018-cpr-regulator.dtsi" -#include "qcom-ipq6018-cp-cpu.dtsi" -#include +#include "qcom-ipq6018-pax1800.dtsi" / { - #address-cells = <0x2>; - #size-cells = <0x2>; model = "Plasma Cloud PAX1800 v2"; compatible = "plasmacloud,pax1800-v2", "qcom,ipq6018-cp03", "qcom,ipq6018"; - - interrupt-parent = <&intc>; - qcom,msm-id = <0x1A5 0x0>; - - chosen { - bootargs = "console=ttyMSM0,115200,n8 rw init=/init"; - bootargs-append = " swiotlb=1 coherent_pool=2M"; - }; - - aliases { - serial0 = &blsp1_uart3; - /* - * Aliases as required by u-boot - * to patch MAC addresses - */ - ethernet0 = "/soc/dp1"; - ethernet1 = "/soc/dp2"; - - led-boot = &led_status_green; - led-failsafe = &led_status_green; - led-running = &led_status_green; - led-upgrade = &led_status_green; - led-uplink = &led_status_blue; - }; - - gpio_keys { - compatible = "gpio-keys"; - pinctrl-0 = <&button_pins>; - pinctrl-names = "default"; - - reset { - label = "reset"; - linux,code = ; - gpios = <&tlmm 24 GPIO_ACTIVE_LOW>; - linux,input-type = <1>; - debounce-interval = <60>; - }; - }; - - leds { - compatible = "gpio-leds"; - pinctrl-0 = <&leds_pins>; - pinctrl-names = "default"; - - status_red { - label = "red:status"; - gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "default-off"; - }; - - led_status_green: status_green { - label = "green:status"; - gpios = <&tlmm 35 GPIO_ACTIVE_HIGH>; - }; - - led_status_blue: status_blue { - label = "blue:status"; - gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "default-off"; - }; - }; - - watchdog { - compatible = "linux,wdt-gpio"; - pinctrl-0 = <&watchdog_pins>; - pinctrl-names = "default"; - gpios = <&tlmm 67 GPIO_ACTIVE_LOW>; - hw_algo = "toggle"; - hw_margin_ms = <2000>; - always-running; - }; - - /* - * +=========+==============+========================+ - * | | | | - * | Region | Start Offset | Size | - * | | | | - * +--------+--------------+-------------------------+ - * | | | | - * | | | | - * | | | | - * | | | | - * | Linux | 0x41000000 | 139MB | - * | | | | - * | | | | - * | | | | - * +--------+--------------+-------------------------+ - * | TZ App | 0x49B00000 | 6MB | - * +--------+--------------+-------------------------+ - * - * From the available 145 MB for Linux in the first 256 MB, - * we are reserving 6 MB for TZAPP. - * - * Refer arch/arm64/boot/dts/qcom/qcom-ipq6018-memory.dtsi - * for memory layout. - */ - -/* TZAPP is enabled only in default memory profile */ -#if !defined(__IPQ_MEM_PROFILE_256_MB__) && !defined(__IPQ_MEM_PROFILE_512_MB__) - reserved-memory { - tzapp:tzapp@49B00000 { /* TZAPPS */ - no-map; - reg = <0x0 0x49B00000 0x0 0x00600000>; - }; - }; -#endif -}; - -&tlmm { - uart_pins: uart_pins { - mux { - pins = "gpio44", "gpio45"; - function = "blsp2_uart"; - drive-strength = <8>; - bias-pull-down; - }; - }; - - spi_0_pins: spi_0_pins { - mux { - pins = "gpio38", "gpio39", "gpio40", "gpio41"; - function = "blsp0_spi"; - drive-strength = <8>; - bias-pull-down; - }; - }; - - button_pins: button_pins { - reset_button { - pins = "gpio24"; - function = "gpio"; - drive-strength = <8>; - bias-pull-up; - }; - }; - - mdio_pins: mdio_pinmux { - mux_0 { - pins = "gpio64"; - function = "mdc"; - drive-strength = <8>; - bias-pull-up; - }; - mux_1 { - pins = "gpio65"; - function = "mdio"; - drive-strength = <8>; - bias-pull-up; - }; - mux_2 { - pins = "gpio75"; - function = "gpio"; - bias-pull-up; - }; - }; - - leds_pins: led_pinmux { - led_power_green { - pins = "gpio25"; - function = "gpio"; - drive-strength = <8>; - bias-pull-down; - }; - led_power_blue { - pins = "gpio35"; - function = "gpio"; - drive-strength = <8>; - bias-pull-down; - }; - led_power_red { - pins = "gpio37"; - function = "gpio"; - drive-strength = <8>; - bias-pull-down; - }; - }; - - watchdog_pins: watchdog_pinmux { - mux { - pins = "gpio67"; - function = "gpio"; - bias-none; - output-low; - }; - }; -}; - -&soc { - mdio@90000 { - pinctrl-0 = <&mdio_pins>; - pinctrl-names = "default"; - phy-reset-gpio = <&tlmm 75 0>; - status = "ok"; - phy0: ethernet-phy@0 { - reg = <3>; - }; - phy1: ethernet-phy@1 { - reg = <4>; - }; - }; - - ess-switch@3a000000 { - switch_cpu_bmp = <0x1>; /* cpu port bitmap */ - switch_lan_bmp = <0x08>; /* lan port bitmap */ - switch_wan_bmp = <0x10>; /* wan port bitmap */ - switch_inner_bmp = <0xc0>; /*inner port bitmap*/ - switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/ - switch_mac_mode1 = <0xff>; /* mac mode for uniphy instance1*/ - switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/ - qcom,port_phyinfo { - port@3 { - port_id = <3>; - phy_address = <4>; - }; - port@4 { - port_id = <4>; - phy_address = <3>; - }; - }; - }; - - dp1 { - device_type = "network"; - compatible = "qcom,nss-dp"; - qcom,id = <3>; - reg = <0x3a001400 0x200>; - qcom,mactype = <0>; - local-mac-address = [000000000000]; - qcom,link-poll = <1>; - qcom,phy-mdio-addr = <4>; - phy-mode = "sgmii"; - }; - - dp2 { - device_type = "network"; - compatible = "qcom,nss-dp"; - qcom,id = <4>; - reg = <0x3a001600 0x200>; - qcom,mactype = <0>; - local-mac-address = [000000000000]; - qcom,link-poll = <1>; - qcom,phy-mdio-addr = <3>; - phy-mode = "sgmii"; - }; -}; - -&blsp1_uart3 { - pinctrl-0 = <&uart_pins>; - pinctrl-names = "default"; - status = "ok"; -}; - -&spi_0 { - pinctrl-0 = <&spi_0_pins>; - pinctrl-names = "default"; - cs-select = <0>; - status = "ok"; - - m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - reg = <0>; - compatible = "n25q128a11"; - linux,modalias = "m25p80", "n25q128a11"; - spi-max-frequency = <50000000>; - use-default-sizes; - }; -}; - -&qpic_bam { - status = "ok"; -}; - -&nss_crypto { - status = "ok"; -}; - -/* TZAPP is enabled in default memory profile only */ -#if !defined(__IPQ_MEM_PROFILE_256_MB__) && !defined(__IPQ_MEM_PROFILE_512_MB__) -&qseecom { - mem-start = <0x49B00000>; - mem-size = <0x600000>; - status = "ok"; -}; -#endif - -&wifi0 { - status = "okay"; - qcom,ath11k-calibration-variant = "PlasmaCloud-PAX1800"; }; diff --git a/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-pax1800.dtsi b/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-pax1800.dtsi new file mode 100644 index 000000000..e540e0f2c --- /dev/null +++ b/feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-pax1800.dtsi @@ -0,0 +1,315 @@ +/* + * Copyright (c) 2019, The Linux Foundation. All rights reserved. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include "qcom-ipq6018.dtsi" +#include "qcom-ipq6018-rpm-regulator.dtsi" +#include "qcom-ipq6018-cpr-regulator.dtsi" +#include "qcom-ipq6018-cp-cpu.dtsi" +#include + +/ { + #address-cells = <0x2>; + #size-cells = <0x2>; + + interrupt-parent = <&intc>; + qcom,msm-id = <0x1A5 0x0>; + + chosen { + bootargs = "console=ttyMSM0,115200,n8 rw init=/init"; + bootargs-append = " swiotlb=1 coherent_pool=2M"; + }; + + aliases { + serial0 = &blsp1_uart3; + /* + * Aliases as required by u-boot + * to patch MAC addresses + */ + ethernet0 = "/soc/dp1"; + ethernet1 = "/soc/dp2"; + + led-boot = &led_status_green; + led-failsafe = &led_status_green; + led-running = &led_status_green; + led-upgrade = &led_status_green; + led-uplink = &led_status_blue; + }; + + gpio_keys { + compatible = "gpio-keys"; + pinctrl-0 = <&button_pins>; + pinctrl-names = "default"; + + reset { + label = "reset"; + linux,code = ; + gpios = <&tlmm 24 GPIO_ACTIVE_LOW>; + linux,input-type = <1>; + debounce-interval = <60>; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&leds_pins>; + pinctrl-names = "default"; + + status_red { + label = "red:status"; + gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "default-off"; + }; + + led_status_green: status_green { + label = "green:status"; + gpios = <&tlmm 35 GPIO_ACTIVE_HIGH>; + }; + + led_status_blue: status_blue { + label = "blue:status"; + gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "default-off"; + }; + }; + + watchdog { + compatible = "linux,wdt-gpio"; + pinctrl-0 = <&watchdog_pins>; + pinctrl-names = "default"; + gpios = <&tlmm 67 GPIO_ACTIVE_LOW>; + hw_algo = "toggle"; + hw_margin_ms = <2000>; + always-running; + }; + + /* + * +=========+==============+========================+ + * | | | | + * | Region | Start Offset | Size | + * | | | | + * +--------+--------------+-------------------------+ + * | | | | + * | | | | + * | | | | + * | | | | + * | Linux | 0x41000000 | 139MB | + * | | | | + * | | | | + * | | | | + * +--------+--------------+-------------------------+ + * | TZ App | 0x49B00000 | 6MB | + * +--------+--------------+-------------------------+ + * + * From the available 145 MB for Linux in the first 256 MB, + * we are reserving 6 MB for TZAPP. + * + * Refer arch/arm64/boot/dts/qcom/qcom-ipq6018-memory.dtsi + * for memory layout. + */ + +/* TZAPP is enabled only in default memory profile */ +#if !defined(__IPQ_MEM_PROFILE_256_MB__) && !defined(__IPQ_MEM_PROFILE_512_MB__) + reserved-memory { + tzapp:tzapp@49B00000 { /* TZAPPS */ + no-map; + reg = <0x0 0x49B00000 0x0 0x00600000>; + }; + }; +#endif +}; + +&tlmm { + uart_pins: uart_pins { + mux { + pins = "gpio44", "gpio45"; + function = "blsp2_uart"; + drive-strength = <8>; + bias-pull-down; + }; + }; + + spi_0_pins: spi_0_pins { + mux { + pins = "gpio38", "gpio39", "gpio40", "gpio41"; + function = "blsp0_spi"; + drive-strength = <8>; + bias-pull-down; + }; + }; + + button_pins: button_pins { + reset_button { + pins = "gpio24"; + function = "gpio"; + drive-strength = <8>; + bias-pull-up; + }; + }; + + mdio_pins: mdio_pinmux { + mux_0 { + pins = "gpio64"; + function = "mdc"; + drive-strength = <8>; + bias-pull-up; + }; + mux_1 { + pins = "gpio65"; + function = "mdio"; + drive-strength = <8>; + bias-pull-up; + }; + mux_2 { + pins = "gpio75"; + function = "gpio"; + bias-pull-up; + }; + }; + + leds_pins: led_pinmux { + led_power_green { + pins = "gpio25"; + function = "gpio"; + drive-strength = <8>; + bias-pull-down; + }; + led_power_blue { + pins = "gpio35"; + function = "gpio"; + drive-strength = <8>; + bias-pull-down; + }; + led_power_red { + pins = "gpio37"; + function = "gpio"; + drive-strength = <8>; + bias-pull-down; + }; + }; + + watchdog_pins: watchdog_pinmux { + mux { + pins = "gpio67"; + function = "gpio"; + bias-none; + output-low; + }; + }; +}; + +&soc { + mdio@90000 { + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; + phy-reset-gpio = <&tlmm 75 0>; + status = "ok"; + phy0: ethernet-phy@0 { + reg = <3>; + }; + phy1: ethernet-phy@1 { + reg = <4>; + }; + }; + + ess-switch@3a000000 { + switch_cpu_bmp = <0x1>; /* cpu port bitmap */ + switch_lan_bmp = <0x08>; /* lan port bitmap */ + switch_wan_bmp = <0x10>; /* wan port bitmap */ + switch_inner_bmp = <0xc0>; /*inner port bitmap*/ + switch_mac_mode = <0x0>; /* mac mode for uniphy instance0*/ + switch_mac_mode1 = <0xff>; /* mac mode for uniphy instance1*/ + switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/ + qcom,port_phyinfo { + port@3 { + port_id = <3>; + phy_address = <4>; + }; + port@4 { + port_id = <4>; + phy_address = <3>; + }; + }; + }; + + dp1 { + device_type = "network"; + compatible = "qcom,nss-dp"; + qcom,id = <3>; + reg = <0x3a001400 0x200>; + qcom,mactype = <0>; + local-mac-address = [000000000000]; + qcom,link-poll = <1>; + qcom,phy-mdio-addr = <4>; + phy-mode = "sgmii"; + }; + + dp2 { + device_type = "network"; + compatible = "qcom,nss-dp"; + qcom,id = <4>; + reg = <0x3a001600 0x200>; + qcom,mactype = <0>; + local-mac-address = [000000000000]; + qcom,link-poll = <1>; + qcom,phy-mdio-addr = <3>; + phy-mode = "sgmii"; + }; +}; + +&blsp1_uart3 { + pinctrl-0 = <&uart_pins>; + pinctrl-names = "default"; + status = "ok"; +}; + +&spi_0 { + pinctrl-0 = <&spi_0_pins>; + pinctrl-names = "default"; + cs-select = <0>; + status = "ok"; + + m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + reg = <0>; + compatible = "n25q128a11"; + linux,modalias = "m25p80", "n25q128a11"; + spi-max-frequency = <50000000>; + use-default-sizes; + }; +}; + +&qpic_bam { + status = "ok"; +}; + +&nss_crypto { + status = "ok"; +}; + +/* TZAPP is enabled in default memory profile only */ +#if !defined(__IPQ_MEM_PROFILE_256_MB__) && !defined(__IPQ_MEM_PROFILE_512_MB__) +&qseecom { + mem-start = <0x49B00000>; + mem-size = <0x600000>; + status = "ok"; +}; +#endif + +&wifi0 { + status = "okay"; + qcom,ath11k-calibration-variant = "PlasmaCloud-PAX1800"; +}; diff --git a/feeds/ipq807x/ipq807x/image/ipq60xx.mk b/feeds/ipq807x/ipq807x/image/ipq60xx.mk index 6ea87cb4e..a4444bd69 100644 --- a/feeds/ipq807x/ipq807x/image/ipq60xx.mk +++ b/feeds/ipq807x/ipq807x/image/ipq60xx.mk @@ -101,6 +101,17 @@ define Device/plasmacloud_common_64k KERNEL += | pad-to $$(BLOCKSIZE) endef +define Device/plasmacloud_pax1800-v1 + $(Device/plasmacloud_common_64k) + DEVICE_TITLE := Plasma Cloud PAX1800 v1 + DEVICE_DTS := qcom-ipq6018-pax1800-v1 + SUPPORTED_DEVICES := plasmacloud,pax1800-v1 + DEVICE_DTS_CONFIG := config@cp03-c1 + CE_TYPE := PAX1800 + DEVICE_PACKAGES += ath11k-wifi-plasmacloud-pax1800 +endef +TARGET_DEVICES += plasmacloud_pax1800-v1 + define Device/plasmacloud_pax1800-v2 $(Device/plasmacloud_common_64k) DEVICE_TITLE := Plasma Cloud PAX1800 v2 diff --git a/patches/ipq807x/0005-om-fwupgradecfg-gen-Add-support-for-Plasma-Cloud-PAX.patch b/patches/ipq807x/0005-om-fwupgradecfg-gen-Add-support-for-Plasma-Cloud-PAX.patch index e0d197242..e169b2c7a 100644 --- a/patches/ipq807x/0005-om-fwupgradecfg-gen-Add-support-for-Plasma-Cloud-PAX.patch +++ b/patches/ipq807x/0005-om-fwupgradecfg-gen-Add-support-for-Plasma-Cloud-PAX.patch @@ -1,6 +1,6 @@ From: Sven Eckelmann Date: Mon, 14 Mar 2022 15:23:40 +0100 -Subject: om-fwupgradecfg-gen: Add support for Plasma Cloud PAX1800 v2 +Subject: om-fwupgradecfg-gen: Add support for Plasma Cloud PAX1800 v1/v2 Signed-off-by: Sven Eckelmann @@ -8,10 +8,11 @@ diff --git a/scripts/om-fwupgradecfg-gen.sh b/scripts/om-fwupgradecfg-gen.sh index bf7c047c5ba8e78ad4e43fa7edff2bb4bb3f4388..61617a0b772e1661a46f559380ffaf0b021c524d 100755 --- a/scripts/om-fwupgradecfg-gen.sh +++ b/scripts/om-fwupgradecfg-gen.sh -@@ -45,6 +45,12 @@ case $CE_TYPE in +@@ -45,6 +45,13 @@ case $CE_TYPE in SIZE_FACTOR=1024 SIZE_FORMAT="0x%08x" ;; ++ PAX1800|\ + PAX1800v2) + MAX_PART_SIZE=28672 + KERNEL_FLASH_ADDR=0x3a0000