mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
u-boot: update Amlogic patcheset
This commit is contained in:
Christian Hewitt
parent
eeae7f246b
commit
cbe9a7218b
@ -1,7 +1,7 @@
|
||||
From 66b8aff5a485dd2c77974992b031d4298ddfee13 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Fri, 13 Nov 2020 02:09:36 +0000
|
||||
Subject: [PATCH 01/30] HACK: configs: meson64: prevent stdout/stderr on
|
||||
Subject: [PATCH 01/31] HACK: configs: meson64: prevent stdout/stderr on
|
||||
videoconsole
|
||||
|
||||
Several devices have CONFIG_DM_VIDEO enabled which causes stdout/stderr
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From d6bd0e0edae9093f43bc566daac7586aa807b6ac Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Thu, 22 Apr 2021 06:52:50 +0000
|
||||
Subject: [PATCH 02/30] HACK: configs: meson64: remove /amlogic so fdtdir finds
|
||||
Subject: [PATCH 02/31] HACK: configs: meson64: remove /amlogic so fdtdir finds
|
||||
LE boot files
|
||||
|
||||
---
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 7a6e8626ca82952d6c6b38a1a91841c1a0fe1e7f Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Tue, 3 Aug 2021 18:42:55 +0000
|
||||
Subject: [PATCH 03/30] HACK: board: amlogic: odroid-n2: remove /amlogic/
|
||||
Subject: [PATCH 03/31] HACK: board: amlogic: odroid-n2: remove /amlogic/
|
||||
prefix for dtb path
|
||||
|
||||
Remove the /amlogic/ prefix to align with current LE dtb locations.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From ad67f25d0d0fad4f0432336ade9374762a1ff279 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Fri, 20 Aug 2021 01:11:52 +0000
|
||||
Subject: [PATCH 04/30] FROMGIT: ARM: meson: Add S905Y2 SOC ID
|
||||
Subject: [PATCH 04/31] FROMGIT: ARM: meson: Add S905Y2 SOC ID
|
||||
|
||||
Add the SOC ID for the S905Y2 to board info, see below for before/after
|
||||
tested with a Radxa Zero board:
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 24bc1b456ce4879b58b8cbdf45e4d36d8feb69c4 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Wed, 8 Sep 2021 14:32:12 +0200
|
||||
Subject: [PATCH 05/30] FROMGIT: pci: pcie_dw_meson: fix usb fail when pci link
|
||||
Subject: [PATCH 05/31] FROMGIT: pci: pcie_dw_meson: fix usb fail when pci link
|
||||
fails to go up
|
||||
|
||||
On Amlogic A311D, when the PCIe link fails disabling the related clocks
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 2f8c4f67793016b54c5ef0b58abd4c90ff10db42 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Fri, 17 Sep 2021 09:37:00 +0200
|
||||
Subject: [PATCH 06/30] FROMGIT: ARM: meson: Sync Amlogic DT from Linux 5.14
|
||||
Subject: [PATCH 06/31] FROMGIT: ARM: meson: Sync Amlogic DT from Linux 5.14
|
||||
|
||||
Import Amlogic DT changes from Linux commit 7d2a07b76933 ("Linux 5.14"),
|
||||
dt-bindings clock changes and new meson-g12b-gsking-x.dts,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 0115cea6009aebd6c59ad7306da59292f50dc081 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Fri, 17 Sep 2021 09:37:01 +0200
|
||||
Subject: [PATCH 07/30] FROMGIT: usb: dwc3: meson-gxl: add AXG compatible
|
||||
Subject: [PATCH 07/31] FROMGIT: usb: dwc3: meson-gxl: add AXG compatible
|
||||
|
||||
Upstream Linux uses the "amlogic,meson-axg-usb-ctrl" for AXG SoCs.
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From c1683775d6022d456e2c0930b872abd77650f5c3 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Fri, 17 Sep 2021 09:37:02 +0200
|
||||
Subject: [PATCH 08/30] FROMGIT: ARM: meson: keep HW order for MMC devices
|
||||
Subject: [PATCH 08/31] FROMGIT: ARM: meson: keep HW order for MMC devices
|
||||
|
||||
Since Linux commmit [1], the order is fixed with aliases, in order to keep the
|
||||
MMC device order, set it back to HW order in U-Boot dtsi files.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From a7c1806fb36b8e3fea461bb4cbb8607216dad001 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Fri, 17 Sep 2021 09:37:03 +0200
|
||||
Subject: [PATCH 09/30] FROMGIT: ARM: meson-axg: remove local USB nodes
|
||||
Subject: [PATCH 09/31] FROMGIT: ARM: meson-axg: remove local USB nodes
|
||||
|
||||
Drop the local USB nodes after Linux 5.14 sync.
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 6d99a04473373ce9449f38d02722e4baf4d451a9 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Wed, 8 Sep 2021 16:17:23 +0200
|
||||
Subject: [PATCH 10/30] FROMGIT: configs: meson64: add SCSI boot target
|
||||
Subject: [PATCH 10/31] FROMGIT: configs: meson64: add SCSI boot target
|
||||
|
||||
Add SCSI target to be able to boot from the SATA disks on the Odroid HC4 using
|
||||
an on-board AHCI PCIe controller.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From a332eaf364ae643ca71974887093cc027bc4e21a Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Fri, 17 Sep 2021 09:37:05 +0200
|
||||
Subject: [PATCH 11/30] FROMGIT: distro_bootcmd: run pci enum for scsi_boot
|
||||
Subject: [PATCH 11/31] FROMGIT: distro_bootcmd: run pci enum for scsi_boot
|
||||
just like it is done for nvme_boot
|
||||
|
||||
The SCSI device can be a PCIe adapter, so run pcie enum if enabled.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 1145e026ac9c4b0173c0bb44f381c9c0d23044f9 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Fri, 17 Sep 2021 09:37:06 +0200
|
||||
Subject: [PATCH 12/30] FROMGIT: ARM: amlogic: add support for Odroid-HC4
|
||||
Subject: [PATCH 12/31] FROMGIT: ARM: amlogic: add support for Odroid-HC4
|
||||
device
|
||||
|
||||
The Odroid-HC4 is a variant of the Odroid-C4 board but with a PCIe-SATA bridge
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 5d5fafb005313cfef25e2de69fd6521487047c20 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Fri, 17 Sep 2021 09:37:07 +0200
|
||||
Subject: [PATCH 13/30] FROMGIT: doc: boards: amlogic: update for Odroid HC4
|
||||
Subject: [PATCH 13/31] FROMGIT: doc: boards: amlogic: update for Odroid HC4
|
||||
|
||||
Add documentation bits for the Odroid-HC4.
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 160de51c71b384a5514394f261e3d0255ebf8454 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Fri, 17 Sep 2021 09:37:08 +0200
|
||||
Subject: [PATCH 14/30] FROMGIT: ARM: meson: add Beelink GS-King X board
|
||||
Subject: [PATCH 14/31] FROMGIT: ARM: meson: add Beelink GS-King X board
|
||||
|
||||
The Beelink GS-King X is a variant of the GS King boards but with an internal
|
||||
USB to SATA bridge and advanced audio features.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From a29813bd3bfbe4d263b6fd9010d713383bc0fcf3 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Fri, 17 Sep 2021 09:37:09 +0200
|
||||
Subject: [PATCH 15/30] FROMGIT: ARM: amlogic: add Banana Pi M5
|
||||
Subject: [PATCH 15/31] FROMGIT: ARM: amlogic: add Banana Pi M5
|
||||
|
||||
Banana Pi BPI-M5 is a credit card format SBC with the following features:
|
||||
- Amlogic S905X3 quad core Cortex-A55
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 9a68cb8d0d042b0c9ebc3546aeecdba75b320463 Mon Sep 17 00:00:00 2001
|
||||
From: Vyacheslav Bocharov <adeep@lexina.in>
|
||||
Date: Mon, 20 Sep 2021 11:40:14 +0300
|
||||
Subject: [PATCH 16/30] FROMGIT: ARM: amlogic: add JetHub common config header
|
||||
Subject: [PATCH 16/31] FROMGIT: ARM: amlogic: add JetHub common config header
|
||||
|
||||
JetHub devices uses its own boot sequence with "rescue" button
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From a6421333d73b027884bef7dd2841861d87e3a977 Mon Sep 17 00:00:00 2001
|
||||
From: Vyacheslav Bocharov <adeep@lexina.in>
|
||||
Date: Mon, 20 Sep 2021 11:40:15 +0300
|
||||
Subject: [PATCH 17/30] FROMGIT: ARM: amlogic: add JetHub D1/H1 device support
|
||||
Subject: [PATCH 17/31] FROMGIT: ARM: amlogic: add JetHub D1/H1 device support
|
||||
|
||||
Add support for new home automation devices.
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From e4e87754aff3c9e961f12ae46426ac05132c1f16 Mon Sep 17 00:00:00 2001
|
||||
From: Vyacheslav Bocharov <adeep@lexina.in>
|
||||
Date: Mon, 20 Sep 2021 11:40:16 +0300
|
||||
Subject: [PATCH 18/30] FROMGIT: ARM: amlogic: add JetHub D1/H1 docs
|
||||
Subject: [PATCH 18/31] FROMGIT: ARM: amlogic: add JetHub D1/H1 docs
|
||||
|
||||
Fix doc/board/amlogic/index.rst:
|
||||
- Add S905W to S905X column.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 4fba951d8285c969f9701ae080034cc8129dec83 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Wed, 15 Sep 2021 01:46:56 +0000
|
||||
Subject: [PATCH 19/30] FROMGIT: ARM: dts: sort Amlogic Makefile section
|
||||
Subject: [PATCH 19/31] FROMGIT: ARM: dts: sort Amlogic Makefile section
|
||||
|
||||
Alpha sort the Amlogic dtb list (same as the kernel).
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 27730602a803186eed0e319bc620c4c08dba78aa Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Wed, 15 Sep 2021 01:46:57 +0000
|
||||
Subject: [PATCH 20/30] FROMGIT: ARM: dts: add support for Radxa Zero
|
||||
Subject: [PATCH 20/31] FROMGIT: ARM: dts: add support for Radxa Zero
|
||||
|
||||
Import the initial dts queued for Linux 5.16.y
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 029bd38e1e503ed676d2bd894e5402b62bbe26ed Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Wed, 15 Sep 2021 01:46:58 +0000
|
||||
Subject: [PATCH 21/30] FROMGIT: boards: amlogic: add Radxa Zero defconfig
|
||||
Subject: [PATCH 21/31] FROMGIT: boards: amlogic: add Radxa Zero defconfig
|
||||
|
||||
Add a defconfig for the Radxa Zero SBC, using an Amlogic S905Y2 chip.
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From c5f9aa2256a1cae64fef4a1dbc9e7540d8805e85 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Wed, 15 Sep 2021 01:46:59 +0000
|
||||
Subject: [PATCH 22/30] FROMGIT: doc: boards: amlogic: update for Radxa Zero
|
||||
Subject: [PATCH 22/31] FROMGIT: doc: boards: amlogic: update for Radxa Zero
|
||||
|
||||
Add documentation bits for the Radxa Zero
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 39890cba3c5eeaa63cbe999c5368a0a5862499ed Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Tue, 20 Apr 2021 05:19:43 +0000
|
||||
Subject: [PATCH 23/30] WIP: ARM: dts: import WeTek Hub/Play2 DTs from Linux
|
||||
Subject: [PATCH 23/31] WIP: ARM: dts: import WeTek Hub/Play2 DTs from Linux
|
||||
5.14
|
||||
|
||||
Import the WeTek common dtsi and Hub/Play2 device-trees.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From a4a5411bf88f1f138eb4cd1edfd9de2be5154d22 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Tue, 20 Apr 2021 05:29:19 +0000
|
||||
Subject: [PATCH 24/30] WIP: ARM: dts: use snps,reset on WeTek devices to fix
|
||||
Subject: [PATCH 24/31] WIP: ARM: dts: use snps,reset on WeTek devices to fix
|
||||
Ethernet
|
||||
|
||||
The sync of the device tree and dt-bindings from Linux v5.6-rc2
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 7c50f32f91d4d80bcc73e2ca58f96a7c68765f24 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Thu, 9 Sep 2021 16:03:42 +0000
|
||||
Subject: [PATCH 25/30] WIP: ARM: dts: backport fixups patch for WeTek
|
||||
Subject: [PATCH 25/31] WIP: ARM: dts: backport fixups patch for WeTek
|
||||
Hub/Play2
|
||||
|
||||
---
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 9016e83df512cf11547aeb308bc4f4d9af90d893 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Thu, 22 Apr 2021 05:45:29 +0000
|
||||
Subject: [PATCH 26/30] WIP: boards: amlogic: add board files for wetek-gxbb
|
||||
Subject: [PATCH 26/31] WIP: boards: amlogic: add board files for wetek-gxbb
|
||||
devices
|
||||
|
||||
These support the WeTek Hub and Play2 devices.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From ee8e14699c8eaaad66ddb9c4feaf69136c17f2ad Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Sat, 27 Feb 2021 06:03:00 +0000
|
||||
Subject: [PATCH 27/30] WIP: boards: amlogic: add WeTek Hub defconfig
|
||||
Subject: [PATCH 27/31] WIP: boards: amlogic: add WeTek Hub defconfig
|
||||
|
||||
Signed-of-by: Christian Hewitt <christianshewitt@gmail.com>
|
||||
---
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From b87da03bb2f7c8eb01926f8fd383c08228ff0211 Mon Sep 17 00:00:00 2001
|
||||
From: chewitt <christianshewitt@gmail.com>
|
||||
Date: Sat, 27 Feb 2021 06:04:00 +0000
|
||||
Subject: [PATCH 28/30] WIP: boards: amlogic: add WeTek Play2 defconfig
|
||||
Subject: [PATCH 28/31] WIP: boards: amlogic: add WeTek Play2 defconfig
|
||||
|
||||
Signed-off-by: Christian Hewittt <christianshewitt@gmail.com>
|
||||
---
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 3969e7f4780855dda78ea8ffa8819f9ca3773287 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Tue, 21 Sep 2021 17:54:02 +0000
|
||||
Subject: [PATCH 29/30] WIP: boards: amlogic: add CONFIG_DM_USB to Odroid-HC4
|
||||
Subject: [PATCH 29/31] WIP: boards: amlogic: add CONFIG_DM_USB to Odroid-HC4
|
||||
|
||||
This is required for 2021.07 but can be dropped with 2021.10/2022.01
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 0c92a1152843384f45d399528762c9aa20a1aa14 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Sat, 30 Oct 2021 09:44:52 +0000
|
||||
Subject: [PATCH 30/30] WIP: boards: amlogic: add CONFIG_DM_ETH to Radxa Zero
|
||||
Subject: [PATCH 30/31] WIP: boards: amlogic: add CONFIG_DM_ETH to Radxa Zero
|
||||
|
||||
Radxa Zero does not have on-board Ethernet hardware but the common
|
||||
Amlogic board/SoC files have dependencies on Ethernet code, so we
|
||||
|
||||
@ -0,0 +1,93 @@
|
||||
From a81703836325b1a0cfe1d241ec7c5e775feccbc7 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Glass <sjg@chromium.org>
|
||||
Date: Thu, 9 Dec 2021 09:07:48 +0000
|
||||
Subject: [PATCH 31/31] FROMGIT: pinctrl: meson: Correct the driver GPIO
|
||||
declaration
|
||||
|
||||
This should use the provided U_BOOT_DRIVER() macro so that the driver gets
|
||||
added to the appropriate linker list. Fix it.
|
||||
|
||||
Signed-off-by: Simon Glass <sjg@chromium.org>
|
||||
Fixes: 7c9dcfed50f ("pinctrl: meson: rework gx pmx function")
|
||||
Reported-by: Tom Rini <trini@konsulko.com>
|
||||
Tested-by: Tom Rini <trini@konsulko.com> on libretech-cc
|
||||
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
||||
---
|
||||
drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c | 2 +-
|
||||
drivers/pinctrl/meson/pinctrl-meson-gx.h | 2 +-
|
||||
drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 4 ++--
|
||||
drivers/pinctrl/meson/pinctrl-meson-gxl.c | 4 ++--
|
||||
4 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
|
||||
index 159f3406a2..99502d89c6 100644
|
||||
--- a/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
|
||||
+++ b/drivers/pinctrl/meson/pinctrl-meson-gx-pmx.c
|
||||
@@ -145,7 +145,7 @@ static const struct dm_gpio_ops meson_gx_gpio_ops = {
|
||||
.direction_output = meson_gpio_direction_output,
|
||||
};
|
||||
|
||||
-const struct driver meson_gx_gpio_driver = {
|
||||
+U_BOOT_DRIVER(meson_gx_gpio_driver) = {
|
||||
.name = "meson-gx-gpio",
|
||||
.id = UCLASS_GPIO,
|
||||
.probe = meson_gpio_probe,
|
||||
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gx.h b/drivers/pinctrl/meson/pinctrl-meson-gx.h
|
||||
index 4c1aa1a300..c70c1f51c6 100644
|
||||
--- a/drivers/pinctrl/meson/pinctrl-meson-gx.h
|
||||
+++ b/drivers/pinctrl/meson/pinctrl-meson-gx.h
|
||||
@@ -43,6 +43,6 @@ struct meson_gx_pmx_data {
|
||||
}
|
||||
|
||||
extern const struct pinctrl_ops meson_gx_pinctrl_ops;
|
||||
-extern const struct driver meson_gx_gpio_driver;
|
||||
+extern U_BOOT_DRIVER(meson_gx_gpio_driver);
|
||||
|
||||
#endif /* __PINCTRL_MESON_GX_H__ */
|
||||
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
|
||||
index 8c01c73906..93a895c9fa 100644
|
||||
--- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
|
||||
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
|
||||
@@ -439,7 +439,7 @@ struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
|
||||
.num_groups = ARRAY_SIZE(meson_gxbb_periphs_groups),
|
||||
.num_funcs = ARRAY_SIZE(meson_gxbb_periphs_functions),
|
||||
.num_banks = ARRAY_SIZE(meson_gxbb_periphs_banks),
|
||||
- .gpio_driver = &meson_gx_gpio_driver,
|
||||
+ .gpio_driver = DM_DRIVER_REF(meson_gx_gpio_driver),
|
||||
};
|
||||
|
||||
struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = {
|
||||
@@ -452,7 +452,7 @@ struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = {
|
||||
.num_groups = ARRAY_SIZE(meson_gxbb_aobus_groups),
|
||||
.num_funcs = ARRAY_SIZE(meson_gxbb_aobus_functions),
|
||||
.num_banks = ARRAY_SIZE(meson_gxbb_aobus_banks),
|
||||
- .gpio_driver = &meson_gx_gpio_driver,
|
||||
+ .gpio_driver = DM_DRIVER_REF(meson_gx_gpio_driver),
|
||||
};
|
||||
|
||||
static const struct udevice_id meson_gxbb_pinctrl_match[] = {
|
||||
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
|
||||
index 51a0b4c5ca..a44145e2d4 100644
|
||||
--- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
|
||||
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
|
||||
@@ -701,7 +701,7 @@ struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
|
||||
.num_groups = ARRAY_SIZE(meson_gxl_periphs_groups),
|
||||
.num_funcs = ARRAY_SIZE(meson_gxl_periphs_functions),
|
||||
.num_banks = ARRAY_SIZE(meson_gxl_periphs_banks),
|
||||
- .gpio_driver = &meson_gx_gpio_driver,
|
||||
+ .gpio_driver = DM_DRIVER_REF(meson_gx_gpio_driver),
|
||||
};
|
||||
|
||||
struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = {
|
||||
@@ -714,7 +714,7 @@ struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = {
|
||||
.num_groups = ARRAY_SIZE(meson_gxl_aobus_groups),
|
||||
.num_funcs = ARRAY_SIZE(meson_gxl_aobus_functions),
|
||||
.num_banks = ARRAY_SIZE(meson_gxl_aobus_banks),
|
||||
- .gpio_driver = &meson_gx_gpio_driver,
|
||||
+ .gpio_driver = DM_DRIVER_REF(meson_gx_gpio_driver),
|
||||
};
|
||||
|
||||
static const struct udevice_id meson_gxl_pinctrl_match[] = {
|
||||
--
|
||||
2.17.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user