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

meson64-6.11: rebase/rewrite remaining patches, no changes

Browse Source
This commit is contained in:
Ricardo Pardini 2024-09-14 15:02:49 +02:00 committed by Igor
parent d4e9105413
commit c93407ebec
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patch/kernel/archive/meson64-6.11/board-t95z-add-rc-remote-keymap.patch
View File

@ -22,7 +22,7 @@ diff --git a/Documentation/devicetree/bindings/media/rc.yaml b/Documentation/dev
index 111111111111..222222222222 100644
--- a/Documentation/devicetree/bindings/media/rc.yaml
+++ b/Documentation/devicetree/bindings/media/rc.yaml
@@ -127,6 +127,7 @@ properties:
@@ -128,6 +128,7 @@ properties:
- rc-reddo
- rc-snapstream-firefly
- rc-streamzap
@ -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
@@ -1411,6 +1411,8 @@ patternProperties:
@@ -1431,6 +1431,8 @@ patternProperties:
description: Sundance DSP Inc.
"^sunplus,.*":
description: Sunplus Technology Co., Ltd.
@ -47,7 +47,7 @@ diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefi
index 111111111111..222222222222 100644
--- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -107,6 +107,7 @@ obj-$(CONFIG_RC_MAP) += \
@@ -108,6 +108,7 @@ obj-$(CONFIG_RC_MAP) += \
rc-reddo.o \
rc-snapstream-firefly.o \
rc-streamzap.o \
@ -140,7 +140,7 @@ diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 111111111111..222222222222 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -314,6 +314,7 @@ struct rc_map *rc_map_get(const char *name);
@@ -315,6 +315,7 @@ struct rc_map *rc_map_get(const char *name);
#define RC_MAP_REDDO "rc-reddo"
#define RC_MAP_SNAPSTREAM_FIREFLY "rc-snapstream-firefly"
#define RC_MAP_STREAMZAP "rc-streamzap"

6
patch/kernel/archive/meson64-6.11/drv-spi-spidev-remove-warnings.patch
View File

@ -19,15 +19,15 @@ index 111111111111..222222222222 100644
+ { .name = "spi-dev" },
{ .name = "bh2228fv" },
{ .name = "dh2228fv" },
{ .name = "ltc2488" },
@@ -729,6 +730,7 @@ static int spidev_of_check(struct device *dev)
{ .name = "jg10309-01" },
@@ -730,6 +731,7 @@ static int spidev_of_check(struct device *dev)
}
static const struct of_device_id spidev_dt_ids[] = {
+ { .compatible = "armbian,spi-dev", .data = &spidev_of_check },
{ .compatible = "cisco,spi-petra", .data = &spidev_of_check },
{ .compatible = "dh,dhcom-board", .data = &spidev_of_check },
{ .compatible = "lineartechnology,ltc2488", .data = &spidev_of_check },
{ .compatible = "elgin,jg10309-01", .data = &spidev_of_check },
--
Armbian

2
patch/kernel/archive/meson64-6.11/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
@@ -1481,4 +1481,10 @@
@@ -1484,4 +1484,10 @@
#define USB_VENDOR_ID_SIGNOTEC 0x2133
#define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011 0x0018

8
patch/kernel/archive/meson64-6.11/general-meson-mmc-3-arm64-dts-docs-Update-mmc-meson-gx-documentation-for.patch
View File

@ -23,9 +23,9 @@ diff --git a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml b/D
index 111111111111..222222222222 100644
--- a/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml
+++ b/Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml
@@ -51,6 +51,16 @@ properties:
set when controller's internal DMA engine cannot access the DRAM memory,
like on the G12A dedicated SDIO controller.
@@ -54,6 +54,16 @@ properties:
power-domains:
maxItems: 1
+ amlogic,mmc-phases:
+ type: integer
@ -40,7 +40,7 @@ index 111111111111..222222222222 100644
required:
- compatible
- reg
@@ -73,4 +83,5 @@ examples:
@@ -76,4 +86,5 @@ examples:
clock-names = "core", "clkin0", "clkin1";
pinctrl-0 = <&emm_pins>;
resets = <&reset_mmc>;

4
patch/kernel/archive/meson64-6.11/general-socinfo-sm-5-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
@@ -407,6 +407,7 @@ hwrng: rng@5118 {
@@ -420,6 +420,7 @@ hwrng: rng@5118 {
sec_AO: ao-secure@5a20 {
compatible = "amlogic,meson-gx-ao-secure", "syscon";
reg = <0x0 0x5a20 0x0 0x140>;
@ -43,7 +43,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot
index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -2059,6 +2059,7 @@ cec_AO: cec@100 {
@@ -2056,6 +2056,7 @@ cec_AO: cec@100 {
sec_AO: ao-secure@140 {
compatible = "amlogic,meson-gx-ao-secure", "syscon";
reg = <0x0 0x140 0x0 0x140>;

12
patch/kernel/archive/meson64-6.11/general-spi-nor-add-support-for-XT25F128B.patch
View File

@ -34,9 +34,9 @@ diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile
index 111111111111..222222222222 100644
--- a/drivers/mtd/spi-nor/Makefile
+++ b/drivers/mtd/spi-nor/Makefile
@@ -15,6 +15,7 @@ spi-nor-objs += sst.o
@@ -14,6 +14,7 @@ spi-nor-objs += spansion.o
spi-nor-objs += sst.o
spi-nor-objs += winbond.o
spi-nor-objs += xilinx.o
spi-nor-objs += xmc.o
+spi-nor-objs += xtx.o
spi-nor-$(CONFIG_DEBUG_FS) += debugfs.o
@ -46,9 +46,9 @@ diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index 111111111111..222222222222 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -1988,6 +1988,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
@@ -1977,6 +1977,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
&spi_nor_sst,
&spi_nor_winbond,
&spi_nor_xilinx,
&spi_nor_xmc,
+ &spi_nor_xtx,
};
@ -58,9 +58,9 @@ diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
index 111111111111..222222222222 100644
--- a/drivers/mtd/spi-nor/core.h
+++ b/drivers/mtd/spi-nor/core.h
@@ -605,6 +605,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst;
@@ -593,6 +593,7 @@ extern const struct spi_nor_manufacturer spi_nor_spansion;
extern const struct spi_nor_manufacturer spi_nor_sst;
extern const struct spi_nor_manufacturer spi_nor_winbond;
extern const struct spi_nor_manufacturer spi_nor_xilinx;
extern const struct spi_nor_manufacturer spi_nor_xmc;
+extern const struct spi_nor_manufacturer spi_nor_xtx;

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

@ -30,7 +30,7 @@ index 111111111111..222222222222 100644
mclk0_a_pins: mclk0-a {
mux {
groups = "mclk0_a";
@@ -2039,6 +2047,14 @@ mux {
@@ -1542,6 +1550,14 @@ mux {
bias-disable;
};
};