leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: bcmbca: add bcm6858 SoC support under CONFIG_ARCH_BCMBCA

Browse Source 
BCM6858 is a Broadcom B53 based PON Gateway SoC. It is part of the BCA
(Broadband Carrier Access origin) chipset family. Like other broadband
SoC, this patch adds it under CONFIG_BCM6858 chip config and
CONFIG_ARCH_BCMBCA platform config.

This initial support includes a bare-bone implementation and the
original dts is updated with the one from linux next git repository.

The u-boot image can be loaded from flash or network to the entry point
address in the memory and boot from there to the console.

Signed-off-by: William Zhang <william.zhang@broadcom.com>
Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com>
This commit is contained in:
William Zhang 2022-08-22 11:39:43 -07:00 committed by Tom Rini
parent 4dcd23f70b
commit b0e2b6abac
12 changed files with 258 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -230,6 +230,7 @@ N: bcm[9]?6756
N: bcm[9]?6813 N: bcm[9]?6813
N: bcm[9]?6846 N: bcm[9]?6846
N: bcm[9]?6856 N: bcm[9]?6856
N: bcm[9]?6858
N: bcm[9]?6878 N: bcm[9]?6878
ARM BROADCOM BCMSTB ARM BROADCOM BCMSTB

2
arch/arm/dts/Makefile
View File

@ -1199,6 +1199,8 @@ dtb-$(CONFIG_BCM6846) += \
dtb-$(CONFIG_BCM6856) += \ dtb-$(CONFIG_BCM6856) += \
bcm96856.dtb \ bcm96856.dtb \
bcm968360bg.dtb bcm968360bg.dtb
dtb-$(CONFIG_BCM6858) += \
bcm96858.dtb
dtb-$(CONFIG_BCM6878) += \ dtb-$(CONFIG_BCM6878) += \
bcm96878.dtb bcm96878.dtb

197
arch/arm/dts/bcm6858.dtsi
View File

@ -1,122 +1,161 @@
// SPDX-License-Identifier: GPL-2.0+ // SPDX-License-Identifier: GPL-2.0+
/* /*
* Copyright (C) 2018 Philippe Reynes <philippe.reynes@softathome.com> * Copyright (C) 2018 Philippe Reynes <philippe.reynes@softathome.com>
* Copyright 2022 Broadcom Ltd.
*/ */
#include "skeleton64.dtsi" #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
/ { / {
compatible = "brcm,bcm6858"; compatible = "brcm,bcm6858", "brcm,bcmbca";
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
aliases { interrupt-parent = <&gic>;
spi0 = &hsspi;
};
cpus { cpus {
#address-cells = <2>; #address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
u-boot,dm-pre-reloc;
cpu0: cpu@0 { B53_0: cpu@0 {
compatible = "arm,cortex-a53", "arm,armv8"; compatible = "brcm,brahma-b53";
device_type = "cpu"; device_type = "cpu";
reg = <0x0 0x0>; reg = <0x0 0x0>;
next-level-cache = <&l2>; next-level-cache = <&L2_0>;
u-boot,dm-pre-reloc; enable-method = "psci";
}; };
cpu1: cpu@1 { B53_1: cpu@1 {
compatible = "arm,cortex-a53", "arm,armv8"; compatible = "brcm,brahma-b53";
device_type = "cpu"; device_type = "cpu";
reg = <0x0 0x1>; reg = <0x0 0x1>;
next-level-cache = <&l2>; next-level-cache = <&L2_0>;
u-boot,dm-pre-reloc; enable-method = "psci";
}; };
cpu2: cpu@2 { B53_2: cpu@2 {
compatible = "arm,cortex-a53", "arm,armv8"; compatible = "brcm,brahma-b53";
device_type = "cpu"; device_type = "cpu";
reg = <0x0 0x2>; reg = <0x0 0x2>;
next-level-cache = <&l2>; next-level-cache = <&L2_0>;
u-boot,dm-pre-reloc; enable-method = "psci";
}; };
cpu3: cpu@3 { B53_3: cpu@3 {
compatible = "arm,cortex-a53", "arm,armv8"; compatible = "brcm,brahma-b53";
device_type = "cpu"; device_type = "cpu";
reg = <0x0 0x3>; reg = <0x0 0x3>;
next-level-cache = <&l2>; next-level-cache = <&L2_0>;
u-boot,dm-pre-reloc; enable-method = "psci";
}; };
l2: l2-cache0 { L2_0: l2-cache0 {
compatible = "cache"; compatible = "cache";
u-boot,dm-pre-reloc;
}; };
}; };
timer {
compatible = "arm,armv8-timer";
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
};
pmu: pmu {
compatible = "arm,armv8-pmuv3";
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
interrupt-affinity = <&B53_0>, <&B53_1>,
<&B53_2>, <&B53_3>;
};
clocks { clocks {
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <2>;
ranges;
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
periph_osc: periph-osc { periph_clk: periph_clk {
compatible = "fixed-clock"; compatible = "fixed-clock";
#clock-cells = <0>; #clock-cells = <0>;
clock-frequency = <200000000>; clock-frequency = <200000000>;
u-boot,dm-pre-reloc;
}; };
hsspi_pll: hsspi-pll { hsspi_pll: hsspi-pll {
compatible = "fixed-factor-clock"; compatible = "fixed-factor-clock";
#clock-cells = <0>; #clock-cells = <0>;
clocks = <&periph_osc>; clocks = <&periph_clk>;
clock-mult = <2>; clock-mult = <2>;
clock-div = <1>; clock-div = <1>;
}; };
refclk50mhz: refclk50mhz { wdt_clk: wdt-clk {
compatible = "fixed-clock"; compatible = "fixed-factor-clock";
#clock-cells = <0>; #clock-cells = <0>;
clock-frequency = <50000000>; clocks = <&periph_clk>;
clock-div = <4>;
clock-mult = <1>;
}; };
}; };
ubus { psci {
compatible = "arm,psci-0.2";
method = "smc";
};
axi@81000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <2>; #address-cells = <1>;
#size-cells = <2>; #size-cells = <1>;
ranges = <0x0 0x0 0x81000000 0x8000>;
gic: interrupt-controller@1000 {
compatible = "arm,gic-400";
#interrupt-cells = <3>;
interrupt-controller;
reg = <0x1000 0x1000>, /* GICD */
<0x2000 0x2000>, /* GICC */
<0x4000 0x2000>, /* GICH */
<0x6000 0x2000>; /* GICV */
interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |
IRQ_TYPE_LEVEL_HIGH)>;
};
};
bus@ff800000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x0 0xff800000 0x800000>;
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
uart0: serial@ff800640 { uart0: serial@640 {
compatible = "brcm,bcm6345-uart"; compatible = "brcm,bcm6345-uart";
reg = <0x0 0xff800640 0x0 0x18>; reg = <0x640 0x18>;
clocks = <&periph_osc>; interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&periph_clk>;
clock-names = "refclk";
status = "disabled"; status = "disabled";
}; };
leds: led-controller@ff800800 { leds: led-controller@800 {
compatible = "brcm,bcm6858-leds"; compatible = "brcm,bcm6858-leds";
reg = <0x0 0xff800800 0x0 0xe4>; reg = <0x800 0xe4>;
status = "disabled"; status = "disabled";
}; };
wdt1: watchdog@ff802780 { wdt1: watchdog@2780 {
compatible = "brcm,bcm6345-wdt"; compatible = "brcm,bcm6345-wdt";
reg = <0x0 0xff802780 0x0 0x14>; reg = <0x2780 0x14>;
clocks = <&refclk50mhz>; clocks = <&wdt_clk>;
}; };
wdt2: watchdog@ff8027c0 { wdt2: watchdog@27c0 {
compatible = "brcm,bcm6345-wdt"; compatible = "brcm,bcm6345-wdt";
reg = <0x0 0xff8027c0 0x0 0x14>; reg = <0x27c0 0x14>;
clocks = <&refclk50mhz>; clocks = <&wdt_clk>;
}; };
wdt-reboot { wdt-reboot {
@ -124,91 +163,91 @@
wdt = <&wdt1>; wdt = <&wdt1>;
}; };
gpio0: gpio-controller@0xff800500 { gpio0: gpio-controller@500 {
compatible = "brcm,bcm6345-gpio"; compatible = "brcm,bcm6345-gpio";
reg = <0x0 0xff800500 0x0 0x4>, reg = <0x500 0x4>,
<0x0 0xff800520 0x0 0x4>; <0x520 0x4>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
status = "disabled"; status = "disabled";
}; };
gpio1: gpio-controller@0xff800504 { gpio1: gpio-controller@504 {
compatible = "brcm,bcm6345-gpio"; compatible = "brcm,bcm6345-gpio";
reg = <0x0 0xff800504 0x0 0x4>, reg = <0x504 0x4>,
<0x0 0xff800524 0x0 0x4>; <0x524 0x4>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
status = "disabled"; status = "disabled";
}; };
gpio2: gpio-controller@0xff800508 { gpio2: gpio-controller@508 {
compatible = "brcm,bcm6345-gpio"; compatible = "brcm,bcm6345-gpio";
reg = <0x0 0xff800508 0x0 0x4>, reg = <0x508 0x4>,
<0x0 0xff800528 0x0 0x4>; <0x528 0x4>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
status = "disabled"; status = "disabled";
}; };
gpio3: gpio-controller@0xff80050c { gpio3: gpio-controller@50c {
compatible = "brcm,bcm6345-gpio"; compatible = "brcm,bcm6345-gpio";
reg = <0x0 0xff80050c 0x0 0x4>, reg = <0x50c 0x4>,
<0x0 0xff80052c 0x0 0x4>; <0x52c 0x4>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
status = "disabled"; status = "disabled";
}; };
gpio4: gpio-controller@0xff800510 { gpio4: gpio-controller@510 {
compatible = "brcm,bcm6345-gpio"; compatible = "brcm,bcm6345-gpio";
reg = <0x0 0xff800510 0x0 0x4>, reg = <0x510 0x4>,
<0x0 0xff800530 0x0 0x4>; <0x530 0x4>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
status = "disabled"; status = "disabled";
}; };
gpio5: gpio-controller@0xff800514 { gpio5: gpio-controller@514 {
compatible = "brcm,bcm6345-gpio"; compatible = "brcm,bcm6345-gpio";
reg = <0x0 0xff800514 0x0 0x4>, reg = <0x514 0x4>,
<0x0 0xff800534 0x0 0x4>; <0x534 0x4>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
status = "disabled"; status = "disabled";
}; };
gpio6: gpio-controller@0xff800518 { gpio6: gpio-controller@518 {
compatible = "brcm,bcm6345-gpio"; compatible = "brcm,bcm6345-gpio";
reg = <0x0 0xff800518 0x0 0x4>, reg = <0x518 0x4>,
<0x0 0xff800538 0x0 0x4>; <0x538 0x4>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
status = "disabled"; status = "disabled";
}; };
gpio7: gpio-controller@0xff80051c { gpio7: gpio-controller@51c {
compatible = "brcm,bcm6345-gpio"; compatible = "brcm,bcm6345-gpio";
reg = <0x0 0xff80051c 0x0 0x4>, reg = <0x51c 0x4>,
<0x0 0xff80053c 0x0 0x4>; <0x53c 0x4>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
status = "disabled"; status = "disabled";
}; };
hsspi: spi-controller@ff801000 { hsspi: spi-controller@1000 {
compatible = "brcm,bcm6328-hsspi"; compatible = "brcm,bcm6328-hsspi";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x0 0xff801000 0x0 0x600>; reg = <0x1000 0x600>;
clocks = <&hsspi_pll>, <&hsspi_pll>; clocks = <&hsspi_pll>, <&hsspi_pll>;
clock-names = "hsspi", "pll"; clock-names = "hsspi", "pll";
spi-max-frequency = <100000000>; spi-max-frequency = <100000000>;
@ -217,14 +256,14 @@
status = "disabled"; status = "disabled";
}; };
nand: nand-controller@ff801800 { nand: nand-controller@1800 {
compatible = "brcm,nand-bcm6858", compatible = "brcm,nand-bcm6858",
"brcm,brcmnand-v5.0", "brcm,brcmnand-v5.0",
"brcm,brcmnand"; "brcm,brcmnand";
reg-names = "nand", "nand-int-base", "nand-cache"; reg-names = "nand", "nand-int-base", "nand-cache";
reg = <0x0 0xff801800 0x0 0x180>, reg = <0x1800 0x180>,
<0x0 0xff802000 0x0 0x10>, <0x2000 0x10>,
<0x0 0xff801c00 0x0 0x200>; <0x1c00 0x200>;
parameter-page-big-endian = <0>; parameter-page-big-endian = <0>;
status = "disabled"; status = "disabled";

30
arch/arm/dts/bcm96858.dts Normal file
View File

@ -0,0 +1,30 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright 2022 Broadcom Ltd.
*/
/dts-v1/;
#include "bcm6858.dtsi"
/ {
model = "Broadcom BCM96858 Reference Board";
compatible = "brcm,bcm96858", "brcm,bcm6858", "brcm,bcmbca";
aliases {
serial0 = &uart0;
};
chosen {
stdout-path = "serial0:115200n8";
};
memory@0 {
device_type = "memory";
reg = <0x0 0x0 0x0 0x08000000>;
};
};
&uart0 {
status = "okay";
};

11
arch/arm/mach-bcmbca/Kconfig
View File

@ -93,6 +93,16 @@ config BCM6856
Broadcom BCM6856 is a dual core Brahma-B53 ARMv8 based xPON Gateway Broadcom BCM6856 is a dual core Brahma-B53 ARMv8 based xPON Gateway
SoC. This SoC family includes BCM6856, BCM6836 and BCM4910. SoC. This SoC family includes BCM6856, BCM6836 and BCM4910.
config BCM6858
bool "Support for Broadcom 6858 Family"
select ARM64
select SYS_ARCH_TIMER
select DM_SERIAL
select BCM6345_SERIAL
help
Broadcom BCM6858 is a quad core Brahma-B53 ARMv8 based xPON Gateway
SoC. This SoC family includes BCM6858, BCM49508, BCM5504X and BCM6545.
config BCM6878 config BCM6878
bool "Support for Broadcom 6878 Family" bool "Support for Broadcom 6878 Family"
select SYS_ARCH_TIMER select SYS_ARCH_TIMER
@ -112,6 +122,7 @@ source "arch/arm/mach-bcmbca/bcm6756/Kconfig"
source "arch/arm/mach-bcmbca/bcm6813/Kconfig" source "arch/arm/mach-bcmbca/bcm6813/Kconfig"
source "arch/arm/mach-bcmbca/bcm6846/Kconfig" source "arch/arm/mach-bcmbca/bcm6846/Kconfig"
source "arch/arm/mach-bcmbca/bcm6856/Kconfig" source "arch/arm/mach-bcmbca/bcm6856/Kconfig"
source "arch/arm/mach-bcmbca/bcm6858/Kconfig"
source "arch/arm/mach-bcmbca/bcm6878/Kconfig" source "arch/arm/mach-bcmbca/bcm6878/Kconfig"
endif endif

1
arch/arm/mach-bcmbca/Makefile
View File

@ -15,4 +15,5 @@ obj-$(CONFIG_BCM6756) += bcm6756/
obj-$(CONFIG_BCM6813) += bcm6813/ obj-$(CONFIG_BCM6813) += bcm6813/
obj-$(CONFIG_BCM6846) += bcm6846/ obj-$(CONFIG_BCM6846) += bcm6846/
obj-$(CONFIG_BCM6856) += bcm6856/ obj-$(CONFIG_BCM6856) += bcm6856/
obj-$(CONFIG_BCM6858) += bcm6858/
obj-$(CONFIG_BCM6878) += bcm6878/ obj-$(CONFIG_BCM6878) += bcm6878/

17
arch/arm/mach-bcmbca/bcm6858/Kconfig Normal file
View File

@ -0,0 +1,17 @@
# SPDX-License-Identifier: GPL-2.0+
#
# (C) Copyright 2022 Broadcom Ltd
#
if BCM6858
config TARGET_BCM96858
bool "Broadcom 6858 Reference Board"
depends on ARCH_BCMBCA
config SYS_SOC
default "bcm6858"
source "board/broadcom/bcmbca/Kconfig"
endif

5
arch/arm/mach-bcmbca/bcm6858/Makefile Normal file
View File

@ -0,0 +1,5 @@
# SPDX-License-Identifier: GPL-2.0+
#
# (C) Copyright 2022 Broadcom Ltd
#
obj-y += mmu_table.o

32
arch/arm/mach-bcmbca/bcm6858/mmu_table.c Normal file
View File

@ -0,0 +1,32 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2022 Broadcom Ltd.
*/
#include <common.h>
#include <asm/armv8/mmu.h>
#include <linux/sizes.h>
static struct mm_region bcm96858_mem_map[] = {
{
.virt = 0x00000000UL,
.phys = 0x00000000UL,
.size = 1UL * SZ_1G,
.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
PTE_BLOCK_INNER_SHARE
},
{
/* SoC peripheral */
.virt = 0xff800000UL,
.phys = 0xff800000UL,
.size = 0x100000,
.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
PTE_BLOCK_NON_SHARE |
PTE_BLOCK_PXN | PTE_BLOCK_UXN
},
{
/* List terminator */
0,
}
};
struct mm_region *mem_map = bcm96858_mem_map;

7
board/broadcom/bcmbca/Kconfig
View File

@ -93,6 +93,13 @@ config SYS_CONFIG_NAME
endif endif
if TARGET_BCM96858
config SYS_CONFIG_NAME
default "bcm96858"
endif
if TARGET_BCM96878 if TARGET_BCM96878
config SYS_CONFIG_NAME config SYS_CONFIG_NAME

23
configs/bcm96858_defconfig Normal file
View File

@ -0,0 +1,23 @@
CONFIG_ARM=y
CONFIG_COUNTER_FREQUENCY=50000000
CONFIG_ARCH_BCMBCA=y
CONFIG_SYS_TEXT_BASE=0x01000000
CONFIG_SYS_MALLOC_LEN=0x2000000
CONFIG_SYS_MALLOC_F_LEN=0x8000
CONFIG_BCM6858=y
CONFIG_TARGET_BCM96858=y
CONFIG_NR_DRAM_BANKS=2
CONFIG_DEFAULT_DEVICE_TREE="bcm96858"
CONFIG_IDENT_STRING=" Broadcom BCM6858"
CONFIG_SYS_LOAD_ADDR=0x01000000
CONFIG_ENV_VARS_UBOOT_CONFIG=y
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000000
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_MAXARGS=64
CONFIG_SYS_BOOTM_LEN=0x4000000
CONFIG_CMD_CACHE=y
CONFIG_OF_EMBED=y
CONFIG_CLK=y

11
include/configs/bcm96858.h Normal file
View File

@ -0,0 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2022 Broadcom Ltd.
*/
#ifndef __BCM96858_H
#define __BCM96858_H
#define CONFIG_SYS_SDRAM_BASE 0x00000000
#endif