jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-27 04:36:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux (Allwinner): rebase patches for 6.5-rc1

Browse Source
This commit is contained in:
Rudi Heitbaum 2023-07-10 11:09:28 +00:00
parent e8711e070c
commit e9712777a2
8 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
projects/Allwinner/patches/linux/0004-DO-NOT-MERGE-ARM-dts-sunxi-h3-h5-Protect-SCP-clocks.patch
View File

@ -5,11 +5,11 @@ Subject: [PATCH] [DO NOT MERGE] ARM: dts: sunxi: h3/h5: Protect SCP clocks
Signed-off-by: Samuel Holland <samuel@sholland.org> Signed-off-by: Samuel Holland <samuel@sholland.org>
--- ---
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 2 ++ arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi | 2 ++
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi --- a/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi +++ b/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
@@ -388,6 +388,7 @@ @@ -388,6 +388,7 @@
reg = <0x01c20000 0x400>; reg = <0x01c20000 0x400>;
clocks = <&osc24M>, <&rtc 0>; clocks = <&osc24M>, <&rtc 0>;

12
projects/Allwinner/patches/linux/0010-ARM-dts-sunxi-h3-h5-Add-SCPI-protocol.patch
View File

@ -5,13 +5,13 @@ Subject: [PATCH] ARM: dts: sunxi: h3/h5: Add SCPI protocol
Signed-off-by: Samuel Holland <samuel@sholland.org> Signed-off-by: Samuel Holland <samuel@sholland.org>
--- ---
arch/arm/boot/dts/sun8i-h3.dtsi | 13 +++++++++++++ arch/arm/boot/dts/allwinner/sun8i-h3.dtsi | 13 +++++++++++++
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 7 +++++++ arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi | 7 +++++++
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 13 +++++++++++++ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 13 +++++++++++++
3 files changed, 33 insertions(+) 3 files changed, 33 insertions(+)
--- a/arch/arm/boot/dts/sun8i-h3.dtsi --- a/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi +++ b/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
@@ -170,6 +170,19 @@ @@ -170,6 +170,19 @@
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
@ -32,8 +32,8 @@ Signed-off-by: Samuel Holland <samuel@sholland.org>
sram_c: sram@1d00000 { sram_c: sram@1d00000 {
compatible = "mmio-sram"; compatible = "mmio-sram";
reg = <0x01d00000 0x80000>; reg = <0x01d00000 0x80000>;
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi --- a/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi +++ b/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
@@ -105,6 +105,13 @@ @@ -105,6 +105,13 @@
status = "disabled"; status = "disabled";
}; };

6
projects/Allwinner/patches/linux/0034-HACK-h3-h5-Add-HDMI-sound-card.patch
View File

@ -5,11 +5,11 @@ Subject: [PATCH 44/44] HACK: h3/h5: Add HDMI sound card
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
--- ---
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 20 +++++++++++++++++++- arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-) 1 file changed, 19 insertions(+), 1 deletion(-)
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi --- a/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi +++ b/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
@@ -77,6 +77,24 @@ @@ -77,6 +77,24 @@
}; };
}; };

16
projects/Allwinner/patches/linux/0036-wip-h3-h5-cvbs.patch
View File

@ -4,8 +4,8 @@ Date: Wed, 20 Jan 2021 22:15:36 +0100
Subject: [PATCH] wip h3/h5 cvbs Subject: [PATCH] wip h3/h5 cvbs
--- ---
arch/arm/boot/dts/sun8i-h3.dtsi | 22 +++++ arch/arm/boot/dts/allwinner/sun8i-h3.dtsi | 22 +++++
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 95 +++++++++++++++++++- arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi | 95 +++++++++++++++++++-
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 22 +++++ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 22 +++++
drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 14 ++- drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 14 ++-
drivers/gpu/drm/sun4i/sun4i_tv.c | 35 +++++++- drivers/gpu/drm/sun4i/sun4i_tv.c | 35 +++++++-
@ -13,10 +13,10 @@ Subject: [PATCH] wip h3/h5 cvbs
drivers/gpu/drm/sun4i/sun8i_mixer.h | 5 +- drivers/gpu/drm/sun4i/sun8i_mixer.h | 5 +-
7 files changed, 226 insertions(+), 11 deletions(-) 7 files changed, 226 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi b/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
index 448dd325f8c3..d896dc5502f5 100644 index 448dd325f8c3..d896dc5502f5 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi --- a/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi +++ b/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
@@ -252,6 +252,20 @@ ths: thermal-sensor@1c25000 { @@ -252,6 +252,20 @@ ths: thermal-sensor@1c25000 {
nvmem-cell-names = "calibration"; nvmem-cell-names = "calibration";
#thermal-sensor-cells = <0>; #thermal-sensor-cells = <0>;
@ -57,10 +57,10 @@ index 448dd325f8c3..d896dc5502f5 100644
+&tcon1_out_tve { +&tcon1_out_tve {
+ remote-endpoint = <&tve_in_tcon1>; + remote-endpoint = <&tve_in_tcon1>;
+}; +};
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi diff --git a/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
index 3d37a6a586b6..152029413784 100644 index 3d37a6a586b6..152029413784 100644
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi --- a/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi +++ b/arch/arm/boot/dts/allwinner/sunxi-h3-h5.dtsi
@@ -119,7 +119,7 @@ osc32k: osc32k_clk { @@ -119,7 +119,7 @@ osc32k: osc32k_clk {
de: display-engine { de: display-engine {

12
projects/Allwinner/patches/linux/0041-bpi-m2u-analog-codec.patch
View File

@ -5,12 +5,12 @@ Subject: [PATCH 16/17] dts: enable analog codec
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
--- ---
.../boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 9 ++++ .../boot/dts/allwinner/sun8i-r40-bananapi-m2-ultra.dts | 9 ++++
arch/arm/boot/dts/sun8i-r40.dtsi | 42 +++++++++++++++++++ arch/arm/boot/dts/allwinner/sun8i-r40.dtsi | 42 +++++++++++++++++++
2 files changed, 51 insertions(+) 2 files changed, 51 insertions(+)
--- a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts --- a/arch/arm/boot/dts/allwinner/sun8i-r40-bananapi-m2-ultra.dts
+++ b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-r40-bananapi-m2-ultra.dts
@@ -113,6 +113,15 @@ @@ -113,6 +113,15 @@
status = "okay"; status = "okay";
}; };
@ -27,8 +27,8 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
&de { &de {
status = "okay"; status = "okay";
}; };
--- a/arch/arm/boot/dts/sun8i-r40.dtsi --- a/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
+++ b/arch/arm/boot/dts/sun8i-r40.dtsi +++ b/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
@@ -736,6 +736,25 @@ @@ -736,6 +736,25 @@
status = "disabled"; status = "disabled";
}; };

6
projects/Allwinner/patches/linux/0042-r40-hdmi-audio-wip.patch
View File

@ -5,11 +5,11 @@ Subject: [PATCH 17/17] r40 hdmi audio wip
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
--- ---
arch/arm/boot/dts/sun8i-r40.dtsi | 19 +++++++++++++++++++ arch/arm/boot/dts/allwinner/sun8i-r40.dtsi | 19 +++++++++++++++++++
1 file changed, 19 insertions(+) 1 file changed, 19 insertions(+)
--- a/arch/arm/boot/dts/sun8i-r40.dtsi --- a/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
+++ b/arch/arm/boot/dts/sun8i-r40.dtsi +++ b/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
@@ -111,6 +111,24 @@ @@ -111,6 +111,24 @@
status = "disabled"; status = "disabled";
}; };

16
projects/Allwinner/patches/linux/0057-HACK-Disable-MBUS-due-to-fw_devlink-on.patch
View File

@ -4,14 +4,14 @@ Date: Sat, 25 Sep 2021 16:21:41 +0200
Subject: [PATCH] HACK: Disable MBUS due to fw_devlink=on Subject: [PATCH] HACK: Disable MBUS due to fw_devlink=on
--- ---
arch/arm/boot/dts/sun8i-r40.dtsi | 1 + arch/arm/boot/dts/allwinner/sun8i-r40.dtsi | 1 +
arch/arm/boot/dts/sun8i-h3.dtsi | 1 + arch/arm/boot/dts/allwinner/sun8i-h3.dtsi | 1 +
2 files changed, 2 insertions(+) 2 files changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi diff --git a/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi b/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
index 291f4784e86c..173edaff4c9b 100644 index 291f4784e86c..173edaff4c9b 100644
--- a/arch/arm/boot/dts/sun8i-r40.dtsi --- a/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
+++ b/arch/arm/boot/dts/sun8i-r40.dtsi +++ b/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
@@ -949,6 +949,7 @@ mbus: dram-controller@1c62000 { @@ -949,6 +949,7 @@ mbus: dram-controller@1c62000 {
#size-cells = <1>; #size-cells = <1>;
dma-ranges = <0x00000000 0x40000000 0x80000000>; dma-ranges = <0x00000000 0x40000000 0x80000000>;
@ -20,10 +20,10 @@ index 291f4784e86c..173edaff4c9b 100644
}; };
tcon_top: tcon-top@1c70000 { tcon_top: tcon-top@1c70000 {
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi diff --git a/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi b/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
index eac2349a2380..3c08f5ee2780 100644 index eac2349a2380..3c08f5ee2780 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi --- a/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi +++ b/arch/arm/boot/dts/allwinner/sun8i-h3.dtsi
@@ -297,6 +297,7 @@ &display_clocks { @@ -297,6 +297,7 @@ &display_clocks {
&mbus { &mbus {

8
projects/Allwinner/patches/linux/0105-ARM-dts-sun8i-r40-Add-interconnect-to-video-codec.patch
View File

@ -8,13 +8,13 @@ DMA addresses.
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com> Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
--- ---
arch/arm/boot/dts/sun8i-r40.dtsi | 2 ++ arch/arm/boot/dts/allwinner/sun8i-r40.dtsi | 2 ++
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi diff --git a/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi b/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
index 4ef26d8f5340..a5b1f1e3900d 100644 index 4ef26d8f5340..a5b1f1e3900d 100644
--- a/arch/arm/boot/dts/sun8i-r40.dtsi --- a/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
+++ b/arch/arm/boot/dts/sun8i-r40.dtsi +++ b/arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
@@ -338,6 +338,8 @@ video-codec@1c0e000 { @@ -338,6 +338,8 @@ video-codec@1c0e000 {
resets = <&ccu RST_BUS_VE>; resets = <&ccu RST_BUS_VE>;
interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;