From: Domenico Andreoli Platform infrastructure for the Broadcom BCM4760 based ARM11 SoCs. Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Domenico Andreoli --- Documentation/devicetree/bindings/arm/bcm4760.txt | 8 ++ MAINTAINERS | 7 ++ arch/arm/Makefile | 1 + arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/bcm4760-catalina.dts | 11 +++ arch/arm/boot/dts/bcm4760.dtsi | 48 +++++++++++++ arch/arm/configs/bcm4760_defconfig | 79 ++++++++++++++++++++++ arch/arm/mach-bcm/Kconfig | 18 +++++ arch/arm/mach-bcm/Makefile | 2 + arch/arm/mach-bcm/bcm4760.c | 80 ++++++++++++++++++++++ 10 files changed, 255 insertions(+) Index: b/Documentation/devicetree/bindings/arm/bcm4760.txt =================================================================== --- /dev/null +++ b/Documentation/devicetree/bindings/arm/bcm4760.txt @@ -0,0 +1,8 @@ +Broadcom BCM4760 ARM11 SoC device tree bindings +----------------------------------------------- + +Boards with the BCM4760 SoC shall have the following properties: + +Required root node property: + +compatible = "brcm,bcm4760"; Index: b/arch/arm/Makefile =================================================================== --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -147,6 +147,7 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x0020 machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_BCM) += bcm machine-$(CONFIG_ARCH_BCM2835) += bcm2835 +machine-$(CONFIG_ARCH_BCM4760) += bcm machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx machine-$(CONFIG_ARCH_DAVINCI) += davinci Index: b/arch/arm/configs/bcm4760_defconfig =================================================================== --- /dev/null +++ b/arch/arm/configs/bcm4760_defconfig @@ -0,0 +1,79 @@ +CONFIG_IRQ_DOMAIN_DEBUG=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_EMBEDDED=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_MULTI_V6=y +# CONFIG_ARCH_MULTI_V7 is not set +CONFIG_ARCH_BCM4760=y +CONFIG_ARM_ERRATA_411920=y +CONFIG_ARM_ERRATA_364296=y +CONFIG_AEABI=y +CONFIG_DEPRECATED_PARAM_STRUCT=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_ATAG_DTB_COMPAT=y +CONFIG_VFP=y +# CONFIG_SUSPEND is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_CMA=y +CONFIG_PROC_DEVICETREE=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_SCSI=y +# CONFIG_SCSI_PROC_FS is not set +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_LOWLEVEL is not set +# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +# CONFIG_VT is not set +# CONFIG_DEVKMEM is not set +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +# CONFIG_HW_RANDOM is not set +CONFIG_PINCONF=y +CONFIG_DEBUG_PINCTRL=y +CONFIG_PINCTRL_BCM4760=y +# CONFIG_HWMON is not set +# CONFIG_HID is not set +# CONFIG_USB_SUPPORT is not set +CONFIG_COMMON_CLK_DEBUG=y +# CONFIG_IOMMU_SUPPORT is not set +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=y +CONFIG_FANOTIFY=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +# CONFIG_PROC_PAGE_MONITOR is not set +CONFIG_TMPFS=y +CONFIG_CRAMFS=y +CONFIG_ROMFS_FS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=y +CONFIG_PRINTK_TIME=y +CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_INFO_REDUCED=y +CONFIG_STRIP_ASM_SYMS=y +CONFIG_DEBUG_SECTION_MISMATCH=y +CONFIG_MAGIC_SYSRQ=y +# CONFIG_SCHED_DEBUG is not set +CONFIG_DEBUG_SPINLOCK=y +CONFIG_DEBUG_MUTEXES=y +CONFIG_DEBUG_ATOMIC_SLEEP=y +# CONFIG_FTRACE is not set +# CONFIG_CRYPTO_ANSI_CPRNG is not set +# CONFIG_CRYPTO_HW is not set Index: b/arch/arm/mach-bcm/bcm4760.c =================================================================== --- /dev/null +++ b/arch/arm/mach-bcm/bcm4760.c @@ -0,0 +1,80 @@ +/* + * Broadcom BCM4760 based ARM11 SoCs platform support + * + * Copyright (C) 2012 Domenico Andreoli + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include + +#include +#include +#include + +#define BCM4760_PERIPH_PHYS 0x00080000 +#define BCM4760_PERIPH_VIRT IOMEM(0xd0080000) +#define BCM4760_PERIPH_SIZE SZ_512K + +static struct map_desc io_map __initdata = { + .virtual = (unsigned long) BCM4760_PERIPH_VIRT, + .pfn = __phys_to_pfn(BCM4760_PERIPH_PHYS), + .length = BCM4760_PERIPH_SIZE, + .type = MT_DEVICE, +}; + +static void __init bcm4760_map_io(void) +{ + iotable_init(&io_map, 1); +} + +#define BCM4760_CPUID0 IOMEM(0xd00b0ff0) +#define BCM4760_CPUID1 IOMEM(0xd00b0ff4) + +static void __init bcm4760_system_rev(void) +{ + u32 id0, id1; + + id0 = readl_relaxed(BCM4760_CPUID0); + id1 = readl_relaxed(BCM4760_CPUID1); + + if (id0 >> 16 != 0xbcbc) + system_rev = 0xbc4760a0; + else + system_rev = id0 << 8 | (id1 & 0xff); +} + +static void __init bcm4760_init(void) +{ + int err; + + bcm4760_system_rev(); + + err = of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + if (err) { + pr_err("of_platform_populate failed: %d\n", err); + BUG(); + } +} + +static const char * const bcm4760_compat[] __initconst = { + "brcm,bcm4760", + NULL +}; + +DT_MACHINE_START(BCM4760, "Broadcom BCM4760") + .map_io = bcm4760_map_io, + .init_machine = bcm4760_init, + .dt_compat = bcm4760_compat +MACHINE_END Index: b/MAINTAINERS =================================================================== --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1802,6 +1802,13 @@ F: arch/arm/boot/dts/bcm2835* F: arch/arm/configs/bcm2835_defconfig F: drivers/*/*bcm2835* +BROADCOM BCM4760 ARM ARCHITECTURE +M: Domenico Andreoli +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +S: Maintained +F: arch/arm/mach-bcm/bcm4760.c +F: drivers/*/*bcm4760* + BROADCOM TG3 GIGABIT ETHERNET DRIVER M: Nithin Nayak Sujir M: Michael Chan Index: b/arch/arm/boot/dts/Makefile =================================================================== --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -42,6 +42,7 @@ dtb-$(CONFIG_ARCH_AT91) += sama5d34ek.dt dtb-$(CONFIG_ARCH_AT91) += sama5d35ek.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb +dtb-$(CONFIG_ARCH_BCM4760) += bcm4760-catalina.dtb dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \ da850-evm.dtb Index: b/arch/arm/boot/dts/bcm4760-catalina.dts =================================================================== --- /dev/null +++ b/arch/arm/boot/dts/bcm4760-catalina.dts @@ -0,0 +1,11 @@ +/dts-v1/; +#include "bcm4760.dtsi" + +/ { + compatible = "brcm,catalina", "brcm,bcm4760"; + model = "Broadcom Catalina"; + + memory { + reg = <0x30000000 0x4000000>; + }; +}; Index: b/arch/arm/boot/dts/bcm4760.dtsi =================================================================== --- /dev/null +++ b/arch/arm/boot/dts/bcm4760.dtsi @@ -0,0 +1,48 @@ +/include/ "skeleton.dtsi" + +/ { + compatible = "brcm,bcm4760"; + model = "Broadcom BCM4760"; + + amba { + compatible = "arm,amba-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + vic0: interrupt-controller@80000 { + compatible = "brcm,bcm4760-pl192", "arm,pl192-vic", "arm,primecell"; + reg = <0x80000 0x1000>; + interrupt-controller; + #interrupt-cells = <1>; + }; + + vic1: interrupt-controller@81000 { + compatible = "brcm,bcm4760-pl192", "arm,pl192-vic", "arm,primecell"; + reg = <0x81000 0x1000>; + interrupt-controller; + #interrupt-cells = <1>; + }; + + uart0@c0000 { + compatible = "brcm,bcm4760-pl011", "arm,pl011", "arm,primecell"; + reg = <0xc0000 0x1000>; + interrupt-parent = <&vic0>; + interrupts = <14>; + }; + + uart1@c1000 { + compatible = "brcm,bcm4760-pl011", "arm,pl011", "arm,primecell"; + reg = <0xc1000 0x1000>; + interrupt-parent = <&vic0>; + interrupts = <15>; + }; + + uart2@b2000 { + compatible = "brcm,bcm4760-pl011", "arm,pl011", "arm,primecell"; + reg = <0xb2000 0x1000>; + interrupt-parent = <&vic0>; + interrupts = <16>; + }; + }; +}; Index: b/arch/arm/mach-bcm/Kconfig =================================================================== --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -17,3 +17,21 @@ config ARCH_BCM It currently supports the 'BCM281XX' family, which includes BCM11130, BCM11140, BCM11351, BCM28145 and BCM28155 variants. + +config ARCH_BCM4760 + bool "Broadcom BCM4760 based SoCs (ARM11)" if ARCH_MULTI_V6 + select ARCH_WANT_OPTIONAL_GPIOLIB + select ARM_AMBA + select ARM_VIC + select CLKDEV_LOOKUP + select CLKSRC_OF + select COMMON_CLK + select CPU_V6 + select GENERIC_CLOCKEVENTS + select GENERIC_IRQ_CHIP + select MULTI_IRQ_HANDLER + select NO_IOPORT + select PINCTRL + select PINMUX + select SPARSE_IRQ + select USE_OF Index: b/arch/arm/mach-bcm/Makefile =================================================================== --- a/arch/arm/mach-bcm/Makefile +++ b/arch/arm/mach-bcm/Makefile @@ -13,3 +13,5 @@ obj-$(CONFIG_ARCH_BCM) := board_bcm.o bcm_kona_smc.o bcm_kona_smc_asm.o plus_sec := $(call as-instr,.arch_extension sec,+sec) AFLAGS_bcm_kona_smc_asm.o :=-Wa,-march=armv7-a$(plus_sec) + +obj-$(CONFIG_ARCH_BCM4760) += bcm4760.o