Skip to content

Commit

Permalink
Merge branch 'main' into v3.0.0-release
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaspreetsachdev
jaspreetsachdev committed Dec 9, 2023
2 parents 8301bfb + eef04c8 commit 1ebd905
Show file tree
Hide file tree
Showing 56 changed files with 5,308 additions and 3,030 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-dev.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
target: [ 'cig_wf186w', 'cig_wf188n', 'cig_wf196', 'cig_wf660a', 'cybertan_eww622-a1', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap111', 'edgecore_ecw5211', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap102', 'hfcl_ion4','hfcl_ion4xi_wp', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4xi_w', 'hfcl_ion4xi_HMR', 'hfcl_ion4x_w', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'indio_um-310ax-v1', 'indio_um-510axp-v1', 'indio_um-510axm-v1', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018_v4', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ]
target: [ 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf196', 'cig_wf660a', 'cybertan_eww622-a1', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap111', 'edgecore_ecw5211', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap102', 'hfcl_ion4','hfcl_ion4xi_wp', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4xi_w', 'hfcl_ion4xi_HMR', 'hfcl_ion4x_w', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'indio_um-310ax-v1', 'indio_um-510axp-v1', 'indio_um-510axm-v1', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018_v4', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ]

steps:
- uses: actions/checkout@v3
Expand Down
7 changes: 7 additions & 0 deletions feeds/ipq807x/ipq807x/base-files/etc/board.d/02_network
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,13 @@ qcom_setup_interfaces()
ucidef_add_switch "switch1" \
"6@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
;;
optimcloud,d60|\
optimcloud,d60-5g|\
optimcloud,d50|\
optimcloud,d50-5g)
ucidef_set_interface_wan "eth0"
ucidef_set_interface_lan "eth1"
;;
qcom,ipq5018-mp03.1)
ucidef_set_interface_lan "eth1"
ucidef_set_interface_wan "eth0"
Expand Down
12 changes: 12 additions & 0 deletions feeds/ipq807x/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@ ath11k/IPQ5018/hw1.0/caldata.bin)
liteon,wpx8324|\
motorola,q14|\
muxi,ap3220l|\
optimcloud,d60|\
optimcloud,d60-5g|\
optimcloud,d50|\
optimcloud,d50-5g|\
qcom,ipq5018-mp03.1)
caldata_extract "0:ART" 0x1000 0x20000
;;
Expand Down Expand Up @@ -249,6 +253,10 @@ ath11k/QCN9074/hw1.0/caldata_1.bin)
cig,wf196|\
wallys,dr6018-v4|\
cybertan,eww622-a1|\
optimcloud,d60|\
optimcloud,d60-5g|\
optimcloud,d50|\
optimcloud,d50-5g|\
qcom,ipq5018-mp03.1|\
qcom,ipq807x-hk14)
caldata_extract "0:ART" 0x26800 0x20000
Expand Down Expand Up @@ -287,6 +295,10 @@ ath11k-macs)
indio,um-310ax-v1|\
indio,um-510axp-v1|\
indio,um-510axm-v1|\
optimcloud,d60|\
optimcloud,d60-5g|\
optimcloud,d50|\
optimcloud,d50-5g|\
cig,wf188n)
ath11k_generate_macs
;;
Expand Down
10 changes: 9 additions & 1 deletion feeds/ipq807x/ipq807x/base-files/lib/upgrade/platform.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ do_flash_emmc() {
local emmcblock=$(find_mmc_part $2)
local board_dir=$3
local part=$4

[ -b "$emmcblock" ] || emmcblock=$(find_mmc_part $2)

[ -z "$emmcblock" ] && {
Expand Down Expand Up @@ -162,6 +162,10 @@ platform_check_image() {
qcom,ipq6018-cp01|\
qcom,ipq807x-hk01|\
qcom,ipq807x-hk14|\
optimcloud,d60|\
optimcloud,d60-5g|\
optimcloud,d50|\
optimcloud,d50-5g|\
qcom,ipq5018-mp03.3)
[ "$magic_long" = "73797375" ] && return 0
;;
Expand Down Expand Up @@ -200,6 +204,10 @@ platform_do_upgrade() {
qcom,ipq6018-cp01|\
qcom,ipq807x-hk01|\
qcom,ipq807x-hk14|\
optimcloud,d60|\
optimcloud,d60-5g|\
optimcloud,d50|\
optimcloud,d50-5g|\
qcom,ipq5018-mp03.3|\
wallys,dr5018|\
wallys,dr6018|\
Expand Down
23 changes: 23 additions & 0 deletions feeds/ipq807x/ipq807x/files/arch/arm/boot/dts/qcom-ipq5018-optimcloud-d50-5g.dts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Copyright (c) 2018-2020, 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-ipq5018-optimcloud-d50-5g.dts"

/ {
pmuv8: pmu {
compatible = "arm,cortex-a7-pmu";
};
};
23 changes: 23 additions & 0 deletions feeds/ipq807x/ipq807x/files/arch/arm/boot/dts/qcom-ipq5018-optimcloud-d50.dts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Copyright (c) 2018-2020, 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-ipq5018-optimcloud-d50.dts"

/ {
pmuv8: pmu {
compatible = "arm,cortex-a7-pmu";
};
};
23 changes: 23 additions & 0 deletions feeds/ipq807x/ipq807x/files/arch/arm/boot/dts/qcom-ipq5018-optimcloud-d60-5g.dts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Copyright (c) 2018-2020, 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-ipq5018-optimcloud-d50-5g.dts"

/ {
pmuv8: pmu {
compatible = "arm,cortex-a7-pmu";
};
};
23 changes: 23 additions & 0 deletions feeds/ipq807x/ipq807x/files/arch/arm/boot/dts/qcom-ipq5018-optimcloud-d60.dts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Copyright (c) 2018-2020, 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-ipq5018-optimcloud-d50.dts"

/ {
pmuv8: pmu {
compatible = "arm,cortex-a7-pmu";
};
};
56 changes: 49 additions & 7 deletions feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-cig-wf186h.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
serial1 = &blsp1_uart2;
ethernet0 = "/soc/dp1";
ethernet1 = "/soc/dp2";
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
};

chosen {
Expand Down Expand Up @@ -682,6 +686,27 @@
};
};

leds_pins: leds_pins {
led_pwr_g {
pins = "gpio0";
function = "gpio";
drive-strength = <8>;
bias-pull-down;
};
led_pwr_b {
pins = "gpio1";
function = "gpio";
drive-strength = <8>;
bias-pull-down;
};
led_pwr_r {
pins = "gpio45";
function = "gpio";
drive-strength = <8>;
bias-pull-down;
};
};

i2c_pins: i2c_pins {
i2c_scl {
pins = "gpio25";
Expand Down Expand Up @@ -758,14 +783,31 @@
};

&soc {

pwm: pwm@0x1941010 {
pinctrl-0 = <&pwm_pins>;
pinctrl-names = "default";
used-pwm-indices = <1>, <1>, <1>, <1>;
dft-pwm-status = <1>, <0>, <0>, <0>;
status = "ok";
leds {
compatible = "gpio-leds";
pinctrl-0 = <&leds_pins>;
pinctrl-names = "default";

led3 {
label = "blue:status";
gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "blue-on";
default-state = "off";
};
led2 {
label = "red:status";
gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "red-on";
default-state = "off";
};
led_power: led1 {
label = "green:status";
gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "default-on";
default-state = "on";
};
};

};

&usb3 {
Expand Down
56 changes: 49 additions & 7 deletions feeds/ipq807x/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-cig-wf186w.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
serial1 = &blsp1_uart2;
ethernet0 = "/soc/dp1";
ethernet1 = "/soc/dp2";
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
};

chosen {
Expand Down Expand Up @@ -682,6 +686,27 @@
};
};

leds_pins: leds_pins {
led_pwr_g {
pins = "gpio0";
function = "gpio";
drive-strength = <8>;
bias-pull-down;
};
led_pwr_b {
pins = "gpio1";
function = "gpio";
drive-strength = <8>;
bias-pull-down;
};
led_pwr_r {
pins = "gpio45";
function = "gpio";
drive-strength = <8>;
bias-pull-down;
};
};

i2c_pins: i2c_pins {
i2c_scl {
pins = "gpio25";
Expand Down Expand Up @@ -758,14 +783,31 @@
};

&soc {

pwm: pwm@0x1941010 {
pinctrl-0 = <&pwm_pins>;
pinctrl-names = "default";
used-pwm-indices = <1>, <1>, <1>, <1>;
dft-pwm-status = <1>, <0>, <0>, <0>;
status = "ok";
leds {
compatible = "gpio-leds";
pinctrl-0 = <&leds_pins>;
pinctrl-names = "default";

led3 {
label = "blue:status";
gpios = <&tlmm 1 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "blue-on";
default-state = "off";
};
led2 {
label = "red:status";
gpios = <&tlmm 45 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "red-on";
default-state = "off";
};
led_power: led1 {
label = "green:status";
gpios = <&tlmm 0 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "default-on";
default-state = "on";
};
};

};

&usb3 {
Expand Down
Loading

0 comments on commit 1ebd905

Please sign in to comment.