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

meson64-6.12: rebase onto 6.12-rc7, no changes

Browse Source
This commit is contained in:
Ricardo Pardini 2024-11-17 16:27:45 +01:00
parent d76427e85c
commit 5dedeb544e
21 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patch/kernel/archive/meson64-6.12/board-bananapi-cm4-cm4io.patch
View File

@ -31,7 +31,7 @@ index 111111111111..222222222222 100644
};
};
@@ -116,6 +117,10 @@ codec {
@@ -120,6 +121,10 @@ codec {
};
};

6
patch/kernel/archive/meson64-6.12/board-bananapim5-002-add-wifi-bt-support.patch
View File

@ -37,7 +37,7 @@ index 111111111111..222222222222 100644
sound {
compatible = "amlogic,axg-sound-card";
model = "BPI-M5";
@@ -149,7 +163,6 @@ &acodec {
@@ -153,7 +167,6 @@ &acodec {
status = "okay";
};
@ -45,7 +45,7 @@ index 111111111111..222222222222 100644
&clkc_audio {
status = "okay";
};
@@ -172,6 +185,42 @@ &frddr_c {
@@ -176,6 +189,42 @@ &frddr_c {
status = "okay";
};
@ -88,7 +88,7 @@ index 111111111111..222222222222 100644
&tdmif_b {
status = "okay";
};
@@ -219,3 +268,18 @@ &toddr_b {
@@ -223,3 +272,18 @@ &toddr_b {
&toddr_c {
status = "okay";
};

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

@ -47,7 +47,7 @@ index 111111111111..222222222222 100644
sound {
compatible = "amlogic,axg-sound-card";
model = "BPI-M2-PRO";
@@ -95,3 +99,9 @@ &tdmout_b {
@@ -99,3 +103,9 @@ &tdmout_b {
&tohdmitx {
status = "okay";
};

2
patch/kernel/archive/meson64-6.12/board-khadas-vim3-fix-missing-i2c3-nod.patch
View File

@ -18,7 +18,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boo
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
@@ -332,6 +332,13 @@ hdmi_tx_tmds_out: endpoint {
@@ -336,6 +336,13 @@ hdmi_tx_tmds_out: endpoint {
};
};

4
patch/kernel/archive/meson64-6.12/board-nanopi-k2-enable-emmc.patch
View File

@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/b
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
@@ -358,7 +358,7 @@ &sd_emmc_b {
@@ -362,7 +362,7 @@ &sd_emmc_b {
/* eMMC */
&sd_emmc_c {
@ -21,7 +21,7 @@ index 111111111111..222222222222 100644
pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
pinctrl-1 = <&emmc_clk_gate_pins>;
pinctrl-names = "default", "clk-gate";
@@ -368,8 +368,6 @@ &sd_emmc_c {
@@ -372,8 +372,6 @@ &sd_emmc_c {
non-removable;
disable-wp;
cap-mmc-highspeed;

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

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

2
patch/kernel/archive/meson64-6.12/board-odroidc2-enable-scpi-dvfs.patch
View File

@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/bo
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -360,7 +360,8 @@ &saradc {
@@ -364,7 +364,8 @@ &saradc {
};
&scpi_clocks {

6
patch/kernel/archive/meson64-6.12/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch
View File

@ -41,7 +41,7 @@ index 111111111111..222222222222 100644
ao_5v: regulator-ao-5v {
compatible = "regulator-fixed";
regulator-name = "AO_5V";
@@ -202,6 +210,18 @@ wifi32k: wifi32k {
@@ -206,6 +214,18 @@ wifi32k: wifi32k {
};
};
@ -60,7 +60,7 @@ index 111111111111..222222222222 100644
&arb {
status = "okay";
};
@@ -289,6 +309,26 @@ &ir {
@@ -293,6 +313,26 @@ &ir {
pinctrl-names = "default";
};
@ -87,7 +87,7 @@ index 111111111111..222222222222 100644
&pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default";
@@ -413,3 +453,11 @@ &uart_AO {
@@ -417,3 +457,11 @@ &uart_AO {
&usb {
status = "okay";
};

2
patch/kernel/archive/meson64-6.12/board-radxa-zero-dts-slow-down-sdio-for-working-wifi.patch
View File

@ -15,7 +15,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
@@ -361,7 +361,7 @@ &sd_emmc_a {
@@ -365,7 +365,7 @@ &sd_emmc_a {
bus-width = <4>;
cap-sd-highspeed;

2
patch/kernel/archive/meson64-6.12/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
@@ -1431,6 +1431,8 @@ patternProperties:
@@ -1435,6 +1435,8 @@ patternProperties:
description: Sundance DSP Inc.
"^sunplus,.*":
description: Sunplus Technology Co., Ltd.

4
patch/kernel/archive/meson64-6.12/driver-power-meson64-reset.patch
View File

@ -13,7 +13,7 @@ diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index 111111111111..222222222222 100644
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -148,6 +148,13 @@ config POWER_RESET_ODROID_GO_ULTRA_POWEROFF
@@ -158,6 +158,13 @@ config POWER_RESET_ODROID_GO_ULTRA_POWEROFF
help
This driver supports Power off for Odroid Go Ultra device.
@ -31,7 +31,7 @@ diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile
index 111111111111..222222222222 100644
--- a/drivers/power/reset/Makefile
+++ b/drivers/power/reset/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o
@@ -15,6 +15,7 @@ obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o
obj-$(CONFIG_POWER_RESET_LINKSTATION) += linkstation-poweroff.o
obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o
obj-$(CONFIG_POWER_RESET_MT6323) += mt6323-poweroff.o

4
patch/kernel/archive/meson64-6.12/drv-spi-spidev-remove-warnings.patch
View File

@ -12,7 +12,7 @@ diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 111111111111..222222222222 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -700,6 +700,7 @@ static const struct class spidev_class = {
@@ -699,6 +699,7 @@ static const struct class spidev_class = {
};
static const struct spi_device_id spidev_spi_ids[] = {
@ -20,7 +20,7 @@ index 111111111111..222222222222 100644
{ .name = "bh2228fv" },
{ .name = "dh2228fv" },
{ .name = "jg10309-01" },
@@ -730,6 +731,7 @@ static int spidev_of_check(struct device *dev)
@@ -729,6 +730,7 @@ static int spidev_of_check(struct device *dev)
}
static const struct of_device_id spidev_dt_ids[] = {

2
patch/kernel/archive/meson64-6.12/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch
View File

@ -13,7 +13,7 @@ diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/
index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -768,6 +768,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable)
@@ -765,6 +765,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable)
else
hdmi->mc_clkdis |= HDMI_MC_CLKDIS_AUDCLK_DISABLE;
hdmi_writeb(hdmi, hdmi->mc_clkdis, HDMI_MC_CLKDIS);

2
patch/kernel/archive/meson64-6.12/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
@@ -205,8 +205,7 @@ static int c_show(struct seq_file *m, void *v)
@@ -206,8 +206,7 @@ static int c_show(struct seq_file *m, void *v)
* "processor". Give glibc what it expects.
*/
seq_printf(m, "processor\t: %d\n", i);

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

@ -45,7 +45,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
@@ -1430,4 +1430,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
@@ -1388,4 +1388,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
To compile this driver as a module, choose M here: the
module will be called himax_hx83112b.
@ -64,7 +64,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
@@ -120,4 +120,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o
@@ -116,4 +116,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

6
patch/kernel/archive/meson64-6.12/general-meson-vdec-add-HEVC-decode-codec.patch
View File

@ -1546,7 +1546,7 @@ index 111111111111..222222222222 100644
}, {
.pixfmt = V4L2_PIX_FMT_H264,
.min_buffers = 2,
@@ -114,6 +127,18 @@ static const struct amvdec_format vdec_formats_gxm[] = {
@@ -152,6 +165,18 @@ static const struct amvdec_format vdec_formats_gxm[] = {
.pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
.flags = V4L2_FMT_FLAG_COMPRESSED |
V4L2_FMT_FLAG_DYN_RESOLUTION,
@ -1565,7 +1565,7 @@ index 111111111111..222222222222 100644
}, {
.pixfmt = V4L2_PIX_FMT_H264,
.min_buffers = 2,
@@ -165,6 +190,18 @@ static const struct amvdec_format vdec_formats_g12a[] = {
@@ -203,6 +228,18 @@ static const struct amvdec_format vdec_formats_g12a[] = {
.flags = V4L2_FMT_FLAG_COMPRESSED |
V4L2_FMT_FLAG_DYN_RESOLUTION,
}, {
@ -1584,7 +1584,7 @@ index 111111111111..222222222222 100644
.pixfmt = V4L2_PIX_FMT_H264,
.min_buffers = 2,
.max_buffers = 24,
@@ -214,6 +251,18 @@ static const struct amvdec_format vdec_formats_sm1[] = {
@@ -252,6 +289,18 @@ static const struct amvdec_format vdec_formats_sm1[] = {
.pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 },
.flags = V4L2_FMT_FLAG_COMPRESSED |
V4L2_FMT_FLAG_DYN_RESOLUTION,

6
patch/kernel/archive/meson64-6.12/general-meson64-overlays.patch
View File

@ -12,9 +12,9 @@ diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 111111111111..222222222222 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -93,6 +93,9 @@ base-dtb-y := $(filter %.dtb, $(call real-search, $(multi-dtb-y), .dtb, -dtbs))
always-y += $(dtb-y)
@@ -75,6 +75,9 @@ always-y += $(hostprogs-always-y) $(hostprogs-always-m)
userprogs += $(userprogs-always-y) $(userprogs-always-m)
always-y += $(userprogs-always-y) $(userprogs-always-m)
+# Overlay targets
+extra-y += $(dtbo-y) $(scr-y) $(dtbotxt-y)

6
patch/kernel/archive/meson64-6.12/jethome-0001-Fix-meson64-add-gpio-irq-patch-from-https-lkml.org-l.patch
View File

@ -22,7 +22,7 @@ index 111111111111..222222222222 100644
#include "../core.h"
#include "../pinctrl-utils.h"
@@ -601,6 +602,40 @@ static int meson_gpio_get(struct gpio_chip *chip, unsigned gpio)
@@ -602,6 +603,40 @@ static int meson_gpio_get(struct gpio_chip *chip, unsigned gpio)
return !!(val & BIT(bit));
}
@ -63,7 +63,7 @@ index 111111111111..222222222222 100644
static int meson_gpiolib_register(struct meson_pinctrl *pc)
{
int ret;
@@ -616,6 +651,7 @@ static int meson_gpiolib_register(struct meson_pinctrl *pc)
@@ -617,6 +652,7 @@ static int meson_gpiolib_register(struct meson_pinctrl *pc)
pc->chip.direction_output = meson_gpio_direction_output;
pc->chip.get = meson_gpio_get;
pc->chip.set = meson_gpio_set;
@ -71,7 +71,7 @@ index 111111111111..222222222222 100644
pc->chip.base = -1;
pc->chip.ngpio = pc->data->num_pins;
pc->chip.can_sleep = false;
@@ -679,6 +715,11 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc)
@@ -680,6 +716,11 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc)
pc->fwnode = gpiochip_node_get_first(pc->dev);
gpio_np = to_of_node(pc->fwnode);

4
patch/kernel/archive/meson64-6.12/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 };
@@ -737,6 +740,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = {
@@ -737,6 +740,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
/* bank GPIOA */
GROUP(i2c3_sda_a, 2),
GROUP(i2c3_sck_a, 2),
@ -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",
};
@@ -1266,6 +1274,7 @@ static struct meson_pmx_func meson_g12a_periphs_functions[] = {
@@ -1266,6 +1274,7 @@ static const struct meson_pmx_func meson_g12a_periphs_functions[] = {
FUNCTION(i2c1),
FUNCTION(i2c2),
FUNCTION(i2c3),

4
patch/kernel/archive/meson64-6.12/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch
View File

@ -83,7 +83,7 @@ index 111111111111..222222222222 100644
/* pwm_e */
static const unsigned int pwm_e_pins[] = { GPIOX_16 };
@@ -594,6 +598,9 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = {
@@ -594,6 +598,9 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
GROUP(bt565_a_din5, 2),
GROUP(bt565_a_din6, 2),
GROUP(bt565_a_din7, 2),
@ -93,7 +93,7 @@ index 111111111111..222222222222 100644
GROUP(tsin_b_valid_z, 3),
GROUP(tsin_b_sop_z, 3),
GROUP(tsin_b_din0_z, 3),
@@ -726,6 +733,7 @@ static struct meson_pmx_group meson_g12a_periphs_groups[] = {
@@ -726,6 +733,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
GROUP(uart_c_rts, 2),
GROUP(iso7816_clk_h, 1),
GROUP(iso7816_data_h, 1),

2
patch/kernel/archive/meson64-6.12/meson-gxl-gxm-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch
View File

@ -90,7 +90,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/bo
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
@@ -256,7 +256,11 @@ &sd_emmc_a {
@@ -260,7 +260,11 @@ &sd_emmc_a {
bus-width = <4>;
cap-sd-highspeed;