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

sunxi-6.12: reexport all patches to v6.12.12

Browse Source
This commit is contained in:
The-going
2025-02-06 19:32:51 +03:00
committed by Igor
parent db3615f7b0
commit d5d31302a3
7 changed files with 40 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
patch/kernel/archive/sunxi-6.12/patches.armbian/bigtereetech-cb1-i2c-gpio-and-ws2812.patch → patch/kernel/archive/sunxi-6.12/patches.armbian/BigTreeTech-CB1-dts-i2c-gpio-mode-adjustment-and-ws2812-rgb_val.patch
View File

@@ -1,22 +1,20 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 20dc0b0f3da7895d50f2824b4608c5e44729f892 Mon Sep 17 00:00:00 2001
From: JohnTheCoolingFan <ivan8215145640@gmail.com>
Date: Sat, 25 Jan 2025 11:30:04 +0000
Subject: BigTreeTech CB1: dts: i2c gpio mode adjustment and ws2812 rgb_value
Signed-off-by: JohnTheCoolingFan <ivan8215145640@gmail.com>
---
arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-emmc.dts | 4 ++--
arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-sd.dts | 4 ++--
arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 2 +-
.../boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-emmc.dts | 4 ++--
.../boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-sd.dts | 4 ++--
.../arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-emmc.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-emmc.dts
index f878c23f1..b059ea08f 100644
index f878c23f1d90..b059ea08fec0 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-emmc.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-emmc.dts
@@ -19,12 +19,12 @@ &mmc2 {
&ws2812 {
gpios = <&pio 8 15 GPIO_ACTIVE_LOW>; /* PI15 */
@@ -21,8 +21,8 @@ &ws2812 {
};
&i2c_gpio {
@@ -27,15 +25,11 @@ index f878c23f1..b059ea08f 100644
};
&can0_pin_irq {
pins = "PI3";
};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-sd.dts b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-sd.dts
index e18dd854d..cc10be714 100644
index e18dd854d74b..cc10be714676 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-sd.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-sd.dts
@@ -10,12 +10,12 @@
&ws2812 {
gpios = <&pio 2 14 GPIO_ACTIVE_LOW>; /* PC14 */
@@ -12,8 +12,8 @@ &ws2812 {
};
&i2c_gpio {
@@ -46,15 +40,11 @@ index e18dd854d..cc10be714 100644
};
&can0_pin_irq {
pins = "PC9";
};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
index 3b3a196ea..d18695148 100644
index 3b3a196eaa93..d18695148ef5 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
@@ -106,11 +106,11 @@ wifi_pwrseq: wifi-pwrseq {
ws2812: ws2812 {
@@ -108,7 +108,7 @@ ws2812: ws2812 {
compatible = "rgb-ws2812";
pinctrl-names = "default";
rgb_cnt = <2>;
@@ -63,8 +53,6 @@ index 3b3a196ea..d18695148 100644
status = "disabled";
};
i2c_gpio: i2c-gpio {
#address-cells = <1>;
--
Created with Armbian build tools https://github.com/armbian/build
2.35.3

78
patch/kernel/archive/sunxi-6.12/patches.armbian/Fix-ghost-touches-on-tsc2007-tft-screen.patch
View File

@@ -1,23 +1,21 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 5607ccab3192a2cc9d70c6072f83d9b9060295c8 Mon Sep 17 00:00:00 2001
From: JohnTheCoolingFan <ivan8215145640@gmail.com>
Date: Sat, 25 Jan 2025 12:54:16 +0000
Subject: Fix ghost touches on tsc2007 tft screen
Signed-off-by: JohnTheCoolingFan <ivan8215145640@gmail.com>
---
arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 1 +
drivers/input/touchscreen/tsc2007.h | 1 +
drivers/input/touchscreen/tsc2007_core.c | 96 +++++-----
include/linux/platform_data/tsc2007.h | 1 +
.../sun50i-h616-bigtreetech-cb1.dtsi | 1 +
drivers/input/touchscreen/tsc2007.h | 1 +
drivers/input/touchscreen/tsc2007_core.c | 96 +++++++++----------
include/linux/platform_data/tsc2007.h | 1 +
4 files changed, 49 insertions(+), 50 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
index 2022990e4..3b3a196ea 100644
index 2022990e4bc0..3b3a196eaa93 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi
@@ -123,10 +123,11 @@ i2c_gpio: i2c-gpio {
tft_tp: ns2009@48 {
compatible = "ti,tsc2007";
@@ -125,6 +125,7 @@ tft_tp: ns2009@48 {
reg = <0x48>;
status = "disabled";
ti,x-plate-ohms = <660>;
@@ -25,15 +23,11 @@ index 2022990e4..3b3a196ea 100644
ti,rt-thr = <3000>;
ti,fuzzx = <32>;
ti,fuzzy = <16>;
i2c,ignore-nak = <1>;
};
diff --git a/drivers/input/touchscreen/tsc2007.h b/drivers/input/touchscreen/tsc2007.h
index 5252b6c6d..7411b8bce 100644
index 5252b6c6daeb..7411b8bce99c 100644
--- a/drivers/input/touchscreen/tsc2007.h
+++ b/drivers/input/touchscreen/tsc2007.h
@@ -63,10 +63,11 @@ struct tsc2007 {
struct i2c_client *client;
@@ -65,6 +65,7 @@ struct tsc2007 {
u16 model;
u16 x_plate_ohms;
@@ -41,15 +35,11 @@ index 5252b6c6d..7411b8bce 100644
u16 max_rt;
u16 rt_thr;
u8 touched;
unsigned long poll_period; /* in jiffies */
int fuzzx;
diff --git a/drivers/input/touchscreen/tsc2007_core.c b/drivers/input/touchscreen/tsc2007_core.c
index 08bbbafbb..1ae1b1a3e 100644
index 08bbbafbbae1..1ae1b1a3e367 100644
--- a/drivers/input/touchscreen/tsc2007_core.c
+++ b/drivers/input/touchscreen/tsc2007_core.c
@@ -68,26 +68,24 @@ static void tsc2007_read_values(struct tsc2007 *tsc, struct ts_event *tc)
tsc2007_xfer(tsc, PWRDOWN);
}
@@ -70,22 +70,20 @@ static void tsc2007_read_values(struct tsc2007 *tsc, struct ts_event *tc)
u32 tsc2007_calculate_resistance(struct tsc2007 *tsc, struct ts_event *tc)
{
@@ -82,11 +72,7 @@ index 08bbbafbb..1ae1b1a3e 100644
}
bool tsc2007_is_pen_down(struct tsc2007 *ts)
{
/*
@@ -178,58 +176,45 @@ static irqreturn_t tsc2007_soft_poll(int irq, void *handle)
{
struct tsc2007 *ts = handle;
@@ -180,6 +178,7 @@ static irqreturn_t tsc2007_soft_poll(int irq, void *handle)
struct input_dev *input = ts->input;
struct ts_event tc;
u32 rt;
@@ -94,9 +80,7 @@ index 08bbbafbb..1ae1b1a3e 100644
if(!ts->stopped) {
mutex_lock(&ts->mlock);
tsc2007_read_values(ts, &tc);
mutex_unlock(&ts->mlock);
@@ -189,45 +188,31 @@ static irqreturn_t tsc2007_soft_poll(int irq, void *handle)
rt = tsc2007_calculate_resistance(ts, &tc);
@@ -162,11 +146,7 @@ index 08bbbafbb..1ae1b1a3e 100644
}
return IRQ_HANDLED;
}
@@ -327,10 +312,17 @@ static int tsc2007_probe_properties(struct device *dev, struct tsc2007 *ts)
} else {
dev_err(dev, "Missing ti,x-plate-ohms device property\n");
@@ -329,6 +314,13 @@ static int tsc2007_probe_properties(struct device *dev, struct tsc2007 *ts)
return -EINVAL;
}
@@ -180,11 +160,7 @@ index 08bbbafbb..1ae1b1a3e 100644
ts->gpiod = devm_gpiod_get_optional(dev, NULL, GPIOD_IN);
if (IS_ERR(ts->gpiod))
return PTR_ERR(ts->gpiod);
if (ts->gpiod)
@@ -345,10 +337,11 @@ static int tsc2007_probe_pdev(struct device *dev, struct tsc2007 *ts,
const struct tsc2007_platform_data *pdata,
const struct i2c_device_id *id)
@@ -347,6 +339,7 @@ static int tsc2007_probe_pdev(struct device *dev, struct tsc2007 *ts,
{
ts->model = pdata->model;
ts->x_plate_ohms = pdata->x_plate_ohms;
@@ -192,11 +168,7 @@ index 08bbbafbb..1ae1b1a3e 100644
ts->max_rt = pdata->max_rt ? : MAX_12BIT;
ts->poll_period = msecs_to_jiffies(pdata->poll_period ? : 1);
ts->get_pendown_state = pdata->get_pendown_state;
ts->clear_penirq = pdata->clear_penirq;
ts->fuzzx = pdata->fuzzx;
@@ -358,10 +351,15 @@ static int tsc2007_probe_pdev(struct device *dev, struct tsc2007 *ts,
if (pdata->x_plate_ohms == 0) {
dev_err(dev, "x_plate_ohms is not set up in platform data\n");
@@ -360,6 +353,11 @@ static int tsc2007_probe_pdev(struct device *dev, struct tsc2007 *ts,
return -EINVAL;
}
@@ -208,11 +180,7 @@ index 08bbbafbb..1ae1b1a3e 100644
return 0;
}
static void tsc2007_call_exit_platform_hw(void *data)
{
@@ -456,15 +454,13 @@ static int tsc2007_probe(struct i2c_client *client)
dev_err(&client->dev, "Failed to request irq %d: %d\n",
ts->irq, err);
@@ -458,11 +456,9 @@ static int tsc2007_probe(struct i2c_client *client)
return err;
}
} else {
@@ -226,15 +194,11 @@ index 08bbbafbb..1ae1b1a3e 100644
add_timer(&ts->timer);
}
tsc2007_stop(ts);
diff --git a/include/linux/platform_data/tsc2007.h b/include/linux/platform_data/tsc2007.h
index a0ca52c41..f88e58032 100644
index a0ca52c41ccb..f88e580322f0 100644
--- a/include/linux/platform_data/tsc2007.h
+++ b/include/linux/platform_data/tsc2007.h
@@ -5,10 +5,11 @@
/* linux/platform_data/tsc2007.h */
@@ -7,6 +7,7 @@
struct tsc2007_platform_data {
u16 model; /* 2007. */
u16 x_plate_ohms; /* must be non-zero value */
@@ -242,8 +206,6 @@ index a0ca52c41..f88e58032 100644
u16 max_rt; /* max. resistance above which samples are ignored */
unsigned long poll_period; /* time (in ms) between samples */
int fuzzx; /* fuzz factor for X, Y and pressure axes */
int fuzzy;
int fuzzz;
--
Created with Armbian build tools https://github.com/armbian/build
2.35.3

8
patch/kernel/archive/sunxi-6.12/patches.megous/ASoC-codec-es8316-DAC-Soft-Ramp-Rate-is-just-a-2-bit-control.patch
View File

@@ -1,4 +1,4 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From 62e3909bb6e8e32f6260b0877f54dacfafa3c9f1 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Fri, 29 Jul 2022 01:08:29 +0200
Subject: ASoC: codec: es8316: "DAC Soft Ramp Rate" is just a 2 bit control
@@ -12,10 +12,10 @@ Signed-off-by: Ondrej Jirman <megi@xff.cz>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
index 111111111111..222222222222 100644
index f508df01145b..e7bd561a8f40 100644
--- a/sound/soc/codecs/es8316.c
+++ b/sound/soc/codecs/es8316.c
@@ -99,7 +99,7 @@ static const struct snd_kcontrol_new es8316_snd_controls[] = {
@@ -101,7 +101,7 @@ static const struct snd_kcontrol_new es8316_snd_controls[] = {
SOC_DOUBLE_R_TLV("DAC Playback Volume", ES8316_DAC_VOLL,
ES8316_DAC_VOLR, 0, 0xc0, 1, dac_vol_tlv),
SOC_SINGLE("DAC Soft Ramp Switch", ES8316_DAC_SET1, 4, 1, 1),
@@ -25,5 +25,5 @@ index 111111111111..222222222222 100644
SOC_SINGLE("DAC Double Fs Switch", ES8316_DAC_SET2, 7, 1, 0),
SOC_SINGLE("DAC Stereo Enhancement", ES8316_DAC_SET3, 0, 7, 0),
--
Armbian
2.35.3

6
patch/kernel/archive/sunxi-6.12/patches.megous/usb-serial-option-add-reset_resume-callback-for-WWAN-devices.patch
View File

@@ -1,4 +1,4 @@
From 84f9ed3a19d718bf4f35e45d4b553f2fe51ca7c7 Mon Sep 17 00:00:00 2001
From c4b98967269c353f88e5544988bad6468febd286 Mon Sep 17 00:00:00 2001
From: Thomas Thorne <Thomas.Thorne@Net2Edge.com>
Date: Tue, 20 Sep 2022 20:34:57 -0400
Subject: usb: serial: option: add 'reset_resume' callback for WWAN devices
@@ -17,10 +17,10 @@ However the rest of the patch is not needed/already upstreamed.
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 64317b390d22..3056d0f99ff8 100644
index 1e2ae0c6c41c..8ab87dfae501 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -2444,6 +2444,7 @@ static struct usb_serial_driver option_1port_device = {
@@ -2446,6 +2446,7 @@ static struct usb_serial_driver option_1port_device = {
#ifdef CONFIG_PM
.suspend = usb_wwan_suspend,
.resume = usb_wwan_resume,

0
patch/kernel/archive/sunxi-6.12/series.addon
View File

2
patch/kernel/archive/sunxi-6.12/series.armbian
View File

@@ -177,4 +177,4 @@
patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch
patches.armbian/Fix-ghost-touches-on-tsc2007-tft-screen.patch
patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-usb_otg-dr_mode.patch
patches.armbian/bigtereetech-cb1-i2c-gpio-and-ws2812.patch
patches.armbian/BigTreeTech-CB1-dts-i2c-gpio-mode-adjustment-and-ws2812-rgb_val.patch

5
patch/kernel/archive/sunxi-6.12/series.conf
View File

@@ -433,7 +433,4 @@
patches.armbian/Add-BananaPi-BPI-M4-Zero-overlays.patch
patches.armbian/Fix-ghost-touches-on-tsc2007-tft-screen.patch
patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-usb_otg-dr_mode.patch
patches.armbian/bigtereetech-cb1-i2c-gpio-and-ws2812.patch
# The patches.addon folder where new patches are added before they get into
# one of the two main series.
#
patches.armbian/BigTreeTech-CB1-dts-i2c-gpio-mode-adjustment-and-ws2812-rgb_val.patch