linux: drop some FROMGIT patches to fix Amlogic S912 USB issue

This commit is contained in:
Christian Hewitt 2022-06-11 08:43:14 +00:00
parent 83a7f20ba7
commit 07f2b78459
75 changed files with 116 additions and 750 deletions

View File

@ -1,7 +1,7 @@
From 32f8a4addb742b9f3291e3246fb6dd92bb993bdf Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 13 Apr 2019 05:41:51 +0000
Subject: [PATCH 01/75] HACK: set meson-gx cma pool to 896MB
Subject: [PATCH 01/70] HACK: set meson-gx cma pool to 896MB
This change sets the CMA pool to a larger 896MB! value for vdec use

View File

@ -1,7 +1,7 @@
From 801391b375e48d9c4873d24c153356b3810f6dea Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 14 Aug 2019 19:58:14 +0000
Subject: [PATCH 02/75] HACK: set meson-g12 cma pool to 896MB
Subject: [PATCH 02/70] HACK: set meson-g12 cma pool to 896MB
This change sets the CMA pool to a larger 896MB! value for vdec use

View File

@ -1,7 +1,7 @@
From 47b67b6884682e830f70a01ef0e08c1c3f4b7533 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 13 Apr 2019 05:45:18 +0000
Subject: [PATCH 03/75] HACK: arm64: fix Kodi sysinfo CPU information
Subject: [PATCH 03/70] HACK: arm64: fix Kodi sysinfo CPU information
This allows the CPU information to show in the Kodi sysinfo screen, e.g.

View File

@ -1,7 +1,7 @@
From efe5caf45217e979c555627fa95391f66cddc297 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 5 Jan 2022 15:03:06 +0000
Subject: [PATCH 04/75] HACK: arm64: dts: meson: add LibreELEC device-tree
Subject: [PATCH 04/70] HACK: arm64: dts: meson: add LibreELEC device-tree
overlays for Amlogic
This commit implements a series of device-tree overlays used with LibreELEC

View File

@ -1,7 +1,7 @@
From 8b47dc38f0f48b7e987f0f7200ef60cfcd3cfbfd Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Thu, 3 Nov 2016 15:29:23 +0100
Subject: [PATCH 05/75] HACK: arm64: meson: add Amlogic Meson GX PM Suspend
Subject: [PATCH 05/70] HACK: arm64: meson: add Amlogic Meson GX PM Suspend
The Amlogic Meson GX SoCs uses a non-standard argument to the
PSCI CPU_SUSPEND call to enter system suspend.

View File

@ -1,7 +1,7 @@
From 37fd7a9e99414ce73467a31ab22983034a0d0e35 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Thu, 3 Nov 2016 15:29:25 +0100
Subject: [PATCH 06/75] HACK: arm64: dts: meson: add support for GX PM and
Subject: [PATCH 06/70] HACK: arm64: dts: meson: add support for GX PM and
Virtual RTC
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

View File

@ -1,7 +1,7 @@
From ae110ea056c4560544aaf3473d63befbed0e9161 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 21 Jan 2021 01:35:36 +0000
Subject: [PATCH 07/75] HACK: arm64: dts: meson: add rtc/vrtc aliases to Khadas
Subject: [PATCH 07/70] HACK: arm64: dts: meson: add rtc/vrtc aliases to Khadas
VIM
Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1

View File

@ -1,7 +1,7 @@
From 8eeab8589298a2d667239ffd57e2fbd253daa42e Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 6 Nov 2021 13:01:08 +0000
Subject: [PATCH 08/75] HACK: arm64: dts: meson: add rtc/vrtc aliases to Khadas
Subject: [PATCH 08/70] HACK: arm64: dts: meson: add rtc/vrtc aliases to Khadas
VIM2
Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1

View File

@ -1,7 +1,7 @@
From 769ed2d2c0edbf69532d76ea359c63f884d5d804 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 1 Feb 2021 19:27:40 +0000
Subject: [PATCH 09/75] HACK: arm64: dts: meson: add rtc/vrtc aliases to Minix
Subject: [PATCH 09/70] HACK: arm64: dts: meson: add rtc/vrtc aliases to Minix
NEO U9-H
Add node aliases to prevent meson-vrtc from claiming /dev/rtc0

View File

@ -1,7 +1,7 @@
From 64490625822874190847c5385f013b87b8741642 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi.hannula@iki.fi>
Date: Sun, 17 Apr 2022 04:37:48 +0000
Subject: [PATCH 10/75] HACK: ALSA: Assign internal PCM chmap/ELD/IEC958 kctls
Subject: [PATCH 10/70] HACK: ALSA: Assign internal PCM chmap/ELD/IEC958 kctls
to device 0
On SoC sound devices utilizing codec2codec DAI links with a HDMI codec

View File

@ -1,7 +1,7 @@
From 71e83f4fbad67b698a1c02c68eeabfdbec7a564b Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 3 Jan 2022 10:44:17 +0000
Subject: [PATCH 11/75] HACK: usb: hub: disable autosuspend for Genesys Logic
Subject: [PATCH 11/70] HACK: usb: hub: disable autosuspend for Genesys Logic
Hubs
Disable autosuspend in Genesys Logic hubs to allow USB devices on the

View File

@ -1,7 +1,7 @@
From c6810a206df5eb935e20caec57559a9dbf5b94ae Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Wed, 15 Sep 2021 05:00:45 +0000
Subject: [PATCH 12/75] HACK: of: partial revert of fdt.c changes
Subject: [PATCH 12/70] HACK: of: partial revert of fdt.c changes
This resolves reports similar to the below which are present in dmesg
since Linux 5.10; which are also causing crashes in some distros:

View File

@ -1,7 +1,7 @@
From 739950cde9d1ae5ed24cc0b517ee84189364e8d5 Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Date: Thu, 7 Apr 2022 16:21:59 +0200
Subject: [PATCH 13/75] FROMGIT(5.19): arm64: dts: meson: align SPI NOR node
Subject: [PATCH 13/70] FROMGIT(5.19): arm64: dts: meson: align SPI NOR node
name with dtschema
The node names should be generic and SPI NOR dtschema expects "flash".

View File

@ -1,7 +1,7 @@
From 5f4ab98342c476dec2e3acf2f4ac4d923e58f177 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 9 Apr 2022 06:37:28 +0000
Subject: [PATCH 14/75] FROMGIT(5.19): arm64: dts: meson: alpa-sort the board
Subject: [PATCH 14/70] FROMGIT(5.19): arm64: dts: meson: alpa-sort the board
Makefile
Let's alpha-sort the board Makefile to keep things organised.

View File

@ -1,7 +1,7 @@
From 192fd30a2e6b7f13de716d42fe8da5d0ba8883cc Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Sun, 3 Oct 2021 05:35:48 +0000
Subject: [PATCH 15/75] FROMLIST(v1): ASoC: meson: aiu: Fix HDMI codec control
Subject: [PATCH 15/70] FROMLIST(v1): ASoC: meson: aiu: Fix HDMI codec control
selection
The HDMI controllers on Amlogic Meson SoCs which use the AIU

View File

@ -1,7 +1,7 @@
From 975f10771d598e490cf68c9163ccded0aa0a6139 Mon Sep 17 00:00:00 2001
From: David Heidelberg <david@ixit.cz>
Date: Sat, 27 Nov 2021 07:23:35 +0000
Subject: [PATCH 16/75] FROMLIST(v1): arm64: dts: meson: make dts use gpio-fan
Subject: [PATCH 16/70] FROMLIST(v1): arm64: dts: meson: make dts use gpio-fan
matrix instead of array
No functional changes.

View File

@ -1,7 +1,7 @@
From 751353c08fce291c76a323cb95555c4ebf08deea Mon Sep 17 00:00:00 2001
From: Sergey Shtylyov <s.shtylyov@omp.ru>
Date: Fri, 24 Dec 2021 06:09:57 +0000
Subject: [PATCH 17/75] FROMLIST(v1): mmc: meson-gx: fix deferred probing
Subject: [PATCH 17/70] FROMLIST(v1): mmc: meson-gx: fix deferred probing
The driver overrides the error codes and IRQ0 returned by platform_get_irq()
to -EINVAL, so if it returns -EPROBE_DEFER, the driver will fail the probe

View File

@ -1,7 +1,7 @@
From fc25c91da66fbaa08e1e9c74bf2e5a24aa3f7478 Mon Sep 17 00:00:00 2001
From: Vyacheslav Bocharov <adeep@lexina.in>
Date: Sat, 15 Jan 2022 08:27:14 +0000
Subject: [PATCH 18/75] FROMLIST(v3): Bluetooth: btrtl: Add support for
Subject: [PATCH 18/70] FROMLIST(v3): Bluetooth: btrtl: Add support for
RTL8822C hci_ver 0x08
Add detection of RTL8822CS controller with hci_ver = 0x08

View File

@ -1,7 +1,7 @@
From cbac6712db2371d20449e18b52787cae576f6e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
Date: Sun, 20 Feb 2022 08:23:12 +0000
Subject: [PATCH 19/75] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan
Subject: [PATCH 19/70] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan
Micro Electronics
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8

View File

@ -1,7 +1,7 @@
From f382615afadc84f444a891161d93eb535aca009f Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Sun, 20 Feb 2022 08:24:47 +0000
Subject: [PATCH 20/75] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro
Subject: [PATCH 20/70] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro
Electronics TM1628
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8

View File

@ -1,7 +1,7 @@
From f2759e37f087169376d1522bf638faaeb3bd5770 Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Sun, 20 Feb 2022 08:26:27 +0000
Subject: [PATCH 21/75] FROMLIST(v5): docs: ABI: document tm1628 attribute
Subject: [PATCH 21/70] FROMLIST(v5): docs: ABI: document tm1628 attribute
display-text
Document the attribute for reading / writing the text to be displayed on

View File

@ -1,7 +1,7 @@
From 8655736b28687a69774e3dade4f91bae42766907 Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 4 Apr 2022 18:51:20 +0000
Subject: [PATCH 22/75] FROMLIST(v5): auxdisplay: add support for Titanmec
Subject: [PATCH 22/70] FROMLIST(v5): auxdisplay: add support for Titanmec
TM1628 7 segment display controller
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8

View File

@ -1,7 +1,7 @@
From 021c61c4100c6fd158b1c46bc5259bee58326adf Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 4 Apr 2022 18:52:34 +0000
Subject: [PATCH 23/75] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add
Subject: [PATCH 23/70] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add
support for the 7 segment display
This patch adds support for the 7 segment display of the device.

View File

@ -1,7 +1,7 @@
From bcda997efd9f2b6e744db9a8f477c5b2007ba826 Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 4 Apr 2022 18:53:32 +0000
Subject: [PATCH 24/75] FROMLIST(v5): MAINTAINERS: Add entry for tm1628
Subject: [PATCH 24/70] FROMLIST(v5): MAINTAINERS: Add entry for tm1628
auxdisplay driver
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

View File

@ -1,7 +1,7 @@
From 445c146a13be51cdb78f4f6ee4904d72b7c850ef Mon Sep 17 00:00:00 2001
From 084a6b7be7860e26f07b8814dcf37279a799b1cb Mon Sep 17 00:00:00 2001
From: Lucas Tanure <tanure@linux.com>
Date: Sun, 10 Apr 2022 09:48:48 +0000
Subject: [PATCH 30/75] FROMLIST(v2): i2c: meson: Use _SHIFT and _MASK for
Subject: [PATCH 25/70] FROMLIST(v2): i2c: meson: Use _SHIFT and _MASK for
register definitions
Differentiate between masks and shifts

View File

@ -1,154 +0,0 @@
From 3229cb32ce07ad1e0aed2e8b46e71c08d6218419 Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 4 Apr 2022 18:58:27 +0000
Subject: [PATCH 25/75] FROMLIST(v2): xhci: factor out parts of
xhci_gen_setup()
Factoring out parts of xhci_gen_setup() has two motivations:
- When adding functionaliy to omit shared hcd if not needed in a
subsequent patch, we'll have to call xhci_hcd_init_usb3_data()
from two places.
- It reduces size of xhci_gen_setup() and makes it better readable.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/usb/host/xhci.c | 104 +++++++++++++++++++++-------------------
1 file changed, 54 insertions(+), 50 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 2be38d9de8df..9f801de6d9e0 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -5209,6 +5209,57 @@ static int xhci_get_frame(struct usb_hcd *hcd)
return readl(&xhci->run_regs->microframe_index) >> 3;
}
+static void xhci_hcd_init_usb2_data(struct xhci_hcd *xhci, struct usb_hcd *hcd)
+{
+ xhci->usb2_rhub.hcd = hcd;
+ hcd->speed = HCD_USB2;
+ hcd->self.root_hub->speed = USB_SPEED_HIGH;
+ /*
+ * USB 2.0 roothub under xHCI has an integrated TT,
+ * (rate matching hub) as opposed to having an OHCI/UHCI
+ * companion controller.
+ */
+ hcd->has_tt = 1;
+}
+
+static void xhci_hcd_init_usb3_data(struct xhci_hcd *xhci, struct usb_hcd *hcd)
+{
+ unsigned int minor_rev;
+
+ /*
+ * Early xHCI 1.1 spec did not mention USB 3.1 capable hosts
+ * should return 0x31 for sbrn, or that the minor revision
+ * is a two digit BCD containig minor and sub-minor numbers.
+ * This was later clarified in xHCI 1.2.
+ *
+ * Some USB 3.1 capable hosts therefore have sbrn 0x30, and
+ * minor revision set to 0x1 instead of 0x10.
+ */
+ if (xhci->usb3_rhub.min_rev == 0x1)
+ minor_rev = 1;
+ else
+ minor_rev = xhci->usb3_rhub.min_rev / 0x10;
+
+ switch (minor_rev) {
+ case 2:
+ hcd->speed = HCD_USB32;
+ hcd->self.root_hub->speed = USB_SPEED_SUPER_PLUS;
+ hcd->self.root_hub->rx_lanes = 2;
+ hcd->self.root_hub->tx_lanes = 2;
+ hcd->self.root_hub->ssp_rate = USB_SSP_GEN_2x2;
+ break;
+ case 1:
+ hcd->speed = HCD_USB31;
+ hcd->self.root_hub->speed = USB_SPEED_SUPER_PLUS;
+ hcd->self.root_hub->ssp_rate = USB_SSP_GEN_2x1;
+ break;
+ }
+ xhci_info(xhci, "Host supports USB 3.%x %sSuperSpeed\n",
+ minor_rev, minor_rev ? "Enhanced " : "");
+
+ xhci->usb3_rhub.hcd = hcd;
+}
+
int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
{
struct xhci_hcd *xhci;
@@ -5217,7 +5268,6 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
* quirks
*/
struct device *dev = hcd->self.sysdev;
- unsigned int minor_rev;
int retval;
/* Accept arbitrarily long scatter-gather lists */
@@ -5232,60 +5282,14 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
xhci = hcd_to_xhci(hcd);
if (usb_hcd_is_primary_hcd(hcd)) {
- xhci->main_hcd = hcd;
- xhci->usb2_rhub.hcd = hcd;
- /* Mark the first roothub as being USB 2.0.
- * The xHCI driver will register the USB 3.0 roothub.
- */
- hcd->speed = HCD_USB2;
- hcd->self.root_hub->speed = USB_SPEED_HIGH;
- /*
- * USB 2.0 roothub under xHCI has an integrated TT,
- * (rate matching hub) as opposed to having an OHCI/UHCI
- * companion controller.
- */
- hcd->has_tt = 1;
+ xhci_hcd_init_usb2_data(xhci, hcd);
} else {
- /*
- * Early xHCI 1.1 spec did not mention USB 3.1 capable hosts
- * should return 0x31 for sbrn, or that the minor revision
- * is a two digit BCD containig minor and sub-minor numbers.
- * This was later clarified in xHCI 1.2.
- *
- * Some USB 3.1 capable hosts therefore have sbrn 0x30, and
- * minor revision set to 0x1 instead of 0x10.
- */
- if (xhci->usb3_rhub.min_rev == 0x1)
- minor_rev = 1;
- else
- minor_rev = xhci->usb3_rhub.min_rev / 0x10;
-
- switch (minor_rev) {
- case 2:
- hcd->speed = HCD_USB32;
- hcd->self.root_hub->speed = USB_SPEED_SUPER_PLUS;
- hcd->self.root_hub->rx_lanes = 2;
- hcd->self.root_hub->tx_lanes = 2;
- hcd->self.root_hub->ssp_rate = USB_SSP_GEN_2x2;
- break;
- case 1:
- hcd->speed = HCD_USB31;
- hcd->self.root_hub->speed = USB_SPEED_SUPER_PLUS;
- hcd->self.root_hub->ssp_rate = USB_SSP_GEN_2x1;
- break;
- }
- xhci_info(xhci, "Host supports USB 3.%x %sSuperSpeed\n",
- minor_rev,
- minor_rev ? "Enhanced " : "");
-
- xhci->usb3_rhub.hcd = hcd;
- /* xHCI private pointer was set in xhci_pci_probe for the second
- * registered roothub.
- */
+ xhci_hcd_init_usb3_data(xhci, hcd);
return 0;
}
mutex_init(&xhci->mutex);
+ xhci->main_hcd = hcd;
xhci->cap_regs = hcd->regs;
xhci->op_regs = hcd->regs +
HC_LENGTH(readl(&xhci->cap_regs->hc_capbase));
--
2.17.1

View File

@ -1,7 +1,7 @@
From 81bf505d4fe80bd13a228f42024448122c7a4a96 Mon Sep 17 00:00:00 2001
From 40a73e17fcacdab5aa34a1f7b307f6eb9a5fbe93 Mon Sep 17 00:00:00 2001
From: Lucas Tanure <tanure@linux.com>
Date: Sun, 10 Apr 2022 09:50:15 +0000
Subject: [PATCH 31/75] FROMLIST(v2): i2c: meson: Use 50% duty cycle for I2C
Subject: [PATCH 26/70] FROMLIST(v2): i2c: meson: Use 50% duty cycle for I2C
clock
The duty cycle of 33% is less than the required

View File

@ -1,285 +0,0 @@
From 3af2706d6d2b09d97f144df527d5da51e0e73bc3 Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 4 Apr 2022 18:59:21 +0000
Subject: [PATCH 26/75] FROMLIST(v2): xhci: prepare for operation w/o shared
hcd
This patch prepares xhci for the following scenario:
- If either of the root hubs has no ports, then omit shared hcd
- Main hcd can be USB3 if there are no USB2 ports
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/usb/host/xhci-hub.c | 3 ++-
drivers/usb/host/xhci-mem.c | 11 ++++----
drivers/usb/host/xhci.c | 53 ++++++++++++++++++++++++-------------
drivers/usb/host/xhci.h | 26 ++++++++++++++++++
4 files changed, 68 insertions(+), 25 deletions(-)
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index f65f1ba2b592..c54f2bc23d3f 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -707,6 +707,7 @@ static int xhci_enter_test_mode(struct xhci_hcd *xhci,
u16 test_mode, u16 wIndex, unsigned long *flags)
__must_hold(&xhci->lock)
{
+ struct usb_hcd *usb3_hcd = xhci_get_usb3_hcd(xhci);
int i, retval;
/* Disable all Device Slots */
@@ -727,7 +728,7 @@ static int xhci_enter_test_mode(struct xhci_hcd *xhci,
xhci_dbg(xhci, "Disable all port (PP = 0)\n");
/* Power off USB3 ports*/
for (i = 0; i < xhci->usb3_rhub.num_ports; i++)
- xhci_set_port_power(xhci, xhci->shared_hcd, i, false, flags);
+ xhci_set_port_power(xhci, usb3_hcd, i, false, flags);
/* Power off USB2 ports*/
for (i = 0; i < xhci->usb2_rhub.num_ports; i++)
xhci_set_port_power(xhci, xhci->main_hcd, i, false, flags);
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index bbb27ee2c6a3..50bf64dcb186 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -1072,7 +1072,7 @@ static u32 xhci_find_real_port_number(struct xhci_hcd *xhci,
struct usb_hcd *hcd;
if (udev->speed >= USB_SPEED_SUPER)
- hcd = xhci->shared_hcd;
+ hcd = xhci_get_usb3_hcd(xhci);
else
hcd = xhci->main_hcd;
@@ -2362,10 +2362,11 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags)
xhci->usb2_rhub.num_ports = USB_MAXCHILDREN;
}
- /*
- * Note we could have all USB 3.0 ports, or all USB 2.0 ports.
- * Not sure how the USB core will handle a hub with no ports...
- */
+ if (!xhci->usb2_rhub.num_ports)
+ xhci_info(xhci, "USB2 root hub has no ports\n");
+
+ if (!xhci->usb3_rhub.num_ports)
+ xhci_info(xhci, "USB3 root hub has no ports\n");
xhci_create_rhub_port_array(xhci, &xhci->usb2_rhub, flags);
xhci_create_rhub_port_array(xhci, &xhci->usb3_rhub, flags);
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 9f801de6d9e0..80db65f19e47 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -486,6 +486,10 @@ static void compliance_mode_recovery(struct timer_list *t)
xhci = from_timer(xhci, t, comp_mode_recovery_timer);
rhub = &xhci->usb3_rhub;
+ hcd = rhub->hcd;
+
+ if (!hcd)
+ return;
for (i = 0; i < rhub->num_ports; i++) {
temp = readl(rhub->ports[i]->addr);
@@ -499,7 +503,6 @@ static void compliance_mode_recovery(struct timer_list *t)
i + 1);
xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
"Attempting compliance mode recovery");
- hcd = xhci->shared_hcd;
if (hcd->state == HC_STATE_SUSPENDED)
usb_hcd_resume_root_hub(hcd);
@@ -612,14 +615,11 @@ static int xhci_run_finished(struct xhci_hcd *xhci)
xhci_halt(xhci);
return -ENODEV;
}
- xhci->shared_hcd->state = HC_STATE_RUNNING;
xhci->cmd_ring_state = CMD_RING_STATE_RUNNING;
if (xhci->quirks & XHCI_NEC_HOST)
xhci_ring_cmd_db(xhci);
- xhci_dbg_trace(xhci, trace_xhci_dbg_init,
- "Finished xhci_run for USB3 roothub");
return 0;
}
@@ -694,7 +694,7 @@ int xhci_run(struct usb_hcd *hcd)
xhci_free_command(xhci, command);
}
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
- "Finished xhci_run for USB2 roothub");
+ "Finished %s for main hcd", __func__);
set_bit(HCD_FLAG_DEFER_RH_REGISTER, &hcd->flags);
@@ -702,6 +702,9 @@ int xhci_run(struct usb_hcd *hcd)
xhci_debugfs_init(xhci);
+ if (xhci_has_one_roothub(xhci))
+ return xhci_run_finished(xhci);
+
return 0;
}
EXPORT_SYMBOL_GPL(xhci_run);
@@ -994,7 +997,7 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup)
return 0;
if (hcd->state != HC_STATE_SUSPENDED ||
- xhci->shared_hcd->state != HC_STATE_SUSPENDED)
+ (xhci->shared_hcd && xhci->shared_hcd->state != HC_STATE_SUSPENDED))
return -EINVAL;
/* Clear root port wake on bits if wakeup not allowed. */
@@ -1011,15 +1014,18 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup)
__func__, hcd->self.busnum);
clear_bit(HCD_FLAG_POLL_RH, &hcd->flags);
del_timer_sync(&hcd->rh_timer);
- clear_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags);
- del_timer_sync(&xhci->shared_hcd->rh_timer);
+ if (xhci->shared_hcd) {
+ clear_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags);
+ del_timer_sync(&xhci->shared_hcd->rh_timer);
+ }
if (xhci->quirks & XHCI_SUSPEND_DELAY)
usleep_range(1000, 1500);
spin_lock_irq(&xhci->lock);
clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
- clear_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);
+ if (xhci->shared_hcd)
+ clear_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);
/* step 1: stop endpoint */
/* skipped assuming that port suspend has done */
@@ -1119,7 +1125,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
msleep(100);
set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
- set_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);
+ if (xhci->shared_hcd)
+ set_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);
spin_lock_irq(&xhci->lock);
@@ -1179,7 +1186,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
/* Let the USB core know _both_ roothubs lost power. */
usb_root_hub_lost_power(xhci->main_hcd->self.root_hub);
- usb_root_hub_lost_power(xhci->shared_hcd->self.root_hub);
+ if (xhci->shared_hcd)
+ usb_root_hub_lost_power(xhci->shared_hcd->self.root_hub);
xhci_dbg(xhci, "Stop HCD\n");
xhci_halt(xhci);
@@ -1219,12 +1227,13 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
xhci_dbg(xhci, "Start the primary HCD\n");
retval = xhci_run(hcd->primary_hcd);
- if (!retval) {
+ if (!retval && secondary_hcd) {
xhci_dbg(xhci, "Start the secondary HCD\n");
retval = xhci_run(secondary_hcd);
}
hcd->state = HC_STATE_SUSPENDED;
- xhci->shared_hcd->state = HC_STATE_SUSPENDED;
+ if (xhci->shared_hcd)
+ xhci->shared_hcd->state = HC_STATE_SUSPENDED;
goto done;
}
@@ -1262,7 +1271,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
}
if (pending_portevent) {
- usb_hcd_resume_root_hub(xhci->shared_hcd);
+ if (xhci->shared_hcd)
+ usb_hcd_resume_root_hub(xhci->shared_hcd);
usb_hcd_resume_root_hub(hcd);
}
}
@@ -1281,8 +1291,10 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
/* Re-enable port polling. */
xhci_dbg(xhci, "%s: starting usb%d port polling.\n",
__func__, hcd->self.busnum);
- set_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags);
- usb_hcd_poll_rh_status(xhci->shared_hcd);
+ if (xhci->shared_hcd) {
+ set_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags);
+ usb_hcd_poll_rh_status(xhci->shared_hcd);
+ }
set_bit(HCD_FLAG_POLL_RH, &hcd->flags);
usb_hcd_poll_rh_status(hcd);
@@ -5281,9 +5293,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
xhci = hcd_to_xhci(hcd);
- if (usb_hcd_is_primary_hcd(hcd)) {
- xhci_hcd_init_usb2_data(xhci, hcd);
- } else {
+ if (!usb_hcd_is_primary_hcd(hcd)) {
xhci_hcd_init_usb3_data(xhci, hcd);
return 0;
}
@@ -5364,6 +5374,11 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks)
return retval;
xhci_dbg(xhci, "Called HCD init\n");
+ if (xhci_hcd_is_usb3(hcd))
+ xhci_hcd_init_usb3_data(xhci, hcd);
+ else
+ xhci_hcd_init_usb2_data(xhci, hcd);
+
xhci_info(xhci, "hcc params 0x%08x hci version 0x%x quirks 0x%016llx\n",
xhci->hcc_params, xhci->hci_version, xhci->quirks);
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 473a33ce299e..c792a3148e49 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1911,6 +1911,8 @@ struct xhci_hcd {
unsigned hw_lpm_support:1;
/* Broken Suspend flag for SNPS Suspend resume issue */
unsigned broken_suspend:1;
+ /* Indicates that omitting hcd is supported if root hub has no ports */
+ unsigned allow_single_roothub:1;
/* cached usb2 extened protocol capabilites */
u32 *ext_caps;
unsigned int num_ext_caps;
@@ -1966,6 +1968,30 @@ static inline struct usb_hcd *xhci_to_hcd(struct xhci_hcd *xhci)
return xhci->main_hcd;
}
+static inline struct usb_hcd *xhci_get_usb3_hcd(struct xhci_hcd *xhci)
+{
+ if (xhci->shared_hcd)
+ return xhci->shared_hcd;
+
+ if (!xhci->usb2_rhub.num_ports)
+ return xhci->main_hcd;
+
+ return NULL;
+}
+
+static inline bool xhci_hcd_is_usb3(struct usb_hcd *hcd)
+{
+ struct xhci_hcd *xhci = hcd_to_xhci(hcd);
+
+ return hcd == xhci_get_usb3_hcd(xhci);
+}
+
+static inline bool xhci_has_one_roothub(struct xhci_hcd *xhci)
+{
+ return xhci->allow_single_roothub &&
+ (!xhci->usb2_rhub.num_ports || !xhci->usb3_rhub.num_ports);
+}
+
#define xhci_dbg(xhci, fmt, args...) \
dev_dbg(xhci_to_hcd(xhci)->self.controller , fmt , ## args)
#define xhci_err(xhci, fmt, args...) \
--
2.17.1

View File

@ -1,7 +1,7 @@
From 7cb684981f3e948237b492d5b5e5e11877e5c545 Mon Sep 17 00:00:00 2001
From 27541d259243b8c7cb20058fbee1e28dd23cc105 Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Sun, 17 Apr 2022 05:34:29 +0000
Subject: [PATCH 32/75] FROMLIST(v1): mmc: meson-gx: switch to device-managed
Subject: [PATCH 27/70] FROMLIST(v1): mmc: meson-gx: switch to device-managed
dmam_alloc_coherent()
Using the device-managed version allows to simplify clean-up in probe()

View File

@ -1,99 +0,0 @@
From 9823aeb7de8e2c608de01399e902ec43819b2d89 Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 4 Apr 2022 19:00:18 +0000
Subject: [PATCH 27/75] FROMLIST(v2): usb: host: xhci-plat: create shared hcd
after having added main hcd
This patch is in preparation of an extension where in case of a
root hub with no ports no shared hcd will be created.
Whether one of the root hubs has no ports we figure our in
usb_add_hcd() for the primary hcd. Therefore create the shared hcd
only after this call.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/usb/host/xhci-plat.c | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 649ffd861b44..5d752b384de2 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -283,12 +283,6 @@ static int xhci_plat_probe(struct platform_device *pdev)
device_set_wakeup_capable(&pdev->dev, true);
xhci->main_hcd = hcd;
- xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev,
- dev_name(&pdev->dev), hcd);
- if (!xhci->shared_hcd) {
- ret = -ENOMEM;
- goto disable_clk;
- }
/* imod_interval is the interrupt moderation value in nanoseconds. */
xhci->imod_interval = 40000;
@@ -313,16 +307,16 @@ static int xhci_plat_probe(struct platform_device *pdev)
if (IS_ERR(hcd->usb_phy)) {
ret = PTR_ERR(hcd->usb_phy);
if (ret == -EPROBE_DEFER)
- goto put_usb3_hcd;
+ goto disable_clk;
hcd->usb_phy = NULL;
} else {
ret = usb_phy_init(hcd->usb_phy);
if (ret)
- goto put_usb3_hcd;
+ goto disable_clk;
}
hcd->tpl_support = of_usb_host_tpl_support(sysdev->of_node);
- xhci->shared_hcd->tpl_support = hcd->tpl_support;
+
if (priv && (priv->quirks & XHCI_SKIP_PHY_INIT))
hcd->skip_phy_initialization = 1;
@@ -333,12 +327,21 @@ static int xhci_plat_probe(struct platform_device *pdev)
if (ret)
goto disable_usb_phy;
+ xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev,
+ dev_name(&pdev->dev), hcd);
+ if (!xhci->shared_hcd) {
+ ret = -ENOMEM;
+ goto dealloc_usb2_hcd;
+ }
+
+ xhci->shared_hcd->tpl_support = hcd->tpl_support;
+
if (HCC_MAX_PSA(xhci->hcc_params) >= 4)
xhci->shared_hcd->can_do_streams = 1;
ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED);
if (ret)
- goto dealloc_usb2_hcd;
+ goto put_usb3_hcd;
device_enable_async_suspend(&pdev->dev);
pm_runtime_put_noidle(&pdev->dev);
@@ -352,15 +355,15 @@ static int xhci_plat_probe(struct platform_device *pdev)
return 0;
+put_usb3_hcd:
+ usb_put_hcd(xhci->shared_hcd);
+
dealloc_usb2_hcd:
usb_remove_hcd(hcd);
disable_usb_phy:
usb_phy_shutdown(hcd->usb_phy);
-put_usb3_hcd:
- usb_put_hcd(xhci->shared_hcd);
-
disable_clk:
clk_disable_unprepare(xhci->clk);
--
2.17.1

View File

@ -1,7 +1,7 @@
From 1fd3223c764b09d9a4069f514bb74658451119bf Mon Sep 17 00:00:00 2001
From 1d39b9d6ac09b1723656feb0189bf2f3d6684447 Mon Sep 17 00:00:00 2001
From: John Ogness <john.ogness@linutronix.de>
Date: Mon, 9 May 2022 09:33:17 +0000
Subject: [PATCH 33/75] FROMLIST(v1): serial: meson: acquire port->lock in
Subject: [PATCH 28/70] FROMLIST(v1): serial: meson: acquire port->lock in
startup()
The uart_ops startup() callback is called without interrupts

View File

@ -1,66 +0,0 @@
From 04139ded1d649c5abe2d91bb78bd3a5f73dfa359 Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 4 Apr 2022 19:01:08 +0000
Subject: [PATCH 28/75] FROMLIST(v2): usb: host: xhci-plat: prepare operation
w/o shared hcd
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
drivers/usb/host/xhci-plat.c | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 5d752b384de2..c512ec2148ae 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -180,7 +180,7 @@ static int xhci_plat_probe(struct platform_device *pdev)
struct device *sysdev, *tmpdev;
struct xhci_hcd *xhci;
struct resource *res;
- struct usb_hcd *hcd;
+ struct usb_hcd *hcd, *usb3_hcd;
int ret;
int irq;
struct xhci_plat_priv *priv = NULL;
@@ -327,21 +327,26 @@ static int xhci_plat_probe(struct platform_device *pdev)
if (ret)
goto disable_usb_phy;
- xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev,
- dev_name(&pdev->dev), hcd);
- if (!xhci->shared_hcd) {
- ret = -ENOMEM;
- goto dealloc_usb2_hcd;
- }
+ if (!xhci_has_one_roothub(xhci)) {
+ xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev,
+ dev_name(&pdev->dev), hcd);
+ if (!xhci->shared_hcd) {
+ ret = -ENOMEM;
+ goto dealloc_usb2_hcd;
+ }
- xhci->shared_hcd->tpl_support = hcd->tpl_support;
+ xhci->shared_hcd->tpl_support = hcd->tpl_support;
+ }
- if (HCC_MAX_PSA(xhci->hcc_params) >= 4)
- xhci->shared_hcd->can_do_streams = 1;
+ usb3_hcd = xhci_get_usb3_hcd(xhci);
+ if (usb3_hcd && HCC_MAX_PSA(xhci->hcc_params) >= 4)
+ usb3_hcd->can_do_streams = 1;
- ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED);
- if (ret)
- goto put_usb3_hcd;
+ if (xhci->shared_hcd) {
+ ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED);
+ if (ret)
+ goto put_usb3_hcd;
+ }
device_enable_async_suspend(&pdev->dev);
pm_runtime_put_noidle(&pdev->dev);
--
2.17.1

View File

@ -1,7 +1,7 @@
From 9bf7cff59bc0a7a363194a0cc7a246c84c9262c0 Mon Sep 17 00:00:00 2001
From a9242f292fe47ee3ef2dc0353a06bbc27c3946a5 Mon Sep 17 00:00:00 2001
From: Dongjin Kim <tobetter@gmail.com>
Date: Mon, 16 May 2022 05:46:15 +0000
Subject: [PATCH 34/75] FROMLIST(v1): drm/meson: add YUV422 output support
Subject: [PATCH 29/70] FROMLIST(v1): drm/meson: add YUV422 output support
Support YUV422 output from the Amlogic Meson SoC VPU to the HDMI
controller. Without this YUV422 format out of the HDMI encoder

View File

@ -1,30 +0,0 @@
From bc9b1a4ab1b93959f1ad28b702b4550b10f09685 Mon Sep 17 00:00:00 2001
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Mon, 4 Apr 2022 19:01:52 +0000
Subject: [PATCH 29/75] FROMLIST(v2): usb: host: xhci-plat: omit shared hcd if
either root hub has no ports
Activate the just added extension for xhci-plat and omit the shared
hcd if either of the root hubs has no ports.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/usb/host/xhci-plat.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index c512ec2148ae..044855818cb1 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -245,6 +245,8 @@ static int xhci_plat_probe(struct platform_device *pdev)
xhci = hcd_to_xhci(hcd);
+ xhci->allow_single_roothub = 1;
+
/*
* Not all platforms have clks so it is not an error if the
* clock do not exist.
--
2.17.1

View File

@ -1,7 +1,7 @@
From f1630da0b79afe985dc712d4bbff57f127c85587 Mon Sep 17 00:00:00 2001
From 8ec8b2a4840423f1e0ba3163e6849ddc8c28674a Mon Sep 17 00:00:00 2001
From: Furkan Kardame <f.kardame@manjaro.org>
Date: Sat, 14 May 2022 17:46:36 +0300
Subject: [PATCH 35/75] FROMLIST(v2): arm64: dts: meson: add gpio-fan control
Subject: [PATCH 30/70] FROMLIST(v2): arm64: dts: meson: add gpio-fan control
to GS-King-X
GS-King-X has a single speed GPIO fan which is always-on by default. If

View File

@ -1,7 +1,7 @@
From abf6ff44ca6aefe3de2eb1041db86b47d64977be Mon Sep 17 00:00:00 2001
From d88569b2be528dfca5381ec78b76c332a4b8106b Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 23 Dec 2018 02:24:38 +0100
Subject: [PATCH 36/75] WIP: ASoC: hdmi-codec: reorder channel allocation list
Subject: [PATCH 31/70] WIP: ASoC: hdmi-codec: reorder channel allocation list
Wrong channel allocation is selected by hdmi_codec_get_ch_alloc_table_idx().

View File

@ -1,7 +1,7 @@
From 036d29d2263989713edde0aaae540e9a4704f9ba Mon Sep 17 00:00:00 2001
From 31fa54bde59f26c8706fb8d44b75024c504f9e04 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Thu, 14 Jan 2021 17:43:02 +0100
Subject: [PATCH 37/75] WIP: mmc: meson-gx-mmc: set core clock phase to 270
Subject: [PATCH 32/70] WIP: mmc: meson-gx-mmc: set core clock phase to 270
degrees for AXG compatible controllers
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

View File

@ -1,7 +1,7 @@
From d4503f96f3e9dc45199684062ace62d1cd34b733 Mon Sep 17 00:00:00 2001
From 70f1da1e961e436cb624ac96accc02b8efed3781 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 13 Jan 2022 03:50:01 +0000
Subject: [PATCH 38/75] WIP: arm64: dts: meson: add Broadcom WiFi to P212 dtsi
Subject: [PATCH 33/70] WIP: arm64: dts: meson: add Broadcom WiFi to P212 dtsi
The P212 has a combined WiFi/BT module. The BT side is already enabled
in the dtsi but the WiFi side is not. Let's enable the WiFi module.

View File

@ -1,7 +1,7 @@
From dd411125bc8d3236683c13010baac9691182c27e Mon Sep 17 00:00:00 2001
From f1373505a9d35ecdccc696bc7b4c18684dd282a2 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 13 Jan 2022 03:56:12 +0000
Subject: [PATCH 39/75] WIP: arm64: dts: meson: move pwm_ef node in P212 dtsi
Subject: [PATCH 34/70] WIP: arm64: dts: meson: move pwm_ef node in P212 dtsi
Cosmetic-only change to alpha-sort the pwm_ef node.

View File

@ -1,7 +1,7 @@
From c610b3619eec78b6948a3d6fbb14a08075975def Mon Sep 17 00:00:00 2001
From 11dd0fd7e0dea29ac4bf1d65d3f38bf02b81de74 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 13 Jan 2022 03:58:58 +0000
Subject: [PATCH 40/75] WIP: arm64: dts: meson: remove WiFi/BT nodes from
Subject: [PATCH 35/70] WIP: arm64: dts: meson: remove WiFi/BT nodes from
Khadas VIM1
The Broadcom WiFi/BT SDIO nodes are now inherited from the P212 common dtsi

View File

@ -1,7 +1,7 @@
From fd651d3658c024591cc3689675aa3431cd7ac18e Mon Sep 17 00:00:00 2001
From 430a8b141965e2b20563d90c8095dc131c6272ee Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 18 Jan 2022 15:09:12 +0000
Subject: [PATCH 41/75] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to
Subject: [PATCH 36/70] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to
100MHz
Amlogic datasheets describe 50MHz max-frequency for SDIO on GXL/GXM but

View File

@ -1,7 +1,7 @@
From 720a81782de7838de2b2be72da7dfdc4058492d2 Mon Sep 17 00:00:00 2001
From f19abb3fb53a14abb442ae53f82e454891d82c56 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 19 Jan 2022 06:45:06 +0000
Subject: [PATCH 42/75] WIP: arm64: dts: meson: add UHS SDIO capabilities to
Subject: [PATCH 37/70] WIP: arm64: dts: meson: add UHS SDIO capabilities to
p212/p23x/q20x
Add UHS capabilities to the SDIO node to enable 100MHz speeds.

View File

@ -1,7 +1,7 @@
From 3b018fd0f13e75ea458cc08732000af8eeb462e5 Mon Sep 17 00:00:00 2001
From 16ee4ba76934644c0adaaaf18df96a84a5f2e028 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 18 Jan 2022 15:18:32 +0000
Subject: [PATCH 43/75] WIP: arm64: dts: meson: remove SDIO node from Khadas
Subject: [PATCH 38/70] WIP: arm64: dts: meson: remove SDIO node from Khadas
VIM1
Now that SDIO 100MHz max-frequency is inherited from the p212 dtsi we

View File

@ -1,7 +1,7 @@
From 977f6cc6e2881bb31b8bcafc499b1b881870e428 Mon Sep 17 00:00:00 2001
From aa35a44f6134308d772b3d43a3a87b831def8819 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Thu, 13 Jan 2022 04:30:44 +0000
Subject: [PATCH 44/75] WIP: arm64: dts: meson: add audio playback to
Subject: [PATCH 39/70] WIP: arm64: dts: meson: add audio playback to
S905X-P212 dts
Add support for the HDMI and Analogue i2s audio outputs.

View File

@ -1,7 +1,7 @@
From ab3efb263dfedd383eb570991e044795b4977302 Mon Sep 17 00:00:00 2001
From 08c3b18c0cd8e82357535da3f96ca405cda36607 Mon Sep 17 00:00:00 2001
From: benjamin545 <benjamin545@gmail.com>
Date: Thu, 15 Jul 2021 14:32:33 -0400
Subject: [PATCH 45/75] WIP: drivers: meson: vdec: remove redundant if
Subject: [PATCH 40/70] WIP: drivers: meson: vdec: remove redundant if
statement
checking if sess->fmt_out->pixfmt is V4L2_PIX_FMT_VP9 was already done

View File

@ -1,7 +1,7 @@
From 7bb603d543ec434995cfd877a7635bcccede9738 Mon Sep 17 00:00:00 2001
From 2861450ee7427d009c5b0ce55b246b442e82270d Mon Sep 17 00:00:00 2001
From: benjamin545 <benjamin545@gmail.com>
Date: Thu, 15 Jul 2021 16:32:39 -0400
Subject: [PATCH 46/75] WIP: drivers: meson: vdec: improve mmu and fbc handling
Subject: [PATCH 41/70] WIP: drivers: meson: vdec: improve mmu and fbc handling
and add 10 bit handling
---

View File

@ -1,7 +1,7 @@
From a483f00fdf368268d46568fc29f0fcd32979cd4d Mon Sep 17 00:00:00 2001
From 2d855dc8ffb19370836b3b7c6e8009064249a38d Mon Sep 17 00:00:00 2001
From: benjamin545 <benjamin545@gmail.com>
Date: Thu, 15 Jul 2021 17:08:42 -0400
Subject: [PATCH 47/75] WIP: drivers: meson: vdec: add HEVC decode codec
Subject: [PATCH 42/70] WIP: drivers: meson: vdec: add HEVC decode codec
---
drivers/staging/media/meson/vdec/Makefile | 2 +-

View File

@ -1,7 +1,7 @@
From 29b04bbe39012039087a9d1b6b012231acd6c13a Mon Sep 17 00:00:00 2001
From fb71027e2206f709534b8dcd6c2626d5e518d768 Mon Sep 17 00:00:00 2001
From: benjamin545 <benjamin545@gmail.com>
Date: Mon, 2 Aug 2021 15:18:40 -0400
Subject: [PATCH 48/75] WIP: drivers: meson: vdec: add handling to HEVC decoder
Subject: [PATCH 43/70] WIP: drivers: meson: vdec: add handling to HEVC decoder
to show frames when ready
..rather than when no longer referenced

View File

@ -1,7 +1,7 @@
From 4bae2dad3ead7bbc09bf39653d86252b5cb18a83 Mon Sep 17 00:00:00 2001
From fd601dd7097bfe01fe8ef2d40a179e5dc57a7b96 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 21 Nov 2021 19:12:07 +0000
Subject: [PATCH 49/75] WIP: drivers: meson: vdec: add HEVC support to GXBB
Subject: [PATCH 44/70] WIP: drivers: meson: vdec: add HEVC support to GXBB
It's not clear whether the GXL firmware is the same one used with GXBB
but let's try it and see!

View File

@ -1,7 +1,7 @@
From 02d45da06c445f4efdacbbb9747dffd3f2381c27 Mon Sep 17 00:00:00 2001
From d4d06521ca9bd4274d50144534ad83b29ec93399 Mon Sep 17 00:00:00 2001
From: Neil Armstrong <narmstrong@baylibre.com>
Date: Mon, 22 Nov 2021 09:15:21 +0000
Subject: [PATCH 50/75] WIP: drivers: meson: vdec: check if parser has really
Subject: [PATCH 45/70] WIP: drivers: meson: vdec: check if parser has really
parser before marking input buffer as error
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

View File

@ -1,7 +1,7 @@
From 77ac78870d1d53fb26844378421979478f290a52 Mon Sep 17 00:00:00 2001
From cc0840e772532109925281d939bd04ed0abda671 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 13 Feb 2022 08:53:39 +0000
Subject: [PATCH 51/75] WIP: drm/meson/meson_vclk: fix VIC alternate timings
Subject: [PATCH 46/70] WIP: drm/meson/meson_vclk: fix VIC alternate timings
4K VP9 media with 59.94 fractional refresh rate refuses to play with
the screen going blank (no sync) and the following error reported in

View File

@ -1,7 +1,7 @@
From 405347c53b51de03ad15c7ca5c8fb34d4bb92f5e Mon Sep 17 00:00:00 2001
From 4c13445878854898d15468383e49a0e8da480ce7 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 17 Aug 2021 16:16:43 +0000
Subject: [PATCH 52/75] WIP: arm64: dts: meson: radxa-zero: add support for the
Subject: [PATCH 47/70] WIP: arm64: dts: meson: radxa-zero: add support for the
usb type-c controller
Radxa Zero uses an FUSB302 type-c controller, so lets enable it.

View File

@ -1,7 +1,7 @@
From d14c758923932a75cedc55f6e7be249fb21169cf Mon Sep 17 00:00:00 2001
From 906616d64230c5d0792d92344f5906270dfbb988 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 16 Feb 2022 07:27:07 +0000
Subject: [PATCH 53/75] WIP: dt-bindings: arm: amlogic: add support for Radxa
Subject: [PATCH 48/70] WIP: dt-bindings: arm: amlogic: add support for Radxa
Zero2
The Radxa Zero2 is a small form-factor SBC using the Amlogic

View File

@ -1,7 +1,7 @@
From 89494c9d88e58ecb01688dd78a5fbffe4636609f Mon Sep 17 00:00:00 2001
From b15574af9b4cf1111ce9cbf9fae6418d7707d148 Mon Sep 17 00:00:00 2001
From: Yuntian Zhang <yt@radxa.com>
Date: Fri, 14 Jan 2022 15:50:02 +0000
Subject: [PATCH 54/75] WIP: arm64: dts: meson: add support for Radxa Zero2
Subject: [PATCH 49/70] WIP: arm64: dts: meson: add support for Radxa Zero2
Radxa Zero2 is a small form factor SBC based on the Amlogic A311D
chipset that ships in a number of eMMC configurations:

View File

@ -1,7 +1,7 @@
From e51fef3f7a3968e463997e0c333c88bdd187ab54 Mon Sep 17 00:00:00 2001
From 678d500a4895cd56fc23438034689bd89292a830 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 15 May 2020 07:52:47 +0000
Subject: [PATCH 55/75] WIP: arm64: dts: meson: add audio playback to p201
Subject: [PATCH 50/70] WIP: arm64: dts: meson: add audio playback to p201
Add initial audio support limited to HDMI i2s.

View File

@ -1,7 +1,7 @@
From 315994a00870c9b1e205ef622417de19b71481e6 Mon Sep 17 00:00:00 2001
From 7c65f9a5a2218a1b2a9129fbbf0175a7584da6bd Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Fri, 15 May 2020 07:56:15 +0000
Subject: [PATCH 56/75] WIP: arm64: dts: meson: add audio playback to p200
Subject: [PATCH 51/70] WIP: arm64: dts: meson: add audio playback to p200
Add initial support limited to HDMI i2s and SPDIF (LPCM).

View File

@ -1,7 +1,7 @@
From 76c1237256b3dcb0ce1e3903448896c2564339db Mon Sep 17 00:00:00 2001
From a94d37f7c55c140182f6312ef41ec8282ce95824 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 17 May 2020 05:00:55 +0000
Subject: [PATCH 57/75] WIP: arm64: dts: meson: add audio playback to u200
Subject: [PATCH 52/70] WIP: arm64: dts: meson: add audio playback to u200
Add initial support limited to HDMI i2s and SPDIF (LPCM).

View File

@ -1,7 +1,7 @@
From 928bbfaff5a7cd9c04075e687669c209a2610e92 Mon Sep 17 00:00:00 2001
From 11e9c1636417e129f3d2973189abce122d032c6f Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 27 Nov 2021 13:50:06 +0000
Subject: [PATCH 58/75] WIP: arm64: dts: meson: add Headphone output to Beelink
Subject: [PATCH 53/70] WIP: arm64: dts: meson: add Headphone output to Beelink
GT-King
Add support for the Headphone audio DAC built-in to the S922X chip.

View File

@ -1,7 +1,7 @@
From 32ddc007fea550f373a074718927d0ca07b875d3 Mon Sep 17 00:00:00 2001
From 0efa988eaf7df8bbd1d637ed314684fc4f944ad8 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 29 Feb 2020 15:13:02 +0000
Subject: [PATCH 59/75] WIP: dt-bindings: arm: amlogic: add support for the
Subject: [PATCH 54/70] WIP: dt-bindings: arm: amlogic: add support for the
Tanix TX5 Max
The Oranth (Tanix) TX5 Max is based on the Amlogic U200 reference

View File

@ -1,7 +1,7 @@
From eb61ecdece3343e7bd50b530e51e25b4aac63e8b Mon Sep 17 00:00:00 2001
From a7c2d3037a1b6b90c31f974c74ba67809788c1e5 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 20 Oct 2019 04:06:59 +0000
Subject: [PATCH 60/75] WIP: arm64: dts: meson: add support for the Tanix TX5
Subject: [PATCH 55/70] WIP: arm64: dts: meson: add support for the Tanix TX5
Max
The Tanix TX5 Max is based on the Amlogic U200 reference design

View File

@ -1,7 +1,7 @@
From 3ac89ffe05e55c3f86662d30fbb62ed0b7822bc0 Mon Sep 17 00:00:00 2001
From 0088267e2ad6a3570ce3d20d202c5993cc290df0 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Mon, 21 Oct 2019 03:58:06 +0000
Subject: [PATCH 61/75] WIP: arm64: dts: meson: add multiple MeCool device
Subject: [PATCH 56/70] WIP: arm64: dts: meson: add multiple MeCool device
trees
This adds initial device trees for a range of MeCool devices based on various

View File

@ -1,7 +1,7 @@
From 8149e25d4b807f91c26c254bd33bd4dbc99ccd7e Mon Sep 17 00:00:00 2001
From 6ce67ed1957b6930923c70f36c6d5783ad2a176b Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 11 Apr 2021 05:50:13 +0000
Subject: [PATCH 62/75] WIP: dt-bindings: arm: amlogic: add support for Minix
Subject: [PATCH 57/70] WIP: dt-bindings: arm: amlogic: add support for Minix
NEO-U1
The Minix NEO-U1 is an Android STB based on the Amlogic P200 (GXBB)

View File

@ -1,7 +1,7 @@
From 13f772c9334bc82e94cbc67933a06a6c6049fc9e Mon Sep 17 00:00:00 2001
From 57005cd5d6ecf66f5e3db2296ed5bdbe9663c9b3 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 11 Apr 2021 05:52:14 +0000
Subject: [PATCH 63/75] WIP: arm64: dts: meson: add initial device-tree for
Subject: [PATCH 58/70] WIP: arm64: dts: meson: add initial device-tree for
Minix NEO-U1
The Minix NEO-U1 is an Android STB based on the Amlogic P200 (GXBB)

View File

@ -1,7 +1,7 @@
From b7af46e05082d70dfe263faa991b5f649d4d7043 Mon Sep 17 00:00:00 2001
From 6685ffedb8428933722df419d28b46980aa774df Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 8 Dec 2021 15:33:47 +0000
Subject: [PATCH 64/75] WIP: media: rc: add keymap for Beelink Mini MXIII
Subject: [PATCH 59/70] WIP: media: rc: add keymap for Beelink Mini MXIII
remote
Add a keymap and bindings for the simple IR (NEC) remote used with

View File

@ -1,7 +1,7 @@
From adbea439a0159df7718ead370bba2d5174c745d3 Mon Sep 17 00:00:00 2001
From f544b0271bb0442779ade891e4bfbae85286b8fa Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 8 Dec 2021 15:28:50 +0000
Subject: [PATCH 65/75] WIP: dt-bindings: arm: amlogic: add support for Beelink
Subject: [PATCH 60/70] WIP: dt-bindings: arm: amlogic: add support for Beelink
Mini MXIII
The Beelink Mini MXIII is an Android STB based on the Amlogic P200

View File

@ -1,7 +1,7 @@
From de286b569825dc266631cee353756949a2e6d875 Mon Sep 17 00:00:00 2001
From 586845db3c0d5b383baf3e5ef65ceb1816324242 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 8 Dec 2021 15:26:00 +0000
Subject: [PATCH 66/75] WIP: arm64: dts: meson: add support for Beelink Mini
Subject: [PATCH 61/70] WIP: arm64: dts: meson: add support for Beelink Mini
MXIII
This is a GXBB board that ships in two variants, one with

View File

@ -1,7 +1,7 @@
From aad0f30ca90c6d650defbfc0c1ed01fdd2f73194 Mon Sep 17 00:00:00 2001
From a6f4ce5d454817a8bc295b0fff02882fdedf2d3e Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 16 Jan 2022 08:48:02 +0000
Subject: [PATCH 67/75] WIP: media: rc: add keymap for MeCool M8S Pro W remote
Subject: [PATCH 62/70] WIP: media: rc: add keymap for MeCool M8S Pro W remote
Add a keymap and bindings for the simple IR (NEC) remote used with
the MeCool M8S Pro W Android STB device.

View File

@ -1,7 +1,7 @@
From 12061d85260284744a26e1b8eaf577cb72442e34 Mon Sep 17 00:00:00 2001
From 0db44872152147ad4416d09d8b57d01d678c6bb5 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 16 Jan 2022 08:15:36 +0000
Subject: [PATCH 68/75] WIP: dt-bindings: arm: amlogic: add support for MeCool
Subject: [PATCH 63/70] WIP: dt-bindings: arm: amlogic: add support for MeCool
M8S Pro W
The MeCool M8S Pro W is an Android STB based on the Amlogic P281

View File

@ -1,7 +1,7 @@
From 9be73c2e6b4ebaba8b70d5345cb88a26ef435ebc Mon Sep 17 00:00:00 2001
From 2f470ced1bf1ea07f2fa96e2051c0da6bdbf6c02 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 16 Jan 2022 08:17:41 +0000
Subject: [PATCH 69/75] WIP: arm64: dts: meson: add support for MeCool M8S Pro
Subject: [PATCH 64/70] WIP: arm64: dts: meson: add support for MeCool M8S Pro
W
MeCool M8S Pro W is an Android STB based on the Amlogic P281 (GXL)

View File

@ -1,7 +1,7 @@
From 16e2b2c20441dd3a3f878cf9558bbe78e8513f20 Mon Sep 17 00:00:00 2001
From ada75ffa04b61378f9b251d9fd99a3a9c9c33d77 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 19 Jan 2022 02:40:20 +0000
Subject: [PATCH 70/75] WIP: dt-bindings: arm: amlogic: add Vero 4K binding
Subject: [PATCH 65/70] WIP: dt-bindings: arm: amlogic: add Vero 4K binding
Add the board binding for the OSMC Vero 4K STB device

View File

@ -1,7 +1,7 @@
From efe23d4dfa8150f2cec26d94bb2d5726409c10b1 Mon Sep 17 00:00:00 2001
From 112683bd1871f2f083ea7a168c736dfef54a37f7 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 19 Jan 2022 04:06:17 +0000
Subject: [PATCH 71/75] WIP: arm64: dts: meson: add support for OSMC Vero 4K
Subject: [PATCH 66/70] WIP: arm64: dts: meson: add support for OSMC Vero 4K
The OSMC Vero 4K device is based on the Amlogic S905X (P212) reference
design with the following specifications:

View File

@ -1,7 +1,7 @@
From 0bec4c9445bac8fe8874a521c10f13e8dc360acb Mon Sep 17 00:00:00 2001
From a2608334105a89a83c3d444e252969f103f7bbcc Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Tue, 12 Apr 2022 11:21:21 +0000
Subject: [PATCH 72/75] WIP: arm64: dts: meson: add RTL8822CS bluetooth to
Subject: [PATCH 67/70] WIP: arm64: dts: meson: add RTL8822CS bluetooth to
X96-Air
Add the uart_A/bluetooth node for the RTL8822CS chip.

View File

@ -1,7 +1,7 @@
From 79a0b69973929bd01db36e3fbb46f9a634f0e83b Mon Sep 17 00:00:00 2001
From 1ab7fe55136b9ff1d5a22728a2c95dbf59f964df Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 10 Apr 2022 11:51:38 +0000
Subject: [PATCH 73/75] WIP: media: rc: add keymap for Venz V10 remote
Subject: [PATCH 68/70] WIP: media: rc: add keymap for Venz V10 remote
Add a keymap and bindings for the IR (NEC) remote used with
the Venz V10 Android STB device.

View File

@ -1,7 +1,7 @@
From 0552742c5fa01b5cc61b72702ea4721fde1eb548 Mon Sep 17 00:00:00 2001
From 0b2458d02ebd3bd27f86833ccf6b26d93e1981c8 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 9 Apr 2022 06:27:50 +0000
Subject: [PATCH 74/75] WIP: dt-bindings: arm: amlogic: add S905L and Venz V10
Subject: [PATCH 69/70] WIP: dt-bindings: arm: amlogic: add S905L and Venz V10
bindings
Add SOC bindings for S905L devices and the board binding for Venz V10.

View File

@ -1,7 +1,7 @@
From 7f880eb95259215065c43e78ecf04d99680a6113 Mon Sep 17 00:00:00 2001
From a3ec4a99978dfa8dd52e7d2a580c6cc36adf7a6a Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sat, 9 Apr 2022 06:21:58 +0000
Subject: [PATCH 75/75] WIP: arm64: dts: meson: add support for Venz V10
Subject: [PATCH 70/70] WIP: arm64: dts: meson: add support for Venz V10
The Venz V10 is an Android STB based on the Amlogic P212 (GXL)
reference design with an S905L chip and the following specs: