[U-Boot] [PATCH 0/3] mips: bmips: add BCM6338 SoC support

[U-Boot] [PATCH 0/3] mips: bmips: add BCM6338 SoC support

[Álvaro Fernández Rojas]

BCM6338 is one of the first BCM63xx SoCs and prior to BCM6348/BCM6358, which
means that it also needs ioremap "hacks".

Álvaro Fernández Rojas (3):
  dm: cpu: bmips: add BCM6338 support
  MIPS: add support for Broadcom MIPS BCM6338 SoC family
  MIPS: add BMIPS Sagem F at ST1704 board

 arch/mips/dts/Makefile                    |   1 +
 arch/mips/dts/brcm,bcm6338.dtsi           | 118 ++++++++++++++++++++++++++++++
 arch/mips/dts/sagem,f at st1704.dts          |  50 +++++++++++++
 arch/mips/mach-bmips/Kconfig              |  18 +++++
 arch/mips/mach-bmips/include/ioremap.h    |   3 +-
 board/sagem/f at st1704/Kconfig              |  12 +++
 board/sagem/f at st1704/MAINTAINERS          |   6 ++
 board/sagem/f at st1704/Makefile             |   5 ++
 board/sagem/f at st1704/f at st1704.c           |   7 ++
 configs/sagem_f at st1704_ram_defconfig      |  52 +++++++++++++
 drivers/cpu/bmips_cpu.c                   |  14 ++++
 include/configs/bmips_bcm6338.h           |  30 ++++++++
 include/configs/sagem_f at st1704.h          |  15 ++++
 include/dt-bindings/clock/bcm6338-clock.h |  19 +++++
 include/dt-bindings/reset/bcm6338-reset.h |  22 ++++++
 15 files changed, 371 insertions(+), 1 deletion(-)
 create mode 100644 arch/mips/dts/brcm,bcm6338.dtsi
 create mode 100644 arch/mips/dts/sagem,f at st1704.dts
 create mode 100644 board/sagem/f at st1704/Kconfig
 create mode 100644 board/sagem/f at st1704/MAINTAINERS
 create mode 100644 board/sagem/f at st1704/Makefile
 create mode 100644 board/sagem/f at st1704/f at st1704.c
 create mode 100644 configs/sagem_f at st1704_ram_defconfig
 create mode 100644 include/configs/bmips_bcm6338.h
 create mode 100644 include/configs/sagem_f at st1704.h
 create mode 100644 include/dt-bindings/clock/bcm6338-clock.h
 create mode 100644 include/dt-bindings/reset/bcm6338-reset.h

-- 
2.1.4

[U-Boot] [PATCH 1/3] dm: cpu: bmips: add BCM6338 support

[Álvaro Fernández Rojas]

BCM6338 has a fixed CPU frequency of 240 MHz.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 drivers/cpu/bmips_cpu.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index 4f412fa..07a873a 100644
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -128,6 +128,11 @@ static ulong bcm6328_get_cpu_freq(struct bmips_cpu_priv *priv)
 	}
 }
 
+static ulong bcm6338_get_cpu_freq(struct bmips_cpu_priv *priv)
+{
+	return 240000000;
+}
+
 static ulong bcm6348_get_cpu_freq(struct bmips_cpu_priv *priv)
 {
 	unsigned int tmp, n1, n2, m1;
@@ -207,6 +212,12 @@ static const struct bmips_cpu_hw bmips_cpu_bcm6328 = {
 	.get_cpu_count = bcm6328_get_cpu_count,
 };
 
+static const struct bmips_cpu_hw bmips_cpu_bcm6338 = {
+	.get_cpu_desc = bmips_short_cpu_desc,
+	.get_cpu_freq = bcm6338_get_cpu_freq,
+	.get_cpu_count = bcm6345_get_cpu_count,
+};
+
 static const struct bmips_cpu_hw bmips_cpu_bcm6348 = {
 	.get_cpu_desc = bmips_short_cpu_desc,
 	.get_cpu_freq = bcm6348_get_cpu_freq,
@@ -307,6 +318,9 @@ static const struct udevice_id bmips_cpu_ids[] = {
 		.compatible = "brcm,bcm6328-cpu",
 		.data = (ulong)&bmips_cpu_bcm6328,
 	}, {
+		.compatible = "brcm,bcm6338-cpu",
+		.data = (ulong)&bmips_cpu_bcm6338,
+	}, {
 		.compatible = "brcm,bcm6348-cpu",
 		.data = (ulong)&bmips_cpu_bcm6348,
 	}, {
-- 
2.1.4

[U-Boot] [PATCH 2/3] MIPS: add support for Broadcom MIPS BCM6338 SoC family

[Álvaro Fernández Rojas]

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 arch/mips/dts/brcm,bcm6338.dtsi           | 118 ++++++++++++++++++++++++++++++
 arch/mips/mach-bmips/Kconfig              |  12 +++
 include/configs/bmips_bcm6338.h           |  30 ++++++++
 include/dt-bindings/clock/bcm6338-clock.h |  19 +++++
 include/dt-bindings/reset/bcm6338-reset.h |  22 ++++++
 5 files changed, 201 insertions(+)
 create mode 100644 arch/mips/dts/brcm,bcm6338.dtsi
 create mode 100644 include/configs/bmips_bcm6338.h
 create mode 100644 include/dt-bindings/clock/bcm6338-clock.h
 create mode 100644 include/dt-bindings/reset/bcm6338-reset.h

diff --git a/arch/mips/dts/brcm,bcm6338.dtsi b/arch/mips/dts/brcm,bcm6338.dtsi
new file mode 100644
index 0000000..eb51a43
--- /dev/null
+++ b/arch/mips/dts/brcm,bcm6338.dtsi
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <dt-bindings/clock/bcm6338-clock.h>
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/reset/bcm6338-reset.h>
+#include "skeleton.dtsi"
+
+/ {
+	compatible = "brcm,bcm6338";
+
+	cpus {
+		reg = <0xfffe0000 0x4>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		u-boot,dm-pre-reloc;
+
+		cpu at 0 {
+			compatible = "brcm,bcm6338-cpu", "mips,mips4Kc";
+			device_type = "cpu";
+			reg = <0>;
+			u-boot,dm-pre-reloc;
+		};
+	};
+
+	clocks {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		u-boot,dm-pre-reloc;
+
+		periph_osc: periph-osc {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <50000000>;
+			u-boot,dm-pre-reloc;
+		};
+
+		periph_clk: periph-clk {
+			compatible = "brcm,bcm6345-clk";
+			reg = <0xfffe0004 0x4>;
+			#clock-cells = <1>;
+		};
+	};
+
+	pflash: nor at 1fc00000 {
+		compatible = "cfi-flash";
+		reg = <0x1fc00000 0x400000>;
+		bank-width = <2>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		status = "disabled";
+	};
+
+	ubus {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		u-boot,dm-pre-reloc;
+
+		pll_cntl: syscon at fffe0008 {
+			compatible = "syscon";
+			reg = <0xfffe0008 0x4>;
+		};
+
+		syscon-reboot {
+			compatible = "syscon-reboot";
+			regmap = <&pll_cntl>;
+			offset = <0x0>;
+			mask = <0x1>;
+		};
+
+		periph_rst: reset-controller at fffe0028 {
+			compatible = "brcm,bcm6345-reset";
+			reg = <0xfffe0028 0x4>;
+			#reset-cells = <1>;
+		};
+
+		wdt: watchdog at fffe021c {
+			compatible = "brcm,bcm6345-wdt";
+			reg = <0xfffe021c 0xc>;
+			clocks = <&periph_osc>;
+		};
+
+		wdt-reboot {
+			compatible = "wdt-reboot";
+			wdt = <&wdt>;
+		};
+
+		uart0: serial at fffe0300 {
+			compatible = "brcm,bcm6345-uart";
+			reg = <0xfffe0300 0x18>;
+			clocks = <&periph_osc>;
+
+			status = "disabled";
+		};
+
+		gpio: gpio-controller at fffe0404 {
+			compatible = "brcm,bcm6345-gpio";
+			reg = <0xfffe0404 0x4>, <0xfffe040c 0x4>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <8>;
+
+			status = "disabled";
+		};
+
+		memory-controller at fffe3100 {
+			compatible = "brcm,bcm6338-mc";
+			reg = <0xfffe3100 0x38>;
+			u-boot,dm-pre-reloc;
+		};
+	};
+};
diff --git a/arch/mips/mach-bmips/Kconfig b/arch/mips/mach-bmips/Kconfig
index a843fda..c2b5abc 100644
--- a/arch/mips/mach-bmips/Kconfig
+++ b/arch/mips/mach-bmips/Kconfig
@@ -4,6 +4,7 @@ menu "Broadcom MIPS platforms"
 config SYS_SOC
 	default "bcm3380" if SOC_BMIPS_BCM3380
 	default "bcm6328" if SOC_BMIPS_BCM6328
+	default "bcm6338" if SOC_BMIPS_BCM6338
 	default "bcm6348" if SOC_BMIPS_BCM6348
 	default "bcm6358" if SOC_BMIPS_BCM6358
 	default "bcm63268" if SOC_BMIPS_BCM63268
@@ -33,6 +34,17 @@ config SOC_BMIPS_BCM6328
 	help
 	  This supports BMIPS BCM6328 family including BCM63281 and BCM63283.
 
+config SOC_BMIPS_BCM6338
+	bool "BMIPS BCM6338 family"
+	select SUPPORTS_BIG_ENDIAN
+	select SUPPORTS_CPU_MIPS32_R1
+	select MIPS_TUNE_4KC
+	select MIPS_L1_CACHE_SHIFT_4
+	select SWAP_IO_SPACE
+	select SYSRESET_SYSCON
+	help
+	  This supports BMIPS BCM6338 family.
+
 config SOC_BMIPS_BCM6348
 	bool "BMIPS BCM6348 family"
 	select SUPPORTS_BIG_ENDIAN
diff --git a/include/configs/bmips_bcm6338.h b/include/configs/bmips_bcm6338.h
new file mode 100644
index 0000000..52d72c8
--- /dev/null
+++ b/include/configs/bmips_bcm6338.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __CONFIG_BMIPS_BCM6338_H
+#define __CONFIG_BMIPS_BCM6338_H
+
+/* CPU */
+#define CONFIG_SYS_MIPS_TIMER_FREQ	120000000
+
+/* RAM */
+#define CONFIG_NR_DRAM_BANKS		1
+#define CONFIG_SYS_SDRAM_BASE		0x80000000
+
+/* U-Boot */
+#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + 0x100000
+
+#if defined(CONFIG_BMIPS_BOOT_RAM)
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_SYS_INIT_SP_OFFSET	0x2000
+#endif
+
+#define CONFIG_SYS_FLASH_BASE			0xbfc00000
+#define CONFIG_SYS_FLASH_EMPTY_INFO
+#define CONFIG_SYS_FLASH_PROTECTION
+#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT	1
+
+#endif /* __CONFIG_BMIPS_BCM6338_H */
diff --git a/include/dt-bindings/clock/bcm6338-clock.h b/include/dt-bindings/clock/bcm6338-clock.h
new file mode 100644
index 0000000..3439c10
--- /dev/null
+++ b/include/dt-bindings/clock/bcm6338-clock.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __DT_BINDINGS_CLOCK_BCM6338_H
+#define __DT_BINDINGS_CLOCK_BCM6338_H
+
+#define BCM6338_CLK_ADSL	0
+#define BCM6338_CLK_MPI		1
+#define BCM6338_CLK_SDRAM	2
+#define BCM6338_CLK_ENET	4
+#define BCM6338_CLK_SAR		5
+#define BCM6338_CLK_SPI		9
+
+#endif /* __DT_BINDINGS_CLOCK_BCM6338_H */
diff --git a/include/dt-bindings/reset/bcm6338-reset.h b/include/dt-bindings/reset/bcm6338-reset.h
new file mode 100644
index 0000000..17a5e12
--- /dev/null
+++ b/include/dt-bindings/reset/bcm6338-reset.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __DT_BINDINGS_RESET_BCM6338_H
+#define __DT_BINDINGS_RESET_BCM6338_H
+
+#define BCM6338_RST_SPI		0
+#define BCM6338_RST_ENET	2
+#define BCM6338_RST_USBH	3
+#define BCM6338_RST_USBS	4
+#define BCM6338_RST_ADSL	5
+#define BCM6338_RST_DMAMEM	6
+#define BCM6338_RST_SAR		7
+#define BCM6338_RST_ACLC	8
+#define BCM6338_RST_ADSL_MIPS	10
+
+#endif /* __DT_BINDINGS_RESET_BCM6338_H */
-- 
2.1.4

[U-Boot] [PATCH 3/3] MIPS: add BMIPS Sagem F@ST1704 board

[Álvaro Fernández Rojas]

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 arch/mips/dts/Makefile                 |  1 +
 arch/mips/dts/sagem,f at st1704.dts       | 50 ++++++++++++++++++++++++++++++++
 arch/mips/mach-bmips/Kconfig           |  6 ++++
 arch/mips/mach-bmips/include/ioremap.h |  3 +-
 board/sagem/f at st1704/Kconfig           | 12 ++++++++
 board/sagem/f at st1704/MAINTAINERS       |  6 ++++
 board/sagem/f at st1704/Makefile          |  5 ++++
 board/sagem/f at st1704/f at st1704.c        |  7 +++++
 configs/sagem_f at st1704_ram_defconfig   | 52 ++++++++++++++++++++++++++++++++++
 include/configs/sagem_f at st1704.h       | 15 ++++++++++
 10 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 arch/mips/dts/sagem,f at st1704.dts
 create mode 100644 board/sagem/f at st1704/Kconfig
 create mode 100644 board/sagem/f at st1704/MAINTAINERS
 create mode 100644 board/sagem/f at st1704/Makefile
 create mode 100644 board/sagem/f at st1704/f at st1704.c
 create mode 100644 configs/sagem_f at st1704_ram_defconfig
 create mode 100644 include/configs/sagem_f at st1704.h

diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile
index fdce645..a190485 100644
--- a/arch/mips/dts/Makefile
+++ b/arch/mips/dts/Makefile
@@ -13,6 +13,7 @@ dtb-$(CONFIG_BOARD_COMTREND_CT5361) += comtrend,ct-5361.dtb
 dtb-$(CONFIG_BOARD_COMTREND_VR3032U) += comtrend,vr-3032u.dtb
 dtb-$(CONFIG_BOARD_HUAWEI_HG556A) += huawei,hg556a.dtb
 dtb-$(CONFIG_BOARD_NETGEAR_CG3100D) += netgear,cg3100d.dtb
+dtb-$(CONFIG_BOARD_SAGEM_FAST1704) += sagem,f at st1704.dtb
 dtb-$(CONFIG_BOARD_TPLINK_WDR4300) += tplink_wdr4300.dtb
 
 targets += $(dtb-y)
diff --git a/arch/mips/dts/sagem,f at st1704.dts b/arch/mips/dts/sagem,f at st1704.dts
new file mode 100644
index 0000000..be15fe5
--- /dev/null
+++ b/arch/mips/dts/sagem,f at st1704.dts
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/dts-v1/;
+
+#include "brcm,bcm6338.dtsi"
+
+/ {
+	model = "Sagem F at ST1704";
+	compatible = "sagem,f at st1704", "brcm,bcm6338";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		inet_green {
+			label = "F at ST1704:green:inet";
+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
+		};
+
+		power_green {
+			label = "F at ST1704:green:power";
+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+		};
+
+		inet_red {
+			label = "F at ST1704:red:inet";
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
+
+&gpio {
+	status = "okay";
+};
+
+&uart0 {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
diff --git a/arch/mips/mach-bmips/Kconfig b/arch/mips/mach-bmips/Kconfig
index c2b5abc..5454405 100644
--- a/arch/mips/mach-bmips/Kconfig
+++ b/arch/mips/mach-bmips/Kconfig
@@ -109,6 +109,11 @@ config BOARD_NETGEAR_CG3100D
 	depends on SOC_BMIPS_BCM3380
 	select BMIPS_SUPPORTS_BOOT_RAM
 
+config BOARD_SAGEM_FAST1704
+	bool "Sagem F at ST1704"
+	depends on SOC_BMIPS_BCM6338
+	select BMIPS_SUPPORTS_BOOT_RAM
+
 config BOARD_SFR_NB4_SER
 	bool "SFR NeufBox 4 (Sercomm)"
 	depends on SOC_BMIPS_BCM6358
@@ -137,6 +142,7 @@ source "board/comtrend/ct5361/Kconfig"
 source "board/comtrend/vr3032u/Kconfig"
 source "board/huawei/hg556a/Kconfig"
 source "board/netgear/cg3100d/Kconfig"
+source "board/sagem/f at st1704/Kconfig"
 source "board/sfr/nb4_ser/Kconfig"
 
 endmenu
diff --git a/arch/mips/mach-bmips/include/ioremap.h b/arch/mips/mach-bmips/include/ioremap.h
index d3dc0b8..a57f55d 100644
--- a/arch/mips/mach-bmips/include/ioremap.h
+++ b/arch/mips/mach-bmips/include/ioremap.h
@@ -18,7 +18,8 @@ static inline phys_addr_t fixup_bigphys_addr(phys_addr_t phys_addr,
 
 static inline int is_bmips_internal_registers(phys_addr_t offset)
 {
-#if defined(CONFIG_SOC_BMIPS_BCM6348) || \
+#if defined(CONFIG_SOC_BMIPS_BCM6338) || \
+	defined(CONFIG_SOC_BMIPS_BCM6348) || \
 	defined(CONFIG_SOC_BMIPS_BCM6358)
 	if (offset >= 0xfffe0000)
 		return 1;
diff --git a/board/sagem/f at st1704/Kconfig b/board/sagem/f at st1704/Kconfig
new file mode 100644
index 0000000..4566fcc
--- /dev/null
+++ b/board/sagem/f at st1704/Kconfig
@@ -0,0 +1,12 @@
+if BOARD_SAGEM_FAST1704
+
+config SYS_BOARD
+	default "f at st1704"
+
+config SYS_VENDOR
+	default "sagem"
+
+config SYS_CONFIG_NAME
+	default "sagem_f at st1704"
+
+endif
diff --git a/board/sagem/f at st1704/MAINTAINERS b/board/sagem/f at st1704/MAINTAINERS
new file mode 100644
index 0000000..72e1c5c
--- /dev/null
+++ b/board/sagem/f at st1704/MAINTAINERS
@@ -0,0 +1,6 @@
+SAGEM F at ST1704 BOARD
+M:	Álvaro Fernández Rojas <noltari@gmail.com>
+S:	Maintained
+F:	board/sagem/f at st1704/
+F:	include/configs/sagem_f at st1704.h
+F:	configs/sagem_f at st1704_ram_defconfig
diff --git a/board/sagem/f at st1704/Makefile b/board/sagem/f at st1704/Makefile
new file mode 100644
index 0000000..a5f97f8
--- /dev/null
+++ b/board/sagem/f at st1704/Makefile
@@ -0,0 +1,5 @@
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y += f at st1704.o
diff --git a/board/sagem/f at st1704/f at st1704.c b/board/sagem/f at st1704/f at st1704.c
new file mode 100644
index 0000000..d181ca6
--- /dev/null
+++ b/board/sagem/f at st1704/f at st1704.c
@@ -0,0 +1,7 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
diff --git a/configs/sagem_f at st1704_ram_defconfig b/configs/sagem_f at st1704_ram_defconfig
new file mode 100644
index 0000000..8e89c15
--- /dev/null
+++ b/configs/sagem_f at st1704_ram_defconfig
@@ -0,0 +1,52 @@
+CONFIG_ARCH_BMIPS=y
+CONFIG_BAUDRATE=115200
+CONFIG_BCM6345_CLK=y
+CONFIG_BCM6345_GPIO=y
+CONFIG_BCM6345_SERIAL=y
+CONFIG_BMIPS_BOOT_RAM=y
+CONFIG_BOARD_SAGEM_FAST1704=y
+# CONFIG_CMD_BOOTD is not set
+CONFIG_CMD_BOOTM=y
+CONFIG_CMD_CPU=y
+# CONFIG_CMD_CRC32 is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_EXPORTENV is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_GPIO is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_IMPORTENV is not set
+CONFIG_CMD_LED=y
+CONFIG_CMD_LICENSE=y
+CONFIG_CMD_LOADB=y
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MEMINFO=y
+# CONFIG_CMD_MISC is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_XIMG is not set
+CONFIG_DEFAULT_DEVICE_TREE="sagem,f at st1704"
+CONFIG_DISPLAY_CPUINFO=y
+# CONFIG_DM_DEVICE_REMOVE is not set
+CONFIG_DM_GPIO=y
+CONFIG_DM_RESET=y
+CONFIG_DM_SERIAL=y
+CONFIG_HUSH_PARSER=y
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_MIPS=y
+# CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set
+# CONFIG_MIPS_BOOT_ENV_LEGACY is not set
+CONFIG_MIPS_BOOT_FDT=y
+CONFIG_OF_STDOUT_VIA_ALIAS=y
+CONFIG_RESET=y
+CONFIG_RESET_BCM6345=y
+CONFIG_SOC_BMIPS_BCM6338=y
+# CONFIG_SPL_SERIAL_PRESENT is not set
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SYS_NO_FLASH=y
+CONFIG_SYS_PROMPT="F at ST1704 # "
+CONFIG_SYS_TEXT_BASE=0x80010000
diff --git a/include/configs/sagem_f at st1704.h b/include/configs/sagem_f at st1704.h
new file mode 100644
index 0000000..dbc7725
--- /dev/null
+++ b/include/configs/sagem_f at st1704.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <configs/bmips_common.h>
+#include <configs/bmips_bcm6338.h>
+
+#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_SIZE			(8 * 1024)
+
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_SYS_LONGHELP
-- 
2.1.4

[U-Boot] [PATCH 3/3] MIPS: add BMIPS Sagem F@ST1704 board

[Daniel Schwierzeck]

2017-05-15 22:49 GMT+02:00 Álvaro Fernández Rojas <noltari@gmail.com>:
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> ---
>  arch/mips/dts/Makefile                 |  1 +
>  arch/mips/dts/sagem,f at st1704.dts       | 50 ++++++++++++++++++++++++++++++++
>  arch/mips/mach-bmips/Kconfig           |  6 ++++
>  arch/mips/mach-bmips/include/ioremap.h |  3 +-
>  board/sagem/f at st1704/Kconfig           | 12 ++++++++
>  board/sagem/f at st1704/MAINTAINERS       |  6 ++++
>  board/sagem/f at st1704/Makefile          |  5 ++++
>  board/sagem/f at st1704/f at st1704.c        |  7 +++++
>  configs/sagem_f at st1704_ram_defconfig   | 52 ++++++++++++++++++++++++++++++++++
>  include/configs/sagem_f at st1704.h       | 15 ++++++++++
>  10 files changed, 156 insertions(+), 1 deletion(-)
>  create mode 100644 arch/mips/dts/sagem,f at st1704.dts
>  create mode 100644 board/sagem/f at st1704/Kconfig
>  create mode 100644 board/sagem/f at st1704/MAINTAINERS
>  create mode 100644 board/sagem/f at st1704/Makefile
>  create mode 100644 board/sagem/f at st1704/f at st1704.c
>  create mode 100644 configs/sagem_f at st1704_ram_defconfig
>  create mode 100644 include/configs/sagem_f at st1704.h
>
> diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile
> index fdce645..a190485 100644
> --- a/arch/mips/dts/Makefile
> +++ b/arch/mips/dts/Makefile
> @@ -13,6 +13,7 @@ dtb-$(CONFIG_BOARD_COMTREND_CT5361) += comtrend,ct-5361.dtb
>  dtb-$(CONFIG_BOARD_COMTREND_VR3032U) += comtrend,vr-3032u.dtb
>  dtb-$(CONFIG_BOARD_HUAWEI_HG556A) += huawei,hg556a.dtb
>  dtb-$(CONFIG_BOARD_NETGEAR_CG3100D) += netgear,cg3100d.dtb
> +dtb-$(CONFIG_BOARD_SAGEM_FAST1704) += sagem,f at st1704.dtb
>  dtb-$(CONFIG_BOARD_TPLINK_WDR4300) += tplink_wdr4300.dtb
>
>  targets += $(dtb-y)
> diff --git a/arch/mips/dts/sagem,f at st1704.dts b/arch/mips/dts/sagem,f at st1704.dts
> new file mode 100644
> index 0000000..be15fe5
> --- /dev/null
> +++ b/arch/mips/dts/sagem,f at st1704.dts
> @@ -0,0 +1,50 @@
> +/*
> + * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +/dts-v1/;
> +
> +#include "brcm,bcm6338.dtsi"
> +
> +/ {
> +       model = "Sagem F at ST1704";
> +       compatible = "sagem,f at st1704", "brcm,bcm6338";
> +
> +       aliases {
> +               serial0 = &uart0;
> +       };
> +
> +       chosen {
> +               stdout-path = "serial0:115200n8";
> +       };
> +
> +       gpio-leds {
> +               compatible = "gpio-leds";
> +
> +               inet_green {
> +                       label = "F at ST1704:green:inet";
> +                       gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
> +               };
> +
> +               power_green {
> +                       label = "F at ST1704:green:power";
> +                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
> +               };
> +
> +               inet_red {
> +                       label = "F at ST1704:red:inet";
> +                       gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
> +               };
> +       };
> +};
> +
> +&gpio {
> +       status = "okay";
> +};
> +
> +&uart0 {
> +       u-boot,dm-pre-reloc;
> +       status = "okay";
> +};
> diff --git a/arch/mips/mach-bmips/Kconfig b/arch/mips/mach-bmips/Kconfig
> index c2b5abc..5454405 100644
> --- a/arch/mips/mach-bmips/Kconfig
> +++ b/arch/mips/mach-bmips/Kconfig
> @@ -109,6 +109,11 @@ config BOARD_NETGEAR_CG3100D
>         depends on SOC_BMIPS_BCM3380
>         select BMIPS_SUPPORTS_BOOT_RAM
>
> +config BOARD_SAGEM_FAST1704
> +       bool "Sagem F at ST1704"
> +       depends on SOC_BMIPS_BCM6338
> +       select BMIPS_SUPPORTS_BOOT_RAM
> +
>  config BOARD_SFR_NB4_SER
>         bool "SFR NeufBox 4 (Sercomm)"
>         depends on SOC_BMIPS_BCM6358
> @@ -137,6 +142,7 @@ source "board/comtrend/ct5361/Kconfig"
>  source "board/comtrend/vr3032u/Kconfig"
>  source "board/huawei/hg556a/Kconfig"
>  source "board/netgear/cg3100d/Kconfig"
> +source "board/sagem/f at st1704/Kconfig"
>  source "board/sfr/nb4_ser/Kconfig"
>
>  endmenu
> diff --git a/arch/mips/mach-bmips/include/ioremap.h b/arch/mips/mach-bmips/include/ioremap.h
> index d3dc0b8..a57f55d 100644
> --- a/arch/mips/mach-bmips/include/ioremap.h
> +++ b/arch/mips/mach-bmips/include/ioremap.h
> @@ -18,7 +18,8 @@ static inline phys_addr_t fixup_bigphys_addr(phys_addr_t phys_addr,
>
>  static inline int is_bmips_internal_registers(phys_addr_t offset)
>  {
> -#if defined(CONFIG_SOC_BMIPS_BCM6348) || \
> +#if defined(CONFIG_SOC_BMIPS_BCM6338) || \
> +       defined(CONFIG_SOC_BMIPS_BCM6348) || \
>         defined(CONFIG_SOC_BMIPS_BCM6358)

this change should be done in patch 2/3

>         if (offset >= 0xfffe0000)
>                 return 1;
> diff --git a/board/sagem/f at st1704/Kconfig b/board/sagem/f at st1704/Kconfig
> new file mode 100644
> index 0000000..4566fcc
> --- /dev/null
> +++ b/board/sagem/f at st1704/Kconfig
> @@ -0,0 +1,12 @@
> +if BOARD_SAGEM_FAST1704
> +
> +config SYS_BOARD
> +       default "f at st1704"
> +
> +config SYS_VENDOR
> +       default "sagem"
> +
> +config SYS_CONFIG_NAME
> +       default "sagem_f at st1704"
> +
> +endif
> diff --git a/board/sagem/f at st1704/MAINTAINERS b/board/sagem/f at st1704/MAINTAINERS
> new file mode 100644
> index 0000000..72e1c5c
> --- /dev/null
> +++ b/board/sagem/f at st1704/MAINTAINERS
> @@ -0,0 +1,6 @@
> +SAGEM F at ST1704 BOARD
> +M:     Álvaro Fernández Rojas <noltari@gmail.com>
> +S:     Maintained
> +F:     board/sagem/f at st1704/
> +F:     include/configs/sagem_f at st1704.h
> +F:     configs/sagem_f at st1704_ram_defconfig
> diff --git a/board/sagem/f at st1704/Makefile b/board/sagem/f at st1704/Makefile
> new file mode 100644
> index 0000000..a5f97f8
> --- /dev/null
> +++ b/board/sagem/f at st1704/Makefile
> @@ -0,0 +1,5 @@
> +#
> +# SPDX-License-Identifier:     GPL-2.0+
> +#
> +
> +obj-y += f at st1704.o
> diff --git a/board/sagem/f at st1704/f at st1704.c b/board/sagem/f at st1704/f at st1704.c
> new file mode 100644
> index 0000000..d181ca6
> --- /dev/null
> +++ b/board/sagem/f at st1704/f at st1704.c
> @@ -0,0 +1,7 @@
> +/*
> + * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#include <common.h>
> diff --git a/configs/sagem_f at st1704_ram_defconfig b/configs/sagem_f at st1704_ram_defconfig
> new file mode 100644
> index 0000000..8e89c15
> --- /dev/null
> +++ b/configs/sagem_f at st1704_ram_defconfig
> @@ -0,0 +1,52 @@
> +CONFIG_ARCH_BMIPS=y
> +CONFIG_BAUDRATE=115200
> +CONFIG_BCM6345_CLK=y
> +CONFIG_BCM6345_GPIO=y
> +CONFIG_BCM6345_SERIAL=y
> +CONFIG_BMIPS_BOOT_RAM=y
> +CONFIG_BOARD_SAGEM_FAST1704=y
> +# CONFIG_CMD_BOOTD is not set
> +CONFIG_CMD_BOOTM=y
> +CONFIG_CMD_CPU=y
> +# CONFIG_CMD_CRC32 is not set
> +# CONFIG_CMD_EDITENV is not set
> +# CONFIG_CMD_ELF is not set
> +# CONFIG_CMD_ENV_EXISTS is not set
> +# CONFIG_CMD_EXPORTENV is not set
> +# CONFIG_CMD_FLASH is not set
> +# CONFIG_CMD_FPGA is not set
> +# CONFIG_CMD_GPIO is not set
> +# CONFIG_CMD_IMLS is not set
> +# CONFIG_CMD_IMPORTENV is not set
> +CONFIG_CMD_LED=y
> +CONFIG_CMD_LICENSE=y
> +CONFIG_CMD_LOADB=y
> +# CONFIG_CMD_LOADS is not set
> +CONFIG_CMD_MEMINFO=y
> +# CONFIG_CMD_MISC is not set
> +# CONFIG_CMD_NET is not set
> +# CONFIG_CMD_NFS is not set
> +# CONFIG_CMD_SAVEENV is not set
> +# CONFIG_CMD_XIMG is not set
> +CONFIG_DEFAULT_DEVICE_TREE="sagem,f at st1704"
> +CONFIG_DISPLAY_CPUINFO=y
> +# CONFIG_DM_DEVICE_REMOVE is not set
> +CONFIG_DM_GPIO=y
> +CONFIG_DM_RESET=y
> +CONFIG_DM_SERIAL=y
> +CONFIG_HUSH_PARSER=y
> +CONFIG_LED=y
> +CONFIG_LED_GPIO=y
> +CONFIG_MIPS=y
> +# CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set
> +# CONFIG_MIPS_BOOT_ENV_LEGACY is not set
> +CONFIG_MIPS_BOOT_FDT=y
> +CONFIG_OF_STDOUT_VIA_ALIAS=y
> +CONFIG_RESET=y
> +CONFIG_RESET_BCM6345=y
> +CONFIG_SOC_BMIPS_BCM6338=y
> +# CONFIG_SPL_SERIAL_PRESENT is not set
> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> +CONFIG_SYS_NO_FLASH=y
> +CONFIG_SYS_PROMPT="F at ST1704 # "
> +CONFIG_SYS_TEXT_BASE=0x80010000
> diff --git a/include/configs/sagem_f at st1704.h b/include/configs/sagem_f at st1704.h
> new file mode 100644
> index 0000000..dbc7725
> --- /dev/null
> +++ b/include/configs/sagem_f at st1704.h
> @@ -0,0 +1,15 @@
> +/*
> + * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
> + *
> + * SPDX-License-Identifier:    GPL-2.0+
> + */
> +
> +#include <configs/bmips_common.h>
> +#include <configs/bmips_bcm6338.h>
> +
> +#define CONFIG_ENV_IS_NOWHERE
> +#define CONFIG_ENV_SIZE                        (8 * 1024)
> +
> +#define CONFIG_AUTO_COMPLETE
> +#define CONFIG_CMDLINE_EDITING
> +#define CONFIG_SYS_LONGHELP
> --
> 2.1.4
>



-- 
- Daniel

[U-Boot] [PATCH v2 0/3] mips: bmips: add BCM6338 SoC support

[Álvaro Fernández Rojas]

BCM6338 is one of the first BCM63xx SoCs and prior to BCM6348/BCM6358, which
means that it also needs ioremap "hacks".

v2: introduce changes requested by Simon Glass and Daniel Schwierzeck.

Álvaro Fernández Rojas (3):
  dm: cpu: bmips: add BCM6338 support
  MIPS: add support for Broadcom MIPS BCM6338 SoC family
  MIPS: add BMIPS Sagem F at ST1704 board

 arch/mips/dts/Makefile                    |   1 +
 arch/mips/dts/brcm,bcm6338.dtsi           | 118 ++++++++++++++++++++++++++++++
 arch/mips/dts/sagem,f at st1704.dts          |  50 +++++++++++++
 arch/mips/mach-bmips/Kconfig              |  24 ++++++
 arch/mips/mach-bmips/include/ioremap.h    |   3 +-
 board/sagem/f at st1704/Kconfig              |  12 +++
 board/sagem/f at st1704/MAINTAINERS          |   6 ++
 board/sagem/f at st1704/Makefile             |   5 ++
 board/sagem/f at st1704/f at st1704.c           |   7 ++
 configs/sagem_f at st1704_ram_defconfig      |  52 +++++++++++++
 drivers/cpu/bmips_cpu.c                   |  14 ++++
 include/configs/bmips_bcm6338.h           |  30 ++++++++
 include/configs/sagem_f at st1704.h          |  15 ++++
 include/dt-bindings/clock/bcm6338-clock.h |  19 +++++
 include/dt-bindings/reset/bcm6338-reset.h |  22 ++++++
 15 files changed, 377 insertions(+), 1 deletion(-)
 create mode 100644 arch/mips/dts/brcm,bcm6338.dtsi
 create mode 100644 arch/mips/dts/sagem,f at st1704.dts
 create mode 100644 board/sagem/f at st1704/Kconfig
 create mode 100644 board/sagem/f at st1704/MAINTAINERS
 create mode 100644 board/sagem/f at st1704/Makefile
 create mode 100644 board/sagem/f at st1704/f at st1704.c
 create mode 100644 configs/sagem_f at st1704_ram_defconfig
 create mode 100644 include/configs/bmips_bcm6338.h
 create mode 100644 include/configs/sagem_f at st1704.h
 create mode 100644 include/dt-bindings/clock/bcm6338-clock.h
 create mode 100644 include/dt-bindings/reset/bcm6338-reset.h

-- 
2.1.4

[U-Boot] [PATCH v2 1/3] dm: cpu: bmips: add BCM6338 support

[Álvaro Fernández Rojas]

BCM6338 has a fixed CPU frequency of 240 MHz.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 v2: no changes.

 drivers/cpu/bmips_cpu.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index 4f412fa..07a873a 100644
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -128,6 +128,11 @@ static ulong bcm6328_get_cpu_freq(struct bmips_cpu_priv *priv)
 	}
 }
 
+static ulong bcm6338_get_cpu_freq(struct bmips_cpu_priv *priv)
+{
+	return 240000000;
+}
+
 static ulong bcm6348_get_cpu_freq(struct bmips_cpu_priv *priv)
 {
 	unsigned int tmp, n1, n2, m1;
@@ -207,6 +212,12 @@ static const struct bmips_cpu_hw bmips_cpu_bcm6328 = {
 	.get_cpu_count = bcm6328_get_cpu_count,
 };
 
+static const struct bmips_cpu_hw bmips_cpu_bcm6338 = {
+	.get_cpu_desc = bmips_short_cpu_desc,
+	.get_cpu_freq = bcm6338_get_cpu_freq,
+	.get_cpu_count = bcm6345_get_cpu_count,
+};
+
 static const struct bmips_cpu_hw bmips_cpu_bcm6348 = {
 	.get_cpu_desc = bmips_short_cpu_desc,
 	.get_cpu_freq = bcm6348_get_cpu_freq,
@@ -307,6 +318,9 @@ static const struct udevice_id bmips_cpu_ids[] = {
 		.compatible = "brcm,bcm6328-cpu",
 		.data = (ulong)&bmips_cpu_bcm6328,
 	}, {
+		.compatible = "brcm,bcm6338-cpu",
+		.data = (ulong)&bmips_cpu_bcm6338,
+	}, {
 		.compatible = "brcm,bcm6348-cpu",
 		.data = (ulong)&bmips_cpu_bcm6348,
 	}, {
-- 
2.1.4

[U-Boot] [PATCH v2 2/3] MIPS: add support for Broadcom MIPS BCM6338 SoC family

[Álvaro Fernández Rojas]

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 v2: introduce changes requested by Daniel Schwierzeck:
  - Add ioremap tweaks to this patch.

 arch/mips/dts/brcm,bcm6338.dtsi           | 118 ++++++++++++++++++++++++++++++
 arch/mips/mach-bmips/Kconfig              |  12 +++
 arch/mips/mach-bmips/include/ioremap.h    |   3 +-
 include/configs/bmips_bcm6338.h           |  30 ++++++++
 include/dt-bindings/clock/bcm6338-clock.h |  19 +++++
 include/dt-bindings/reset/bcm6338-reset.h |  22 ++++++
 6 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 arch/mips/dts/brcm,bcm6338.dtsi
 create mode 100644 include/configs/bmips_bcm6338.h
 create mode 100644 include/dt-bindings/clock/bcm6338-clock.h
 create mode 100644 include/dt-bindings/reset/bcm6338-reset.h

diff --git a/arch/mips/dts/brcm,bcm6338.dtsi b/arch/mips/dts/brcm,bcm6338.dtsi
new file mode 100644
index 0000000..eb51a43
--- /dev/null
+++ b/arch/mips/dts/brcm,bcm6338.dtsi
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <dt-bindings/clock/bcm6338-clock.h>
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/reset/bcm6338-reset.h>
+#include "skeleton.dtsi"
+
+/ {
+	compatible = "brcm,bcm6338";
+
+	cpus {
+		reg = <0xfffe0000 0x4>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		u-boot,dm-pre-reloc;
+
+		cpu at 0 {
+			compatible = "brcm,bcm6338-cpu", "mips,mips4Kc";
+			device_type = "cpu";
+			reg = <0>;
+			u-boot,dm-pre-reloc;
+		};
+	};
+
+	clocks {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		u-boot,dm-pre-reloc;
+
+		periph_osc: periph-osc {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <50000000>;
+			u-boot,dm-pre-reloc;
+		};
+
+		periph_clk: periph-clk {
+			compatible = "brcm,bcm6345-clk";
+			reg = <0xfffe0004 0x4>;
+			#clock-cells = <1>;
+		};
+	};
+
+	pflash: nor at 1fc00000 {
+		compatible = "cfi-flash";
+		reg = <0x1fc00000 0x400000>;
+		bank-width = <2>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		status = "disabled";
+	};
+
+	ubus {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		u-boot,dm-pre-reloc;
+
+		pll_cntl: syscon at fffe0008 {
+			compatible = "syscon";
+			reg = <0xfffe0008 0x4>;
+		};
+
+		syscon-reboot {
+			compatible = "syscon-reboot";
+			regmap = <&pll_cntl>;
+			offset = <0x0>;
+			mask = <0x1>;
+		};
+
+		periph_rst: reset-controller at fffe0028 {
+			compatible = "brcm,bcm6345-reset";
+			reg = <0xfffe0028 0x4>;
+			#reset-cells = <1>;
+		};
+
+		wdt: watchdog at fffe021c {
+			compatible = "brcm,bcm6345-wdt";
+			reg = <0xfffe021c 0xc>;
+			clocks = <&periph_osc>;
+		};
+
+		wdt-reboot {
+			compatible = "wdt-reboot";
+			wdt = <&wdt>;
+		};
+
+		uart0: serial at fffe0300 {
+			compatible = "brcm,bcm6345-uart";
+			reg = <0xfffe0300 0x18>;
+			clocks = <&periph_osc>;
+
+			status = "disabled";
+		};
+
+		gpio: gpio-controller at fffe0404 {
+			compatible = "brcm,bcm6345-gpio";
+			reg = <0xfffe0404 0x4>, <0xfffe040c 0x4>;
+			gpio-controller;
+			#gpio-cells = <2>;
+			ngpios = <8>;
+
+			status = "disabled";
+		};
+
+		memory-controller at fffe3100 {
+			compatible = "brcm,bcm6338-mc";
+			reg = <0xfffe3100 0x38>;
+			u-boot,dm-pre-reloc;
+		};
+	};
+};
diff --git a/arch/mips/mach-bmips/Kconfig b/arch/mips/mach-bmips/Kconfig
index e849438..7071888 100644
--- a/arch/mips/mach-bmips/Kconfig
+++ b/arch/mips/mach-bmips/Kconfig
@@ -4,6 +4,7 @@ menu "Broadcom MIPS platforms"
 config SYS_SOC
 	default "bcm3380" if SOC_BMIPS_BCM3380
 	default "bcm6328" if SOC_BMIPS_BCM6328
+	default "bcm6338" if SOC_BMIPS_BCM6338
 	default "bcm6348" if SOC_BMIPS_BCM6348
 	default "bcm6358" if SOC_BMIPS_BCM6358
 	default "bcm63268" if SOC_BMIPS_BCM63268
@@ -33,6 +34,17 @@ config SOC_BMIPS_BCM6328
 	help
 	  This supports BMIPS BCM6328 family including BCM63281 and BCM63283.
 
+config SOC_BMIPS_BCM6338
+	bool "BMIPS BCM6338 family"
+	select SUPPORTS_BIG_ENDIAN
+	select SUPPORTS_CPU_MIPS32_R1
+	select MIPS_TUNE_4KC
+	select MIPS_L1_CACHE_SHIFT_4
+	select SWAP_IO_SPACE
+	select SYSRESET_SYSCON
+	help
+	  This supports BMIPS BCM6338 family.
+
 config SOC_BMIPS_BCM6348
 	bool "BMIPS BCM6348 family"
 	select SUPPORTS_BIG_ENDIAN
diff --git a/arch/mips/mach-bmips/include/ioremap.h b/arch/mips/mach-bmips/include/ioremap.h
index d3dc0b8..a57f55d 100644
--- a/arch/mips/mach-bmips/include/ioremap.h
+++ b/arch/mips/mach-bmips/include/ioremap.h
@@ -18,7 +18,8 @@ static inline phys_addr_t fixup_bigphys_addr(phys_addr_t phys_addr,
 
 static inline int is_bmips_internal_registers(phys_addr_t offset)
 {
-#if defined(CONFIG_SOC_BMIPS_BCM6348) || \
+#if defined(CONFIG_SOC_BMIPS_BCM6338) || \
+	defined(CONFIG_SOC_BMIPS_BCM6348) || \
 	defined(CONFIG_SOC_BMIPS_BCM6358)
 	if (offset >= 0xfffe0000)
 		return 1;
diff --git a/include/configs/bmips_bcm6338.h b/include/configs/bmips_bcm6338.h
new file mode 100644
index 0000000..52d72c8
--- /dev/null
+++ b/include/configs/bmips_bcm6338.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __CONFIG_BMIPS_BCM6338_H
+#define __CONFIG_BMIPS_BCM6338_H
+
+/* CPU */
+#define CONFIG_SYS_MIPS_TIMER_FREQ	120000000
+
+/* RAM */
+#define CONFIG_NR_DRAM_BANKS		1
+#define CONFIG_SYS_SDRAM_BASE		0x80000000
+
+/* U-Boot */
+#define CONFIG_SYS_LOAD_ADDR		CONFIG_SYS_SDRAM_BASE + 0x100000
+
+#if defined(CONFIG_BMIPS_BOOT_RAM)
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_SYS_INIT_SP_OFFSET	0x2000
+#endif
+
+#define CONFIG_SYS_FLASH_BASE			0xbfc00000
+#define CONFIG_SYS_FLASH_EMPTY_INFO
+#define CONFIG_SYS_FLASH_PROTECTION
+#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT	1
+
+#endif /* __CONFIG_BMIPS_BCM6338_H */
diff --git a/include/dt-bindings/clock/bcm6338-clock.h b/include/dt-bindings/clock/bcm6338-clock.h
new file mode 100644
index 0000000..3439c10
--- /dev/null
+++ b/include/dt-bindings/clock/bcm6338-clock.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __DT_BINDINGS_CLOCK_BCM6338_H
+#define __DT_BINDINGS_CLOCK_BCM6338_H
+
+#define BCM6338_CLK_ADSL	0
+#define BCM6338_CLK_MPI		1
+#define BCM6338_CLK_SDRAM	2
+#define BCM6338_CLK_ENET	4
+#define BCM6338_CLK_SAR		5
+#define BCM6338_CLK_SPI		9
+
+#endif /* __DT_BINDINGS_CLOCK_BCM6338_H */
diff --git a/include/dt-bindings/reset/bcm6338-reset.h b/include/dt-bindings/reset/bcm6338-reset.h
new file mode 100644
index 0000000..17a5e12
--- /dev/null
+++ b/include/dt-bindings/reset/bcm6338-reset.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * Derived from linux/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __DT_BINDINGS_RESET_BCM6338_H
+#define __DT_BINDINGS_RESET_BCM6338_H
+
+#define BCM6338_RST_SPI		0
+#define BCM6338_RST_ENET	2
+#define BCM6338_RST_USBH	3
+#define BCM6338_RST_USBS	4
+#define BCM6338_RST_ADSL	5
+#define BCM6338_RST_DMAMEM	6
+#define BCM6338_RST_SAR		7
+#define BCM6338_RST_ACLC	8
+#define BCM6338_RST_ADSL_MIPS	10
+
+#endif /* __DT_BINDINGS_RESET_BCM6338_H */
-- 
2.1.4

[U-Boot] [PATCH v2 3/3] MIPS: add BMIPS Sagem F@ST1704 board

[Álvaro Fernández Rojas]

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 v2: introduce changes requested by Simon Glass and Daniel Schwierzeck:
  - Add board description.
  - Remove ioremap tweaks from this patch.

 arch/mips/dts/Makefile               |  1 +
 arch/mips/dts/sagem,f at st1704.dts     | 50 ++++++++++++++++++++++++++++++++++
 arch/mips/mach-bmips/Kconfig         | 12 +++++++++
 board/sagem/f at st1704/Kconfig         | 12 +++++++++
 board/sagem/f at st1704/MAINTAINERS     |  6 +++++
 board/sagem/f at st1704/Makefile        |  5 ++++
 board/sagem/f at st1704/f at st1704.c      |  7 +++++
 configs/sagem_f at st1704_ram_defconfig | 52 ++++++++++++++++++++++++++++++++++++
 include/configs/sagem_f at st1704.h     | 15 +++++++++++
 9 files changed, 160 insertions(+)
 create mode 100644 arch/mips/dts/sagem,f at st1704.dts
 create mode 100644 board/sagem/f at st1704/Kconfig
 create mode 100644 board/sagem/f at st1704/MAINTAINERS
 create mode 100644 board/sagem/f at st1704/Makefile
 create mode 100644 board/sagem/f at st1704/f at st1704.c
 create mode 100644 configs/sagem_f at st1704_ram_defconfig
 create mode 100644 include/configs/sagem_f at st1704.h

diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile
index fdce645..a190485 100644
--- a/arch/mips/dts/Makefile
+++ b/arch/mips/dts/Makefile
@@ -13,6 +13,7 @@ dtb-$(CONFIG_BOARD_COMTREND_CT5361) += comtrend,ct-5361.dtb
 dtb-$(CONFIG_BOARD_COMTREND_VR3032U) += comtrend,vr-3032u.dtb
 dtb-$(CONFIG_BOARD_HUAWEI_HG556A) += huawei,hg556a.dtb
 dtb-$(CONFIG_BOARD_NETGEAR_CG3100D) += netgear,cg3100d.dtb
+dtb-$(CONFIG_BOARD_SAGEM_FAST1704) += sagem,f at st1704.dtb
 dtb-$(CONFIG_BOARD_TPLINK_WDR4300) += tplink_wdr4300.dtb
 
 targets += $(dtb-y)
diff --git a/arch/mips/dts/sagem,f at st1704.dts b/arch/mips/dts/sagem,f at st1704.dts
new file mode 100644
index 0000000..be15fe5
--- /dev/null
+++ b/arch/mips/dts/sagem,f at st1704.dts
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/dts-v1/;
+
+#include "brcm,bcm6338.dtsi"
+
+/ {
+	model = "Sagem F at ST1704";
+	compatible = "sagem,f at st1704", "brcm,bcm6338";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		inet_green {
+			label = "F at ST1704:green:inet";
+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
+		};
+
+		power_green {
+			label = "F at ST1704:green:power";
+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+		};
+
+		inet_red {
+			label = "F at ST1704:red:inet";
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
+
+&gpio {
+	status = "okay";
+};
+
+&uart0 {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
diff --git a/arch/mips/mach-bmips/Kconfig b/arch/mips/mach-bmips/Kconfig
index 7071888..fe19ced 100644
--- a/arch/mips/mach-bmips/Kconfig
+++ b/arch/mips/mach-bmips/Kconfig
@@ -121,6 +121,17 @@ config BOARD_NETGEAR_CG3100D
 	  ethernet ports, 1 UART, GPIO buttons and LEDs, and a BCM43225
 	  (miniPCIe).
 
+config BOARD_SAGEM_FAST1704
+	bool "Sagem F at ST1704"
+	depends on SOC_BMIPS_BCM6338
+	select BMIPS_SUPPORTS_BOOT_RAM
+	help
+	  Sagem F at ST1704 boards have a BCM6338 SoC with 16 MB of RAM and 4 MB
+	  of flash (SPI).
+	  Between its different peripherals there's a BCM5325 switch with 4
+	  ethernet ports, 1 UART, GPIO buttons and LEDs, and a BCM4312
+	  (miniPCI).
+
 config BOARD_SFR_NB4_SER
 	bool "SFR NeufBox 4 (Sercomm)"
 	depends on SOC_BMIPS_BCM6358
@@ -149,6 +160,7 @@ source "board/comtrend/ct5361/Kconfig"
 source "board/comtrend/vr3032u/Kconfig"
 source "board/huawei/hg556a/Kconfig"
 source "board/netgear/cg3100d/Kconfig"
+source "board/sagem/f at st1704/Kconfig"
 source "board/sfr/nb4_ser/Kconfig"
 
 endmenu
diff --git a/board/sagem/f at st1704/Kconfig b/board/sagem/f at st1704/Kconfig
new file mode 100644
index 0000000..4566fcc
--- /dev/null
+++ b/board/sagem/f at st1704/Kconfig
@@ -0,0 +1,12 @@
+if BOARD_SAGEM_FAST1704
+
+config SYS_BOARD
+	default "f at st1704"
+
+config SYS_VENDOR
+	default "sagem"
+
+config SYS_CONFIG_NAME
+	default "sagem_f at st1704"
+
+endif
diff --git a/board/sagem/f at st1704/MAINTAINERS b/board/sagem/f at st1704/MAINTAINERS
new file mode 100644
index 0000000..72e1c5c
--- /dev/null
+++ b/board/sagem/f at st1704/MAINTAINERS
@@ -0,0 +1,6 @@
+SAGEM F at ST1704 BOARD
+M:	Álvaro Fernández Rojas <noltari@gmail.com>
+S:	Maintained
+F:	board/sagem/f at st1704/
+F:	include/configs/sagem_f at st1704.h
+F:	configs/sagem_f at st1704_ram_defconfig
diff --git a/board/sagem/f at st1704/Makefile b/board/sagem/f at st1704/Makefile
new file mode 100644
index 0000000..a5f97f8
--- /dev/null
+++ b/board/sagem/f at st1704/Makefile
@@ -0,0 +1,5 @@
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y += f at st1704.o
diff --git a/board/sagem/f at st1704/f at st1704.c b/board/sagem/f at st1704/f at st1704.c
new file mode 100644
index 0000000..d181ca6
--- /dev/null
+++ b/board/sagem/f at st1704/f at st1704.c
@@ -0,0 +1,7 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
diff --git a/configs/sagem_f at st1704_ram_defconfig b/configs/sagem_f at st1704_ram_defconfig
new file mode 100644
index 0000000..8e89c15
--- /dev/null
+++ b/configs/sagem_f at st1704_ram_defconfig
@@ -0,0 +1,52 @@
+CONFIG_ARCH_BMIPS=y
+CONFIG_BAUDRATE=115200
+CONFIG_BCM6345_CLK=y
+CONFIG_BCM6345_GPIO=y
+CONFIG_BCM6345_SERIAL=y
+CONFIG_BMIPS_BOOT_RAM=y
+CONFIG_BOARD_SAGEM_FAST1704=y
+# CONFIG_CMD_BOOTD is not set
+CONFIG_CMD_BOOTM=y
+CONFIG_CMD_CPU=y
+# CONFIG_CMD_CRC32 is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_EXPORTENV is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_GPIO is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_IMPORTENV is not set
+CONFIG_CMD_LED=y
+CONFIG_CMD_LICENSE=y
+CONFIG_CMD_LOADB=y
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MEMINFO=y
+# CONFIG_CMD_MISC is not set
+# CONFIG_CMD_NET is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_SAVEENV is not set
+# CONFIG_CMD_XIMG is not set
+CONFIG_DEFAULT_DEVICE_TREE="sagem,f at st1704"
+CONFIG_DISPLAY_CPUINFO=y
+# CONFIG_DM_DEVICE_REMOVE is not set
+CONFIG_DM_GPIO=y
+CONFIG_DM_RESET=y
+CONFIG_DM_SERIAL=y
+CONFIG_HUSH_PARSER=y
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_MIPS=y
+# CONFIG_MIPS_BOOT_CMDLINE_LEGACY is not set
+# CONFIG_MIPS_BOOT_ENV_LEGACY is not set
+CONFIG_MIPS_BOOT_FDT=y
+CONFIG_OF_STDOUT_VIA_ALIAS=y
+CONFIG_RESET=y
+CONFIG_RESET_BCM6345=y
+CONFIG_SOC_BMIPS_BCM6338=y
+# CONFIG_SPL_SERIAL_PRESENT is not set
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SYS_NO_FLASH=y
+CONFIG_SYS_PROMPT="F at ST1704 # "
+CONFIG_SYS_TEXT_BASE=0x80010000
diff --git a/include/configs/sagem_f at st1704.h b/include/configs/sagem_f at st1704.h
new file mode 100644
index 0000000..dbc7725
--- /dev/null
+++ b/include/configs/sagem_f at st1704.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <configs/bmips_common.h>
+#include <configs/bmips_bcm6338.h>
+
+#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_SIZE			(8 * 1024)
+
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_SYS_LONGHELP
-- 
2.1.4

[U-Boot] [PATCH v2 1/3] dm: cpu: bmips: add BCM6338 support

[Simon Glass]

On 16 May 2017 at 10:46, Álvaro Fernández Rojas <noltari@gmail.com> wrote:
> BCM6338 has a fixed CPU frequency of 240 MHz.
>
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> ---
>  v2: no changes.
>
>  drivers/cpu/bmips_cpu.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH v2 2/3] MIPS: add support for Broadcom MIPS BCM6338 SoC family

[Simon Glass]

On 16 May 2017 at 10:46, Álvaro Fernández Rojas <noltari@gmail.com> wrote:
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> ---
>  v2: introduce changes requested by Daniel Schwierzeck:
>   - Add ioremap tweaks to this patch.
>
>  arch/mips/dts/brcm,bcm6338.dtsi           | 118 ++++++++++++++++++++++++++++++
>  arch/mips/mach-bmips/Kconfig              |  12 +++
>  arch/mips/mach-bmips/include/ioremap.h    |   3 +-
>  include/configs/bmips_bcm6338.h           |  30 ++++++++
>  include/dt-bindings/clock/bcm6338-clock.h |  19 +++++
>  include/dt-bindings/reset/bcm6338-reset.h |  22 ++++++
>  6 files changed, 203 insertions(+), 1 deletion(-)
>  create mode 100644 arch/mips/dts/brcm,bcm6338.dtsi
>  create mode 100644 include/configs/bmips_bcm6338.h
>  create mode 100644 include/dt-bindings/clock/bcm6338-clock.h
>  create mode 100644 include/dt-bindings/reset/bcm6338-reset.h

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH v2 3/3] MIPS: add BMIPS Sagem F@ST1704 board

[Simon Glass]

On 16 May 2017 at 10:46, Álvaro Fernández Rojas <noltari@gmail.com> wrote:
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
> ---
>  v2: introduce changes requested by Simon Glass and Daniel Schwierzeck:
>   - Add board description.
>   - Remove ioremap tweaks from this patch.
>
>  arch/mips/dts/Makefile               |  1 +
>  arch/mips/dts/sagem,f at st1704.dts     | 50 ++++++++++++++++++++++++++++++++++
>  arch/mips/mach-bmips/Kconfig         | 12 +++++++++
>  board/sagem/f at st1704/Kconfig         | 12 +++++++++
>  board/sagem/f at st1704/MAINTAINERS     |  6 +++++
>  board/sagem/f at st1704/Makefile        |  5 ++++
>  board/sagem/f at st1704/f at st1704.c      |  7 +++++
>  configs/sagem_f at st1704_ram_defconfig | 52 ++++++++++++++++++++++++++++++++++++
>  include/configs/sagem_f at st1704.h     | 15 +++++++++++
>  9 files changed, 160 insertions(+)
>  create mode 100644 arch/mips/dts/sagem,f at st1704.dts
>  create mode 100644 board/sagem/f at st1704/Kconfig
>  create mode 100644 board/sagem/f at st1704/MAINTAINERS
>  create mode 100644 board/sagem/f at st1704/Makefile
>  create mode 100644 board/sagem/f at st1704/f at st1704.c
>  create mode 100644 configs/sagem_f at st1704_ram_defconfig
>  create mode 100644 include/configs/sagem_f at st1704.h
>

Reviewed-by: Simon Glass <sjg@chromium.org>

[U-Boot] [PATCH v2 0/3] mips: bmips: add BCM6338 SoC support

[Daniel Schwierzeck]

Am 16.05.2017 um 18:46 schrieb Álvaro Fernández Rojas:
> BCM6338 is one of the first BCM63xx SoCs and prior to BCM6348/BCM6358, which
> means that it also needs ioremap "hacks".
> 
> v2: introduce changes requested by Simon Glass and Daniel Schwierzeck.
> 
> Álvaro Fernández Rojas (3):
>   dm: cpu: bmips: add BCM6338 support
>   MIPS: add support for Broadcom MIPS BCM6338 SoC family
>   MIPS: add BMIPS Sagem F at ST1704 board
> 
>  arch/mips/dts/Makefile                    |   1 +
>  arch/mips/dts/brcm,bcm6338.dtsi           | 118 ++++++++++++++++++++++++++++++
>  arch/mips/dts/sagem,f at st1704.dts          |  50 +++++++++++++
>  arch/mips/mach-bmips/Kconfig              |  24 ++++++
>  arch/mips/mach-bmips/include/ioremap.h    |   3 +-
>  board/sagem/f at st1704/Kconfig              |  12 +++
>  board/sagem/f at st1704/MAINTAINERS          |   6 ++
>  board/sagem/f at st1704/Makefile             |   5 ++
>  board/sagem/f at st1704/f at st1704.c           |   7 ++
>  configs/sagem_f at st1704_ram_defconfig      |  52 +++++++++++++
>  drivers/cpu/bmips_cpu.c                   |  14 ++++
>  include/configs/bmips_bcm6338.h           |  30 ++++++++
>  include/configs/sagem_f at st1704.h          |  15 ++++
>  include/dt-bindings/clock/bcm6338-clock.h |  19 +++++
>  include/dt-bindings/reset/bcm6338-reset.h |  22 ++++++
>  15 files changed, 377 insertions(+), 1 deletion(-)
>  create mode 100644 arch/mips/dts/brcm,bcm6338.dtsi
>  create mode 100644 arch/mips/dts/sagem,f at st1704.dts
>  create mode 100644 board/sagem/f at st1704/Kconfig
>  create mode 100644 board/sagem/f at st1704/MAINTAINERS
>  create mode 100644 board/sagem/f at st1704/Makefile
>  create mode 100644 board/sagem/f at st1704/f at st1704.c
>  create mode 100644 configs/sagem_f at st1704_ram_defconfig
>  create mode 100644 include/configs/bmips_bcm6338.h
>  create mode 100644 include/configs/sagem_f at st1704.h
>  create mode 100644 include/dt-bindings/clock/bcm6338-clock.h
>  create mode 100644 include/dt-bindings/reset/bcm6338-reset.h
> 

series applied to u-boot-mips, thanks.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170520/e265f90f/attachment.sig>