mirror of
https://github.com/armbian/build.git
synced 2025-09-19 12:41:39 +02:00
d1186b8a0e
I have changed the way the patches are generated a bit. Instead of using orange-pi branch from megous tree for 6.6 kernel, I have used the following kernel branches a83t-suspend, af8133j, anx, audio, axp, cam, drm, err, fixes, mbus, modem, opi3, pb, pinetab, pp, ppkb, samuel, speed, tbs-a711, ths These branches were carefully chosen to include only allwinner related patches and remove importing of the rockchip related patches into the allwinner kernel. Following patches are modified to fix patch application failure - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch - patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch - patches.armbian/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch - patches.armbian/arm64-dts-allwinner-overlay-Add-Overlays-for-sunxi64.patch - patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch Following patches are modified because of kernel api change to fix compilation failure - patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch - patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch
65 lines
2.1 KiB
Diff
65 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Jirman <megi@xff.cz>
|
|
Date: Mon, 6 Mar 2023 01:17:09 +0100
|
|
Subject: input: cyttsp4: Use i2c/spi names directly in the driver
|
|
|
|
Platform data is going to be removed.
|
|
|
|
Signed-off-by: Ondrej Jirman <megi@xff.cz>
|
|
---
|
|
drivers/input/touchscreen/cyttsp4_i2c.c | 4 ++--
|
|
drivers/input/touchscreen/cyttsp4_spi.c | 2 +-
|
|
include/linux/platform_data/cyttsp4.h | 2 --
|
|
3 files changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/input/touchscreen/cyttsp4_i2c.c b/drivers/input/touchscreen/cyttsp4_i2c.c
|
|
index 80a6890cd45a..6df0312fca94 100644
|
|
--- a/drivers/input/touchscreen/cyttsp4_i2c.c
|
|
+++ b/drivers/input/touchscreen/cyttsp4_i2c.c
|
|
@@ -50,14 +50,14 @@ static void cyttsp4_i2c_remove(struct i2c_client *client)
|
|
}
|
|
|
|
static const struct i2c_device_id cyttsp4_i2c_id[] = {
|
|
- { CYTTSP4_I2C_NAME, 0 },
|
|
+ { "cyttsp4_i2c_adapter", 0 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, cyttsp4_i2c_id);
|
|
|
|
static struct i2c_driver cyttsp4_i2c_driver = {
|
|
.driver = {
|
|
- .name = CYTTSP4_I2C_NAME,
|
|
+ .name = "cyttsp4_i2c_adapter",
|
|
.pm = pm_ptr(&cyttsp4_pm_ops),
|
|
},
|
|
.probe = cyttsp4_i2c_probe,
|
|
diff --git a/drivers/input/touchscreen/cyttsp4_spi.c b/drivers/input/touchscreen/cyttsp4_spi.c
|
|
index 944fbbe9113e..f3cca8c9c119 100644
|
|
--- a/drivers/input/touchscreen/cyttsp4_spi.c
|
|
+++ b/drivers/input/touchscreen/cyttsp4_spi.c
|
|
@@ -172,7 +172,7 @@ static void cyttsp4_spi_remove(struct spi_device *spi)
|
|
|
|
static struct spi_driver cyttsp4_spi_driver = {
|
|
.driver = {
|
|
- .name = CYTTSP4_SPI_NAME,
|
|
+ .name = "cyttsp4_spi_adapter",
|
|
.pm = pm_ptr(&cyttsp4_pm_ops),
|
|
},
|
|
.probe = cyttsp4_spi_probe,
|
|
diff --git a/include/linux/platform_data/cyttsp4.h b/include/linux/platform_data/cyttsp4.h
|
|
index 1b5b30796e43..e718d2204ce7 100644
|
|
--- a/include/linux/platform_data/cyttsp4.h
|
|
+++ b/include/linux/platform_data/cyttsp4.h
|
|
@@ -16,8 +16,6 @@
|
|
#define _CYTTSP4_H_
|
|
|
|
#define CYTTSP4_MT_NAME "cyttsp4_mt"
|
|
-#define CYTTSP4_I2C_NAME "cyttsp4_i2c_adapter"
|
|
-#define CYTTSP4_SPI_NAME "cyttsp4_spi_adapter"
|
|
|
|
#define CY_TOUCH_SETTINGS_MAX 32
|
|
|
|
--
|
|
Armbian
|
|
|