diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
| commit | 03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch) | |
| tree | 57d5eac5f8efb015eb0415824512a29d5e20638e /drivers/soc | |
| parent | d4781422d1268aa6deca3e49d2fb227e79c160b4 (diff) | |
| download | u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.zip u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.tar.gz u-boot-03de305ec48b0bb28554372abb40ccd46dbe0bf9.tar.bz2 | |
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"WIP/20May2024-next
As part of bringing the master branch back in to next, we need to allow
for all of these changes to exist here.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/soc-uclass.c | 1 | ||||
| -rw-r--r-- | drivers/soc/soc_sandbox.c | 1 | ||||
| -rw-r--r-- | drivers/soc/soc_ti_k3.c | 1 | ||||
| -rw-r--r-- | drivers/soc/soc_xilinx_versal.c | 1 | ||||
| -rw-r--r-- | drivers/soc/soc_xilinx_versal_net.c | 1 | ||||
| -rw-r--r-- | drivers/soc/soc_xilinx_zynqmp.c | 1 | ||||
| -rw-r--r-- | drivers/soc/ti/k3-navss-ringacc.c | 1 | ||||
| -rw-r--r-- | drivers/soc/ti/keystone_serdes.c | 1 | ||||
| -rw-r--r-- | drivers/soc/ti/pruss.c | 2 |
9 files changed, 1 insertions, 9 deletions
diff --git a/drivers/soc/soc-uclass.c b/drivers/soc/soc-uclass.c index 8b3044f..744cdda 100644 --- a/drivers/soc/soc-uclass.c +++ b/drivers/soc/soc-uclass.c @@ -6,7 +6,6 @@ #define LOG_CATEGORY UCLASS_SOC -#include <common.h> #include <soc.h> #include <dm.h> #include <errno.h> diff --git a/drivers/soc/soc_sandbox.c b/drivers/soc/soc_sandbox.c index 15fdd99..8d621e8 100644 --- a/drivers/soc/soc_sandbox.c +++ b/drivers/soc/soc_sandbox.c @@ -6,7 +6,6 @@ * Dave Gerlach <d-gerlach@ti.com> */ -#include <common.h> #include <dm.h> #include <soc.h> diff --git a/drivers/soc/soc_ti_k3.c b/drivers/soc/soc_ti_k3.c index 3a4e58b..b585e47 100644 --- a/drivers/soc/soc_ti_k3.c +++ b/drivers/soc/soc_ti_k3.c @@ -4,7 +4,6 @@ * Dave Gerlach <d-gerlach@ti.com> */ -#include <common.h> #include <dm.h> #include <soc.h> diff --git a/drivers/soc/soc_xilinx_versal.c b/drivers/soc/soc_xilinx_versal.c index 3d8c25c..7427f84 100644 --- a/drivers/soc/soc_xilinx_versal.c +++ b/drivers/soc/soc_xilinx_versal.c @@ -5,7 +5,6 @@ * Copyright (C) 2021 Xilinx, Inc. */ -#include <common.h> #include <dm.h> #include <soc.h> #include <zynqmp_firmware.h> diff --git a/drivers/soc/soc_xilinx_versal_net.c b/drivers/soc/soc_xilinx_versal_net.c index 146d068..d64fc36 100644 --- a/drivers/soc/soc_xilinx_versal_net.c +++ b/drivers/soc/soc_xilinx_versal_net.c @@ -5,7 +5,6 @@ * Copyright (C) 2022, Advanced Micro Devices, Inc. */ -#include <common.h> #include <dm.h> #include <soc.h> #include <zynqmp_firmware.h> diff --git a/drivers/soc/soc_xilinx_zynqmp.c b/drivers/soc/soc_xilinx_zynqmp.c index d8b4f17..a2d5b82 100644 --- a/drivers/soc/soc_xilinx_zynqmp.c +++ b/drivers/soc/soc_xilinx_zynqmp.c @@ -9,7 +9,6 @@ * Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> */ -#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <asm/cache.h> diff --git a/drivers/soc/ti/k3-navss-ringacc.c b/drivers/soc/ti/k3-navss-ringacc.c index ed39ff2..d3f3d47 100644 --- a/drivers/soc/ti/k3-navss-ringacc.c +++ b/drivers/soc/ti/k3-navss-ringacc.c @@ -5,7 +5,6 @@ * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com */ -#include <common.h> #include <cpu_func.h> #include <log.h> #include <asm/cache.h> diff --git a/drivers/soc/ti/keystone_serdes.c b/drivers/soc/ti/keystone_serdes.c index 0e1bf8f..b196179 100644 --- a/drivers/soc/ti/keystone_serdes.c +++ b/drivers/soc/ti/keystone_serdes.c @@ -7,7 +7,6 @@ */ #include <errno.h> -#include <common.h> #include <asm/io.h> #include <asm/ti-common/keystone_serdes.h> #include <linux/bitops.h> diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c index 4613909..e3bb2ed 100644 --- a/drivers/soc/ti/pruss.c +++ b/drivers/soc/ti/pruss.c @@ -5,7 +5,6 @@ * Copyright (C) 2020-2021 Texas Instruments Incorporated - https://www.ti.com/ */ -#include <common.h> #include <dm.h> #include <dm/of_access.h> #include <errno.h> @@ -205,6 +204,7 @@ static int pruss_probe(struct udevice *dev) static const struct udevice_id pruss_ids[] = { { .compatible = "ti,am654-icssg"}, + { .compatible = "ti,am642-icssg"}, {} }; |