From be3afe8b6892b392f896935efa9f452533df595c Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 26 Jul 2021 17:25:01 +0200 Subject: [PATCH] Update to Linux 5.10.53 (#1475) * Linux: Update kernel 5.10.53 Move back to the LTS kernel 5.10. * Remove ODROID-N2 specific kernel update script --- Documentation/kernel.md | 14 ++--- ...add-i2c3-rtc-nodes-and-rtc-aliases-t.patch | 53 ++++++++++++++++ ...son-add-saradc-node-to-ODROID-N2-N2.patch} | 10 +-- ...add-GPIO-line-names-to-ODROID-N2-N2.patch} | 12 ++-- ...meson-g12b-add-power-button-support.patch} | 12 ++-- ...dts-meson-g12b-add-GPIO-fan-support.patch} | 12 ++-- ...12b-odroid-n2-add-fan-as-cooling-de.patch} | 12 ++-- ...007-arm64-dts-meson-add-uart_A-node.patch} | 12 ++-- ...meson-add-i2c2-node-to-ODROID-N2-N2.patch} | 12 ++-- ...e-hack-avoiding-the-invalid-temperat.patch | 63 +++++++++++++++++++ .../configs/generic_x86_64_defconfig | 2 +- .../configs/odroid_c2_defconfig | 2 +- .../configs/odroid_c4_defconfig | 2 +- .../configs/odroid_n2_defconfig | 2 +- .../configs/odroid_xu4_defconfig | 2 +- buildroot-external/configs/ova_defconfig | 2 +- buildroot-external/configs/tinker_defconfig | 2 +- scripts/update-kernel-odroid-n2.sh | 14 ----- scripts/update-kernel-upstream.sh | 2 +- 19 files changed, 173 insertions(+), 69 deletions(-) create mode 100644 buildroot-external/board/hardkernel/patches/linux/5.10.53/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch rename buildroot-external/board/hardkernel/patches/linux/{5.12.10/0001-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch => 5.10.53/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch} (70%) rename buildroot-external/board/hardkernel/patches/linux/{5.12.10/0002-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch => 5.10.53/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch} (85%) rename buildroot-external/board/hardkernel/patches/linux/{5.12.10/0003-arm64-dts-meson-g12b-add-power-button-support.patch => 5.10.53/0004-arm64-dts-meson-g12b-add-power-button-support.patch} (73%) rename buildroot-external/board/hardkernel/patches/linux/{5.12.10/0004-arm64-dts-meson-g12b-add-GPIO-fan-support.patch => 5.10.53/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch} (74%) rename buildroot-external/board/hardkernel/patches/linux/{5.12.10/0005-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch => 5.10.53/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch} (84%) rename buildroot-external/board/hardkernel/patches/linux/{5.12.10/0006-arm64-dts-meson-add-uart_A-node.patch => 5.10.53/0007-arm64-dts-meson-add-uart_A-node.patch} (72%) rename buildroot-external/board/hardkernel/patches/linux/{5.12.10/0007-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch => 5.10.53/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch} (72%) create mode 100644 buildroot-external/board/hardkernel/patches/linux/5.10.53/0009-ODROID-XU4-Update-hack-avoiding-the-invalid-temperat.patch delete mode 100755 scripts/update-kernel-odroid-n2.sh diff --git a/Documentation/kernel.md b/Documentation/kernel.md index 82036ac9f..f1c2eb866 100644 --- a/Documentation/kernel.md +++ b/Documentation/kernel.md @@ -5,15 +5,15 @@ Default Kernel tree: 5.10 | Board | Version | |-------|---------| -| Open Virtual Appliance | 5.10.45 | +| Open Virtual Appliance | 5.10.53 | | Raspberry Pi | 5.10.17 | | Raspberry Pi 0-W | 5.10.17 | | Raspberry Pi 2 | 5.10.17 | | Raspberry Pi 3 | 5.10.17 | | Raspberry Pi 4 | 5.10.17 | -| Tinker Board | 5.10.45 | -| Odroid-C2 | 5.10.45 | -| Odroid-C4 | 5.10.45 | -| Odroid-N2 | 5.9.16 | -| Odroid-XU4 | 5.10.45 | -| Generic x86-64 | 5.10.45 | +| Tinker Board | 5.10.53 | +| Odroid-C2 | 5.10.53 | +| Odroid-C4 | 5.10.53 | +| Odroid-N2 | 5.10.53 | +| Odroid-XU4 | 5.10.53 | +| Generic x86-64 | 5.10.53 | diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.53/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch new file mode 100644 index 000000000..8da158ec3 --- /dev/null +++ b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0001-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-aliases-t.patch @@ -0,0 +1,53 @@ +From c7825747afd8bb975dc918f28e4afe8058a518f3 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Christian Hewitt +Date: Mon, 11 Jan 2021 13:58:31 +0000 +Subject: [PATCH 1/9] arm64: dts: meson: add i2c3/rtc nodes and rtc aliases to + ODROID-N2 dtsi + +Enable the onboard pcf8563 rtc hardware on ODROID N2/N2+ boards via the +common dtsi. Also add aliases to ensure vrtc does not claim /dev/rtc0. + +Signed-off-by: Christian Hewitt +Reviewed-by: Neil Armstrong +Signed-off-by: Kevin Hilman +Link: https://lore.kernel.org/r/20210111135831.2218-1-christianshewitt@gmail.com +--- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +index 39a09661c5f6..b78be3e6974d 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +@@ -13,6 +13,8 @@ / { + aliases { + serial0 = &uart_AO; + ethernet0 = ðmac; ++ rtc0 = &rtc; ++ rtc1 = &vrtc; + }; + + dioo2133: audio-amplifier-0 { +@@ -478,6 +480,18 @@ &ir { + linux,rc-map-name = "rc-odroid"; + }; + ++&i2c3 { ++ status = "okay"; ++ pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>; ++ pinctrl-names = "default"; ++ ++ rtc: rtc@51 { ++ compatible = "nxp,pcf8563"; ++ reg = <0x51>; ++ wakeup-source; ++ }; ++}; ++ + &pwm_ab { + pinctrl-0 = <&pwm_a_e_pins>; + pinctrl-names = "default"; +-- +2.32.0 + diff --git a/buildroot-external/board/hardkernel/patches/linux/5.12.10/0001-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch similarity index 70% rename from buildroot-external/board/hardkernel/patches/linux/5.12.10/0001-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch rename to buildroot-external/board/hardkernel/patches/linux/5.10.53/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch index d91776cb9..8ee566b05 100644 --- a/buildroot-external/board/hardkernel/patches/linux/5.12.10/0001-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch +++ b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0002-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch @@ -1,8 +1,10 @@ -From 287005e14b9ba3a4c19f7b96a2011323e0f3f1bc Mon Sep 17 00:00:00 2001 -Message-Id: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch> +From ec3b1240b428c5652ccb7fdadad217a2ff8ab4db Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: Hyeonki Hong Date: Wed, 7 Apr 2021 04:26:08 +0000 -Subject: [PATCH 1/8] arm64: dts: meson: add saradc node to ODROID N2/N2+ +Subject: [PATCH 2/9] arm64: dts: meson: add saradc node to ODROID N2/N2+ Add the meson saradc node to the ODROID N2/N2+ common dtsi. @@ -15,7 +17,7 @@ Link: https://lore.kernel.org/r/20210407042609.9736-3-christianshewitt@gmail.com 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index 58ce569b2ace..4f22d00756a9 100644 +index b78be3e6974d..8a5e132c4b79 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi @@ -508,6 +508,11 @@ &pwm_AO_cd { diff --git a/buildroot-external/board/hardkernel/patches/linux/5.12.10/0002-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch similarity index 85% rename from buildroot-external/board/hardkernel/patches/linux/5.12.10/0002-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch rename to buildroot-external/board/hardkernel/patches/linux/5.10.53/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch index ccb49328c..1d32b6846 100644 --- a/buildroot-external/board/hardkernel/patches/linux/5.12.10/0002-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch +++ b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0003-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch @@ -1,10 +1,10 @@ -From 782eddd7ab8b256023c49d258c66248990d0f063 Mon Sep 17 00:00:00 2001 -Message-Id: <782eddd7ab8b256023c49d258c66248990d0f063.1623663122.git.stefan@agner.ch> -In-Reply-To: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch> -References: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch> +From 5ca49a58577f7e9e6f8e0b1cb7c97e756a0e921f Mon Sep 17 00:00:00 2001 +Message-Id: <5ca49a58577f7e9e6f8e0b1cb7c97e756a0e921f.1627311993.git.stefan@agner.ch> +In-Reply-To: +References: From: Hyeonki Hong Date: Wed, 7 Apr 2021 04:26:09 +0000 -Subject: [PATCH 2/8] arm64: dts: meson: add GPIO line names to ODROID N2/N2+ +Subject: [PATCH 3/9] arm64: dts: meson: add GPIO line names to ODROID N2/N2+ Add GPIO line-name identifiers to the ODROID N2/N2+ common dtsi. @@ -18,7 +18,7 @@ Link: https://lore.kernel.org/r/20210407042609.9736-4-christianshewitt@gmail.com 1 file changed, 45 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index 4f22d00756a9..163449aa23a7 100644 +index 8a5e132c4b79..41b2f9c96b5f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi @@ -446,6 +446,51 @@ &frddr_c { diff --git a/buildroot-external/board/hardkernel/patches/linux/5.12.10/0003-arm64-dts-meson-g12b-add-power-button-support.patch b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0004-arm64-dts-meson-g12b-add-power-button-support.patch similarity index 73% rename from buildroot-external/board/hardkernel/patches/linux/5.12.10/0003-arm64-dts-meson-g12b-add-power-button-support.patch rename to buildroot-external/board/hardkernel/patches/linux/5.10.53/0004-arm64-dts-meson-g12b-add-power-button-support.patch index b3836e09b..55ae4590f 100644 --- a/buildroot-external/board/hardkernel/patches/linux/5.12.10/0003-arm64-dts-meson-g12b-add-power-button-support.patch +++ b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0004-arm64-dts-meson-g12b-add-power-button-support.patch @@ -1,10 +1,10 @@ -From 02c65953107991b87b9b85615c1e43af6be366d5 Mon Sep 17 00:00:00 2001 -Message-Id: <02c65953107991b87b9b85615c1e43af6be366d5.1623663122.git.stefan@agner.ch> -In-Reply-To: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch> -References: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch> +From 70e65f906389f7236fe9ad8e1c05dedac0d1988b Mon Sep 17 00:00:00 2001 +Message-Id: <70e65f906389f7236fe9ad8e1c05dedac0d1988b.1627311993.git.stefan@agner.ch> +In-Reply-To: +References: From: Stefan Agner Date: Mon, 11 Jan 2021 11:20:48 +0100 -Subject: [PATCH 3/8] arm64: dts: meson: g12b: add power button support +Subject: [PATCH 4/9] arm64: dts: meson: g12b: add power button support Add power button support on J2 pin 11 (GPIOX_3 on the SoC side). The GPIO is low active, e.g. when connecting with pin 9 (GND) a power @@ -16,7 +16,7 @@ Signed-off-by: Stefan Agner 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index 163449aa23a7..80f7557ebd98 100644 +index 41b2f9c96b5f..4b6bb7e74e25 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi @@ -39,6 +39,17 @@ emmc_pwrseq: emmc-pwrseq { diff --git a/buildroot-external/board/hardkernel/patches/linux/5.12.10/0004-arm64-dts-meson-g12b-add-GPIO-fan-support.patch b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch similarity index 74% rename from buildroot-external/board/hardkernel/patches/linux/5.12.10/0004-arm64-dts-meson-g12b-add-GPIO-fan-support.patch rename to buildroot-external/board/hardkernel/patches/linux/5.10.53/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch index 6418f570c..dc8c5b71a 100644 --- a/buildroot-external/board/hardkernel/patches/linux/5.12.10/0004-arm64-dts-meson-g12b-add-GPIO-fan-support.patch +++ b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0005-arm64-dts-meson-g12b-add-GPIO-fan-support.patch @@ -1,10 +1,10 @@ -From f55e45c5cb4875d535af546893c60d729e29fb24 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch> -References: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch> +From 86d9151effff69d2a8fc2027a31dd60bd8c6eb05 Mon Sep 17 00:00:00 2001 +Message-Id: <86d9151effff69d2a8fc2027a31dd60bd8c6eb05.1627311993.git.stefan@agner.ch> +In-Reply-To: +References: From: Stefan Agner Date: Mon, 11 Jan 2021 11:38:54 +0100 -Subject: [PATCH 4/8] arm64: dts: meson: g12b: add GPIO fan support +Subject: [PATCH 5/9] arm64: dts: meson: g12b: add GPIO fan support Add simple GPIO fan node to support a fan on GPIO J8. Unfortunately the pad used to control the fan does not support real PWM, hence the RPM @@ -16,7 +16,7 @@ Signed-off-by: Stefan Agner 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index 80f7557ebd98..81541dcc7a01 100644 +index 4b6bb7e74e25..e8a3ede698b5 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi @@ -39,6 +39,17 @@ emmc_pwrseq: emmc-pwrseq { diff --git a/buildroot-external/board/hardkernel/patches/linux/5.12.10/0005-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch similarity index 84% rename from buildroot-external/board/hardkernel/patches/linux/5.12.10/0005-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch rename to buildroot-external/board/hardkernel/patches/linux/5.10.53/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch index 81d4f5aa6..28df5d49f 100644 --- a/buildroot-external/board/hardkernel/patches/linux/5.12.10/0005-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch +++ b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0006-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch @@ -1,10 +1,10 @@ -From 69e93af55c78d4b4dca6f9f2f2a422bab1ba42d2 Mon Sep 17 00:00:00 2001 -Message-Id: <69e93af55c78d4b4dca6f9f2f2a422bab1ba42d2.1623663122.git.stefan@agner.ch> -In-Reply-To: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch> -References: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch> +From f1120f132dbdf2e7f7acf328de55bbdce877d882 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: Stefan Agner Date: Mon, 11 Jan 2021 15:53:55 +0100 -Subject: [PATCH 5/8] arm64: dts: meson: g12b: odroid-n2: add fan as cooling +Subject: [PATCH 6/9] arm64: dts: meson: g12b: odroid-n2: add fan as cooling device MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -21,7 +21,7 @@ Signed-off-by: Stefan Agner 1 file changed, 38 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index 81541dcc7a01..2a88a63883b4 100644 +index e8a3ede698b5..dd345c6aa4b5 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi @@ -388,6 +388,44 @@ &clkc_audio { diff --git a/buildroot-external/board/hardkernel/patches/linux/5.12.10/0006-arm64-dts-meson-add-uart_A-node.patch b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0007-arm64-dts-meson-add-uart_A-node.patch similarity index 72% rename from buildroot-external/board/hardkernel/patches/linux/5.12.10/0006-arm64-dts-meson-add-uart_A-node.patch rename to buildroot-external/board/hardkernel/patches/linux/5.10.53/0007-arm64-dts-meson-add-uart_A-node.patch index c7fbf1fda..1257c45c4 100644 --- a/buildroot-external/board/hardkernel/patches/linux/5.12.10/0006-arm64-dts-meson-add-uart_A-node.patch +++ b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0007-arm64-dts-meson-add-uart_A-node.patch @@ -1,10 +1,10 @@ -From d1735a6a414ff1119bf32b27c2bd607241e2152f Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch> -References: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch> +From dcaf2dc71dd62487eb37561682934414a5795e0e Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: Hyeonki Hong Date: Fri, 27 Mar 2020 17:05:22 +0900 -Subject: [PATCH 6/8] arm64: dts: meson: add uart_A node +Subject: [PATCH 7/9] arm64: dts: meson: add uart_A node The UART_A is available through J3 pin 8/10 and documented to be available as UART by default. @@ -15,7 +15,7 @@ Signed-off-by: Stefan Agner 1 file changed, 7 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index 2a88a63883b4..4922841e4af4 100644 +index dd345c6aa4b5..cec346178e3d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi @@ -12,6 +12,7 @@ diff --git a/buildroot-external/board/hardkernel/patches/linux/5.12.10/0007-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch similarity index 72% rename from buildroot-external/board/hardkernel/patches/linux/5.12.10/0007-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch rename to buildroot-external/board/hardkernel/patches/linux/5.10.53/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch index 2a2826b1b..91a448507 100644 --- a/buildroot-external/board/hardkernel/patches/linux/5.12.10/0007-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch +++ b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch @@ -1,10 +1,10 @@ -From 84bf054b6812ccbccdc4535b9baf88fe32324aca Mon Sep 17 00:00:00 2001 -Message-Id: <84bf054b6812ccbccdc4535b9baf88fe32324aca.1623663122.git.stefan@agner.ch> -In-Reply-To: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch> -References: <287005e14b9ba3a4c19f7b96a2011323e0f3f1bc.1623663122.git.stefan@agner.ch> +From d5d2d8b9eb93eab85af12f1844975903a7c5a879 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: Stefan Agner Date: Thu, 29 Apr 2021 21:32:43 +0200 -Subject: [PATCH 7/8] arm64: dts: meson: add i2c2 node to ODROID N2/N2+ +Subject: [PATCH 8/9] arm64: dts: meson: add i2c2 node to ODROID N2/N2+ The J2 connectors pinout documents "I2C.SDA0/SCL0" on pin 3 and 5, which are connected to GPIOX_17/18. This GPIO allow to mux I2C to the second @@ -16,7 +16,7 @@ Signed-off-by: Stefan Agner 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index 4922841e4af4..96114e8f8cb6 100644 +index cec346178e3d..f1c3356c78a0 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi @@ -586,6 +586,12 @@ &ir { diff --git a/buildroot-external/board/hardkernel/patches/linux/5.10.53/0009-ODROID-XU4-Update-hack-avoiding-the-invalid-temperat.patch b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0009-ODROID-XU4-Update-hack-avoiding-the-invalid-temperat.patch new file mode 100644 index 000000000..8b43914cc --- /dev/null +++ b/buildroot-external/board/hardkernel/patches/linux/5.10.53/0009-ODROID-XU4-Update-hack-avoiding-the-invalid-temperat.patch @@ -0,0 +1,63 @@ +From 32e2bb9ac2f2a6e3c2d2536409fcae4e442b548a Mon Sep 17 00:00:00 2001 +Message-Id: <32e2bb9ac2f2a6e3c2d2536409fcae4e442b548a.1627311885.git.stefan@agner.ch> +In-Reply-To: +References: +From: "charles.park" +Date: Fri, 1 Jun 2018 18:12:01 +0900 +Subject: [PATCH 09/10] ODROID-XU4: Update hack avoiding the invalid + temperature by TMU broken + +Change-Id: I6092834427950a50746535458e99bf7089212044 +--- + drivers/thermal/thermal_helpers.c | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +diff --git a/drivers/thermal/thermal_helpers.c b/drivers/thermal/thermal_helpers.c +index c94bc824e5d3..2880126c5861 100644 +--- a/drivers/thermal/thermal_helpers.c ++++ b/drivers/thermal/thermal_helpers.c +@@ -75,6 +75,10 @@ EXPORT_SYMBOL(get_thermal_instance); + * + * Return: On success returns 0, an error code otherwise + */ ++ ++#define CRITICAL_TEMP 120000 ++int thermal_zone_data[4] = { 0, }; ++ + int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) + { + int ret = -EINVAL; +@@ -108,6 +112,30 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) + *temp = tz->emul_temperature; + } + ++ /* save thermal_zone data */ ++ if (!ret) ++ thermal_zone_data[tz->id] = *temp; ++ /* ++ * This case is that the thermal sensor is broken. ++ * That's not real temperature. Set the fake temperature value in order to ++ * avoid reaching the ciritical temperature. ++ */ ++ if ((thermal_zone_data[tz->id] > CRITICAL_TEMP) && (tz->id != 4)) { ++ int i, broken_sensor = 0, correct_temp = 0; ++ for (i = 0; i < 4; i++) { ++ if ((thermal_zone_data[i] <= CRITICAL_TEMP) && ++ (correct_temp <= thermal_zone_data[i])) ++ correct_temp = thermal_zone_data[i]; ++ if (thermal_zone_data[i] > CRITICAL_TEMP) ++ broken_sensor++; ++ } ++ /* ++ * if all thermal sensor broken then critical temperature data send ++ * for system poweroff. ++ */ ++ *temp = (broken_sensor == 4) ? CRITICAL_TEMP : correct_temp; ++ } ++ + mutex_unlock(&tz->lock); + exit: + return ret; +-- +2.32.0 + diff --git a/buildroot-external/configs/generic_x86_64_defconfig b/buildroot-external/configs/generic_x86_64_defconfig index 675339225..ddb48fdec 100644 --- a/buildroot-external/configs/generic_x86_64_defconfig +++ b/buildroot-external/configs/generic_x86_64_defconfig @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.45" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.53" BR2_LINUX_KERNEL_DEFCONFIG="x86_64" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/generic-x86-64/kernel.config" BR2_LINUX_KERNEL_LZ4=y diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index e2a078736..9b79f1e1b 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.45" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.53" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" diff --git a/buildroot-external/configs/odroid_c4_defconfig b/buildroot-external/configs/odroid_c4_defconfig index 3832e10b9..afad98888 100644 --- a/buildroot-external/configs/odroid_c4_defconfig +++ b/buildroot-external/configs/odroid_c4_defconfig @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.45" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.53" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index e1cacd488..eb6b26b50 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -21,7 +21,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.53" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/kernel.config" diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index 2f9fb1752..d60330ba4 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.45" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.53" BR2_LINUX_KERNEL_DEFCONFIG="exynos" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" BR2_LINUX_KERNEL_LZ4=y diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 35027f52c..425031bb2 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.45" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.53" BR2_LINUX_KERNEL_DEFCONFIG="x86_64" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/pc/ova/kernel.config" BR2_LINUX_KERNEL_LZ4=y diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index f32339512..3cbc18f14 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -23,7 +23,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/hassos-hook.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.45" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.53" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/kernel.config" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config" diff --git a/scripts/update-kernel-odroid-n2.sh b/scripts/update-kernel-odroid-n2.sh deleted file mode 100755 index 5866d13dd..000000000 --- a/scripts/update-kernel-odroid-n2.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -e - -if [ -z "$1" ]; then - echo "Need a kernel version!" - exit 1 -fi - -defconfigs=(buildroot-external/configs/odroid_n2_defconfig) -sed -i "s/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\".*\"/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\"$1\"/g" "${defconfigs[@]}" -sed -i "s/| \(Odroid-N2\) | .* |/| \1 | $1 |/g" Documentation/kernel.md -git commit -m "Linux: Update kernel $1" "${defconfigs[@]}" Documentation/kernel.md - -./scripts/check-kernel-patches.sh diff --git a/scripts/update-kernel-upstream.sh b/scripts/update-kernel-upstream.sh index 85f3ebd22..909cf0479 100755 --- a/scripts/update-kernel-upstream.sh +++ b/scripts/update-kernel-upstream.sh @@ -8,7 +8,7 @@ fi defconfigs=(buildroot-external/configs/{generic_x86_64,ova,tinker,odroid_c*,odroid_xu4}_defconfig) sed -i "s/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\".*\"/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\"$1\"/g" "${defconfigs[@]}" -sed -i "s/| \(Open Virtual Appliance\|Generic x86-64\|Tinker Board\|Odroid-C.\|Odroid-XU4\) | .* |/| \1 | $1 |/g" Documentation/kernel.md +sed -i "s/| \(Open Virtual Appliance\|Generic x86-64\|Tinker Board\|Odroid-.*\) | .* |/| \1 | $1 |/g" Documentation/kernel.md git commit -m "Linux: Update kernel $1" "${defconfigs[@]}" Documentation/kernel.md ./scripts/check-kernel-patches.sh