From c6e5ab9530d495677d170f26ce78b3e5cef47278 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 30 Mar 2022 20:45:07 +0200 Subject: [PATCH 1/3] Rename modem to modem1 in DTS --- root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-12.dts | 4 ++-- root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-STM32.dts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-12.dts b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-12.dts index 8b02bf9a..180ddd70 100644 --- a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-12.dts +++ b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-12.dts @@ -10,13 +10,13 @@ #size-cells = <0>; gpio_modem_reset { - gpio-export,name = "modem_reset"; + gpio-export,name = "modem1_reset"; gpio-export,output = <0>; gpios = <&shift_io 16 GPIO_ACTIVE_HIGH>; }; gpio_modem_power { - gpio-export,name = "modem_power"; + gpio-export,name = "modem1_power"; gpio-export,output = <0>; gpios = <&shift_io 17 GPIO_ACTIVE_HIGH>; }; diff --git a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-STM32.dts b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-STM32.dts index ddb8b72c..0f83e6c4 100644 --- a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-STM32.dts +++ b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-STM32.dts @@ -24,13 +24,13 @@ #size-cells = <0>; gpio_modem_reset { - gpio-export,name = "modem_reset"; + gpio-export,name = "modem1_reset"; gpio-export,output = <0>; gpios = <&stm32_io 21 GPIO_ACTIVE_HIGH>; }; gpio_modem_power { - gpio-export,name = "modem_power"; + gpio-export,name = "modem1_power"; gpio-export,output = <0>; gpios = <&stm32_io 20 GPIO_ACTIVE_HIGH>; }; From b46fb9b12312863fd9ac94a7b8e9a4903bc6df3b Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 30 Mar 2022 20:45:58 +0200 Subject: [PATCH 2/3] Change modem tracker RUTX order --- root/target/linux/ipq40xx/base-files/etc/init.d/modem_tracker | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/root/target/linux/ipq40xx/base-files/etc/init.d/modem_tracker b/root/target/linux/ipq40xx/base-files/etc/init.d/modem_tracker index 9eec01f6..46202b76 100755 --- a/root/target/linux/ipq40xx/base-files/etc/init.d/modem_tracker +++ b/root/target/linux/ipq40xx/base-files/etc/init.d/modem_tracker @@ -1,7 +1,8 @@ #!/bin/sh /etc/rc.common # Copyright (C) 2021 Teltonika Networks +# Copyright (C) 2022 Ycarus (Yannick Chabanois) -START=96 +START=2 USE_PROCD=1 From ac0dd53c6f4d4a310ff56b50c3d0c3c182c83c47 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 31 Mar 2022 16:01:52 +0200 Subject: [PATCH 3/3] Fix keep config on upgrade on RUTX --- .../linux/ipq40xx/base-files/lib/upgrade/ipq_failsafe.sh | 2 +- root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/root/target/linux/ipq40xx/base-files/lib/upgrade/ipq_failsafe.sh b/root/target/linux/ipq40xx/base-files/lib/upgrade/ipq_failsafe.sh index c1c93d20..dc59c6f9 100644 --- a/root/target/linux/ipq40xx/base-files/lib/upgrade/ipq_failsafe.sh +++ b/root/target/linux/ipq40xx/base-files/lib/upgrade/ipq_failsafe.sh @@ -356,7 +356,7 @@ platform_do_upgrade_ipq() { return 1; } -platform_copy_config() { +platform_copy_config_ipq() { local emmcblock="$(find_mmc_part "rootfs_data")" mkdir -p /tmp/overlay diff --git a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh index 2703f71e..a7fc337d 100644 --- a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh +++ b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh @@ -208,6 +208,9 @@ platform_copy_config() { glinet,gl-b2200) emmc_copy_config ;; + teltonika,rutx) + platform_copy_config_ipq + ;; esac return 0; }