enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson64-6.18: rewrite patches

Browse Source
This commit is contained in:
Ricardo Pardini 2025-10-12 20:03:42 +02:00 committed by Igor
parent 3381d25b77
commit 8f6e17e52f
13 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patch/kernel/archive/meson64-6.18/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch
View File

@ -22,7 +22,7 @@ index 111111111111..222222222222 100644
/ {
adc-keys {
@@ -388,6 +389,8 @@ &sd_emmc_b {
@@ -387,6 +388,8 @@ &sd_emmc_b {
cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;
vmmc-supply = <&tflash_vdd>;
vqmmc-supply = <&vddio_c>;
@ -31,7 +31,7 @@ index 111111111111..222222222222 100644
};
/* eMMC */
@@ -407,6 +410,8 @@ &sd_emmc_c {
@@ -406,6 +409,8 @@ &sd_emmc_c {
mmc-pwrseq = <&emmc_pwrseq>;
vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&emmc_1v8>;

2
patch/kernel/archive/meson64-6.18/board-bananapism1-add-uart_A-and-AO_B.patch
View File

@ -69,7 +69,7 @@ index 111111111111..222222222222 100644
ethernet0 = &ethmac;
};
@@ -420,6 +421,12 @@ &uart_AO {
@@ -419,6 +420,12 @@ &uart_AO {
pinctrl-names = "default";
};

2
patch/kernel/archive/meson64-6.18/board-odroidc2-add-uartA-uartC.patch
View File

@ -26,7 +26,7 @@ index 111111111111..222222222222 100644
ethernet0 = &ethmac;
};
@@ -387,6 +389,18 @@ &uart_AO {
@@ -383,6 +385,18 @@ &uart_AO {
pinctrl-names = "default";
};

2
patch/kernel/archive/meson64-6.18/board-t95z-add-rc-remote-keymap.patch
View File

@ -34,7 +34,7 @@ diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentat
index 111111111111..222222222222 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -1504,6 +1504,8 @@ patternProperties:
@@ -1560,6 +1560,8 @@ patternProperties:
description: Sundance DSP Inc.
"^sunplus,.*":
description: Sunplus Technology Co., Ltd.

2
patch/kernel/archive/meson64-6.18/general-add-overlay-compilation-support.patch
View File

@ -36,7 +36,7 @@ diff --git a/scripts/Makefile.dtbs b/scripts/Makefile.dtbs
index 111111111111..222222222222 100644
--- a/scripts/Makefile.dtbs
+++ b/scripts/Makefile.dtbs
@@ -122,17 +122,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
@@ -123,17 +123,23 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
quiet_cmd_dtc = DTC $(quiet_dtb_check_tag) $@
cmd_dtc = \
$(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \

2
patch/kernel/archive/meson64-6.18/general-fix-Kodi-sysinfo-CPU-information.patch
View File

@ -16,7 +16,7 @@ diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index 111111111111..222222222222 100644
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -223,9 +223,8 @@ static int c_show(struct seq_file *m, void *v)
@@ -224,9 +224,8 @@ static int c_show(struct seq_file *m, void *v)
* "processor". Give glibc what it expects.
*/
seq_printf(m, "processor\t: %d\n", cpu);

8
patch/kernel/archive/meson64-6.18/general-input-touchscreen-Add-D-WAV-Multitouch.patch
View File

@ -16,7 +16,7 @@ diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 111111111111..222222222222 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -1540,4 +1540,10 @@
@@ -1542,4 +1542,10 @@
#define USB_VENDOR_ID_SMARTLINKTECHNOLOGY 0x4c4a
#define USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155 0x4155
@ -31,7 +31,7 @@ diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 111111111111..222222222222 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -912,6 +912,8 @@ static const struct hid_device_id hid_ignore_list[] = {
@@ -914,6 +914,8 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) },
{ HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) },
@ -44,7 +44,7 @@ diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconf
index 111111111111..222222222222 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -1402,4 +1402,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
@@ -1424,4 +1424,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
To compile this driver as a module, choose M here: the
module will be called himax_hx83112b.
@ -63,7 +63,7 @@ diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Make
index 111111111111..222222222222 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -117,4 +117,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o
@@ -119,4 +119,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o
obj-$(CONFIG_TOUCHSCREEN_IQS5XX) += iqs5xx.o
obj-$(CONFIG_TOUCHSCREEN_IQS7211) += iqs7211.o
obj-$(CONFIG_TOUCHSCREEN_ZINITIX) += zinitix.o

4
patch/kernel/archive/meson64-6.18/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch
View File

@ -23,7 +23,7 @@ index 111111111111..222222222222 100644
/ {
compatible = "amlogic,meson-axg";
@@ -1938,6 +1939,7 @@ sd_emmc_b: mmc@5000 {
@@ -1959,6 +1960,7 @@ sd_emmc_b: mmc@5000 {
<&clkc CLKID_SD_EMMC_B_CLK0>,
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
@ -31,7 +31,7 @@ index 111111111111..222222222222 100644
resets = <&reset RESET_SD_EMMC_B>;
};
@@ -1951,6 +1953,7 @@ sd_emmc_c: mmc@7000 {
@@ -1972,6 +1974,7 @@ sd_emmc_c: mmc@7000 {
<&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1";
resets = <&reset RESET_SD_EMMC_C>;

6
patch/kernel/archive/meson64-6.18/general-soc-0004-arm64-dts-meson-add-dts-links-to-secure-monitor-for-.patch
View File

@ -19,7 +19,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi b/arch/arm64/boot/dts/aml
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
@@ -626,6 +626,7 @@ hwrng: rng@5118 {
@@ -641,6 +641,7 @@ hwrng: rng@5118 {
sec_AO: ao-secure@5a20 {
compatible = "amlogic,meson-gx-ao-secure", "syscon";
reg = <0x0 0x5a20 0x0 0x140>;
@ -31,7 +31,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/am
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -1690,6 +1690,7 @@ mux {
@@ -1711,6 +1711,7 @@ mux {
sec_AO: ao-secure@140 {
compatible = "amlogic,meson-gx-ao-secure", "syscon";
reg = <0x0 0x140 0x0 0x140>;
@ -55,7 +55,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/aml
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -471,6 +471,7 @@ cec_AO: cec@100 {
@@ -498,6 +498,7 @@ cec_AO: cec@100 {
sec_AO: ao-secure@140 {
compatible = "amlogic,meson-gx-ao-secure", "syscon";
reg = <0x0 0x140 0x0 0x140>;

6
patch/kernel/archive/meson64-6.18/meson-g12a-pinctrl-add-missing-ir-options.patch
View File

@ -59,7 +59,7 @@ index 111111111111..222222222222 100644
/* uart_a */
static const unsigned int uart_a_tx_pins[] = { GPIOX_12 };
static const unsigned int uart_a_rx_pins[] = { GPIOX_13 };
@@ -753,6 +756,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
@@ -756,6 +759,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
/* bank GPIOA */
GROUP(i2c3_sda_a, 2),
GROUP(i2c3_sck_a, 2),
@ -67,7 +67,7 @@ index 111111111111..222222222222 100644
GROUP(pdm_din0_a, 1),
GROUP(pdm_din1_a, 1),
GROUP(pdm_din2_a, 1),
@@ -1038,6 +1042,10 @@ static const char * const i2c3_groups[] = {
@@ -1041,6 +1045,10 @@ static const char * const i2c3_groups[] = {
"i2c3_sda_a", "i2c3_sck_a",
};
@ -78,7 +78,7 @@ index 111111111111..222222222222 100644
static const char * const uart_a_groups[] = {
"uart_a_tx", "uart_a_rx", "uart_a_cts", "uart_a_rts",
};
@@ -1282,6 +1290,7 @@ static const struct meson_pmx_func meson_g12a_periphs_functions[] = {
@@ -1289,6 +1297,7 @@ static const struct meson_pmx_func meson_g12a_periphs_functions[] = {
FUNCTION(i2c1),
FUNCTION(i2c2),
FUNCTION(i2c3),

2
patch/kernel/archive/meson64-6.18/meson-g12b-dt-Add-missing-pinmux-node-for-pwm.patch
View File

@ -13,7 +13,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/a
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
@@ -149,3 +149,45 @@ &pmu {
@@ -197,3 +197,45 @@ &pmu {
&npu {
power-domains = <&pwrc PWRC_G12A_NNA_ID>;
};

4
patch/kernel/archive/meson64-6.18/meson-gx-dts-add-support-for-GX-PM-and-VRTC.patch
View File

@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/aml
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -223,6 +223,10 @@ sm: secure-monitor {
@@ -250,6 +250,10 @@ sm: secure-monitor {
};
};
@ -23,7 +23,7 @@ index 111111111111..222222222222 100644
efuse: efuse {
compatible = "amlogic,meson-gx-efuse", "amlogic,meson-gxbb-efuse";
#address-cells = <1>;
@@ -461,6 +465,11 @@ clkc_AO: clock-controller {
@@ -488,6 +492,11 @@ clkc_AO: clock-controller {
};
};

2
patch/kernel/archive/meson64-6.18/meson-sm1-dts-add-higher-clocks.patch
View File

@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/am
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
@@ -137,6 +137,16 @@ opp-1908000000 {
@@ -164,6 +164,16 @@ opp-1908000000 {
opp-hz = /bits/ 64 <1908000000>;
opp-microvolt = <950000>;
};