Skip to contentSkip to conversation

Introducing the Broadcom Cygnus and NSP boards.

PATCH Superseded Steve Rae 1 participant 6 messages Jul 22, 2014 – Jul 31, 2014

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Steve Rae

author
#0 lore raw

v2 cover Introducing the Broadcom Cygnus and NSP boards.

This series adds the bcm958300k and the bcm958622hr boards which share the iproc architecture code.

Changes in v2:
- remove unused include file
- reformat multi-line comment(s)
- remove deprecated "SZ_" definitions
- remove misc_init_r()
- update CONFIG_ENV_SIZE

Scott Branden (4):
arm: iproc: Initial commit of iproc architecture code
arm: bcmcygnus: Add bcmcygnus u-architecture
arm: bcmnsp: Add bcmnsp u-architecture
arm: add Cygnus and NSP boards

 arch/arm/cpu/armv7/Makefile                     |   1 +
 arch/arm/cpu/armv7/bcmcygnus/Makefile           |   7 +
 arch/arm/cpu/armv7/bcmcygnus/reset.c            |  20 +++
 arch/arm/cpu/armv7/bcmnsp/Makefile              |   7 +
 arch/arm/cpu/armv7/bcmnsp/reset.c               |  19 +++
 arch/arm/cpu/armv7/iproc-common/Makefile        |   9 ++
 arch/arm/cpu/armv7/iproc-common/armpll.c        | 170 ++++++++++++++++++++++++
 arch/arm/cpu/armv7/iproc-common/hwinit-common.c |  15 +++
 arch/arm/cpu/armv7/iproc-common/timer.c         | 130 ++++++++++++++++++
 arch/arm/include/asm/arch-bcmcygnus/configs.h   |  25 ++++
 arch/arm/include/asm/arch-bcmnsp/configs.h      |  22 +++
 arch/arm/include/asm/iproc-common/armpll.h      |  14 ++
 arch/arm/include/asm/iproc-common/configs.h     |  20 +++
 arch/arm/include/asm/iproc-common/sysmap.h      |  47 +++++++
 arch/arm/include/asm/iproc-common/timer.h       |  37 ++++++
 board/broadcom/bcm_ep/Makefile                  |   7 +
 board/broadcom/bcm_ep/board.c                   |  55 ++++++++
 boards.cfg                                      |   2 +
 include/configs/bcm_ep_board.h                  | 107 +++++++++++++++
 19 files changed, 714 insertions(+)
 create mode 100644 arch/arm/cpu/armv7/bcmcygnus/Makefile
 create mode 100644 arch/arm/cpu/armv7/bcmcygnus/reset.c
 create mode 100644 arch/arm/cpu/armv7/bcmnsp/Makefile
 create mode 100644 arch/arm/cpu/armv7/bcmnsp/reset.c
 create mode 100644 arch/arm/cpu/armv7/iproc-common/Makefile
 create mode 100644 arch/arm/cpu/armv7/iproc-common/armpll.c
 create mode 100644 arch/arm/cpu/armv7/iproc-common/hwinit-common.c
 create mode 100644 arch/arm/cpu/armv7/iproc-common/timer.c
 create mode 100644 arch/arm/include/asm/arch-bcmcygnus/configs.h
 create mode 100644 arch/arm/include/asm/arch-bcmnsp/configs.h
 create mode 100644 arch/arm/include/asm/iproc-common/armpll.h
 create mode 100644 arch/arm/include/asm/iproc-common/configs.h
 create mode 100644 arch/arm/include/asm/iproc-common/sysmap.h
 create mode 100644 arch/arm/include/asm/iproc-common/timer.h
 create mode 100644 board/broadcom/bcm_ep/Makefile
 create mode 100644 board/broadcom/bcm_ep/board.c
 create mode 100644 include/configs/bcm_ep_board.h
Signature · 1 line
1.8.5
author
#1 lore raw

PATCH v2 1/4 arm: iproc: Initial commit of iproc architecture code

From: Scott Branden <[email protected]>

The iproc architecture code is present in several Broadcom chip architectures, including Cygnus and NSP.

---

Changes in v2:
- remove unused include file

 arch/arm/cpu/armv7/Makefile                     |   1 +
 arch/arm/cpu/armv7/iproc-common/Makefile        |   9 ++
 arch/arm/cpu/armv7/iproc-common/armpll.c        | 170 ++++++++++++++++++++++++
 arch/arm/cpu/armv7/iproc-common/hwinit-common.c |  15 +++
 arch/arm/cpu/armv7/iproc-common/timer.c         | 130 ++++++++++++++++++
 arch/arm/include/asm/iproc-common/armpll.h      |  14 ++
 arch/arm/include/asm/iproc-common/sysmap.h      |  47 +++++++
 arch/arm/include/asm/iproc-common/timer.h       |  37 ++++++
 8 files changed, 423 insertions(+)
 create mode 100644 arch/arm/cpu/armv7/iproc-common/Makefile
 create mode 100644 arch/arm/cpu/armv7/iproc-common/armpll.c
 create mode 100644 arch/arm/cpu/armv7/iproc-common/hwinit-common.c
 create mode 100644 arch/arm/cpu/armv7/iproc-common/timer.c
 create mode 100644 arch/arm/include/asm/iproc-common/armpll.h
 create mode 100644 arch/arm/include/asm/iproc-common/sysmap.h
 create mode 100644 arch/arm/include/asm/iproc-common/timer.h
arch/arm/cpu/armv7/Makefile +1 -0
index 232118d..d0cab8d 100644
@@ -23,6 +23,7 @@ obj-y	+= nonsec_virt.o
 obj-y	+= virt-v7.o
 endif
 
+obj-$(CONFIG_IPROC) += iproc-common/
 obj-$(CONFIG_KONA) += kona-common/
 obj-$(CONFIG_OMAP_COMMON) += omap-common/
 obj-$(CONFIG_SYS_ARCH_TIMER) += arch_timer.o
arch/arm/cpu/armv7/iproc-common/Makefile new file +9 -0
new file mode 100644
index 0000000..c071a17
@@ -0,0 +1,9 @@
+#
+# Copyright 2014 Broadcom Corporation.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	+= armpll.o
+obj-y	+= hwinit-common.o
+obj-y	+= timer.o
arch/arm/cpu/armv7/iproc-common/armpll.c new file +170 -0

170 lines not on this page · raw message

arch/arm/cpu/armv7/iproc-common/hwinit-common.c new file +15 -0
new file mode 100644
index 0000000..7131524
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2014 Broadcom Corporation.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+
+#ifndef CONFIG_SYS_DCACHE_OFF
+void enable_caches(void)
+{
+	/* Enable D-cache. I-cache is already enabled in start.S */
+	dcache_enable();
+}
+#endif
arch/arm/cpu/armv7/iproc-common/timer.c new file +130 -0

130 lines not on this page · raw message

arch/arm/include/asm/iproc-common/armpll.h new file +14 -0
new file mode 100644
index 0000000..1bee350
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2014 Broadcom Corporation.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __ARMPLL_H
+#define __ARMPLL_H
+
+#include <linux/types.h>
+
+uint32_t armpll_config(uint32_t clkmhz);
+
+#endif /*__ARMPLL_H */
arch/arm/include/asm/iproc-common/sysmap.h new file +47 -0

47 lines not on this page · raw message

arch/arm/include/asm/iproc-common/timer.h new file +37 -0
new file mode 100644
index 0000000..2bc2322
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2014 Broadcom Corporation.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __TIMER_H
+#define __TIMER_H
+
+#include <linux/types.h>
+
+void timer_systick_init(uint32_t tick_ms);
+void timer_global_init(void);
+
+/* ARM A9 Private Timer */
+#define TIMER_PVT_LOAD_OFFSET			0x00000000
+#define TIMER_PVT_COUNTER_OFFSET		0x00000004
+#define TIMER_PVT_CTRL_OFFSET			0x00000008
+#define TIMER_PVT_STATUS_OFFSET			0x0000000C
+#define TIMER_PVT_TIM_CTRL_TIM_EN		0x00000001
+#define TIMER_PVT_TIM_CTRL_AUTO_RELD		0x00000002
+#define TIMER_PVT_TIM_CTRL_INT_EN		0x00000004
+#define TIMER_PVT_TIM_CTRL_PRESC_MASK		0x0000FF00
+#define TIMER_PVT_TIM_INT_STATUS_SET		0x00000001
+
+/* Global timer */
+#define TIMER_GLB_LOW_OFFSET			0x00000000
+#define TIMER_GLB_HI_OFFSET			0x00000004
+#define TIMER_GLB_CTRL_OFFSET			0x00000008
+#define TIMER_GLB_TIM_CTRL_TIM_EN		0x00000001
+#define TIMER_GLB_TIM_CTRL_COMP_EN		0x00000002
+#define TIMER_GLB_TIM_CTRL_INT_EN		0x00000004
+#define TIMER_GLB_TIM_CTRL_AUTO_INC		0x00000008
+#define TIMER_GLB_TIM_CTRL_PRESC_MASK		0x0000FF00
+#define TIMER_GLB_TIM_INT_STATUS_SET		0x00000001
+
+#endif /*__TIMER_H */
Signature · 1 line
1.8.5
author
#2 lore raw

PATCH v2 2/4 arm: bcmcygnus: Add bcmcygnus u-architecture

In reply to Steve Rae

From: Scott Branden <[email protected]>

Base support for the Broadcom Cygnus SoC.
Based on iproc-common and the SoC specific reset function.

---

Changes in v2: None

 arch/arm/cpu/armv7/bcmcygnus/Makefile |  7 +++++++
 arch/arm/cpu/armv7/bcmcygnus/reset.c  | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 arch/arm/cpu/armv7/bcmcygnus/Makefile
 create mode 100644 arch/arm/cpu/armv7/bcmcygnus/reset.c
arch/arm/cpu/armv7/bcmcygnus/Makefile new file +7 -0
new file mode 100644
index 0000000..04afcf9
@@ -0,0 +1,7 @@
+#
+# Copyright 2014 Broadcom Corporation.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	+= reset.o
arch/arm/cpu/armv7/bcmcygnus/reset.c new file +20 -0
new file mode 100644
index 0000000..53ecc0c
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2014 Broadcom Corporation.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>
+
+#define CRMU_MAIL_BOX1		0x03024028
+#define CRMU_SOFT_RESET_CMD	0xFFFFFFFF
+
+void reset_cpu(ulong ignored)
+{
+	/* Send soft reset command via Mailbox. */
+	writel(CRMU_SOFT_RESET_CMD, CRMU_MAIL_BOX1);
+
+	while (1)
+		;	/* loop forever till reset */
+}
Signature · 1 line
1.8.5
author
#3 lore raw

PATCH v2 3/4 arm: bcmnsp: Add bcmnsp u-architecture

In reply to Steve Rae

From: Scott Branden <[email protected]>

Base support for the Broadcom NSP SoC.
Based on iproc-common and the SoC specific reset function.

---

Changes in v2: None

 arch/arm/cpu/armv7/bcmnsp/Makefile |  7 +++++++
 arch/arm/cpu/armv7/bcmnsp/reset.c  | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 arch/arm/cpu/armv7/bcmnsp/Makefile
 create mode 100644 arch/arm/cpu/armv7/bcmnsp/reset.c
arch/arm/cpu/armv7/bcmnsp/Makefile new file +7 -0
new file mode 100644
index 0000000..04afcf9
@@ -0,0 +1,7 @@
+#
+# Copyright 2014 Broadcom Corporation.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	+= reset.o
arch/arm/cpu/armv7/bcmnsp/reset.c new file +19 -0
new file mode 100644
index 0000000..d79d9aa
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 Broadcom Corporation.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>
+
+#define CRU_RESET_OFFSET	0x1803F184
+
+void reset_cpu(ulong ignored)
+{
+	/* Reset the cpu by setting software reset request bit */
+	writel(0x1, CRU_RESET_OFFSET);
+
+	while (1)
+		;	/* loop forever till reset */
+}
Signature · 1 line
1.8.5
author
#4 lore raw

PATCH v2 4/4 arm: add Cygnus and NSP boards

In reply to Steve Rae

From: Scott Branden <[email protected]>

The bcm_ep board configuration is used by a number of boards including Cygnus and NSP.
Add builds for the bcm958300k and the bcm958622hr boards.

---

Changes in v2:
- reformat multi-line comment(s)
- remove deprecated "SZ_" definitions
- remove misc_init_r()
- update CONFIG_ENV_SIZE

 arch/arm/include/asm/arch-bcmcygnus/configs.h |  25 ++++++
 arch/arm/include/asm/arch-bcmnsp/configs.h    |  22 ++++++
 arch/arm/include/asm/iproc-common/configs.h   |  20 +++++
 board/broadcom/bcm_ep/Makefile                |   7 ++
 board/broadcom/bcm_ep/board.c                 |  55 +++++++++++++
 boards.cfg                                    |   2 +
 include/configs/bcm_ep_board.h                | 107 ++++++++++++++++++++++++++
 7 files changed, 238 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-bcmcygnus/configs.h
 create mode 100644 arch/arm/include/asm/arch-bcmnsp/configs.h
 create mode 100644 arch/arm/include/asm/iproc-common/configs.h
 create mode 100644 board/broadcom/bcm_ep/Makefile
 create mode 100644 board/broadcom/bcm_ep/board.c
 create mode 100644 include/configs/bcm_ep_board.h
arch/arm/include/asm/arch-bcmcygnus/configs.h new file +25 -0
new file mode 100644
index 0000000..5354637
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 Broadcom Corporation.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __ARCH_CONFIGS_H
+#define __ARCH_CONFIGS_H
+
+#include <asm/iproc-common/configs.h>
+
+/* uArchitecture specifics */
+
+/* Serial Info */
+/* Post pad 3 bytes after each reg addr */
+#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
+#define CONFIG_SYS_NS16550_MEM32
+
+#define CONFIG_SYS_NS16550_CLK		100000000
+#define CONFIG_SYS_NS16550_CLK_DIV	54
+#define CONFIG_SERIAL_MULTI
+#define CONFIG_CONS_INDEX		3
+#define CONFIG_SYS_NS16550_COM3		0x18023000
+
+#endif /* __ARCH_CONFIGS_H */
arch/arm/include/asm/arch-bcmnsp/configs.h new file +22 -0
new file mode 100644
index 0000000..786deae
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2014 Broadcom Corporation.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __ARCH_CONFIGS_H
+#define __ARCH_CONFIGS_H
+
+#include <asm/iproc-common/configs.h>
+
+/* uArchitecture specifics */
+
+/* Serial Info */
+/* no padding */
+#define CONFIG_SYS_NS16550_REG_SIZE	1
+
+#define CONFIG_SYS_NS16550_CLK		0x03b9aca0
+#define CONFIG_CONS_INDEX		1
+#define CONFIG_SYS_NS16550_COM1		0x18000300
+
+#endif /* __ARCH_CONFIGS_H */
arch/arm/include/asm/iproc-common/configs.h new file +20 -0
new file mode 100644
index 0000000..c24de1f
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2014 Broadcom Corporation.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __IPROC_COMMON_CONFIGS_H
+#define __IPROC_COMMON_CONFIGS_H
+
+#include <linux/stringify.h>
+
+/* Architecture, CPU, chip, etc */
+#define CONFIG_IPROC
+#define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
+
+/* Memory Info */
+#define CONFIG_SYS_TEXT_BASE		0x61000000
+#define CONFIG_SYS_SDRAM_BASE		0x61000000
+
+#endif /* __IPROC_COMMON_CONFIGS_H */
board/broadcom/bcm_ep/Makefile new file +7 -0
new file mode 100644
index 0000000..8914e54
@@ -0,0 +1,7 @@
+#
+# Copyright 2014 Broadcom Corporation.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y	+= board.o
board/broadcom/bcm_ep/board.c new file +55 -0

55 lines not on this page · raw message

boards.cfg +2 -0
index 4b2bc19..b06bb32 100644
@@ -289,6 +289,8 @@ Active  arm         armv7          at91        atmel           sama5d3xek
 Active  arm         armv7          at91        atmel           sama5d3xek          sama5d3xek_nandflash                  sama5d3xek:SAMA5D3,SYS_USE_NANDFLASH                                                                                              Bo Shen <[email protected]>
 Active  arm         armv7          at91        atmel           sama5d3xek          sama5d3xek_spiflash                   sama5d3xek:SAMA5D3,SYS_USE_SERIALFLASH                                                                                            Bo Shen <[email protected]>
 Active  arm         armv7          bcm281xx    broadcom        bcm28155_ap         bcm28155_ap                           bcm28155_ap                                                                                                                       Tim Kryger <[email protected]>
+Active  arm         armv7          bcmcygnus   broadcom        bcm_ep              bcm958300k                            bcm_ep_board:SYS_SDRAM_SIZE=0x20000000                                                                                            Steve Rae <[email protected]>
+Active  arm         armv7          bcmnsp      broadcom        bcm_ep              bcm958622hr                           bcm_ep_board:SYS_SDRAM_SIZE=0x01000000                                                                                            Steve Rae <[email protected]>
 Active  arm         armv7          exynos      samsung         arndale             arndale                               -                                                                                                                                 Inderpal Singh <[email protected]>
 Active  arm         armv7          exynos      samsung         origen              origen                                -                                                                                                                                 Chander Kashyap <[email protected]>
 Active  arm         armv7          exynos      samsung         smdk5250            smdk5250                              -                                                                                                                                 Chander Kashyap <[email protected]>
include/configs/bcm_ep_board.h new file +107 -0

107 lines not on this page · raw message

Signature · 1 line
1.8.5
author
#5 lore raw

v2 cover Introducing the Broadcom Cygnus and NSP boards.

In reply to Steve Rae
Quoted 45 lines · Steve Rae

This series adds the bcm958300k and the bcm958622hr boards which share the iproc architecture code.

Changes in v2:
- remove unused include file
- reformat multi-line comment(s)
- remove deprecated "SZ_" definitions
- remove misc_init_r()
- update CONFIG_ENV_SIZE

Scott Branden (4):
arm: iproc: Initial commit of iproc architecture code
arm: bcmcygnus: Add bcmcygnus u-architecture
arm: bcmnsp: Add bcmnsp u-architecture
arm: add Cygnus and NSP boards

  arch/arm/cpu/armv7/Makefile                     |   1 +
  arch/arm/cpu/armv7/bcmcygnus/Makefile           |   7 +
  arch/arm/cpu/armv7/bcmcygnus/reset.c            |  20 +++
  arch/arm/cpu/armv7/bcmnsp/Makefile              |   7 +
  arch/arm/cpu/armv7/bcmnsp/reset.c               |  19 +++
  arch/arm/cpu/armv7/iproc-common/Makefile        |   9 ++
  arch/arm/cpu/armv7/iproc-common/armpll.c        | 170 ++++++++++++++++++++++++
  arch/arm/cpu/armv7/iproc-common/hwinit-common.c |  15 +++
  arch/arm/cpu/armv7/iproc-common/timer.c         | 130 ++++++++++++++++++
  arch/arm/include/asm/arch-bcmcygnus/configs.h   |  25 ++++
  arch/arm/include/asm/arch-bcmnsp/configs.h      |  22 +++
  arch/arm/include/asm/iproc-common/armpll.h      |  14 ++
  arch/arm/include/asm/iproc-common/configs.h     |  20 +++
  arch/arm/include/asm/iproc-common/sysmap.h      |  47 +++++++
  arch/arm/include/asm/iproc-common/timer.h       |  37 ++++++
  board/broadcom/bcm_ep/Makefile                  |   7 +
  board/broadcom/bcm_ep/board.c                   |  55 ++++++++
  boards.cfg                                      |   2 +
  include/configs/bcm_ep_board.h                  | 107 +++++++++++++++
  19 files changed, 714 insertions(+)

create mode 100644 arch/arm/cpu/armv7/bcmcygnus/Makefile create mode 100644 arch/arm/cpu/armv7/bcmcygnus/reset.c create mode 100644 arch/arm/cpu/armv7/bcmnsp/Makefile create mode 100644 arch/arm/cpu/armv7/bcmnsp/reset.c create mode 100644 arch/arm/cpu/armv7/iproc-common/Makefile create mode 100644 arch/arm/cpu/armv7/iproc-common/armpll.c create mode 100644 arch/arm/cpu/armv7/iproc-common/hwinit-common.c create mode 100644 arch/arm/cpu/armv7/iproc-common/timer.c create mode 100644 arch/arm/include/asm/arch-bcmcygnus/configs.h

Quoted 9 lines

create mode 100644 arch/arm/include/asm/arch-bcmnsp/configs.h create mode 100644 arch/arm/include/asm/iproc-common/armpll.h create mode 100644 arch/arm/include/asm/iproc-common/configs.h create mode 100644 arch/arm/include/asm/iproc-common/sysmap.h create mode 100644 arch/arm/include/asm/iproc-common/timer.h create mode 100644 board/broadcom/bcm_ep/Makefile create mode 100644 board/broadcom/bcm_ep/board.c create mode 100644 include/configs/bcm_ep_board.h

Albert,
I notice that this patchset is assigned to you:
http://patchwork.ozlabs.org/patch/371767/
I have more features to submit, which are dependant on this patchset. Is the process to submit those changes, and to put in the commit note that this patchset is a prerequisite, or ???
Thanks, Steve