meson64: rewrite edge kernel patches

This commit is contained in:
retro98boy
2025-08-30 22:39:01 +08:00
committed by Igor
parent 2b166f37f3
commit 2bf0163d1c
21 changed files with 59 additions and 60 deletions

View File

@@ -62,7 +62,7 @@ index 111111111111..222222222222 100644
chosen { chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
@@ -365,8 +374,7 @@ &uart_A { @@ -359,8 +368,7 @@ &uart_A {
bluetooth { bluetooth {
compatible = "realtek,rtl8822cs-bt"; compatible = "realtek,rtl8822cs-bt";

View File

@@ -22,7 +22,7 @@ index 111111111111..222222222222 100644
/ { / {
adc-keys { adc-keys {
@@ -392,6 +393,8 @@ &sd_emmc_b { @@ -388,6 +389,8 @@ &sd_emmc_b {
cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;
vmmc-supply = <&tflash_vdd>; vmmc-supply = <&tflash_vdd>;
vqmmc-supply = <&vddio_c>; vqmmc-supply = <&vddio_c>;
@@ -31,7 +31,7 @@ index 111111111111..222222222222 100644
}; };
/* eMMC */ /* eMMC */
@@ -411,6 +414,8 @@ &sd_emmc_c { @@ -407,6 +410,8 @@ &sd_emmc_c {
mmc-pwrseq = <&emmc_pwrseq>; mmc-pwrseq = <&emmc_pwrseq>;
vmmc-supply = <&vddao_3v3>; vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&emmc_1v8>; vqmmc-supply = <&emmc_1v8>;

View File

@@ -69,7 +69,7 @@ index 111111111111..222222222222 100644
ethernet0 = &ethmac; ethernet0 = &ethmac;
}; };
@@ -424,6 +425,12 @@ &uart_AO { @@ -420,6 +421,12 @@ &uart_AO {
pinctrl-names = "default"; pinctrl-names = "default";
}; };

View File

@@ -19,7 +19,7 @@ diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 111111111111..222222222222 100644 index 111111111111..222222222222 100644
--- a/drivers/usb/core/hub.c --- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c
@@ -5975,7 +5975,7 @@ static const struct usb_device_id hub_id_table[] = { @@ -6014,7 +6014,7 @@ static const struct usb_device_id hub_id_table[] = {
| USB_DEVICE_ID_MATCH_INT_CLASS, | USB_DEVICE_ID_MATCH_INT_CLASS,
.idVendor = USB_VENDOR_GENESYS_LOGIC, .idVendor = USB_VENDOR_GENESYS_LOGIC,
.bInterfaceClass = USB_CLASS_HUB, .bInterfaceClass = USB_CLASS_HUB,

View File

@@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi b/arch/arm64/boot
index 111111111111..222222222222 100644 index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi --- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
@@ -45,6 +45,14 @@ opp-1800000000 { @@ -46,6 +46,14 @@ opp-1800000000 {
opp-hz = /bits/ 64 <1800000000>; opp-hz = /bits/ 64 <1800000000>;
opp-microvolt = <1001000>; opp-microvolt = <1001000>;
}; };
@@ -27,7 +27,7 @@ index 111111111111..222222222222 100644
}; };
cpub_opp_table_1: opp-table-1 { cpub_opp_table_1: opp-table-1 {
@@ -105,5 +113,13 @@ opp-2208000000 { @@ -107,5 +115,13 @@ opp-2208000000 {
opp-hz = /bits/ 64 <2208000000>; opp-hz = /bits/ 64 <2208000000>;
opp-microvolt = <1011000>; opp-microvolt = <1011000>;
}; };

View File

@@ -60,7 +60,7 @@ index 111111111111..222222222222 100644
&arb { &arb {
status = "okay"; status = "okay";
}; };
@@ -293,6 +313,26 @@ &ir { @@ -289,6 +309,26 @@ &ir {
pinctrl-names = "default"; pinctrl-names = "default";
}; };
@@ -87,7 +87,7 @@ index 111111111111..222222222222 100644
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
@@ -413,3 +453,11 @@ &uart_AO { @@ -409,3 +449,11 @@ &uart_AO {
&usb { &usb {
status = "okay"; status = "okay";
}; };

View File

@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/
index 111111111111..222222222222 100644 index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
@@ -409,7 +409,7 @@ &sd_emmc_c { @@ -405,7 +405,7 @@ &sd_emmc_c {
cap-mmc-highspeed; cap-mmc-highspeed;
mmc-ddr-1_8v; mmc-ddr-1_8v;
mmc-hs200-1_8v; mmc-hs200-1_8v;

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 index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+++ b/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 { @@ -357,7 +357,7 @@ &sd_emmc_a {
bus-width = <4>; bus-width = <4>;
cap-sd-highspeed; cap-sd-highspeed;

View File

@@ -34,7 +34,7 @@ diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentat
index 111111111111..222222222222 100644 index 111111111111..222222222222 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -1471,6 +1471,8 @@ patternProperties: @@ -1483,6 +1483,8 @@ patternProperties:
description: Sundance DSP Inc. description: Sundance DSP Inc.
"^sunplus,.*": "^sunplus,.*":
description: Sunplus Technology Co., Ltd. description: Sunplus Technology Co., Ltd.

View File

@@ -1,7 +1,7 @@
From cd00b35baedf57792117e37855c76ec73f455fee Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com> From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 13 Apr 2019 05:45:18 +0000 Date: Sat, 13 Apr 2019 05:45:18 +0000
Subject: [PATCH] LOCAL: arm64: fix Kodi sysinfo CPU information Subject: LOCAL: arm64: fix Kodi sysinfo CPU information
This allows the CPU information to show in the Kodi sysinfo screen, e.g. This allows the CPU information to show in the Kodi sysinfo screen, e.g.
@@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
1 file changed, 2 insertions(+), 3 deletions(-) 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index c1f2b6b04b411a..8bbdb64ec3ec1c 100644 index 111111111111..222222222222 100644
--- a/arch/arm64/kernel/cpuinfo.c --- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c
@@ -221,9 +221,8 @@ static int c_show(struct seq_file *m, void *v) @@ -221,9 +221,8 @@ static int c_show(struct seq_file *m, void *v)
@@ -28,3 +28,6 @@ index c1f2b6b04b411a..8bbdb64ec3ec1c 100644
seq_printf(m, "BogoMIPS\t: %lu.%02lu\n", seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
loops_per_jiffy / (500000UL/HZ), loops_per_jiffy / (500000UL/HZ),
--
Armbian

View File

@@ -15,7 +15,7 @@ diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vc
index 111111111111..222222222222 100644 index 111111111111..222222222222 100644
--- a/drivers/gpu/drm/meson/meson_vclk.c --- a/drivers/gpu/drm/meson/meson_vclk.c
+++ b/drivers/gpu/drm/meson/meson_vclk.c +++ b/drivers/gpu/drm/meson/meson_vclk.c
@@ -360,6 +360,8 @@ enum { @@ -357,6 +357,8 @@ enum {
MESON_VCLK_HDMI_594000, MESON_VCLK_HDMI_594000,
/* 2970 /1 /1 /1 /5 /1 => /1 /2 */ /* 2970 /1 /1 /1 /5 /1 => /1 /2 */
MESON_VCLK_HDMI_594000_YUV420, MESON_VCLK_HDMI_594000_YUV420,
@@ -24,7 +24,7 @@ index 111111111111..222222222222 100644
}; };
struct meson_vclk_params { struct meson_vclk_params {
@@ -470,6 +472,18 @@ struct meson_vclk_params { @@ -467,6 +469,18 @@ struct meson_vclk_params {
.vid_pll_div = VID_PLL_DIV_5, .vid_pll_div = VID_PLL_DIV_5,
.vclk_div = 1, .vclk_div = 1,
}, },
@@ -43,7 +43,7 @@ index 111111111111..222222222222 100644
{ /* sentinel */ }, { /* sentinel */ },
}; };
@@ -879,6 +893,10 @@ static void meson_vclk_set(struct meson_drm *priv, @@ -894,6 +908,10 @@ static void meson_vclk_set(struct meson_drm *priv,
m = 0xf7; m = 0xf7;
frac = vic_alternate_clock ? 0x8148 : 0x10000; frac = vic_alternate_clock ? 0x8148 : 0x10000;
break; break;

View File

@@ -6,19 +6,19 @@ Subject: ODROID-COMMON: input/touchscreen: Add D-WAV Multitouch driver.
Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71 Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71
--- ---
drivers/hid/hid-ids.h | 6 + drivers/hid/hid-ids.h | 6 +
drivers/hid/hid-quirks.c | 3 + drivers/hid/hid-quirks.c | 2 +
drivers/input/touchscreen/Kconfig | 10 + drivers/input/touchscreen/Kconfig | 10 +
drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/Makefile | 1 +
drivers/input/touchscreen/dwav-usb-mt.c | 554 ++++++++++ drivers/input/touchscreen/dwav-usb-mt.c | 554 ++++++++++
5 files changed, 574 insertions(+) 5 files changed, 573 insertions(+)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 111111111111..222222222222 100644 index 111111111111..222222222222 100644
--- a/drivers/hid/hid-ids.h --- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h
@@ -1475,4 +1475,10 @@ @@ -1532,4 +1532,10 @@
#define USB_VENDOR_ID_SIGNOTEC 0x2133 #define USB_VENDOR_ID_SMARTLINKTECHNOLOGY 0x4c4a
#define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011 0x0018 #define USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155 0x4155
+#define USB_DEVICE_ID_DWAV_MULTITOUCH 0x0005 +#define USB_DEVICE_ID_DWAV_MULTITOUCH 0x0005
+ +
@@ -28,12 +28,10 @@ index 111111111111..222222222222 100644
+ +
#endif #endif
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
index 80372342c..92472ae7b 100644 index 111111111111..222222222222 100644
--- a/drivers/hid/hid-quirks.c --- a/drivers/hid/hid-quirks.c
+++ b/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c
@@ -895,10 +895,12 @@ static const struct hid_device_id hid_ignore_list[] = { @@ -908,6 +908,8 @@ 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) }, { HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) }, { HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) },
{ HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) }, { HID_USB_DEVICE(USB_VENDOR_ID_SMARTLINKTECHNOLOGY, USB_DEVICE_ID_SMARTLINKTECHNOLOGY_4155) },
@@ -42,13 +40,11 @@ index 80372342c..92472ae7b 100644
{ } { }
}; };
/*
* hid_mouse_ignore_list - mouse devices which should not be handled by the hid layer
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 111111111111..222222222222 100644 index 111111111111..222222222222 100644
--- a/drivers/input/touchscreen/Kconfig --- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig
@@ -1388,4 +1388,14 @@ config TOUCHSCREEN_HIMAX_HX83112B @@ -1402,4 +1402,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called himax_hx83112b. module will be called himax_hx83112b.
@@ -67,7 +63,7 @@ diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Make
index 111111111111..222222222222 100644 index 111111111111..222222222222 100644
--- a/drivers/input/touchscreen/Makefile --- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile
@@ -116,4 +116,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o @@ -117,4 +117,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o
obj-$(CONFIG_TOUCHSCREEN_IQS5XX) += iqs5xx.o obj-$(CONFIG_TOUCHSCREEN_IQS5XX) += iqs5xx.o
obj-$(CONFIG_TOUCHSCREEN_IQS7211) += iqs7211.o obj-$(CONFIG_TOUCHSCREEN_IQS7211) += iqs7211.o
obj-$(CONFIG_TOUCHSCREEN_ZINITIX) += zinitix.o obj-$(CONFIG_TOUCHSCREEN_ZINITIX) += zinitix.o

View File

@@ -17,7 +17,7 @@ diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index 111111111111..222222222222 100644 index 111111111111..222222222222 100644
--- a/drivers/of/of_reserved_mem.c --- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c
@@ -132,15 +132,6 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base, @@ -133,15 +133,6 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base,
phys_addr_t size, bool nomap) phys_addr_t size, bool nomap)
{ {
if (nomap) { if (nomap) {

View File

@@ -1,7 +1,7 @@
From aa6f47c8e6602b9edcf2a0217fda953a372566fa Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zhang Ning <832666+zhangn1985@users.noreply.github.com> From: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
Date: Sat, 30 Aug 2025 10:33:14 +0800 Date: Sat, 30 Aug 2025 10:33:14 +0800
Subject: [PATCH 1/2] general: meson64 overlays Subject: general: meson64 overlays
Signed-off-by: retro98boy <retro98boy@qq.com> Signed-off-by: retro98boy <retro98boy@qq.com>
--- ---
@@ -9,7 +9,7 @@ Signed-off-by: retro98boy <retro98boy@qq.com>
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/scripts/Makefile.build b/scripts/Makefile.build diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index ba71b27aa..2e932d4aa 100644 index 111111111111..222222222222 100644
--- a/scripts/Makefile.build --- a/scripts/Makefile.build
+++ b/scripts/Makefile.build +++ b/scripts/Makefile.build
@@ -107,6 +107,9 @@ always-y += $(hostprogs-always-y) $(hostprogs-always-m) @@ -107,6 +107,9 @@ always-y += $(hostprogs-always-y) $(hostprogs-always-m)
@@ -23,5 +23,5 @@ index ba71b27aa..2e932d4aa 100644
ifneq ($(obj),.) ifneq ($(obj),.)
-- --
2.51.0 Armbian

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 index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi --- a/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-a1.dtsi
@@ -625,6 +625,7 @@ hwrng: rng@5118 { @@ -626,6 +626,7 @@ hwrng: rng@5118 {
sec_AO: ao-secure@5a20 { sec_AO: ao-secure@5a20 {
compatible = "amlogic,meson-gx-ao-secure", "syscon"; compatible = "amlogic,meson-gx-ao-secure", "syscon";
reg = <0x0 0x5a20 0x0 0x140>; reg = <0x0 0x5a20 0x0 0x140>;

View File

@@ -36,7 +36,7 @@ diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 111111111111..222222222222 100644 index 111111111111..222222222222 100644
--- a/drivers/usb/core/hub.c --- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c
@@ -1476,9 +1476,8 @@ static int hub_configure(struct usb_hub *hub, @@ -1503,9 +1503,8 @@ static int hub_configure(struct usb_hub *hub,
ret = -ENODEV; ret = -ENODEV;
goto fail; goto fail;
} else if (hub->descriptor->bNbrPorts == 0) { } else if (hub->descriptor->bNbrPorts == 0) {

View File

@@ -159,7 +159,7 @@ index 111111111111..222222222222 100644
&emc2305_cooling_ops); &emc2305_cooling_ops);
if (IS_ERR(data->cdev_data[cdev_idx].cdev)) { if (IS_ERR(data->cdev_data[cdev_idx].cdev)) {
@@ -331,9 +386,26 @@ static int emc2305_set_tz(struct device *dev) @@ -337,9 +392,26 @@ static int emc2305_set_tz(struct device *dev)
for (i = 0; i < data->pwm_num; i++) { for (i = 0; i < data->pwm_num; i++) {
ret = emc2305_set_single_tz(dev, i + 1); ret = emc2305_set_single_tz(dev, i + 1);
if (ret) if (ret)
@@ -187,7 +187,7 @@ index 111111111111..222222222222 100644
} }
static umode_t static umode_t
@@ -555,11 +627,18 @@ static int emc2305_probe(struct i2c_client *client) @@ -561,11 +633,18 @@ static int emc2305_probe(struct i2c_client *client)
data->pwm_separate = pdata->pwm_separate; data->pwm_separate = pdata->pwm_separate;
for (i = 0; i < EMC2305_PWM_MAX; i++) for (i = 0; i < EMC2305_PWM_MAX; i++)
data->pwm_min[i] = pdata->pwm_min[i]; data->pwm_min[i] = pdata->pwm_min[i];
@@ -206,7 +206,7 @@ index 111111111111..222222222222 100644
} }
data->hwmon_dev = devm_hwmon_device_register_with_info(dev, "emc2305", data, data->hwmon_dev = devm_hwmon_device_register_with_info(dev, "emc2305", data,
@@ -580,21 +659,40 @@ static int emc2305_probe(struct i2c_client *client) @@ -586,21 +665,40 @@ static int emc2305_probe(struct i2c_client *client)
return ret; return ret;
} }

View File

@@ -1,17 +1,17 @@
From d123e9d219d85568898a66918ef06ddd1be453ae Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: usera <adeep@lexina.in> From: usera <adeep@lexina.in>
Date: Sat, 30 Aug 2025 12:28:20 +0800 Date: Sat, 30 Aug 2025 12:28:20 +0800
Subject: [PATCH] Fix: meson64: add gpio irq (patch from Subject: Fix: meson64: add gpio irq (patch from
https://lkml.org/lkml/2020/11/27/8) https://lkml.org/lkml/2020/11/27/8)
Signed-off-by: retro98boy <retro98boy@qq.com> Signed-off-by: retro98boy <retro98boy@qq.com>
--- ---
drivers/pinctrl/meson/pinctrl-meson.c | 41 +++++++++++++++++++++++++++ drivers/pinctrl/meson/pinctrl-meson.c | 41 ++++++++++
drivers/pinctrl/meson/pinctrl-meson.h | 1 + drivers/pinctrl/meson/pinctrl-meson.h | 1 +
2 files changed, 42 insertions(+) 2 files changed, 42 insertions(+)
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index f5be61f2e..e4116c66f 100644 index 111111111111..222222222222 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c --- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -51,6 +51,7 @@ @@ -51,6 +51,7 @@
@@ -84,7 +84,7 @@ index f5be61f2e..e4116c66f 100644
if (IS_ERR_OR_NULL(pc->reg_mux)) { if (IS_ERR_OR_NULL(pc->reg_mux)) {
dev_err(pc->dev, "mux registers not found\n"); dev_err(pc->dev, "mux registers not found\n");
diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
index 7883ea31a..049377342 100644 index 111111111111..222222222222 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.h --- a/drivers/pinctrl/meson/pinctrl-meson.h
+++ b/drivers/pinctrl/meson/pinctrl-meson.h +++ b/drivers/pinctrl/meson/pinctrl-meson.h
@@ -134,6 +134,7 @@ struct meson_pinctrl { @@ -134,6 +134,7 @@ struct meson_pinctrl {
@@ -96,5 +96,5 @@ index 7883ea31a..049377342 100644
#define FUNCTION(fn) \ #define FUNCTION(fn) \
-- --
2.51.0 Armbian

View File

@@ -16,7 +16,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/
index 111111111111..222222222222 100644 index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
@@ -294,6 +294,32 @@ &frddr_c { @@ -290,6 +290,32 @@ &frddr_c {
status = "okay"; status = "okay";
}; };

View File

@@ -1,7 +1,7 @@
From e1e66c32b7a9ce7cf52922fe073c4bff40054599 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Yuntian Zhang <yt@radxa.com> From: Yuntian Zhang <yt@radxa.com>
Date: Thu, 13 Jan 2022 21:34:10 +0800 Date: Thu, 13 Jan 2022 21:34:10 +0800
Subject: [PATCH] pinctrl: meson: Add several missing pinmux for pwm functions Subject: pinctrl: meson: Add several missing pinmux for pwm functions
The following pin definitions are mentioned in A311D Quick The following pin definitions are mentioned in A311D Quick
Reference Manual and S922X Public Datasheet, but not in S905Y2 Reference Manual and S922X Public Datasheet, but not in S905Y2
@@ -11,12 +11,12 @@ They are currently exposed in Radxa Zero 2's GPIO header.
Signed-off-by: Yuntian Zhang <yt@radxa.com> Signed-off-by: Yuntian Zhang <yt@radxa.com>
--- ---
arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 42 +++++++++++++++++++++ arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 42 ++++++++++
drivers/pinctrl/meson/pinctrl-meson-g12a.c | 16 ++++++-- drivers/pinctrl/meson/pinctrl-meson-g12a.c | 16 +++-
2 files changed, 55 insertions(+), 3 deletions(-) 2 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
index 86e6ceb31..b2f9a09b2 100644 index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi --- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
@@ -149,3 +149,45 @@ &pmu { @@ -149,3 +149,45 @@ &pmu {
@@ -66,10 +66,10 @@ index 86e6ceb31..b2f9a09b2 100644
+ }; + };
+}; +};
diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
index e2788bfc5..c94360afc 100644 index 111111111111..222222222222 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
@@ -268,17 +268,22 @@ static const unsigned int eth_act_led_pins[] = { GPIOZ_15 }; @@ -271,17 +271,22 @@ static const unsigned int eth_act_led_pins[] = { GPIOZ_15 };
static const unsigned int pwm_a_pins[] = { GPIOX_6 }; static const unsigned int pwm_a_pins[] = { GPIOX_6 };
/* pwm_b */ /* pwm_b */
@@ -92,7 +92,7 @@ index e2788bfc5..c94360afc 100644
/* pwm_e */ /* pwm_e */
static const unsigned int pwm_e_pins[] = { GPIOX_16 }; static const unsigned int pwm_e_pins[] = { GPIOX_16 };
@@ -591,6 +596,10 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = { @@ -594,6 +599,10 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
GROUP(bt565_a_din5, 2), GROUP(bt565_a_din5, 2),
GROUP(bt565_a_din6, 2), GROUP(bt565_a_din6, 2),
GROUP(bt565_a_din7, 2), GROUP(bt565_a_din7, 2),
@@ -103,7 +103,7 @@ index e2788bfc5..c94360afc 100644
GROUP(tsin_b_valid_z, 3), GROUP(tsin_b_valid_z, 3),
GROUP(tsin_b_sop_z, 3), GROUP(tsin_b_sop_z, 3),
GROUP(tsin_b_din0_z, 3), GROUP(tsin_b_din0_z, 3),
@@ -723,6 +732,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = { @@ -726,6 +735,7 @@ static const struct meson_pmx_group meson_g12a_periphs_groups[] = {
GROUP(uart_c_rts, 2), GROUP(uart_c_rts, 2),
GROUP(iso7816_clk_h, 1), GROUP(iso7816_clk_h, 1),
GROUP(iso7816_data_h, 1), GROUP(iso7816_data_h, 1),
@@ -111,7 +111,7 @@ index e2788bfc5..c94360afc 100644
GROUP(pwm_f_h, 4), GROUP(pwm_f_h, 4),
GROUP(cec_ao_a_h, 4), GROUP(cec_ao_a_h, 4),
GROUP(cec_ao_b_h, 5), GROUP(cec_ao_b_h, 5),
@@ -1058,15 +1068,15 @@ static const char * const pwm_a_groups[] = { @@ -1066,15 +1076,15 @@ static const char * const pwm_a_groups[] = {
}; };
static const char * const pwm_b_groups[] = { static const char * const pwm_b_groups[] = {
@@ -131,5 +131,5 @@ index e2788bfc5..c94360afc 100644
static const char * const pwm_e_groups[] = { static const char * const pwm_e_groups[] = {
-- --
2.49.0 Armbian

View File

@@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/am
index 111111111111..222222222222 100644 index 111111111111..222222222222 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi --- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
@@ -136,6 +136,16 @@ opp-1908000000 { @@ -137,6 +137,16 @@ opp-1908000000 {
opp-hz = /bits/ 64 <1908000000>; opp-hz = /bits/ 64 <1908000000>;
opp-microvolt = <950000>; opp-microvolt = <950000>;
}; };