diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index 1a02d38f5..fd7b58eab 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -18,12 +18,12 @@ case $BRANCH in current) KERNEL_VERSION_LEVEL="5.15" - KERNELSWITCHOBJ="tag=v5.15.69" + KERNELSWITCHOBJ="tag=v5.15.71" ;; edge) KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-5.19} - KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v5.19.10'} + KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v5.19.12'} ;; esac diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index 053557df8..81106ee79 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -18,11 +18,11 @@ case $BRANCH in ;; current) KERNEL_VERSION_LEVEL="5.15" - KERNELSWITCHOBJ="tag=v5.15.69" + KERNELSWITCHOBJ="tag=v5.15.71" ;; edge) KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-5.19} - KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v5.19.10'} + KERNELSWITCHOBJ=${KERNELSWITCHOBJ:-'tag=v5.19.12'} ;; esac diff --git a/patch/kernel/archive/sunxi-5.15/megous/input-touchscreen-goodix-Add-support-for-GT1158.patch b/patch/kernel/archive/sunxi-5.15/megous/input-touchscreen-goodix-Add-support-for-GT1158.patch deleted file mode 100644 index d129cc35b..000000000 --- a/patch/kernel/archive/sunxi-5.15/megous/input-touchscreen-goodix-Add-support-for-GT1158.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 75c285786adeb3050d110225bd61a38f03d62f52 Mon Sep 17 00:00:00 2001 -From: Ondrej Jirman -Date: Thu, 11 Nov 2021 14:28:41 +0100 -Subject: [PATCH 467/467] input: touchscreen: goodix: Add support for GT1158 - -This controller is used by Pinephone Pro. - -Signed-off-by: Ondrej Jirman ---- - drivers/input/touchscreen/goodix.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c -index 3395110aa..1e7592dc3 100644 ---- a/drivers/input/touchscreen/goodix.c -+++ b/drivers/input/touchscreen/goodix.c -@@ -158,6 +158,7 @@ static const struct goodix_chip_data gt9x_chip_data = { - - static const struct goodix_chip_id goodix_chip_ids[] = { - { .id = "1151", .data = >1x_chip_data }, -+ { .id = "1158", .data = >1x_chip_data }, - { .id = "5663", .data = >1x_chip_data }, - { .id = "5688", .data = >1x_chip_data }, - { .id = "917S", .data = >1x_chip_data }, --- -2.34.0 - diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch deleted file mode 100644 index 1eadb9c8e..000000000 --- a/patch/kernel/archive/sunxi-5.15/patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts -@@ -21,7 +21,8 @@ - - aliases { - ethernet0 = &emac; -- ethernet1 = &rtl8189etv; -+ ethernet1 = &rtl8153; -+ ethernet2 = &rtl8189etv; - serial0 = &uart0; - }; - -@@ -116,6 +117,13 @@ - - &ehci1 { - status = "okay"; -+ -+ rtl8153: device@1 { -+ compatible = "usbbda,8153"; -+ reg = <1>; -+ realtek,led-data = <0x87>; -+ local-mac-address = [00 00 00 00 00 00]; -+ }; - }; - - &ehci2 { diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-r40-add-nodes-for-audio-codec.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-r40-add-nodes-for-audio-codec.patch index cc85f70ae..4fea0e9f5 100644 --- a/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-r40-add-nodes-for-audio-codec.patch +++ b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-r40-add-nodes-for-audio-codec.patch @@ -1,8 +1,17 @@ +From 3a1f0663b112eba24ad69ab2bbe8e41e5b9e5500 Mon Sep 17 00:00:00 2001 +From: The-going <48602507+The-going@users.noreply.github.com> +Date: Tue, 27 Sep 2022 22:28:48 +0300 +Subject: [PATCH] arm: dts: sun8i-r40: add nodes for audio codec + +--- + arch/arm/boot/dts/sun8i-r40.dtsi | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi -index d5ad3b9efd12..7a0b72304da5 100644 +index f3a92c67a..13e3778a8 100644 --- a/arch/arm/boot/dts/sun8i-r40.dtsi +++ b/arch/arm/boot/dts/sun8i-r40.dtsi -@@ -680,6 +680,24 @@ ir1: ir@1c21c00 { +@@ -806,6 +806,24 @@ ir1: ir@1c21c00 { status = "disabled"; }; @@ -27,3 +36,6 @@ index d5ad3b9efd12..7a0b72304da5 100644 ths: thermal-sensor@1c24c00 { compatible = "allwinner,sun8i-r40-ths"; reg = <0x01c24c00 0x100>; +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-enable-audio-codec.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-enable-audio-codec.patch index 4d0c64e80..ab3f2d51e 100644 --- a/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-enable-audio-codec.patch +++ b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-enable-audio-codec.patch @@ -1,5 +1,14 @@ +From 23faceabe4a0b2d8979d90d71b712f86b94487ef Mon Sep 17 00:00:00 2001 +From: The-going <48602507+The-going@users.noreply.github.com> +Date: Tue, 27 Sep 2022 22:32:26 +0300 +Subject: [PATCH] arm: dts: sun8i-r40-bananapi-m2-ultra: enable audio codec + +--- + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 10 ++++++++++ + 1 file changed, 10 insertions(+) + diff --git a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts -index a6a1087a0c9b..3ad67d12cb9f 100644 +index 87cf03574..73370f20d 100644 --- a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts +++ b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts @@ -113,6 +113,16 @@ &ahci { @@ -19,3 +28,6 @@ index a6a1087a0c9b..3ad67d12cb9f 100644 &de { status = "okay"; }; +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-v40-bananapi-m2-berry-enable-audio-codec.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-v40-bananapi-m2-berry-enable-audio-codec.patch index 4e0534d34..1804c06a0 100644 --- a/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-v40-bananapi-m2-berry-enable-audio-codec.patch +++ b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm-dts-sun8i-v40-bananapi-m2-berry-enable-audio-codec.patch @@ -1,5 +1,14 @@ +From ca02810d202000fd9e649b3c6ba7bef446429d96 Mon Sep 17 00:00:00 2001 +From: The-going <48602507+The-going@users.noreply.github.com> +Date: Tue, 27 Sep 2022 22:39:57 +0300 +Subject: [PATCH] arm: dts: sun8i-v40-bananapi-m2-berry: enable audio codec + +--- + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 10 ++++++++++ + 1 file changed, 10 insertions(+) + diff --git a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts -index 47954551f573..781f294c98aa 100644 +index 5df3d347b..ac41653ac 100644 --- a/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts +++ b/arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts @@ -107,6 +107,16 @@ &ahci { @@ -19,3 +28,6 @@ index 47954551f573..781f294c98aa 100644 &de { status = "okay"; }; +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/arm64-dts-sun50i-h5-nanopi-r1s-h5-add-rtl8153-suppor.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm64-dts-sun50i-h5-nanopi-r1s-h5-add-rtl8153-suppor.patch new file mode 100644 index 000000000..5fb6b9ccb --- /dev/null +++ b/patch/kernel/archive/sunxi-5.15/patches.armbian/arm64-dts-sun50i-h5-nanopi-r1s-h5-add-rtl8153-suppor.patch @@ -0,0 +1,40 @@ +From a437091c268ba017e5018f9f06494b3761632763 Mon Sep 17 00:00:00 2001 +From: The-going <48602507+The-going@users.noreply.github.com> +Date: Tue, 27 Sep 2022 21:16:56 +0300 +Subject: [PATCH] arm64: dts: sun50i-h5-nanopi-r1s-h5: add rtl8153 support + +--- + .../boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts +index 55bcdf8d1..2b4098f3a 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts +@@ -21,7 +21,8 @@ / { + + aliases { + ethernet0 = &emac; +- ethernet1 = &rtl8189etv; ++ ethernet1 = &rtl8153; ++ ethernet2 = &rtl8189etv; + serial0 = &uart0; + }; + +@@ -116,6 +117,13 @@ &cpu0 { + + &ehci1 { + status = "okay"; ++ ++ rtl8153: device@1 { ++ compatible = "usbbda,8153"; ++ reg = <1>; ++ realtek,led-data = <0x87>; ++ local-mac-address = [00 00 00 00 00 00]; ++ }; + }; + + &ehci2 { +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/sound-soc-sunxi-sun4i-codec-add-r40.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/sound-soc-sun4i-codec-add-compatible-sun8i_r40_codec.patch similarity index 80% rename from patch/kernel/archive/sunxi-5.15/patches.armbian/sound-soc-sunxi-sun4i-codec-add-r40.patch rename to patch/kernel/archive/sunxi-5.15/patches.armbian/sound-soc-sun4i-codec-add-compatible-sun8i_r40_codec.patch index 2a7e11829..6e129986c 100644 --- a/patch/kernel/archive/sunxi-5.15/patches.armbian/sound-soc-sunxi-sun4i-codec-add-r40.patch +++ b/patch/kernel/archive/sunxi-5.15/patches.armbian/sound-soc-sun4i-codec-add-compatible-sun8i_r40_codec.patch @@ -1,8 +1,17 @@ +From 1a48b7f06ef2d83a87ff372eaaf8208bb71562a6 Mon Sep 17 00:00:00 2001 +From: The-going <48602507+The-going@users.noreply.github.com> +Date: Tue, 27 Sep 2022 21:35:05 +0300 +Subject: [PATCH] sound: soc: sun4i-codec: add compatible sun8i_r40_codec + +--- + sound/soc/sunxi/sun4i-codec.c | 65 +++++++++++++++++++++++++++++++++++ + 1 file changed, 65 insertions(+) + diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c -index da597e456beb..b99727edcb0e 100644 +index f7de88f93..e9e17c740 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c -@@ -1507,6 +1507,45 @@ static struct snd_soc_card *sun8i_h3_codec_create_card(struct device *dev) +@@ -1550,6 +1550,45 @@ static struct snd_soc_card *sun8i_h3_codec_create_card(struct device *dev) return card; }; @@ -48,7 +57,7 @@ index da597e456beb..b99727edcb0e 100644 static struct snd_soc_card *sun8i_v3s_codec_create_card(struct device *dev) { struct snd_soc_card *card; -@@ -1581,6 +1620,13 @@ static const struct regmap_config sun8i_h3_codec_regmap_config = { +@@ -1624,6 +1663,13 @@ static const struct regmap_config sun8i_h3_codec_regmap_config = { .max_register = SUN8I_H3_CODEC_ADC_DBG, }; @@ -62,7 +71,7 @@ index da597e456beb..b99727edcb0e 100644 static const struct regmap_config sun8i_v3s_codec_regmap_config = { .reg_bits = 32, .reg_stride = 4, -@@ -1651,6 +1697,21 @@ static const struct sun4i_codec_quirks sun8i_h3_codec_quirks = { +@@ -1694,6 +1740,21 @@ static const struct sun4i_codec_quirks sun8i_h3_codec_quirks = { .has_reset = true, }; @@ -84,7 +93,7 @@ index da597e456beb..b99727edcb0e 100644 static const struct sun4i_codec_quirks sun8i_v3s_codec_quirks = { .regmap_config = &sun8i_v3s_codec_regmap_config, /* -@@ -1686,6 +1747,10 @@ static const struct of_device_id sun4i_codec_of_match[] = { +@@ -1729,6 +1790,10 @@ static const struct of_device_id sun4i_codec_of_match[] = { .compatible = "allwinner,sun8i-h3-codec", .data = &sun8i_h3_codec_quirks, }, @@ -95,3 +104,6 @@ index da597e456beb..b99727edcb0e 100644 { .compatible = "allwinner,sun8i-v3s-codec", .data = &sun8i_v3s_codec_quirks, +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.15/patches.armbian/sound-soc-sunxi-sun8i-codec-analog-add-r40.patch b/patch/kernel/archive/sunxi-5.15/patches.armbian/sound-soc-sunxi-sun8i-codec-analog-add-r40.patch index 73b007106..e5d196c3f 100644 --- a/patch/kernel/archive/sunxi-5.15/patches.armbian/sound-soc-sunxi-sun8i-codec-analog-add-r40.patch +++ b/patch/kernel/archive/sunxi-5.15/patches.armbian/sound-soc-sunxi-sun8i-codec-analog-add-r40.patch @@ -1,5 +1,14 @@ +From cb6f7d56aaa22259f8a260d34921e639d2303a90 Mon Sep 17 00:00:00 2001 +From: The-going <48602507+The-going@users.noreply.github.com> +Date: Tue, 27 Sep 2022 22:24:05 +0300 +Subject: [PATCH] sound: soc: sunxi: sun8i-codec-analog: add r40 + +--- + sound/soc/sunxi/sun8i-codec-analog.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + diff --git a/sound/soc/sunxi/sun8i-codec-analog.c b/sound/soc/sunxi/sun8i-codec-analog.c -index be872eefa61e..fa5493e8d250 100644 +index 10387fa9f..d0772cfa0 100644 --- a/sound/soc/sunxi/sun8i-codec-analog.c +++ b/sound/soc/sunxi/sun8i-codec-analog.c @@ -686,6 +686,14 @@ static const struct sun8i_codec_analog_quirks sun8i_h3_quirks = { @@ -17,7 +26,7 @@ index be872eefa61e..fa5493e8d250 100644 static int sun8i_codec_analog_add_mixer(struct snd_soc_component *cmpnt, const struct sun8i_codec_analog_quirks *quirks) { -@@ -809,6 +817,10 @@ static const struct of_device_id sun8i_codec_analog_of_match[] = { +@@ -813,6 +821,10 @@ static const struct of_device_id sun8i_codec_analog_of_match[] = { .compatible = "allwinner,sun8i-h3-codec-analog", .data = &sun8i_h3_quirks, }, @@ -28,3 +37,6 @@ index be872eefa61e..fa5493e8d250 100644 { .compatible = "allwinner,sun8i-v3s-codec-analog", .data = &sun8i_v3s_quirks, +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.15/series.conf b/patch/kernel/archive/sunxi-5.15/series.conf index e98dd9142..61ec60872 100644 --- a/patch/kernel/archive/sunxi-5.15/series.conf +++ b/patch/kernel/archive/sunxi-5.15/series.conf @@ -460,7 +460,6 @@ megous/media-i2c-imx258-Add-support-for-reset-gpio.patch megous/media-i2c-imx258-Add-support-for-power-supplies.patch megous/phy-rockchip-inno-usb2-Don-t-print-useless-error.patch - megous/input-touchscreen-goodix-Add-support-for-GT1158.patch megous/arm64-dts-rk3566-qaurtz64-a-Fix-ethernet-performance.patch megous/drm-panel-st7703-Fix-power-off-sequence.patch @@ -558,7 +557,6 @@ patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-.patch patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch -- patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch patches.armbian/arm-dts-sun7i-a20-cubietruck-add-alias-uart2.patch patches.armbian/arm-dts-sun8i-v3s-s3-pinecube-enable-sound-codec.patch patches.armbian/arm-dts-sun8i-r40-add-clk_out_a-fix-bananam2ultra.patch @@ -671,11 +669,11 @@ patches.armbian/0012-fix-h6-emmc.patch patches.armbian/0013-x-fix-h6-emmc-dts.patch patches.armbian/0014-add-uwe-bsp-to-orangepi3-lts-dts-file.patch - patches.armbian/0015-nanopi-r1s-h5-add-rtl8153-support.patch + patches.armbian/arm64-dts-sun50i-h5-nanopi-r1s-h5-add-rtl8153-suppor.patch patches.armbian/999-rollback-rsb.patch patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch patches.armbian/Orangepi_one_plus_Rollback-r_rsb-to-r_i2c.patch - patches.armbian/sound-soc-sunxi-sun4i-codec-add-r40.patch + patches.armbian/sound-soc-sun4i-codec-add-compatible-sun8i_r40_codec.patch patches.armbian/sound-soc-sunxi-sun8i-codec-analog-add-r40.patch patches.armbian/arm-dts-sun8i-r40-add-nodes-for-audio-codec.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-enable-audio-codec.patch diff --git a/patch/kernel/archive/sunxi-5.15/series.megous b/patch/kernel/archive/sunxi-5.15/series.megous index 82e64d93f..9f36edc0e 100644 --- a/patch/kernel/archive/sunxi-5.15/series.megous +++ b/patch/kernel/archive/sunxi-5.15/series.megous @@ -461,6 +461,5 @@ megous/media-i2c-imx258-Add-support-for-reset-gpio.patch megous/media-i2c-imx258-Add-support-for-power-supplies.patch megous/phy-rockchip-inno-usb2-Don-t-print-useless-error.patch - megous/input-touchscreen-goodix-Add-support-for-GT1158.patch megous/arm64-dts-rk3566-qaurtz64-a-Fix-ethernet-performance.patch megous/drm-panel-st7703-Fix-power-off-sequence.patch diff --git a/patch/kernel/archive/sunxi-5.19/patches.armbian/arm64-dts-sun50i-h5-nanopi-r1s-h5-add-rtl8153-suppor.patch b/patch/kernel/archive/sunxi-5.19/patches.armbian/arm64-dts-sun50i-h5-nanopi-r1s-h5-add-rtl8153-suppor.patch new file mode 100644 index 000000000..b8b60ba3c --- /dev/null +++ b/patch/kernel/archive/sunxi-5.19/patches.armbian/arm64-dts-sun50i-h5-nanopi-r1s-h5-add-rtl8153-suppor.patch @@ -0,0 +1,40 @@ +From 6548c16046ff4d02657cd93d268538727352570b Mon Sep 17 00:00:00 2001 +From: The-going <48602507+The-going@users.noreply.github.com> +Date: Tue, 27 Sep 2022 15:28:08 +0300 +Subject: [PATCH] arm64: dts: sun50i-h5-nanopi-r1s-h5: add rtl8153 support + +--- + .../boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts +index 55b369534..61bc2db0d 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts +@@ -21,7 +21,8 @@ / { + + aliases { + ethernet0 = &emac; +- ethernet1 = &rtl8189etv; ++ ethernet1 = &rtl8153; ++ ethernet2 = &rtl8189etv; + serial0 = &uart0; + }; + +@@ -116,6 +117,13 @@ &cpu0 { + + &ehci1 { + status = "okay"; ++ ++ rtl8153: device@1 { ++ compatible = "usbbda,8153"; ++ reg = <1>; ++ realtek,led-data = <0x87>; ++ local-mac-address = [00 00 00 00 00 00]; ++ }; + }; + + &ehci2 { +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.19/patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch b/patch/kernel/archive/sunxi-5.19/patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch deleted file mode 100644 index 1eadb9c8e..000000000 --- a/patch/kernel/archive/sunxi-5.19/patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-r1s-h5.dts -@@ -21,7 +21,8 @@ - - aliases { - ethernet0 = &emac; -- ethernet1 = &rtl8189etv; -+ ethernet1 = &rtl8153; -+ ethernet2 = &rtl8189etv; - serial0 = &uart0; - }; - -@@ -116,6 +117,13 @@ - - &ehci1 { - status = "okay"; -+ -+ rtl8153: device@1 { -+ compatible = "usbbda,8153"; -+ reg = <1>; -+ realtek,led-data = <0x87>; -+ local-mac-address = [00 00 00 00 00 00]; -+ }; - }; - - &ehci2 { diff --git a/patch/kernel/archive/sunxi-5.19/patches.megous/input-touchscreen-goodix-Add-support-for-GT1158.patch b/patch/kernel/archive/sunxi-5.19/patches.megous/input-touchscreen-goodix-Add-support-for-GT1158.patch deleted file mode 100644 index 8f27e7af7..000000000 --- a/patch/kernel/archive/sunxi-5.19/patches.megous/input-touchscreen-goodix-Add-support-for-GT1158.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f3c1445fb3ae4db1483cf33010e9875594678aa3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= -Date: Thu, 11 Nov 2021 14:28:41 +0100 -Subject: [PATCH 323/417] input: touchscreen: goodix: Add support for GT1158 - -This controller is used by Pinephone Pro. - -Signed-off-by: Ondrej Jirman ---- - drivers/input/touchscreen/goodix.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c -index 1d0a513f0..fe14716e9 100644 ---- a/drivers/input/touchscreen/goodix.c -+++ b/drivers/input/touchscreen/goodix.c -@@ -96,6 +96,7 @@ static const struct goodix_chip_data gt9x_chip_data = { - - static const struct goodix_chip_id goodix_chip_ids[] = { - { .id = "1151", .data = >1x_chip_data }, -+ { .id = "1158", .data = >1x_chip_data }, - { .id = "5663", .data = >1x_chip_data }, - { .id = "5688", .data = >1x_chip_data }, - { .id = "917S", .data = >1x_chip_data }, --- -2.35.3 - diff --git a/patch/kernel/archive/sunxi-5.19/series.armbian b/patch/kernel/archive/sunxi-5.19/series.armbian index 0c56b9659..4f04d1d07 100644 --- a/patch/kernel/archive/sunxi-5.19/series.armbian +++ b/patch/kernel/archive/sunxi-5.19/series.armbian @@ -171,6 +171,6 @@ patches.armbian/mmc-host-sunxi-mmc-Fix-H6-emmc.patch patches.armbian/arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc.patch patches.armbian/Rollback-r_rsb-to-r_i2c.patch - patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch + patches.armbian/arm64-dts-sun50i-h5-nanopi-r1s-h5-add-rtl8153-suppor.patch patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-Rollback-r_rsb-to-r_i2c.patch diff --git a/patch/kernel/archive/sunxi-5.19/series.conf b/patch/kernel/archive/sunxi-5.19/series.conf index 80b3d708c..510c80a35 100644 --- a/patch/kernel/archive/sunxi-5.19/series.conf +++ b/patch/kernel/archive/sunxi-5.19/series.conf @@ -323,7 +323,6 @@ patches.megous/drm-panel-hx8394-Fix-mode-clock-for-the-pinephone-pro-panel.patch patches.megous/drm-rockchip-cdn-dp-Disable-CDN-DP-on-disconnect.patch patches.megous/input-touchscreen-goodix-Respect-IRQ-flags-from-DT-when-asked-t.patch - patches.megous/input-touchscreen-goodix-Add-support-for-GT1158.patch patches.megous/power-rk818-Configure-rk808-clkout2-function.patch patches.megous/power-rk818-battery-Add-battery-driver-for-RK818.patch patches.megous/power-supply-rk818-battery-Use-a-more-propper-compatible-string.patch @@ -620,6 +619,6 @@ patches.armbian/mmc-host-sunxi-mmc-Fix-H6-emmc.patch patches.armbian/arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc.patch patches.armbian/Rollback-r_rsb-to-r_i2c.patch - patches.armbian/nanopi-r1s-h5-add-rtl8153-support.patch + patches.armbian/arm64-dts-sun50i-h5-nanopi-r1s-h5-add-rtl8153-suppor.patch patches.armbian/net-usb-r8152-add-LED-configuration-from-OF.patch patches.armbian/arm64-dts-sun50i-h6-orangepi.dtsi-Rollback-r_rsb-to-r_i2c.patch diff --git a/patch/kernel/archive/sunxi-5.19/series.megous b/patch/kernel/archive/sunxi-5.19/series.megous index e08aab612..7f1407598 100644 --- a/patch/kernel/archive/sunxi-5.19/series.megous +++ b/patch/kernel/archive/sunxi-5.19/series.megous @@ -323,7 +323,6 @@ patches.megous/drm-panel-hx8394-Fix-mode-clock-for-the-pinephone-pro-panel.patch patches.megous/drm-rockchip-cdn-dp-Disable-CDN-DP-on-disconnect.patch patches.megous/input-touchscreen-goodix-Respect-IRQ-flags-from-DT-when-asked-t.patch - patches.megous/input-touchscreen-goodix-Add-support-for-GT1158.patch patches.megous/power-rk818-Configure-rk808-clkout2-function.patch patches.megous/power-rk818-battery-Add-battery-driver-for-RK818.patch patches.megous/power-supply-rk818-battery-Use-a-more-propper-compatible-string.patch