From 9f3d078e763752adae63e1bf58d5e20b296c55d7 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Sun, 15 Dec 2024 12:58:04 +0300 Subject: [PATCH] sunxi-6.6: re-export megous patches for v6.6.65 version --- ...one-Add-Type-C-support-for-all-PP-va.patch | 18 ++++++++-------- ...one-Add-detailed-OCV-to-capactiy-con.patch | 10 ++++----- ...one-Add-mount-matrix-for-acceleromet.patch | 21 +++++++++---------- ...one-Shorten-post-power-on-delay-on-m.patch | 12 +++++------ ...dor-prefix-add-prefix-for-Voltafield.patch | 8 +++---- ...port-unidirectional-mailbox-channels.patch | 16 +++++++------- ...or-sending-a-SCPI_CMD_SET_SYS_PWR_ST.patch | 10 ++++----- 7 files changed, 47 insertions(+), 48 deletions(-) diff --git a/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Add-Type-C-support-for-all-PP-va.patch b/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Add-Type-C-support-for-all-PP-va.patch index bfe792ee3560..4de358087fe4 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Add-Type-C-support-for-all-PP-va.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Add-Type-C-support-for-all-PP-va.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 0284c4a28309f931a0ca267339734bb938d16b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Wed, 8 Jul 2020 00:58:16 +0200 Subject: arm64: dts: sun50i-a64-pinephone: Add Type-C support for all PP @@ -10,10 +10,10 @@ of 1.0 and 1.1 boards with one DTS. No need for more subvariants. Signed-off-by: Ondrej Jirman --- - arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts | 86 ++++++++++ - arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts | 86 ++++++++++ - arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts | 60 +++++++ - arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 68 +++++++- + .../allwinner/sun50i-a64-pinephone-1.0.dts | 86 +++++++++++++++++++ + .../allwinner/sun50i-a64-pinephone-1.1.dts | 86 +++++++++++++++++++ + .../allwinner/sun50i-a64-pinephone-1.2.dts | 60 +++++++++++++ + .../dts/allwinner/sun50i-a64-pinephone.dtsi | 68 ++++++++++++++- 4 files changed, 299 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts @@ -291,7 +291,7 @@ index bdca3e118ee4..aaa3349ce3d5 100644 + }; +}; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -index 92e77503b591..bf7bd0be9deb 100644 +index 50818303e9a5..6000608d349f 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi @@ -10,6 +10,7 @@ @@ -391,7 +391,7 @@ index 92e77503b591..bf7bd0be9deb 100644 &i2c_csi { gc2145: front-camera@3c { compatible = "galaxycore,gc2145"; -@@ -299,6 +361,10 @@ &i2c2 { +@@ -302,6 +364,10 @@ &i2c2 { status = "okay"; }; @@ -402,7 +402,7 @@ index 92e77503b591..bf7bd0be9deb 100644 &lradc { vref-supply = <®_aldo3>; wakeup-source; -@@ -592,7 +658,7 @@ &uart3 { +@@ -595,7 +661,7 @@ &uart3 { }; &usb_otg { @@ -412,5 +412,5 @@ index 92e77503b591..bf7bd0be9deb 100644 }; -- -Armbian +2.35.3 diff --git a/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Add-detailed-OCV-to-capactiy-con.patch b/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Add-detailed-OCV-to-capactiy-con.patch index 507d82f4b298..86c47b8fb0b2 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Add-detailed-OCV-to-capactiy-con.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Add-detailed-OCV-to-capactiy-con.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 9ebfe917d6ae804d317932e4c62c52ab1a6bf989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Mon, 28 Sep 2020 04:35:13 +0200 Subject: arm64: dts: sun50i-a64-pinephone: Add detailed OCV to capactiy @@ -10,11 +10,11 @@ limits are enforced. It also allows for more precise capacity reporting Signed-off-by: Ondrej Jirman --- - arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 151 ++++++++++ + .../dts/allwinner/sun50i-a64-pinephone.dtsi | 151 ++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -index bf7bd0be9deb..243d9c793227 100644 +index 6000608d349f..d9111801fa0b 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi @@ -28,6 +28,156 @@ backlight: backlight { @@ -174,7 +174,7 @@ index bf7bd0be9deb..243d9c793227 100644 bt_sco_codec: bt-sco-codec { #sound-dai-cells = <1>; compatible = "linux,bt-sco"; -@@ -468,6 +618,7 @@ axp803: pmic@3a3 { +@@ -471,6 +621,7 @@ axp803: pmic@3a3 { &battery_power_supply { status = "okay"; @@ -183,5 +183,5 @@ index bf7bd0be9deb..243d9c793227 100644 ®_aldo1 { -- -Armbian +2.35.3 diff --git a/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Add-mount-matrix-for-acceleromet.patch b/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Add-mount-matrix-for-acceleromet.patch index 24f866c5b1e0..7e485cb49d2c 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Add-mount-matrix-for-acceleromet.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Add-mount-matrix-for-acceleromet.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 1312787511b4b198cfe4992f81825da08eccecfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Tue, 8 Sep 2020 15:31:26 +0200 Subject: arm64: dts: sun50i-a64-pinephone: Add mount matrix for accelerometer @@ -7,23 +7,22 @@ Port from pine64 kernel. Signed-off-by: Ondrej Jirman --- - arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 3 +++ - 1 file changed, 3 insertions(+) + arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -index ff1182be8434..9bf23a57172f 100644 +index 07df04d10864..ee9653b78321 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -@@ -503,6 +503,9 @@ accelerometer@68 { - interrupts = <7 5 IRQ_TYPE_EDGE_RISING>; /* PH5 */ - vdd-supply = <®_dldo1>; +@@ -505,7 +505,7 @@ accelerometer@68 { vddio-supply = <®_dldo1>; -+ mount-matrix = "0", "1", "0", -+ "-1", "0", "0", -+ "0", "0", "-1"; + mount-matrix = "0", "1", "0", + "-1", "0", "0", +- "0", "0", "1"; ++ "0", "0", "-1"; }; }; -- -Armbian +2.35.3 diff --git a/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Shorten-post-power-on-delay-on-m.patch b/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Shorten-post-power-on-delay-on-m.patch index 133712150971..06297ad791fd 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Shorten-post-power-on-delay-on-m.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.megous/arm64-dts-sun50i-a64-pinephone-Shorten-post-power-on-delay-on-m.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 1c643d54f406046c829dc2d0ed6ba66ca003a8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Thu, 6 Feb 2020 04:58:32 +0100 Subject: arm64: dts: sun50i-a64-pinephone: Shorten post-power-on-delay on mmcs @@ -11,10 +11,10 @@ Signed-off-by: Ondrej Jirman 1 file changed, 3 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -index 243d9c793227..ff1182be8434 100644 +index d9111801fa0b..07df04d10864 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -@@ -543,6 +543,7 @@ &mmc0 { +@@ -546,6 +546,7 @@ &mmc0 { cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ disable-wp; bus-width = <4>; @@ -22,7 +22,7 @@ index 243d9c793227..ff1182be8434 100644 status = "okay"; }; -@@ -553,6 +554,7 @@ &mmc1 { +@@ -556,6 +557,7 @@ &mmc1 { vqmmc-supply = <®_dldo4>; bus-width = <4>; non-removable; @@ -30,7 +30,7 @@ index 243d9c793227..ff1182be8434 100644 status = "okay"; rtl8723cs: wifi@1 { -@@ -568,6 +570,7 @@ &mmc2 { +@@ -571,6 +573,7 @@ &mmc2 { bus-width = <8>; non-removable; cap-mmc-hw-reset; @@ -39,5 +39,5 @@ index 243d9c793227..ff1182be8434 100644 }; -- -Armbian +2.35.3 diff --git a/patch/kernel/archive/sunxi-6.6/patches.megous/dt-bindings-vendor-prefix-add-prefix-for-Voltafield.patch b/patch/kernel/archive/sunxi-6.6/patches.megous/dt-bindings-vendor-prefix-add-prefix-for-Voltafield.patch index 6fabfddc7c52..3fb66e1e7b3f 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.megous/dt-bindings-vendor-prefix-add-prefix-for-Voltafield.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.megous/dt-bindings-vendor-prefix-add-prefix-for-Voltafield.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From e416deafa5d3e4a71cae25903b2a5d4c8c04cf03 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Fri, 30 Dec 2022 23:23:04 +0100 Subject: dt-bindings: vendor-prefix: add prefix for Voltafield @@ -13,10 +13,10 @@ Signed-off-by: Icenowy Zheng 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml -index 573578db9509..326d2a47162e 100644 +index 12a16031d7b6..45cef0307774 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml -@@ -1484,6 +1484,8 @@ patternProperties: +@@ -1486,6 +1486,8 @@ patternProperties: description: VoCore Studio "^voipac,.*": description: Voipac Technologies s.r.o. @@ -26,5 +26,5 @@ index 573578db9509..326d2a47162e 100644 description: Vision Optical Technology Co., Ltd. "^vxt,.*": -- -Armbian +2.35.3 diff --git a/patch/kernel/archive/sunxi-6.6/patches.megous/firmware-arm_scpi-Support-unidirectional-mailbox-channels.patch b/patch/kernel/archive/sunxi-6.6/patches.megous/firmware-arm_scpi-Support-unidirectional-mailbox-channels.patch index 1f20825e205b..8c711025bb1c 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.megous/firmware-arm_scpi-Support-unidirectional-mailbox-channels.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.megous/firmware-arm_scpi-Support-unidirectional-mailbox-channels.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From f586d2ac2ae092252c8328ed78f669927703da5d Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Tue, 5 Mar 2019 22:02:41 -0600 Subject: firmware: arm_scpi: Support unidirectional mailbox channels @@ -14,11 +14,11 @@ one), this new mode only supports a single SCPI channel. Signed-off-by: Samuel Holland --- - drivers/firmware/arm_scpi.c | 58 ++++++++-- + drivers/firmware/arm_scpi.c | 58 +++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c -index 634a6cdcc960..ac01512495bc 100644 +index b8aa8bfc1973..35eb153b4fed 100644 --- a/drivers/firmware/arm_scpi.c +++ b/drivers/firmware/arm_scpi.c @@ -234,7 +234,8 @@ struct scpi_xfer { @@ -40,7 +40,7 @@ index 634a6cdcc960..ac01512495bc 100644 if (ret < 0 || !rx_buf) goto out; -@@ -866,8 +867,13 @@ static void scpi_free_channels(void *data) +@@ -869,8 +870,13 @@ static void scpi_free_channels(void *data) struct scpi_drvinfo *info = data; int i; @@ -56,7 +56,7 @@ index 634a6cdcc960..ac01512495bc 100644 } static int scpi_remove(struct platform_device *pdev) -@@ -924,6 +930,7 @@ static int scpi_probe(struct platform_device *pdev) +@@ -927,6 +933,7 @@ static int scpi_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; struct scpi_drvinfo *scpi_drvinfo; @@ -64,7 +64,7 @@ index 634a6cdcc960..ac01512495bc 100644 scpi_drvinfo = devm_kzalloc(dev, sizeof(*scpi_drvinfo), GFP_KERNEL); if (!scpi_drvinfo) -@@ -937,6 +944,14 @@ static int scpi_probe(struct platform_device *pdev) +@@ -940,6 +947,14 @@ static int scpi_probe(struct platform_device *pdev) dev_err(dev, "no mboxes property in '%pOF'\n", np); return -ENODEV; } @@ -79,7 +79,7 @@ index 634a6cdcc960..ac01512495bc 100644 scpi_drvinfo->channels = devm_kcalloc(dev, count, sizeof(struct scpi_chan), GFP_KERNEL); -@@ -985,15 +1000,34 @@ static int scpi_probe(struct platform_device *pdev) +@@ -988,15 +1003,34 @@ static int scpi_probe(struct platform_device *pdev) mutex_init(&pchan->xfers_lock); ret = scpi_alloc_xfer_list(dev, pchan); @@ -123,5 +123,5 @@ index 634a6cdcc960..ac01512495bc 100644 } -- -Armbian +2.35.3 diff --git a/patch/kernel/archive/sunxi-6.6/patches.megous/firmware-scpi-Add-support-for-sending-a-SCPI_CMD_SET_SYS_PWR_ST.patch b/patch/kernel/archive/sunxi-6.6/patches.megous/firmware-scpi-Add-support-for-sending-a-SCPI_CMD_SET_SYS_PWR_ST.patch index 6ebf446ff73e..ef6e391d892e 100644 --- a/patch/kernel/archive/sunxi-6.6/patches.megous/firmware-scpi-Add-support-for-sending-a-SCPI_CMD_SET_SYS_PWR_ST.patch +++ b/patch/kernel/archive/sunxi-6.6/patches.megous/firmware-scpi-Add-support-for-sending-a-SCPI_CMD_SET_SYS_PWR_ST.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From c9a463489d34b3b2b4247496a378eb1bbe437b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= Date: Sat, 2 Nov 2019 15:14:10 +0100 Subject: firmware: scpi: Add support for sending a SCPI_CMD_SET_SYS_PWR_STATE @@ -22,7 +22,7 @@ Signed-off-by: Ondrej Jirman 2 files changed, 11 insertions(+) diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c -index 435d0e2658a4..634a6cdcc960 100644 +index 3de25e9d18ef..b8aa8bfc1973 100644 --- a/drivers/firmware/arm_scpi.c +++ b/drivers/firmware/arm_scpi.c @@ -184,6 +184,7 @@ enum scpi_drv_cmds { @@ -49,7 +49,7 @@ index 435d0e2658a4..634a6cdcc960 100644 }; struct scpi_xfer { -@@ -779,6 +782,12 @@ static int scpi_device_set_power_state(u16 dev_id, u8 pstate) +@@ -782,6 +785,12 @@ static int scpi_device_set_power_state(u16 dev_id, u8 pstate) sizeof(dev_set), &stat, sizeof(stat)); } @@ -62,7 +62,7 @@ index 435d0e2658a4..634a6cdcc960 100644 static struct scpi_ops scpi_ops = { .get_version = scpi_get_version, .clk_get_range = scpi_clk_get_range, -@@ -795,6 +804,7 @@ static struct scpi_ops scpi_ops = { +@@ -798,6 +807,7 @@ static struct scpi_ops scpi_ops = { .sensor_get_value = scpi_sensor_get_value, .device_get_power_state = scpi_device_get_power_state, .device_set_power_state = scpi_device_set_power_state, @@ -83,5 +83,5 @@ index d2176a56828a..6169348c3b72 100644 #if IS_REACHABLE(CONFIG_ARM_SCPI_PROTOCOL) -- -Armbian +2.35.3