JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

meson64: edge/6.2: rebase onto v6.2-rc5

Browse Source
This commit is contained in:
Ricardo Pardini
2023-01-23 22:39:08 +01:00
parent fa64a1d9af
commit 64f9cf9b46
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patch/kernel/archive/meson64-6.2/board-odroidhc4-enable-fan1_input.patch
View File

@@ -10,7 +10,7 @@ Subject: ODROID-HC4: add DT attributes to enable fan1_input
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
index e3486f60645a..89ef6f07603c 100644
index a1f0c38ccadd..7fd4aac142af 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
@@ -23,6 +23,10 @@ fan0: pwm-fan {

2
patch/kernel/archive/meson64-6.2/drv-spi-spidev-remove-warnings.patch
View File

@@ -12,7 +12,7 @@ Remove SPIdev warnings
1 file changed, 2 insertions(+)
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 6313e7d0cdf8..22056740a731 100644
index 1935ca613447..8a4fb7a0e614 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -694,6 +694,7 @@ static const struct file_operations spidev_fops = {

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

@@ -13,7 +13,7 @@ Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71
5 files changed, 574 insertions(+)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 82713ef3aaa6..d12a5b48352e 100644
index 0f8c11842a3a..846c82dabede 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -1418,4 +1418,10 @@
@@ -28,10 +28,10 @@ index 82713ef3aaa6..d12a5b48352e 100644
+
#endif
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 0e9702c7f7d6..afa6f910a28f 100644
index be3ad02573de..a2a8eb78a067 100644
--- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c
@@ -879,6 +879,9 @@ static const struct hid_device_id hid_ignore_list[] = {
@@ -878,6 +878,9 @@ static const struct hid_device_id hid_ignore_list[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) },
#endif
{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },

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

@@ -41,10 +41,10 @@ index e347b435a038..8992c592a896 100644
obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index d8703d7dfd0a..071bc2071366 100644
index d67c926bca8b..c63ac0c77468 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -1632,6 +1632,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
@@ -1633,6 +1633,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
&spi_nor_winbond,
&spi_nor_xilinx,
&spi_nor_xmc,

4
patch/kernel/archive/meson64-6.2/general-usb-core-improve-handling-of-hubs-with-no-ports.patch
View File

@@ -33,10 +33,10 @@ Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 77e73fc8d673..f0fb30f9bd06 100644
index 9eca403af2a8..33ad681f87d7 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1424,9 +1424,8 @@ static int hub_configure(struct usb_hub *hub,
@@ -1427,9 +1427,8 @@ static int hub_configure(struct usb_hub *hub,
ret = -ENODEV;
goto fail;
} else if (hub->descriptor->bNbrPorts == 0) {