Skip to content

Commit

Permalink
Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
Browse files Browse the repository at this point in the history 
Roger Quadros <rogerq@kernel.org> says:

Sync AM62 device tree files with Linux v6.9 and
add in the missing bits in -u-boot.dtsi to get CPSW
Ethernet working.

CI testing: #534
  • Loading branch information
@trini
trini committed May 13, 2024
2 parents 2ee6f3a + 5773732 commit c8ffd13
Show file tree
Hide file tree
Showing 4,281 changed files with 8,984 additions and 4,581 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
16 changes: 16 additions & 0 deletions MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,22 @@ R: Marc Murphy <marc.murphy@sancloud.com>
S: Supported
F: arch/arm/dts/am335x-sancloud*

ARM SC5XX
M: Nathan Barrett-Morrison <nathan.morrison@timesys.com>
M: Greg Malysa <greg.malysa@timesys.com>
M: Ian Roberts <ian.roberts@timesys.com>
M: Vasileios Bimpikas <vasileios.bimpikas@analog.com>
M: Utsav Agarwal <utsav.agarwal@analog.com>
M: Arturs Artamonovs <arturs.artamonovs@analog.com>
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 <caleb.connolly@linaro.org>
M: Neil Armstrong <neil.armstrong@linaro.org>
Expand Down
4 changes: 3 additions & 1 deletion api/api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@

#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>
Expand Down
2 changes: 1 addition & 1 deletion api/api_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
1 change: 0 additions & 1 deletion api/api_net.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*/

#include <config.h>
#include <common.h>
#include <net.h>
#include <linux/types.h>
#include <api_public.h>
Expand Down
1 change: 0 additions & 1 deletion api/api_platform-arm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <linux/types.h>
#include <api_public.h>

#include <asm/u-boot.h>
#include <asm/global_data.h>

#include "api_private.h"
Expand Down
1 change: 0 additions & 1 deletion api/api_platform-mips.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <linux/types.h>
#include <api_public.h>

#include <asm/u-boot.h>
#include <asm/global_data.h>

#include "api_private.h"
Expand Down
1 change: 0 additions & 1 deletion api/api_platform-powerpc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <linux/types.h>
#include <api_public.h>

#include <asm/u-boot.h>
#include <asm/global_data.h>

#include "api_private.h"
Expand Down
2 changes: 1 addition & 1 deletion api/api_storage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions arch/arc/include/asm/global_data.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#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 {
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1853,6 +1853,9 @@ 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
Expand Down Expand Up @@ -2286,6 +2289,8 @@ 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"
Expand Down
1 change: 1 addition & 0 deletions arch/arm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ 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
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm11/cpu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* CPU specific code
*/

#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <irq_func.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm1136/mx31/devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
*/

#include <common.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h>

Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm1136/mx31/generic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Sascha Hauer, Pengutronix
*/

#include <common.h>
#include <div64.h>
#include <init.h>
#include <asm/arch/imx-regs.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm1136/mx31/timer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Sascha Hauer, Pengutronix
*/

#include <common.h>
#include <init.h>
#include <asm/arch/imx-regs.h>
#include <asm/io.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/cpu/arm720t/interrupts.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Alex Zuepke <azu@sysgo.de>
*/

#include <common.h>
#include <linux/types.h>

#if defined(CONFIG_ARCH_TEGRA)
static ulong timestamp;
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm920t/cpu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
* CPU specific code
*/

#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <irq_func.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm920t/start.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
*/

#include <asm-offsets.h>
#include <common.h>
#include <config.h>

/*
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm926ejs/cache.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#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)
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm926ejs/cpu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
* CPU specific code
*/

#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <irq_func.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm926ejs/mxs/clock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Copyright (C) 2010 Freescale Semiconductor, Inc.
*/

#include <common.h>
#include <log.h>
#include <linux/errno.h>
#include <asm/io.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm926ejs/mxs/iomux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* <armlinux@phytec.de>
*/

#include <common.h>
#include <linux/errno.h>
#include <asm/io.h>
#include <asm/arch/clock.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm926ejs/mxs/mxs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* Copyright (C) 2010 Freescale Semiconductor, Inc.
*/

#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <hang.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm926ejs/mxs/spl_boot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* on behalf of DENX Software Engineering GmbH
*/

#include <common.h>
#include <config.h>
#include <init.h>
#include <log.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* on behalf of DENX Software Engineering GmbH
*/

#include <common.h>
#include <config.h>
#include <log.h>
#include <asm/io.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* on behalf of DENX Software Engineering GmbH
*/

#include <common.h>
#include <config.h>
#include <init.h>
#include <log.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm926ejs/mxs/spl_power_init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* on behalf of DENX Software Engineering GmbH
*/

#include <common.h>
#include <config.h>
#include <hang.h>
#include <log.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm926ejs/mxs/start.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

#include <asm-offsets.h>
#include <config.h>
#include <common.h>
#include <system-constants.h>

/*
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm926ejs/mxs/timer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* (C) Copyright 2009-2010 Freescale Semiconductor, Inc.
*/

#include <common.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm926ejs/start.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include <asm-offsets.h>
#include <config.h>
#include <common.h>
#include <linux/linkage.h>

/*
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/arm946es/cpu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
* CPU specific code
*/

#include <common.h>
#include <command.h>
#include <cpu_func.h>
#include <irq_func.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/cpu/armv7/arch_timer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Texas Instruments Incorporated, <www.ti.com>
*/

#include <common.h>
#include <config.h>
#include <init.h>
#include <time.h>
#include <asm/global_data.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/armv7/bcm235xx/clk-bcm235xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*
*/

#include <common.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/armv7/bcm235xx/clk-bsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Copyright 2013 Broadcom Corporation.
*/

#include <common.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/armv7/bcm235xx/clk-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*
*/

#include <common.h>
#include <log.h>
#include <asm/io.h>
#include <linux/delay.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/armv7/bcm235xx/clk-eth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Copyright 2014 Broadcom Corporation.
*/

#include <common.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/errno.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/armv7/bcm235xx/clk-sdio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Copyright 2013 Broadcom Corporation.
*/

#include <common.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/armv7/bcm235xx/clk-usb-otg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Copyright 2014 Broadcom Corporation.
*/

#include <common.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
#include "clk-core.h"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/armv7/bcm281xx/clk-bcm281xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*
*/

#include <common.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/armv7/bcm281xx/clk-bsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Copyright 2013 Broadcom Corporation.
*/

#include <common.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/armv7/bcm281xx/clk-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*
*/

#include <common.h>
#include <log.h>
#include <asm/io.h>
#include <linux/delay.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/armv7/bcm281xx/clk-eth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Copyright 2014 Broadcom Corporation.
*/

#include <common.h>
#include <asm/io.h>
#include <linux/delay.h>
#include <linux/errno.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/armv7/bcm281xx/clk-sdio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Copyright 2013 Broadcom Corporation.
*/

#include <common.h>
#include <asm/io.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
Expand Down
1 change: 0 additions & 1 deletion arch/arm/cpu/armv7/bcm281xx/clk-usb-otg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Copyright 2014 Broadcom Corporation.
*/

#include <common.h>
#include <linux/errno.h>
#include <asm/arch/sysmap.h>
#include "clk-core.h"
Expand Down

0 comments on commit c8ffd13

Please sign in to comment.