From e062f61813f64c570e2026bd998dc9a2a534290c Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Mon, 10 Jan 2022 16:58:35 +0800 Subject: [PATCH] patches: dts: use new format for gl-hwinfo Signed-off-by: Jianhui Zhao --- ...-Support-glinet-hardware-information.patch | 170 +++++++++--------- .../0112-add-support-for-b1300th.patch | 16 +- .../0001-ath79-add-support-for-gl-xe300.patch | 10 +- .../0002-ath79-add-support-for-gl-mifi.patch | 10 +- ...0007-ath79-add-support-for-gl-ar300m.patch | 10 +- .../0008-ath79-add-support-for-gl-x300b.patch | 10 +- .../0009-ath79-add-support-for-gl-ar150.patch | 10 +- ...0010-ath79-add-support-for-gl-usb150.patch | 10 +- .../0011-add-support-gl-ar750-ar750s.patch | 20 +-- .../0012-ath79-add-support-for-gl-x750.patch | 10 +- 10 files changed, 138 insertions(+), 138 deletions(-) diff --git a/patches-19.x/0100-Target-Support-glinet-hardware-information.patch b/patches-19.x/0100-Target-Support-glinet-hardware-information.patch index 8ec0e73..d9c14c5 100644 --- a/patches-19.x/0100-Target-Support-glinet-hardware-information.patch +++ b/patches-19.x/0100-Target-Support-glinet-hardware-information.patch @@ -59,11 +59,11 @@ index 2b15feeb03..42edf5ae89 + reset-button = "gpio-11"; + usb-port = "1-1"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + @@ -93,11 +93,11 @@ index b68614afe6..235dbf2f8c + usb-port = "1-1.3"; + microsd = "1-1.1"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + @@ -129,11 +129,11 @@ index 51610fefa3..b80f8961fc + lan = "eth0"; + reset-button = "gpio-11"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; }; @@ -161,11 +161,11 @@ index 3471d34eac..1a4f73af86 + reset-button = "gpio-3"; + usb-port = "1-1"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; keys { @@ -194,11 +194,11 @@ index 8a7e60823a..9c6b0150cb + usb-port = "1-1.2"; + microsd = "1-1.1"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + @@ -229,11 +229,11 @@ index 8aa0c05082..3468b188f2 100755 + mcu; + nand; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + @@ -261,11 +261,11 @@ index e3d27835df..1c8dca6d97 + build-in-modem = "1-1"; + reset-button = "gpio-3"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + @@ -293,13 +293,13 @@ index 1517c7ce3c..b7ef24fdea + build-in-modem = "1-1.2"; + reset-button = "gpio-3"; + usb-port = "1-1.3"; -+ microsd = "1-1.1"; ++ microsd = "1-1.1"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + @@ -327,15 +327,15 @@ index 9c8f7e0a51..e452cab26c + build-in-modem = "1-1.2"; + reset-button = "gpio-3"; + usb-port = "1-1.3"; -+ microsd = "1-1.1"; -+ mcu; ++ microsd = "1-1.1"; ++ mcu; + nand; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + @@ -363,14 +363,14 @@ index 2ccfed59ab..d17fd3d300 + switch-button = "gpio-8"; + reset-button = "gpio-2"; + usb-port = "1-1"; -+ microsd = "2-1"; ++ microsd = "2-1"; + nand; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + @@ -403,14 +403,14 @@ index a5efbf1957..1f1736fccc + build-in-modem = "1-1.2,2-1.2"; + reset-button = "gpio-2"; + usb-port = "1-1.4"; -+ microsd = "2-1.1"; ++ microsd = "2-1.1"; + nand; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; }; @@ -438,11 +438,11 @@ index 6a0adc7ba1..edd4c225dc + reset-button = "gpio-50"; + usb-port = "1-1.3"; + factory_data { -+ device_mac = <&factory 0x4000>; -+ device_ddns = <&factory 0x4010>; -+ device_sn_bak = <&factory 0x4020>; -+ device_sn = <&factory 0x4030>; -+ country_code = <&factory 0x4088>; ++ device_mac = "factory", "0x4000"; ++ device_ddns = "factory", "0x4010"; ++ device_sn_bak = "factory", "0x4020"; ++ device_sn = "factory", "0x4030"; ++ country_code = "factory", "0x4088"; + }; }; @@ -467,11 +467,11 @@ index 2cea9d9beb..2cfc2604ea + lan = "eth0.1"; + usb; + factory_data { -+ device_mac = <&factory 0x4>; -+ device_ddns = <&factory 0x4010>; -+ device_sn_bak = <&factory 0x4020>; -+ device_sn = <&factory 0x4030>; -+ country_code = <&factory 0x4088>; ++ device_mac = "factory", "0x4"; ++ device_ddns = "factory", "0x4010"; ++ device_sn_bak = "factory", "0x4020"; ++ device_sn = "factory", "0x4030"; ++ country_code = "factory", "0x4088"; + }; + }; @@ -504,11 +504,11 @@ index 8992664dec..7fb3e1c735 + reset-button = "gpio-38"; + usb-port = "1-1"; + factory_data { -+ device_mac = <&factory 0x4>; -+ device_ddns = <&factory 0x4010>; -+ device_sn_bak = <&factory 0x4020>; -+ device_sn = <&factory 0x4030>; -+ country_code = <&factory 0x4088>; ++ device_mac = "factory", "0x4"; ++ device_ddns = "factory", "0x4010"; ++ device_sn_bak = "factory", "0x4020"; ++ device_sn = "factory", "0x4030"; ++ country_code = "factory", "0x4088"; + }; }; @@ -532,11 +532,11 @@ index a30792cace..f6e04ae764 + lan = "eth0.1"; + usb; + factory_data { -+ device_mac = <&factory 0x4>; -+ device_ddns = <&factory 0x4010>; -+ device_sn_bak = <&factory 0x4020>; -+ device_sn = <&factory 0x4030>; -+ country_code = <&factory 0x4088>; ++ device_mac = "factory", "0x4"; ++ device_ddns = "factory", "0x4010"; ++ device_sn_bak = "factory", "0x4020"; ++ device_sn = "factory", "0x4030"; ++ country_code = "factory", "0x4088"; + }; + }; + @@ -562,11 +562,11 @@ index 74e4b46bfa..600c805705 + wan = "eth0.2"; + reset-button = "gpio-38"; + factory_data { -+ device_mac = <&factory 0x4>; -+ device_ddns = <&factory 0x4010>; -+ device_sn_bak = <&factory 0x4020>; -+ device_sn = <&factory 0x4030>; -+ country_code = <&factory 0x4088>; ++ device_mac = "factory", "0x4"; ++ device_ddns = "factory", "0x4010"; ++ device_sn_bak = "factory", "0x4020"; ++ device_sn = "factory", "0x4030"; ++ country_code = "factory", "0x4088"; + }; + }; + diff --git a/patches-19.x/0112-add-support-for-b1300th.patch b/patches-19.x/0112-add-support-for-b1300th.patch index 73be93f..04fc5d8 100644 --- a/patches-19.x/0112-add-support-for-b1300th.patch +++ b/patches-19.x/0112-add-support-for-b1300th.patch @@ -63,10 +63,10 @@ index 509bed031e..7f303a1052 100644 + reset-button = "gpio-63"; + usb-port = "1-1"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; + }; + }; + @@ -109,10 +109,10 @@ index 81a290ec9e..b76e516542 100644 + lan = "eth1"; + reset-button = "gpio-63"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; + }; + }; + diff --git a/patches-21.02.0/0001-ath79-add-support-for-gl-xe300.patch b/patches-21.02.0/0001-ath79-add-support-for-gl-xe300.patch index 55e9ca8..5f4e00f 100644 --- a/patches-21.02.0/0001-ath79-add-support-for-gl-xe300.patch +++ b/patches-21.02.0/0001-ath79-add-support-for-gl-xe300.patch @@ -281,11 +281,11 @@ index 0000000000..07e4f9cd44 + usb-port = "1-1.3"; + nand; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + diff --git a/patches-21.02.0/0002-ath79-add-support-for-gl-mifi.patch b/patches-21.02.0/0002-ath79-add-support-for-gl-mifi.patch index a62e5a2..44ce5a9 100644 --- a/patches-21.02.0/0002-ath79-add-support-for-gl-mifi.patch +++ b/patches-21.02.0/0002-ath79-add-support-for-gl-mifi.patch @@ -282,11 +282,11 @@ index 7d6e7bd4af..863275b712 100644 + reset-button = "gpio-11"; + usb-port = "1-1.3"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + diff --git a/patches-21.02.0/0007-ath79-add-support-for-gl-ar300m.patch b/patches-21.02.0/0007-ath79-add-support-for-gl-ar300m.patch index f4fb59d..c8ff92f 100644 --- a/patches-21.02.0/0007-ath79-add-support-for-gl-ar300m.patch +++ b/patches-21.02.0/0007-ath79-add-support-for-gl-ar300m.patch @@ -33,11 +33,11 @@ index d0b0d88c48..2f747e5a30 100644 + reset-button = "gpio-3"; + usb-port = "1-1"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + diff --git a/patches-21.02.0/0008-ath79-add-support-for-gl-x300b.patch b/patches-21.02.0/0008-ath79-add-support-for-gl-x300b.patch index c7e4706..8c1628b 100644 --- a/patches-21.02.0/0008-ath79-add-support-for-gl-x300b.patch +++ b/patches-21.02.0/0008-ath79-add-support-for-gl-x300b.patch @@ -99,11 +99,11 @@ index 0000000000..728b40dceb + build-in-modem = "1-1"; + reset-button = "gpio-3"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + diff --git a/patches-21.02.0/0009-ath79-add-support-for-gl-ar150.patch b/patches-21.02.0/0009-ath79-add-support-for-gl-ar150.patch index f9ac30e..5369f76 100644 --- a/patches-21.02.0/0009-ath79-add-support-for-gl-ar150.patch +++ b/patches-21.02.0/0009-ath79-add-support-for-gl-ar150.patch @@ -51,11 +51,11 @@ index 6a13c1b..42edf5a 100644 + reset-button = "gpio-11"; + usb-port = "1-1"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; }; diff --git a/patches-21.02.0/0010-ath79-add-support-for-gl-usb150.patch b/patches-21.02.0/0010-ath79-add-support-for-gl-usb150.patch index dad1b65..0db5565 100644 --- a/patches-21.02.0/0010-ath79-add-support-for-gl-usb150.patch +++ b/patches-21.02.0/0010-ath79-add-support-for-gl-usb150.patch @@ -46,11 +46,11 @@ index 0000000..72848a5 + lan = "eth0"; + reset-button = "gpio-11"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + diff --git a/patches-21.02.0/0011-add-support-gl-ar750-ar750s.patch b/patches-21.02.0/0011-add-support-gl-ar750-ar750s.patch index 5322e8e..f5bfab5 100644 --- a/patches-21.02.0/0011-add-support-gl-ar750-ar750s.patch +++ b/patches-21.02.0/0011-add-support-gl-ar750-ar750s.patch @@ -33,11 +33,11 @@ index 24dc8aa..5ab0340 100644 + reset-button = "gpio-3"; + usb-port = "1-1.2"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + @@ -88,11 +88,11 @@ index 9226d37..d46b5ba 100644 + usb-port = "1-1"; + nand; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; + diff --git a/patches-21.02.0/0012-ath79-add-support-for-gl-x750.patch b/patches-21.02.0/0012-ath79-add-support-for-gl-x750.patch index 2c2f093..c95e811 100644 --- a/patches-21.02.0/0012-ath79-add-support-for-gl-x750.patch +++ b/patches-21.02.0/0012-ath79-add-support-for-gl-x750.patch @@ -113,11 +113,11 @@ index c755e00033..89a109addc + reset-button = "gpio-3"; + usb-port = "1-1.3"; + factory_data { -+ device_mac = <&art 0>; -+ device_ddns = <&art 0x10>; -+ device_sn_bak = <&art 0x20>; -+ device_sn = <&art 0x30>; -+ country_code = <&art 0x88>; ++ device_mac = "art"; ++ device_ddns = "art", "0x10"; ++ device_sn_bak = "art", "0x20"; ++ device_sn = "art", "0x30"; ++ country_code = "art", "0x88"; + }; + }; +