diff --git a/buildroot-external/board/asus/tinker/patches/linux/0001-Revert-ARM-dts-rockchip-use-DMA-channels-for-UARTs-f.patch b/buildroot-external/board/asus/tinker/patches/linux/0001-Revert-ARM-dts-rockchip-use-DMA-channels-for-UARTs-f.patch index 0abc425f1c7..ac283b70699 100644 --- a/buildroot-external/board/asus/tinker/patches/linux/0001-Revert-ARM-dts-rockchip-use-DMA-channels-for-UARTs-f.patch +++ b/buildroot-external/board/asus/tinker/patches/linux/0001-Revert-ARM-dts-rockchip-use-DMA-channels-for-UARTs-f.patch @@ -1,4 +1,4 @@ -From b4d676729c5bee4b9adb85362f6f2e32f833b6c2 Mon Sep 17 00:00:00 2001 +From 675fbbc309e4f7c805cf4fbd7c463cfc8308b54e Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 17 Feb 2021 19:55:41 +0100 Subject: [PATCH] Revert "ARM: dts: rockchip: use DMA channels for UARTs for @@ -10,10 +10,10 @@ This reverts commit 3425fe335c29310f6628faf9a7947d07f32d8962. 1 file changed, 8 deletions(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index cb9cdaddffd4..51f1273d6beb 100644 +index 3f1d640afafae..becf3abd8367f 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi -@@ -378,8 +378,6 @@ uart0: serial@ff180000 { +@@ -387,8 +387,6 @@ uart0: serial@ff180000 { reg-io-width = <4>; clocks = <&cru SCLK_UART0>, <&cru PCLK_UART0>; clock-names = "baudclk", "apb_pclk"; @@ -22,7 +22,7 @@ index cb9cdaddffd4..51f1273d6beb 100644 pinctrl-names = "default"; pinctrl-0 = <&uart0_xfer>; status = "disabled"; -@@ -393,8 +391,6 @@ uart1: serial@ff190000 { +@@ -402,8 +400,6 @@ uart1: serial@ff190000 { reg-io-width = <4>; clocks = <&cru SCLK_UART1>, <&cru PCLK_UART1>; clock-names = "baudclk", "apb_pclk"; @@ -31,7 +31,7 @@ index cb9cdaddffd4..51f1273d6beb 100644 pinctrl-names = "default"; pinctrl-0 = <&uart1_xfer>; status = "disabled"; -@@ -421,8 +417,6 @@ uart3: serial@ff1b0000 { +@@ -430,8 +426,6 @@ uart3: serial@ff1b0000 { reg-io-width = <4>; clocks = <&cru SCLK_UART3>, <&cru PCLK_UART3>; clock-names = "baudclk", "apb_pclk"; @@ -40,7 +40,7 @@ index cb9cdaddffd4..51f1273d6beb 100644 pinctrl-names = "default"; pinctrl-0 = <&uart3_xfer>; status = "disabled"; -@@ -436,8 +430,6 @@ uart4: serial@ff1c0000 { +@@ -445,8 +439,6 @@ uart4: serial@ff1c0000 { reg-io-width = <4>; clocks = <&cru SCLK_UART4>, <&cru PCLK_UART4>; clock-names = "baudclk", "apb_pclk"; diff --git a/buildroot-external/board/asus/tinker/patches/linux/0002-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch b/buildroot-external/board/asus/tinker/patches/linux/0002-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch index 46a9c6277c0..2dd30043d58 100644 --- a/buildroot-external/board/asus/tinker/patches/linux/0002-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch +++ b/buildroot-external/board/asus/tinker/patches/linux/0002-ARM-DTS-rk3288-tinker-Defining-the-SPI-interface.patch @@ -1,4 +1,4 @@ -From 02c7d9bb23f497993d52f5a41341ed955e6a2745 Mon Sep 17 00:00:00 2001 +From 37b4467356113f17f55066aef54db55b64daa030 Mon Sep 17 00:00:00 2001 From: "Miouyouyou (Myy)" Date: Mon, 5 Nov 2018 22:15:14 +0100 Subject: [PATCH] ARM: DTS: rk3288-tinker: Defining the SPI interface @@ -18,7 +18,7 @@ Signed-off-by: Stefan Agner 1 file changed, 19 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi -index 09618bb7d872..30430d2e64b9 100644 +index 09618bb7d872c..30430d2e64b93 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi @@ -483,6 +483,25 @@ &sdio0 { diff --git a/buildroot-external/board/asus/tinker/patches/linux/0003-ARM-dts-rockchip-enable-I2C1-4-on-rk3288-tinker.patch b/buildroot-external/board/asus/tinker/patches/linux/0003-ARM-dts-rockchip-enable-I2C1-4-on-rk3288-tinker.patch index 1a2a1baa4fd..829d93d04bf 100644 --- a/buildroot-external/board/asus/tinker/patches/linux/0003-ARM-dts-rockchip-enable-I2C1-4-on-rk3288-tinker.patch +++ b/buildroot-external/board/asus/tinker/patches/linux/0003-ARM-dts-rockchip-enable-I2C1-4-on-rk3288-tinker.patch @@ -1,4 +1,4 @@ -From bf7869033cf3caa50912cbdfa548428a6571c104 Mon Sep 17 00:00:00 2001 +From 1a15fc7f6a241895a31b00c1f324d358d408a610 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 4 Sep 2020 21:57:55 +0200 Subject: [PATCH] ARM: dts: rockchip: enable I2C1/4 on rk3288-tinker @@ -11,7 +11,7 @@ Signed-off-by: Stefan Agner 1 file changed, 8 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi -index 30430d2e64b9..395afc2b2283 100644 +index 30430d2e64b93..395afc2b2283c 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi @@ -342,10 +342,18 @@ regulator-state-mem { diff --git a/buildroot-external/board/asus/tinker/patches/linux/0004-RK3288-DTSI-rk3288.dtsi-Add-missing-SPI2-pinctrl.patch b/buildroot-external/board/asus/tinker/patches/linux/0004-RK3288-DTSI-rk3288.dtsi-Add-missing-SPI2-pinctrl.patch index 6a8ce20f45e..727f92acf92 100644 --- a/buildroot-external/board/asus/tinker/patches/linux/0004-RK3288-DTSI-rk3288.dtsi-Add-missing-SPI2-pinctrl.patch +++ b/buildroot-external/board/asus/tinker/patches/linux/0004-RK3288-DTSI-rk3288.dtsi-Add-missing-SPI2-pinctrl.patch @@ -1,4 +1,4 @@ -From a0ef6a86e96920a9cf703d8c65d0126494037d37 Mon Sep 17 00:00:00 2001 +From d6c44c231fc4518ad69bb7870a193bb10c563f2a Mon Sep 17 00:00:00 2001 From: Myy Miouyouyou Date: Thu, 19 Oct 2017 21:24:47 +0200 Subject: [PATCH] RK3288: DTSI: rk3288.dtsi: Add missing SPI2 pinctrl @@ -14,10 +14,10 @@ Signed-off-by: Myy Miouyouyou 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi -index 51f1273d6beb..d8663928bfe2 100644 +index becf3abd8367f..e78fa883b9841 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi -@@ -311,7 +311,7 @@ spi2: spi@ff130000 { +@@ -320,7 +320,7 @@ spi2: spi@ff130000 { dma-names = "tx", "rx"; interrupts = ; pinctrl-names = "default"; diff --git a/buildroot-external/board/asus/tinker/patches/linux/0005-ARM-DTSI-rk3288-tinker-Improving-the-CPU-max-voltage.patch b/buildroot-external/board/asus/tinker/patches/linux/0005-ARM-DTSI-rk3288-tinker-Improving-the-CPU-max-voltage.patch index 44ee8a05bbb..06d6484c064 100644 --- a/buildroot-external/board/asus/tinker/patches/linux/0005-ARM-DTSI-rk3288-tinker-Improving-the-CPU-max-voltage.patch +++ b/buildroot-external/board/asus/tinker/patches/linux/0005-ARM-DTSI-rk3288-tinker-Improving-the-CPU-max-voltage.patch @@ -1,4 +1,4 @@ -From e828e0fc2be98e5ad20c93981681505fc97b063b Mon Sep 17 00:00:00 2001 +From dfb0232e9fae1267d04247aaf171739038c1659e Mon Sep 17 00:00:00 2001 From: "Miouyouyou (Myy)" Date: Mon, 5 Nov 2018 20:16:05 +0100 Subject: [PATCH] ARM: DTSI: rk3288-tinker: Improving the CPU max voltage @@ -11,7 +11,7 @@ Signed-off-by: Miouyouyou (Myy) 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi -index 395afc2b2283..c7e79e594720 100644 +index 395afc2b2283c..c7e79e5947206 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi @@ -184,7 +184,7 @@ vdd_cpu: DCDC_REG1 { diff --git a/buildroot-external/board/asus/tinker/patches/linux/0006-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard-.patch b/buildroot-external/board/asus/tinker/patches/linux/0006-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard-.patch index 65116b08edc..74192fa25df 100644 --- a/buildroot-external/board/asus/tinker/patches/linux/0006-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard-.patch +++ b/buildroot-external/board/asus/tinker/patches/linux/0006-drivers-mmc-dw-mci-rockchip-Handle-ASUS-Tinkerboard-.patch @@ -1,4 +1,4 @@ -From ad1ffd6be5f54a0871e3c303602548687dfe0ffc Mon Sep 17 00:00:00 2001 +From 4955695e410289df07258b00290d4028c3ac8fb1 Mon Sep 17 00:00:00 2001 From: Myy Miouyouyou Date: Sun, 7 Jan 2018 01:52:44 +0100 Subject: [PATCH] drivers: mmc: dw-mci-rockchip: Handle ASUS Tinkerboard reboot @@ -21,7 +21,7 @@ Signed-off-by: Myy Miouyouyou 1 file changed, 66 insertions(+) diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c -index b07190ba4b7a..0badaa1b404e 100644 +index f96260fd143b4..fa779ce8fb661 100644 --- a/drivers/mmc/host/dw_mmc-rockchip.c +++ b/drivers/mmc/host/dw_mmc-rockchip.c @@ -12,6 +12,11 @@ @@ -36,7 +36,7 @@ index b07190ba4b7a..0badaa1b404e 100644 #include "dw_mmc.h" #include "dw_mmc-pltfm.h" -@@ -340,6 +345,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = { +@@ -527,6 +532,66 @@ static const struct of_device_id dw_mci_rockchip_match[] = { }; MODULE_DEVICE_TABLE(of, dw_mci_rockchip_match); @@ -103,7 +103,7 @@ index b07190ba4b7a..0badaa1b404e 100644 static int dw_mci_rockchip_probe(struct platform_device *pdev) { const struct dw_mci_drv_data *drv_data; -@@ -367,6 +432,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev) +@@ -554,6 +619,7 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev) } pm_runtime_put_autosuspend(&pdev->dev); diff --git a/buildroot-external/board/asus/tinker/patches/linux/0007-ARM-dts-rockchip-Add-Bluetooth-to-rk3288-tinker.patch b/buildroot-external/board/asus/tinker/patches/linux/0007-ARM-dts-rockchip-Add-Bluetooth-to-rk3288-tinker.patch index b943705def6..8a7e6e1b696 100644 --- a/buildroot-external/board/asus/tinker/patches/linux/0007-ARM-dts-rockchip-Add-Bluetooth-to-rk3288-tinker.patch +++ b/buildroot-external/board/asus/tinker/patches/linux/0007-ARM-dts-rockchip-Add-Bluetooth-to-rk3288-tinker.patch @@ -1,4 +1,4 @@ -From 4e6c3d013c847f199664a3075934f5ca52d8cba4 Mon Sep 17 00:00:00 2001 +From 74227462bbe9236dca234dd24cce4191fa71bdf9 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 10 May 2022 22:57:26 +0200 Subject: [PATCH] ARM: dts: rockchip: Add Bluetooth to rk3288-tinker @@ -12,7 +12,7 @@ Signed-off-by: Stefan Agner 1 file changed, 26 insertions(+) diff --git a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi -index c7e79e594720..5d261fae6e72 100644 +index c7e79e5947206..5d261fae6e72a 100644 --- a/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi @@ -386,6 +386,20 @@ bl_en: bl-en { diff --git a/buildroot-external/board/asus/tinker/patches/linux/0008-usb-audio-add-ASUS-TinkerBoard-s-ALC4040.patch b/buildroot-external/board/asus/tinker/patches/linux/0008-usb-audio-add-ASUS-TinkerBoard-s-ALC4040.patch index aefcdf118d0..1de0cecc744 100644 --- a/buildroot-external/board/asus/tinker/patches/linux/0008-usb-audio-add-ASUS-TinkerBoard-s-ALC4040.patch +++ b/buildroot-external/board/asus/tinker/patches/linux/0008-usb-audio-add-ASUS-TinkerBoard-s-ALC4040.patch @@ -1,4 +1,4 @@ -From f597ec583c262ed4c3264ddf661e22b503fb8a11 Mon Sep 17 00:00:00 2001 +From eb29ab60a69353f355b3af58b06fff1a89d17992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Wed, 10 Jan 2024 16:29:59 +0100 Subject: [PATCH] usb-audio: add ASUS TinkerBoard's ALC4040 @@ -12,10 +12,10 @@ Co-authored-by: Pascal Vizeli 1 file changed, 8 insertions(+) diff --git a/sound/usb/card.c b/sound/usb/card.c -index 1b2edc0fd2e9..3069ac5b6759 100644 +index 9c411b82a218d..672136e25c81d 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c -@@ -521,6 +521,14 @@ static void usb_audio_make_shortname(struct usb_device *dev, +@@ -533,6 +533,14 @@ static void usb_audio_make_shortname(struct usb_device *dev, } strim(card->shortname); diff --git a/buildroot-external/board/hardkernel/odroid-xu4/patches/linux/0001-ODROID-XU4-regulator-s2mps11-add-ethernet-power-rese.patch b/buildroot-external/board/hardkernel/odroid-xu4/patches/linux/0001-ODROID-XU4-regulator-s2mps11-add-ethernet-power-rese.patch index 4e8077df6b2..949c9db25c1 100644 --- a/buildroot-external/board/hardkernel/odroid-xu4/patches/linux/0001-ODROID-XU4-regulator-s2mps11-add-ethernet-power-rese.patch +++ b/buildroot-external/board/hardkernel/odroid-xu4/patches/linux/0001-ODROID-XU4-regulator-s2mps11-add-ethernet-power-rese.patch @@ -1,4 +1,4 @@ -From a699fbe94cea1f391d7af438e98f6008d8c790f1 Mon Sep 17 00:00:00 2001 +From d4ec3799c0773b3a6d3d90f4b16eec1f50e4b032 Mon Sep 17 00:00:00 2001 From: memeka Date: Fri, 18 Jan 2019 14:36:21 +1030 Subject: [PATCH] ODROID-XU4: regulator: s2mps11: add ethernet power reset in diff --git a/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-g12b-add-power-button-support.patch b/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-g12b-add-power-button-support.patch index 3c090bb5a6d..35ada469190 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-g12b-add-power-button-support.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0001-arm64-dts-meson-g12b-add-power-button-support.patch @@ -1,4 +1,4 @@ -From e780a5f405a02e3102c471415f7b0ad73a5cc036 Mon Sep 17 00:00:00 2001 +From 8286ad3b1e761138e3c574160a5e1a2d6ed06084 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 11 Jan 2021 11:20:48 +0100 Subject: [PATCH] arm64: dts: meson: g12b: add power button support @@ -13,7 +13,7 @@ Signed-off-by: Stefan Agner 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi -index 9e12a34b2840..c27eae6488ce 100644 +index 09d959aefb184..6be653ac77fac 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi @@ -38,6 +38,17 @@ fan: gpio-fan { diff --git a/buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-g12b-add-GPIO-fan-support.patch b/buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-g12b-add-GPIO-fan-support.patch index 97bac2a2d90..05a13d22d4f 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-g12b-add-GPIO-fan-support.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0002-arm64-dts-meson-g12b-add-GPIO-fan-support.patch @@ -1,4 +1,4 @@ -From cff7ba94733d9103487d87a6474e2ab026bd718c Mon Sep 17 00:00:00 2001 +From 6835f658a2c21d38730c1280587cf3768a82ad60 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 11 Jan 2021 11:38:54 +0100 Subject: [PATCH] arm64: dts: meson: g12b: add GPIO fan support @@ -13,7 +13,7 @@ Signed-off-by: Stefan Agner 1 file changed, 11 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi -index c27eae6488ce..db8a2dfaf0b3 100644 +index 6be653ac77fac..10dd23a3b44bc 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi @@ -49,6 +49,17 @@ power-button { diff --git a/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch b/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch index 7fbabbba591..bff74d49c84 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0003-arm64-dts-meson-g12b-odroid-n2-add-fan-as-cooling-de.patch @@ -1,4 +1,4 @@ -From 8d781fc504780a3aa8ef751724e3749c2bfda7a9 Mon Sep 17 00:00:00 2001 +From 297031995dabde203581d555e9ddd91a50d155dc Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 11 Jan 2021 15:53:55 +0100 Subject: [PATCH] arm64: dts: meson: g12b: odroid-n2: add fan as cooling device @@ -17,7 +17,7 @@ Signed-off-by: Stefan Agner 1 file changed, 38 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi -index db8a2dfaf0b3..843e66332369 100644 +index 10dd23a3b44bc..13624c6522abc 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi @@ -245,6 +245,44 @@ &clkc_audio { diff --git a/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-add-uart_A-node.patch b/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-add-uart_A-node.patch index 7fc410dbc14..41daf6ed9fc 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-add-uart_A-node.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0004-arm64-dts-meson-add-uart_A-node.patch @@ -1,4 +1,4 @@ -From 01ac730fa92a030690a7701c9b8781bc4ef7bcae Mon Sep 17 00:00:00 2001 +From 742764eb039d8d96aa43afeb62a89b122073bb98 Mon Sep 17 00:00:00 2001 From: Hyeonki Hong Date: Fri, 27 Mar 2020 17:05:22 +0900 Subject: [PATCH] arm64: dts: meson: add uart_A node @@ -12,7 +12,7 @@ Signed-off-by: Stefan Agner 1 file changed, 7 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi -index 843e66332369..61caadd679e2 100644 +index 13624c6522abc..6a1330b40cf4d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi @@ -12,6 +12,7 @@ diff --git a/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch b/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch index ac0d1ea1df7..0ca99ea1ecd 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0005-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch @@ -1,4 +1,4 @@ -From f5676219e12b48a0f591e911797304fae05ca78c Mon Sep 17 00:00:00 2001 +From bb0da00e7b89510fb66c7a8a1acf16d9f58a45fe Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 29 Apr 2021 21:32:43 +0200 Subject: [PATCH] arm64: dts: meson: add i2c2 node to ODROID N2/N2+ @@ -13,11 +13,11 @@ 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 91c9769fda20..ececc6b17639 100644 +index 3bca8023638d4..45f6dada0edee 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -@@ -248,6 +248,12 @@ usb-hub-hog { - }; +@@ -264,6 +264,12 @@ &gpio { + "PIN_36"; /* GPIOX_19 */ }; +&i2c2 { diff --git a/buildroot-external/board/hardkernel/patches/linux/0006-ODROID-C4-arm64-dts-add-uart_A-node.patch b/buildroot-external/board/hardkernel/patches/linux/0006-ODROID-C4-arm64-dts-add-uart_A-node.patch index 95282e3f07f..ed2859fe077 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0006-ODROID-C4-arm64-dts-add-uart_A-node.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0006-ODROID-C4-arm64-dts-add-uart_A-node.patch @@ -1,4 +1,4 @@ -From 1c9c3ca476adf09884295e9f8298288ea497e5ac Mon Sep 17 00:00:00 2001 +From 37b8576e97c3a130160bd5908220c67b2258a443 Mon Sep 17 00:00:00 2001 From: Hyeonki Hong Date: Tue, 1 Mar 2022 21:51:50 +0100 Subject: [PATCH] ODROID-C4: arm64/dts: add uart_A node @@ -8,7 +8,7 @@ Subject: [PATCH] ODROID-C4: arm64/dts: add uart_A node 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi -index 1db2327bbd13..e67869fbb460 100644 +index 7b0e9817a615d..a41fc1cfdeead 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi @@ -10,8 +10,9 @@ @@ -22,7 +22,7 @@ index 1db2327bbd13..e67869fbb460 100644 }; chosen { -@@ -449,6 +450,12 @@ &tohdmitx { +@@ -453,6 +454,12 @@ &tohdmitx { status = "okay"; }; diff --git a/buildroot-external/board/hardkernel/patches/linux/0007-ODROID-C4-arm64-dts-add-i2c2-i2c3-node.patch b/buildroot-external/board/hardkernel/patches/linux/0007-ODROID-C4-arm64-dts-add-i2c2-i2c3-node.patch index e1df0a5bf9b..36b8c7bc43f 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0007-ODROID-C4-arm64-dts-add-i2c2-i2c3-node.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0007-ODROID-C4-arm64-dts-add-i2c2-i2c3-node.patch @@ -1,4 +1,4 @@ -From 9cd343da01d9b69ad33444105208949775c909b4 Mon Sep 17 00:00:00 2001 +From 837c71af687b26385467b5c1e58208de325f6d26 Mon Sep 17 00:00:00 2001 From: Hyeonki Hong Date: Tue, 1 Mar 2022 21:53:32 +0100 Subject: [PATCH] ODROID-C4: arm64/dts: add i2c2, i2c3 node @@ -8,7 +8,7 @@ Subject: [PATCH] ODROID-C4: arm64/dts: add i2c2, i2c3 node 1 file changed, 53 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi -index e67869fbb460..90d2eea7fe24 100644 +index a41fc1cfdeead..ceb8a182820fd 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi @@ -11,6 +11,8 @@ @@ -20,7 +20,7 @@ index e67869fbb460..90d2eea7fe24 100644 serial0 = &uart_AO; serial1 = &uart_A; }; -@@ -386,6 +388,57 @@ &ir { +@@ -390,6 +392,57 @@ &ir { pinctrl-names = "default"; }; diff --git a/buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-amlogic-add-uartA-uartC-to-ODROID-C2.patch b/buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-amlogic-add-uartA-uartC-to-ODROID-C2.patch index f60ac362961..40749ff705e 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-amlogic-add-uartA-uartC-to-ODROID-C2.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0008-arm64-dts-amlogic-add-uartA-uartC-to-ODROID-C2.patch @@ -1,4 +1,4 @@ -From 299d45dd82df026c0164e170d476b56eada4aa77 Mon Sep 17 00:00:00 2001 +From 94625c724799c8082ab0f195e1799f88b352203d Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 15 Feb 2023 20:15:07 +0100 Subject: [PATCH] arm64: dts: amlogic: add uartA/uartC to ODROID-C2 @@ -9,7 +9,7 @@ Signed-off-by: Stefan Agner 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts -index e6d2de7c45a9..c6a38d890db5 100644 +index 959bd8d77a82e..557ad0cf8f975 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -17,6 +17,8 @@ / { @@ -21,7 +21,7 @@ index e6d2de7c45a9..c6a38d890db5 100644 ethernet0 = ðmac; }; -@@ -383,6 +385,18 @@ &uart_AO { +@@ -387,6 +389,18 @@ &uart_AO { pinctrl-names = "default"; }; diff --git a/buildroot-external/board/hardkernel/patches/linux/0009-arm64-dts-amlogic-meson-gx-add-missing-pins-for-I2C-.patch b/buildroot-external/board/hardkernel/patches/linux/0009-arm64-dts-amlogic-meson-gx-add-missing-pins-for-I2C-.patch index 042fb9ca2d4..43ad2cac72d 100644 --- a/buildroot-external/board/hardkernel/patches/linux/0009-arm64-dts-amlogic-meson-gx-add-missing-pins-for-I2C-.patch +++ b/buildroot-external/board/hardkernel/patches/linux/0009-arm64-dts-amlogic-meson-gx-add-missing-pins-for-I2C-.patch @@ -1,4 +1,4 @@ -From 61a378b42a2f61589cc62ff85334dd607014cb6d Mon Sep 17 00:00:00 2001 +From 2ee967384a0062b0de6a4259a9d9c839e11b1120 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 15 Feb 2023 20:16:29 +0100 Subject: [PATCH] arm64: dts: amlogic: meson-gx: add missing pins for I2C A/B @@ -9,10 +9,10 @@ Signed-off-by: Stefan Agner 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi -index 12ef6e81c8bd..90ae81493de2 100644 +index ed00e67e6923a..460a21a4f551a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi -@@ -333,6 +333,8 @@ &hwrng { +@@ -339,6 +339,8 @@ &hwrng { &i2c_A { clocks = <&clkc CLKID_I2C>; @@ -21,7 +21,7 @@ index 12ef6e81c8bd..90ae81493de2 100644 }; &i2c_AO { -@@ -341,6 +343,8 @@ &i2c_AO { +@@ -347,6 +349,8 @@ &i2c_AO { &i2c_B { clocks = <&clkc CLKID_I2C>; diff --git a/buildroot-external/board/nabucasa/green/patches/linux/0001-arm64-dts-rockchip-Add-NabuCasa-Green-board.patch b/buildroot-external/board/nabucasa/green/patches/linux/0001-arm64-dts-rockchip-Add-NabuCasa-Green-board.patch index a6ed42a4709..baf2f99d65c 100644 --- a/buildroot-external/board/nabucasa/green/patches/linux/0001-arm64-dts-rockchip-Add-NabuCasa-Green-board.patch +++ b/buildroot-external/board/nabucasa/green/patches/linux/0001-arm64-dts-rockchip-Add-NabuCasa-Green-board.patch @@ -1,4 +1,4 @@ -From 822994ede606e50b5ed5459ddb48078001b01f7a Mon Sep 17 00:00:00 2001 +From 015fa4136338919a43c1c6e47e8c07679cefbaa2 Mon Sep 17 00:00:00 2001 From: Zhangqun Ming Date: Thu, 6 Jul 2023 10:05:04 +0000 Subject: [PATCH] arm64: dts: rockchip: Add NabuCasa Green board diff --git a/buildroot-external/board/nabucasa/green/patches/linux/0002-drivers-mfd-rk808-set-PWRON_LP_OFF_TIME-12s.patch b/buildroot-external/board/nabucasa/green/patches/linux/0002-drivers-mfd-rk808-set-PWRON_LP_OFF_TIME-12s.patch index b296e673611..c4b5d3cba4c 100644 --- a/buildroot-external/board/nabucasa/green/patches/linux/0002-drivers-mfd-rk808-set-PWRON_LP_OFF_TIME-12s.patch +++ b/buildroot-external/board/nabucasa/green/patches/linux/0002-drivers-mfd-rk808-set-PWRON_LP_OFF_TIME-12s.patch @@ -1,4 +1,4 @@ -From be773999495258994d1df04448a4de43d58db9c4 Mon Sep 17 00:00:00 2001 +From 8bd12039ef70b3b78a588da61f6680cee40b65cf Mon Sep 17 00:00:00 2001 From: Zhangqun Ming Date: Wed, 12 Jul 2023 02:33:03 +0000 Subject: [PATCH] drivers: mfd: rk808: set PWRON_LP_OFF_TIME 12s @@ -9,10 +9,10 @@ Subject: [PATCH] drivers: mfd: rk808: set PWRON_LP_OFF_TIME 12s 2 files changed, 6 insertions(+) diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c -index a577f950c632..418a4506c99e 100644 +index 39ab114ea669d..c7a639b25231f 100644 --- a/drivers/mfd/rk8xx-core.c +++ b/drivers/mfd/rk8xx-core.c -@@ -232,6 +232,7 @@ static const struct rk808_reg_data rk817_pre_init_reg[] = { +@@ -263,6 +263,7 @@ static const struct rk808_reg_data rk817_pre_init_reg[] = { {RK817_GPIO_INT_CFG, RK817_INT_POL_MSK, RK817_INT_POL_L}, {RK817_SYS_CFG(1), RK817_HOTDIE_TEMP_MSK | RK817_TSD_TEMP_MSK, RK817_HOTDIE_105 | RK817_TSD_140}, @@ -21,10 +21,10 @@ index a577f950c632..418a4506c99e 100644 static const struct rk808_reg_data rk818_pre_init_reg[] = { diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h -index 78e167a92483..0bd7031966d6 100644 +index 69cbea78b430b..2a9563caa3e24 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h -@@ -1052,6 +1052,11 @@ enum rk809_reg_id { +@@ -1195,6 +1195,11 @@ enum rk809_reg_id { #define RK817_ON_SOURCE_REG 0xf5 #define RK817_OFF_SOURCE_REG 0xf6 diff --git a/buildroot-external/board/nabucasa/green/patches/linux/0003-arch-arm64-dts-green-Remove-spiflash-partitions.patch b/buildroot-external/board/nabucasa/green/patches/linux/0003-arch-arm64-dts-green-Remove-spiflash-partitions.patch index e6237b44132..8f848818920 100644 --- a/buildroot-external/board/nabucasa/green/patches/linux/0003-arch-arm64-dts-green-Remove-spiflash-partitions.patch +++ b/buildroot-external/board/nabucasa/green/patches/linux/0003-arch-arm64-dts-green-Remove-spiflash-partitions.patch @@ -1,4 +1,4 @@ -From 41026603d639007895de1f48437813f78edb62ea Mon Sep 17 00:00:00 2001 +From c0430945cd4a6a5b4072662b44cb6a44d3f7ecc2 Mon Sep 17 00:00:00 2001 From: Zhangqun Ming Date: Sat, 15 Jul 2023 08:28:16 +0000 Subject: [PATCH] arch: arm64: dts: green: Remove spiflash partitions @@ -8,10 +8,10 @@ Subject: [PATCH] arch: arm64: dts: green: Remove spiflash partitions 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts -index b5e4a67b3fc7..debb9459a5aa 100644 +index d6a86cc57b65e..6336fe758819f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts -@@ -565,36 +565,9 @@ &sfc { +@@ -569,36 +569,9 @@ &sfc { flash@0 { compatible = "jedec,spi-nor"; reg = <0>; diff --git a/buildroot-external/board/nabucasa/green/patches/linux/0004-Input-rk805-pwrkey-reverse-polarity-of-pwrkey.patch b/buildroot-external/board/nabucasa/green/patches/linux/0004-Input-rk805-pwrkey-reverse-polarity-of-pwrkey.patch index f896f4341d7..24a9688af0e 100644 --- a/buildroot-external/board/nabucasa/green/patches/linux/0004-Input-rk805-pwrkey-reverse-polarity-of-pwrkey.patch +++ b/buildroot-external/board/nabucasa/green/patches/linux/0004-Input-rk805-pwrkey-reverse-polarity-of-pwrkey.patch @@ -1,4 +1,4 @@ -From 0c8b1453993f15715836123bfc7c164e568913f2 Mon Sep 17 00:00:00 2001 +From c3f803f835db301e586127b061bd473fb61ec13a Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 19 Jul 2023 10:08:06 +0200 Subject: [PATCH] Input: rk805-pwrkey: reverse polarity of pwrkey @@ -12,7 +12,7 @@ Signed-off-by: Stefan Agner 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/misc/rk805-pwrkey.c b/drivers/input/misc/rk805-pwrkey.c -index 76873aa005b4..139419033c84 100644 +index 76873aa005b41..139419033c84a 100644 --- a/drivers/input/misc/rk805-pwrkey.c +++ b/drivers/input/misc/rk805-pwrkey.c @@ -19,7 +19,7 @@ static irqreturn_t pwrkey_fall_irq(int irq, void *_pwr) diff --git a/buildroot-external/board/nabucasa/green/patches/linux/0005-green-emmc-use-HS200-mode.patch b/buildroot-external/board/nabucasa/green/patches/linux/0005-green-emmc-use-HS200-mode.patch index a2de3c1fa72..b7b7f249e7a 100644 --- a/buildroot-external/board/nabucasa/green/patches/linux/0005-green-emmc-use-HS200-mode.patch +++ b/buildroot-external/board/nabucasa/green/patches/linux/0005-green-emmc-use-HS200-mode.patch @@ -1,4 +1,4 @@ -From 858d26179ee3a06fc7ebadf2c49dc337a7a98485 Mon Sep 17 00:00:00 2001 +From 3d75827d0318c792d4d7a68d7d7076deee3e7ad3 Mon Sep 17 00:00:00 2001 From: zhangcy Date: Mon, 14 Aug 2023 01:27:34 +0000 Subject: [PATCH] green: emmc use HS200 mode @@ -8,10 +8,10 @@ Subject: [PATCH] green: emmc use HS200 mode 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts -index debb9459a5aa..e4b1e80641b9 100644 +index 6336fe758819f..61083a9885a78 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts -@@ -532,6 +532,7 @@ &saradc { +@@ -536,6 +536,7 @@ &saradc { &sdhci { bus-width = <8>; diff --git a/buildroot-external/board/nabucasa/green/patches/linux/0006-arch-arm64-dts-green-Improve-LED-representation.patch b/buildroot-external/board/nabucasa/green/patches/linux/0006-arch-arm64-dts-green-Improve-LED-representation.patch index 6a9dcdc0b00..c9c29ca62ea 100644 --- a/buildroot-external/board/nabucasa/green/patches/linux/0006-arch-arm64-dts-green-Improve-LED-representation.patch +++ b/buildroot-external/board/nabucasa/green/patches/linux/0006-arch-arm64-dts-green-Improve-LED-representation.patch @@ -1,4 +1,4 @@ -From 6b926b041e939655d3a88202bde32f4901459a65 Mon Sep 17 00:00:00 2001 +From 6219da5138cdcdd0186187e8591010bbda5dc8a9 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 4 Sep 2023 22:36:10 +0200 Subject: [PATCH] arch: arm64: dts: green: Improve LED representation @@ -9,7 +9,7 @@ Fix color and use labels/node names according to the LEDs functionality. 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts -index e4b1e80641b9..1d0db11db3e0 100644 +index 61083a9885a78..df260be4211d9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-ha-green.dts @@ -48,16 +48,18 @@ hdmi_con_in: endpoint { diff --git a/buildroot-external/patches/linux/6.12.11/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch b/buildroot-external/patches/linux/6.12.11/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch index 3d7cb7e7dca..651027f9d6b 100644 --- a/buildroot-external/patches/linux/6.12.11/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch +++ b/buildroot-external/patches/linux/6.12.11/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch @@ -1,4 +1,4 @@ -From 76591e4075194cf717dc085b8285912f706bcd46 Mon Sep 17 00:00:00 2001 +From 3a369be3f99ff577e09f8fc02703c7c9e4e74f3d Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 28 Mar 2023 12:02:10 +0200 Subject: [PATCH] ipv6: add option to explicitly enable reachability test @@ -17,7 +17,7 @@ Signed-off-by: Stefan Agner 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig -index 08d4b7132d4c..242bf2eeb7ae 100644 +index 1c9c686d9522f..ee4d9ca9d2e24 100644 --- a/net/ipv6/Kconfig +++ b/net/ipv6/Kconfig @@ -48,6 +48,15 @@ config IPV6_OPTIMISTIC_DAD @@ -37,10 +37,10 @@ index 08d4b7132d4c..242bf2eeb7ae 100644 tristate "IPv6: AH transformation" select XFRM_AH diff --git a/net/ipv6/route.c b/net/ipv6/route.c -index 56525b5b95a2..916769b9a772 100644 +index 8ebfed5d63232..f1a61af0f5199 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -2211,7 +2211,8 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, +@@ -2223,7 +2223,8 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, strict |= flags & RT6_LOOKUP_F_IFACE; strict |= flags & RT6_LOOKUP_F_IGNORE_LINKSTATE; diff --git a/buildroot-external/patches/linux/6.12.11/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch b/buildroot-external/patches/linux/6.12.11/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch index 0a9221b3a40..4f41422226c 100644 --- a/buildroot-external/patches/linux/6.12.11/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch +++ b/buildroot-external/patches/linux/6.12.11/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch @@ -1,4 +1,4 @@ -From f9037c133775498d0ff2f035a957ce4f294e4e81 Mon Sep 17 00:00:00 2001 +From 557c96b3f40753fa22ebfe1cb57de360273a92c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Wed, 6 Mar 2024 13:25:41 +0100 Subject: [PATCH] Revert USB core changes causing issues with Z-Wave.me UZB @@ -33,10 +33,10 @@ Signed-off-by: Jan Čermák 4 files changed, 166 insertions(+), 213 deletions(-) diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c -index 12b6dfeaf658c..d895f6ebbc400 100644 +index 0b2490347b9fe..ab0826d90cc13 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c -@@ -958,7 +958,6 @@ static int register_root_hub(struct usb_hcd *hcd) +@@ -956,7 +956,6 @@ static int register_root_hub(struct usb_hcd *hcd) { struct device *parent_dev = hcd->self.controller; struct usb_device *usb_dev = hcd->self.root_hub; @@ -44,7 +44,7 @@ index 12b6dfeaf658c..d895f6ebbc400 100644 const int devnum = 1; int retval; -@@ -970,16 +969,13 @@ static int register_root_hub(struct usb_hcd *hcd) +@@ -968,16 +967,13 @@ static int register_root_hub(struct usb_hcd *hcd) mutex_lock(&usb_bus_idr_lock); usb_dev->ep0.desc.wMaxPacketSize = cpu_to_le16(64); @@ -65,10 +65,10 @@ index 12b6dfeaf658c..d895f6ebbc400 100644 if (le16_to_cpu(usb_dev->descriptor.bcdUSB) >= 0x0201) { retval = usb_get_bos_descriptor(usb_dev); diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 1ba3feb5e1900..ef1d63537a9b7 100644 +index 21ac9b464696f..0962411898b00 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -4742,67 +4742,6 @@ static int hub_enable_device(struct usb_device *udev) +@@ -4776,67 +4776,6 @@ static int hub_enable_device(struct usb_device *udev) return hcd->driver->enable_device(hcd, udev); } @@ -136,7 +136,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 /* Reset device, (re)assign address, get device descriptor. * Device connection must be stable, no more debouncing needed. * Returns device in USB_STATE_ADDRESS, except on error. -@@ -4812,17 +4751,10 @@ static int get_bMaxPacketSize0(struct usb_device *udev, +@@ -4846,17 +4785,10 @@ static int get_bMaxPacketSize0(struct usb_device *udev, * the port lock. For a newly detected device that is not accessible * through any global pointers, it's not necessary to lock the device, * but it is still necessary to lock the port. @@ -155,7 +155,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 { struct usb_device *hdev = hub->hdev; struct usb_hcd *hcd = bus_to_hcd(hdev->bus); -@@ -4834,13 +4766,6 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, +@@ -4868,13 +4800,6 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, int devnum = udev->devnum; const char *driver_name; bool do_new_scheme; @@ -169,7 +169,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 /* root hub ports have a slightly longer reset period * (from USB 2.0 spec, section 7.1.7.5) -@@ -4873,31 +4798,31 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, +@@ -4907,31 +4832,31 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, } oldspeed = udev->speed; @@ -225,7 +225,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 } speed = usb_speed_string(udev->speed); -@@ -4917,24 +4842,22 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, +@@ -4951,24 +4876,22 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, if (udev->speed < USB_SPEED_SUPER) dev_info(&udev->dev, "%s %s USB device number %d using %s\n", @@ -263,7 +263,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 } /* Why interleave GET_DESCRIPTOR and SET_ADDRESS this way? -@@ -4958,6 +4881,9 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, +@@ -4992,6 +4915,9 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, } if (do_new_scheme) { @@ -273,7 +273,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 retval = hub_enable_device(udev); if (retval < 0) { dev_err(&udev->dev, -@@ -4966,14 +4892,52 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, +@@ -5000,14 +4926,52 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, goto fail; } @@ -333,7 +333,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 retval = hub_port_reset(hub, port1, udev, delay, false); if (retval < 0) /* error or disconnect */ -@@ -4984,13 +4948,14 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, +@@ -5018,13 +4982,14 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, retval = -ENODEV; goto fail; } @@ -352,7 +352,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 } for (operations = 0; operations < SET_ADDRESS_TRIES; ++operations) { -@@ -5031,21 +4996,18 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, +@@ -5065,21 +5030,18 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, if (do_new_scheme) break; @@ -379,7 +379,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 delay = udev->parent->hub_delay; udev->hub_delay = min_t(u32, delay, -@@ -5064,62 +5026,48 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, +@@ -5098,62 +5060,48 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, goto fail; /* @@ -472,7 +472,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 goto fail; } -@@ -5145,7 +5093,6 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, +@@ -5179,7 +5127,6 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, hub_port_disable(hub, port1, 0); update_devnum(udev, devnum); /* for disconnect processing */ } @@ -480,7 +480,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 return retval; } -@@ -5226,7 +5173,7 @@ hub_power_remaining(struct usb_hub *hub) +@@ -5260,7 +5207,7 @@ hub_power_remaining(struct usb_hub *hub) static int descriptors_changed(struct usb_device *udev, @@ -489,7 +489,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 struct usb_host_bos *old_bos) { int changed = 0; -@@ -5237,8 +5184,8 @@ static int descriptors_changed(struct usb_device *udev, +@@ -5271,8 +5218,8 @@ static int descriptors_changed(struct usb_device *udev, int length; char *buf; @@ -500,7 +500,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 return 1; if ((old_bos && !udev->bos) || (!old_bos && udev->bos)) -@@ -5415,7 +5362,7 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, +@@ -5449,7 +5396,7 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus, } /* reset (non-USB 3.0 devices) and get descriptor */ @@ -509,7 +509,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 if (status < 0) goto loop; -@@ -5562,8 +5509,9 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, +@@ -5596,8 +5543,9 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, { struct usb_port *port_dev = hub->ports[port1 - 1]; struct usb_device *udev = port_dev->child; @@ -520,7 +520,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 dev_dbg(&port_dev->dev, "status %04x, change %04x, %s\n", portstatus, portchange, portspeed(hub, portstatus)); -@@ -5590,20 +5538,23 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, +@@ -5624,20 +5572,23 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1, * changed device descriptors before resuscitating the * device. */ @@ -550,7 +550,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 } #ifdef CONFIG_PM } else if (udev->state == USB_STATE_SUSPENDED && -@@ -6060,7 +6011,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev) +@@ -6094,7 +6045,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev) struct usb_device *parent_hdev = udev->parent; struct usb_hub *parent_hub; struct usb_hcd *hcd = bus_to_hcd(udev->bus); @@ -559,7 +559,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 struct usb_host_bos *bos; int i, j, ret = 0; int port1 = udev->portnum; -@@ -6096,7 +6047,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev) +@@ -6130,7 +6081,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev) /* ep0 maxpacket size may change; let the HCD know about it. * Other endpoints will be handled by re-enumeration. */ usb_ep0_reinit(udev); @@ -568,7 +568,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 if (ret >= 0 || ret == -ENOTCONN || ret == -ENODEV) break; } -@@ -6108,6 +6059,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev) +@@ -6142,6 +6093,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev) /* Device might have changed firmware (DFU or similar) */ if (descriptors_changed(udev, &descriptor, bos)) { dev_info(&udev->dev, "device firmware changed\n"); @@ -577,7 +577,7 @@ index 1ba3feb5e1900..ef1d63537a9b7 100644 } diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c -index 077dfe48d01c1..0d2bfc909019b 100644 +index d2b2787be4092..8bc0168e3af56 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -1041,35 +1041,40 @@ char *usb_cache_string(struct usb_device *udev, int index) @@ -634,7 +634,7 @@ index 077dfe48d01c1..0d2bfc909019b 100644 /* diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h -index 60363153fc3f3..69ca59841083b 100644 +index b8324ea05b20f..82fcef57ce3a9 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -43,8 +43,8 @@ extern bool usb_endpoint_is_ignored(struct usb_device *udev,