===================================================================
@@ -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";
===================================================================
@@ -0,0 +1,76 @@
+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_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
===================================================================
@@ -0,0 +1,37 @@
+/*
+ * Broadcom BCM4760 based ARM11 SoCs platform support
+ *
+ * Copyright (C) 2012 Domenico Andreoli <domenico.andreoli@linux.com>
+ *
+ * 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 <linux/init.h>
+#include <linux/clk-provider.h>
+#include <linux/of_platform.h>
+
+#include <asm/mach/arch.h>
+
+static void __init bcm4760_init(void)
+{
+ of_clk_init(NULL);
+ of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+static const char * const bcm4760_compat[] __initconst = {
+ "brcm,bcm4760",
+ NULL,
+};
+
+DT_MACHINE_START(BCM4760, "Broadcom BCM4760")
+ .init_machine = bcm4760_init,
+ .dt_compat = bcm4760_compat,
+MACHINE_END
===================================================================
@@ -1839,6 +1839,13 @@ F: arch/arm/boot/dts/bcm2835*
F: arch/arm/configs/bcm2835_defconfig
F: drivers/*/*bcm2835*
+BROADCOM BCM4760 ARM ARCHITECTURE
+M: Domenico Andreoli <domenico.andreoli@linux.com>
+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 <nsujir@broadcom.com>
M: Michael Chan <mchan@broadcom.com>
===================================================================
@@ -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 \
bcm28155-ap.dtb
dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
===================================================================
@@ -0,0 +1,11 @@
+/dts-v1/;
+#include "bcm4760.dtsi"
+
+/ {
+ compatible = "brcm,catalina", "brcm,bcm4760";
+ model = "Broadcom Catalina";
+
+ memory {
+ reg = <0x30000000 0x4000000>;
+ };
+};
===================================================================
@@ -0,0 +1,75 @@
+#include "skeleton.dtsi"
+
+/ {
+ compatible = "brcm,bcm4760";
+ model = "Broadcom BCM4760";
+
+ clocks {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pclk: plc_m1 {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <100100000>;
+ };
+
+ uartclk: pla_m1 {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <78000000>;
+ };
+ };
+
+ 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>;
+ clocks = <&pclk>;
+ clock-names = "apb_pclk";
+ };
+
+ vic1: interrupt-controller@81000 {
+ compatible = "brcm,bcm4760-pl192", "arm,pl192-vic", "arm,primecell";
+ reg = <0x81000 0x1000>;
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ clocks = <&pclk>;
+ clock-names = "apb_pclk";
+ };
+
+ serial0: uart@c0000 {
+ compatible = "brcm,bcm4760-pl011", "arm,pl011", "arm,primecell";
+ reg = <0xc0000 0x1000>;
+ interrupt-parent = <&vic0>;
+ interrupts = <14>;
+ clocks = <&uartclk>, <&pclk>;
+ clock-names = "uartclk", "apb_pclk";
+ };
+
+ serial1: uart@c1000 {
+ compatible = "brcm,bcm4760-pl011", "arm,pl011", "arm,primecell";
+ reg = <0xc1000 0x1000>;
+ interrupt-parent = <&vic0>;
+ interrupts = <15>;
+ clocks = <&uartclk>, <&pclk>;
+ clock-names = "uartclk", "apb_pclk";
+ };
+
+ serial2: uart@b2000 {
+ compatible = "brcm,bcm4760-pl011", "arm,pl011", "arm,primecell";
+ reg = <0xb2000 0x1000>;
+ interrupt-parent = <&vic0>;
+ interrupts = <16>;
+ clocks = <&uartclk>, <&pclk>;
+ clock-names = "uartclk", "apb_pclk";
+ };
+ };
+};
===================================================================
@@ -18,3 +18,10 @@ 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 ARM_AMBA
+ select ARM_VIC
+ select CLKSRC_OF
+ select SOC_BUS
===================================================================
@@ -13,3 +13,5 @@
obj-$(CONFIG_ARCH_BCM) := board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.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
===================================================================
@@ -94,6 +94,21 @@ choice
depends on ARCH_BCM2835
select DEBUG_UART_PL01X
+ config DEBUG_BCM4760_UART0
+ bool "Kernel low-level debugging on BCM4760 PL011 UART0"
+ depends on ARCH_BCM4760
+ select DEBUG_UART_PL01X
+
+ config DEBUG_BCM4760_UART1
+ bool "Kernel low-level debugging on BCM4760 PL011 UART1"
+ depends on ARCH_BCM4760
+ select DEBUG_UART_PL01X
+
+ config DEBUG_BCM4760_UART2
+ bool "Kernel low-level debugging on BCM4760 PL011 UART2"
+ depends on ARCH_BCM4760
+ select DEBUG_UART_PL01X
+
config DEBUG_CLPS711X_UART1
bool "Kernel low-level debugging messages via UART1"
depends on ARCH_CLPS711X
@@ -929,6 +944,9 @@ config DEBUG_UART_8250
config DEBUG_UART_PHYS
hex "Physical base address of debug UART"
+ default 0x000b2000 if DEBUG_BCM4760_UART2
+ default 0x000c0000 if DEBUG_BCM4760_UART0
+ default 0x000c1000 if DEBUG_BCM4760_UART1
default 0x01c20000 if DEBUG_DAVINCI_DMx_UART0
default 0x01c28000 if DEBUG_SUNXI_UART0
default 0x01c28400 if DEBUG_SUNXI_UART1
@@ -985,6 +1003,9 @@ config DEBUG_UART_PHYS
config DEBUG_UART_VIRT
hex "Virtual base address of debug UART"
+ default 0xd00b2000 if DEBUG_BCM4760_UART2
+ default 0xd00c0000 if DEBUG_BCM4760_UART0
+ default 0xd00c1000 if DEBUG_BCM4760_UART1
default 0xe0010fe0 if ARCH_RPC
default 0xf0000be0 if ARCH_EBSA110
default 0xf0009000 if DEBUG_CNS3XXX