meson64 edge 6.4: drop patches that landed upstream and backports
This commit is contained in:
Ricardo Pardini
Igor
parent
447b0b8276
commit
069324a120
@ -1,38 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: David Heidelberg <david@ixit.cz>
|
||||
Date: Sat, 27 Nov 2021 07:23:35 +0000
|
||||
Subject: arm64: dts: meson: make dts use gpio-fan matrix instead of array
|
||||
|
||||
No functional changes.
|
||||
|
||||
Adjust to comply with dt-schema requirements
|
||||
and make possible to validate values.
|
||||
|
||||
Signed-off-by: David Heidelberg <david@ixit.cz>
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
||||
index b21172ece1fa..74897a154891 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
|
||||
@@ -52,10 +52,11 @@ gpio_fan: gpio-fan {
|
||||
gpios = <&gpio GPIODV_14 GPIO_ACTIVE_HIGH
|
||||
&gpio GPIODV_15 GPIO_ACTIVE_HIGH>;
|
||||
/* Dummy RPM values since fan is optional */
|
||||
- gpio-fan,speed-map = <0 0
|
||||
- 1 1
|
||||
- 2 2
|
||||
- 3 3>;
|
||||
+ gpio-fan,speed-map =
|
||||
+ <0 0>,
|
||||
+ <1 1>,
|
||||
+ <2 2>,
|
||||
+ <3 3>;
|
||||
#cooling-cells = <2>;
|
||||
};
|
||||
|
||||
--
|
||||
Armbian
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: benjamin545 <benjamin545@gmail.com>
|
||||
Date: Thu, 15 Jul 2021 14:32:33 -0400
|
||||
Subject: WIP: drivers: meson: vdec: remove redundant if statement
|
||||
|
||||
checking if sess->fmt_out->pixfmt is V4L2_PIX_FMT_VP9 was already done
|
||||
as a condition to enter the if statement where this additional check is performed
|
||||
---
|
||||
drivers/staging/media/meson/vdec/esparser.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c
|
||||
index 98f1efa4ad31..06f627b141fb 100644
|
||||
--- a/drivers/staging/media/meson/vdec/esparser.c
|
||||
+++ b/drivers/staging/media/meson/vdec/esparser.c
|
||||
@@ -315,8 +315,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf)
|
||||
num_dst_bufs = codec_ops->num_pending_bufs(sess);
|
||||
|
||||
num_dst_bufs += v4l2_m2m_num_dst_bufs_ready(sess->m2m_ctx);
|
||||
- if (sess->fmt_out->pixfmt == V4L2_PIX_FMT_VP9)
|
||||
- num_dst_bufs -= 3;
|
||||
+ num_dst_bufs -= 3;
|
||||
|
||||
if (esparser_vififo_get_free_space(sess) < payload_size ||
|
||||
atomic_read(&sess->esparser_queued_bufs) >= num_dst_bufs)
|
||||
--
|
||||
Armbian
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Lucas Tanure <tanure@linux.com>
|
||||
Date: Wed, 12 Apr 2023 18:46:20 -0400
|
||||
Subject: FROMLIST(v4): of: fdt: Scan /memreserve/ last
|
||||
|
||||
Change the scanning /memreserve/ and /reserved-memory node order to fix
|
||||
Kernel panic on Khadas Vim3 Board.
|
||||
|
||||
If /memreserve/ goes first, the memory is reserved, but nomap can't be
|
||||
applied to the region. So the memory won't be used by Linux, but it is
|
||||
still present in the linear map as normal memory, which allows
|
||||
speculation. Legitimate access to adjacent pages will cause the CPU
|
||||
to end up prefetching into them leading to Kernel panic.
|
||||
|
||||
So /reserved-memory node should go first, as it has a more updated
|
||||
description of the memory regions and can apply flags, like nomap.
|
||||
|
||||
Signed-off-by: Lucas Tanure <tanure@linux.com>
|
||||
---
|
||||
drivers/of/fdt.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
|
||||
index 81508e8b34d2..0252a7189d99 100644
|
||||
--- a/drivers/of/fdt.c
|
||||
+++ b/drivers/of/fdt.c
|
||||
@@ -626,6 +626,9 @@ void __init early_init_fdt_scan_reserved_mem(void)
|
||||
if (!initial_boot_params)
|
||||
return;
|
||||
|
||||
+ fdt_scan_reserved_mem();
|
||||
+ fdt_reserve_elfcorehdr();
|
||||
+
|
||||
/* Process header /memreserve/ fields */
|
||||
for (n = 0; ; n++) {
|
||||
fdt_get_mem_rsv(initial_boot_params, n, &base, &size);
|
||||
@@ -634,8 +637,6 @@ void __init early_init_fdt_scan_reserved_mem(void)
|
||||
memblock_reserve(base, size);
|
||||
}
|
||||
|
||||
- fdt_scan_reserved_mem();
|
||||
- fdt_reserve_elfcorehdr();
|
||||
fdt_init_reserved_mem();
|
||||
}
|
||||
|
||||
--
|
||||
Armbian
|
||||
|
||||
@ -1,97 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Yavitz <pyavitz@gmail.com>
|
||||
Date: Thu, 1 Jun 2023 06:32:23 +0200
|
||||
Subject: use divide XTAL by 2 - backport
|
||||
|
||||
MESON UART
|
||||
Series improves support for UART attached Bluetooth modules on Amlogic Meson G12A and newer SoCs. These SoCs also support the "divide XTAL by 2" bit which (greatly) reduces jitter when generating baud rates such as 1500000 (which is used by the Bluetooth part of the RTL8822CS SDIO WiFi and UART Bluetooth combo chip).
|
||||
---
|
||||
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 15 ++++++----
|
||||
drivers/tty/serial/meson_uart.c | 8 +++--
|
||||
2 files changed, 16 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
index cc549f52219d..c629b2a32175 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
|
||||
@@ -2061,7 +2061,8 @@ pwm_AO_cd: pwm@2000 {
|
||||
};
|
||||
|
||||
uart_AO: serial@3000 {
|
||||
- compatible = "amlogic,meson-gx-uart",
|
||||
+ compatible = "amlogic,meson-g12a-uart",
|
||||
+ "amlogic,meson-gx-uart",
|
||||
"amlogic,meson-ao-uart";
|
||||
reg = <0x0 0x3000 0x0 0x18>;
|
||||
interrupts = <GIC_SPI 193 IRQ_TYPE_EDGE_RISING>;
|
||||
@@ -2071,7 +2072,8 @@ uart_AO: serial@3000 {
|
||||
};
|
||||
|
||||
uart_AO_B: serial@4000 {
|
||||
- compatible = "amlogic,meson-gx-uart",
|
||||
+ compatible = "amlogic,meson-g12a-uart",
|
||||
+ "amlogic,meson-gx-uart",
|
||||
"amlogic,meson-ao-uart";
|
||||
reg = <0x0 0x4000 0x0 0x18>;
|
||||
interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>;
|
||||
@@ -2308,7 +2310,8 @@ clk_msr: clock-measure@18000 {
|
||||
};
|
||||
|
||||
uart_C: serial@22000 {
|
||||
- compatible = "amlogic,meson-gx-uart";
|
||||
+ compatible = "amlogic,meson-g12a-uart",
|
||||
+ "amlogic,meson-gx-uart";
|
||||
reg = <0x0 0x22000 0x0 0x18>;
|
||||
interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>;
|
||||
@@ -2317,7 +2320,8 @@ uart_C: serial@22000 {
|
||||
};
|
||||
|
||||
uart_B: serial@23000 {
|
||||
- compatible = "amlogic,meson-gx-uart";
|
||||
+ compatible = "amlogic,meson-g12a-uart",
|
||||
+ "amlogic,meson-gx-uart";
|
||||
reg = <0x0 0x23000 0x0 0x18>;
|
||||
interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>;
|
||||
@@ -2326,7 +2330,8 @@ uart_B: serial@23000 {
|
||||
};
|
||||
|
||||
uart_A: serial@24000 {
|
||||
- compatible = "amlogic,meson-gx-uart";
|
||||
+ compatible = "amlogic,meson-g12a-uart",
|
||||
+ "amlogic,meson-gx-uart";
|
||||
reg = <0x0 0x24000 0x0 0x18>;
|
||||
interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
|
||||
clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;
|
||||
diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
|
||||
index 74110017988a..2501db5a7aaf 100644
|
||||
--- a/drivers/tty/serial/meson_uart.c
|
||||
+++ b/drivers/tty/serial/meson_uart.c
|
||||
@@ -779,7 +779,7 @@ static int meson_uart_remove(struct platform_device *pdev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static struct meson_uart_data s4_uart_data = {
|
||||
+static struct meson_uart_data meson_g12a_uart_data = {
|
||||
.has_xtal_div2 = true,
|
||||
};
|
||||
|
||||
@@ -788,9 +788,13 @@ static const struct of_device_id meson_uart_dt_match[] = {
|
||||
{ .compatible = "amlogic,meson8-uart" },
|
||||
{ .compatible = "amlogic,meson8b-uart" },
|
||||
{ .compatible = "amlogic,meson-gx-uart" },
|
||||
+ {
|
||||
+ .compatible = "amlogic,meson-g12a-uart",
|
||||
+ .data = (void *)&meson_g12a_uart_data,
|
||||
+ },
|
||||
{
|
||||
.compatible = "amlogic,meson-s4-uart",
|
||||
- .data = (void *)&s4_uart_data,
|
||||
+ .data = (void *)&meson_g12a_uart_data,
|
||||
},
|
||||
{ /* sentinel */ },
|
||||
};
|
||||
--
|
||||
Armbian
|
||||
|
||||
Loading…
Reference in New Issue
Block a user