Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay…

… Ethernet"" When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"' I failed to notice that b4 noticed it was based on next and so took that as the base commit and merged that part of next to master. This reverts commit c8ffd13, reversing changes made to 2ee6f3a. Reported-by: Jonas Karlman <[email protected]> Signed-off-by: Tom Rini <[email protected]>
apalos · May 19, 2024 · d678a59 · d678a59
1 parent 3be9f39
commit d678a59
Show file tree

Hide file tree

Showing 4,281 changed files with 4,581 additions and 8,984 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -598,22 +598,6 @@ R:	Marc Murphy <[email protected]>
 S:	Supported
 F:	arch/arm/dts/am335x-sancloud*
 
-ARM SC5XX
-M:	Nathan Barrett-Morrison <[email protected]>
-M:	Greg Malysa <[email protected]>
-M:	Ian Roberts <[email protected]>
-M:	Vasileios Bimpikas <[email protected]>
-M:	Utsav Agarwal <[email protected]>
-M:	Arturs Artamonovs <[email protected]>
-S:	Supported
-T:	git https://github.com/analogdevicesinc/lnxdsp-u-boot
-F:	arch/arm/include/asm/arch-adi/
-F:	arch/arm/mach-sc5xx/
-F:	drivers/clk/adi/
-F:	drivers/serial/serial_adi_uart4.c
-F:	drivers/timer/adi_sc5xx_timer.c
-F:	include/env/adi/
-
 ARM SNAPDRAGON
 M:	Caleb Connolly <[email protected]>
 M:	Neil Armstrong <[email protected]>

diff --git a/api/api.c b/api/api.c
@@ -7,13 +7,11 @@
 
 #include <config.h>
 #include <command.h>
+#include <common.h>
 #include <env.h>
 #include <malloc.h>
-#include <time.h>
 #include <env_internal.h>
-#include <vsprintf.h>
 #include <linux/delay.h>
-#include <linux/errno.h>
 #include <linux/types.h>
 #include <api_public.h>
 #include <u-boot/crc.h>

diff --git a/api/api_display.c b/api/api_display.c
@@ -3,9 +3,9 @@
  * Copyright (c) 2011 The Chromium OS Authors.
  */
 
+#include <common.h>
 #include <api_public.h>
 #include <log.h>
-#include <linux/types.h>
 
 /* TODO(clchiou): add support of video device */
 

diff --git a/api/api_net.c b/api/api_net.c
@@ -6,6 +6,7 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <net.h>
 #include <linux/types.h>
 #include <api_public.h>

diff --git a/api/api_platform-arm.c b/api/api_platform-arm.c
@@ -12,6 +12,7 @@
 #include <linux/types.h>
 #include <api_public.h>
 
+#include <asm/u-boot.h>
 #include <asm/global_data.h>
 
 #include "api_private.h"

diff --git a/api/api_platform-mips.c b/api/api_platform-mips.c
@@ -9,6 +9,7 @@
 #include <linux/types.h>
 #include <api_public.h>
 
+#include <asm/u-boot.h>
 #include <asm/global_data.h>
 
 #include "api_private.h"

diff --git a/api/api_platform-powerpc.c b/api/api_platform-powerpc.c
@@ -12,6 +12,7 @@
 #include <linux/types.h>
 #include <api_public.h>
 
+#include <asm/u-boot.h>
 #include <asm/global_data.h>
 
 #include "api_private.h"

diff --git a/api/api_storage.c b/api/api_storage.c
@@ -6,10 +6,10 @@
  */
 
 #include <config.h>
+#include <common.h>
 #include <api_public.h>
 #include <part.h>
 #include <scsi.h>
-#include <linux/types.h>
 
 #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
 #include <usb.h>

diff --git a/arch/arc/include/asm/global_data.h b/arch/arc/include/asm/global_data.h
@@ -6,8 +6,6 @@
 #ifndef	__ASM_ARC_GLOBAL_DATA_H
 #define __ASM_ARC_GLOBAL_DATA_H
 
-#include <asm/u-boot.h>
-
 #ifndef __ASSEMBLY__
 /* Architecture-specific global data */
 struct arch_global_data {

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
@@ -1853,9 +1853,6 @@ config TARGET_LS1046AFRWY
 	  development platform that supports the QorIQ LS1046A
 	  Layerscape Architecture processor.
 
-config ARCH_SC5XX
-	bool "Analog Devices SC5XX-processor family"
-
 config TARGET_SL28
 	bool "Support sl28"
 	select ARCH_LS1028A
@@ -2289,8 +2286,6 @@ source "arch/arm/mach-rockchip/Kconfig"
 
 source "arch/arm/mach-s5pc1xx/Kconfig"
 
-source "arch/arm/mach-sc5xx/Kconfig"
-
 source "arch/arm/mach-snapdragon/Kconfig"
 
 source "arch/arm/mach-socfpga/Kconfig"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
@@ -78,7 +78,6 @@ machine-$(CONFIG_ARCH_OWL)		+= owl
 machine-$(CONFIG_ARCH_RENESAS)		+= renesas
 machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip
 machine-$(CONFIG_ARCH_S5PC1XX)		+= s5pc1xx
-machine-$(CONFIG_ARCH_SC5XX)		+= sc5xx
 machine-$(CONFIG_ARCH_SNAPDRAGON)	+= snapdragon
 machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga
 machine-$(CONFIG_ARCH_STM32)		+= stm32

diff --git a/arch/arm/cpu/arm11/cpu.c b/arch/arm/cpu/arm11/cpu.c
@@ -14,6 +14,7 @@
  * CPU specific code
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>

diff --git a/arch/arm/cpu/arm1136/mx31/devices.c b/arch/arm/cpu/arm1136/mx31/devices.c
@@ -6,6 +6,7 @@
  * (c) 2007 Pengutronix, Sascha Hauer <[email protected]>
  */
 
+#include <common.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 

diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -4,6 +4,7 @@
  * Sascha Hauer, Pengutronix
  */
 
+#include <common.h>
 #include <div64.h>
 #include <init.h>
 #include <asm/arch/imx-regs.h>

diff --git a/arch/arm/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c
@@ -4,6 +4,7 @@
  * Sascha Hauer, Pengutronix
  */
 
+#include <common.h>
 #include <init.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>

diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c
@@ -9,7 +9,7 @@
  * Alex Zuepke <[email protected]>
  */
 
-#include <linux/types.h>
+#include <common.h>
 
 #if defined(CONFIG_ARCH_TEGRA)
 static ulong timestamp;

diff --git a/arch/arm/cpu/arm920t/cpu.c b/arch/arm/cpu/arm920t/cpu.c
@@ -12,6 +12,7 @@
  * CPU specific code
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>

diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S
@@ -8,6 +8,7 @@
  */
 
 #include <asm-offsets.h>
+#include <common.h>
 #include <config.h>
 
 /*

diff --git a/arch/arm/cpu/arm926ejs/cache.c b/arch/arm/cpu/arm926ejs/cache.c
@@ -6,6 +6,7 @@
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <linux/types.h>
+#include <common.h>
 
 #if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 void invalidate_dcache_all(void)

diff --git a/arch/arm/cpu/arm926ejs/cpu.c b/arch/arm/cpu/arm926ejs/cpu.c
@@ -12,6 +12,7 @@
  * CPU specific code
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>

diff --git a/arch/arm/cpu/arm926ejs/mxs/clock.c b/arch/arm/cpu/arm926ejs/mxs/clock.c
@@ -9,6 +9,7 @@
  * Copyright (C) 2010 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <log.h>
 #include <linux/errno.h>
 #include <asm/io.h>

diff --git a/arch/arm/cpu/arm926ejs/mxs/iomux.c b/arch/arm/cpu/arm926ejs/mxs/iomux.c
@@ -6,6 +6,7 @@
  *                       <[email protected]>
  */
 
+#include <common.h>
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>

diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -9,6 +9,7 @@
  * Copyright (C) 2010 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <hang.h>

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -6,6 +6,7 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
+#include <common.h>
 #include <config.h>
 #include <init.h>
 #include <log.h>

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
@@ -6,6 +6,7 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
+#include <common.h>
 #include <config.h>
 #include <log.h>
 #include <asm/io.h>

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
@@ -6,6 +6,7 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
+#include <common.h>
 #include <config.h>
 #include <init.h>
 #include <log.h>

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
@@ -6,6 +6,7 @@
  * on behalf of DENX Software Engineering GmbH
  */
 
+#include <common.h>
 #include <config.h>
 #include <hang.h>
 #include <log.h>

diff --git a/arch/arm/cpu/arm926ejs/mxs/start.S b/arch/arm/cpu/arm926ejs/mxs/start.S
@@ -20,6 +20,7 @@
 
 #include <asm-offsets.h>
 #include <config.h>
+#include <common.h>
 #include <system-constants.h>
 
 /*

diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c
@@ -9,6 +9,7 @@
  * (C) Copyright 2009-2010 Freescale Semiconductor, Inc.
  */
 
+#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>

diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S
@@ -16,6 +16,7 @@
 
 #include <asm-offsets.h>
 #include <config.h>
+#include <common.h>
 #include <linux/linkage.h>
 
 /*

diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c
@@ -12,6 +12,7 @@
  * CPU specific code
  */
 
+#include <common.h>
 #include <command.h>
 #include <cpu_func.h>
 #include <irq_func.h>

diff --git a/arch/arm/cpu/armv7/arch_timer.c b/arch/arm/cpu/armv7/arch_timer.c
@@ -4,7 +4,7 @@
  *     Texas Instruments Incorporated, <www.ti.com>
  */
 
-#include <config.h>
+#include <common.h>
 #include <init.h>
 #include <time.h>
 #include <asm/global_data.h>

diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c b/arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>

diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>

diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-core.c b/arch/arm/cpu/armv7/bcm235xx/clk-core.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <linux/delay.h>

diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-eth.c b/arch/arm/cpu/armv7/bcm235xx/clk-eth.c
@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>

diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>

diff --git a/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include "clk-core.h"

diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c b/arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>

diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c b/arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>

diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-core.c b/arch/arm/cpu/armv7/bcm281xx/clk-core.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include <common.h>
 #include <log.h>
 #include <asm/io.h>
 #include <linux/delay.h>

diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-eth.c b/arch/arm/cpu/armv7/bcm281xx/clk-eth.c
@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/errno.h>

diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c b/arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
@@ -3,6 +3,7 @@
  * Copyright 2013 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>

diff --git a/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c b/arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
@@ -3,6 +3,7 @@
  * Copyright 2014 Broadcom Corporation.
  */
 
+#include <common.h>
 #include <linux/errno.h>
 #include <asm/arch/sysmap.h>
 #include "clk-core.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
      */
     #include <asm-offsets.h>
+    #include <common.h>
     #include <config.h>
     /*
@@ Expand Down @@