Skip to contentSkip to conversation

Add HopeRun HiHope RZ/G2M board support

PATCH New Biju Das 2 participants 6 messages Oct 12, 2020

Subsystems (2)
lore
Share & tools
lore

Biju Das

author
#0 lore raw

v5 cover Add HopeRun HiHope RZ/G2M board support

This patch series adds the required board support to boot HopeRun HiHope RZ/G2M board. Also added configuration support for RZ/G2[HN] SoC.

Biju Das (3):
arm: renesas: Add config option for R8A774B1 SoC
arm: renesas: Add config option for R8A774E1 SoC
arm: rmobile: Add HopeRun HiHope RZ/G2M board support

 arch/arm/dts/Makefile                         |   1 +
 arch/arm/dts/hihope-common.dtsi               | 377 ++++++++++++++++++
 arch/arm/dts/hihope-rev4.dtsi                 | 124 ++++++
 arch/arm/dts/hihope-rzg2-ex.dtsi              |  92 +++++
 arch/arm/dts/r8a774a1-hihope-rzg2m-ex.dts     |  21 +
 arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts |  27 ++
 arch/arm/dts/r8a774a1-hihope-rzg2m.dts        |  37 ++
 arch/arm/dts/r8a774a1-u-boot.dtsi             |  55 +++
 arch/arm/mach-rmobile/Kconfig.64              |  22 +-
 board/hoperun/hihope-rzg2/Kconfig             |  15 +
 board/hoperun/hihope-rzg2/MAINTAINERS         |   6 +
 board/hoperun/hihope-rzg2/Makefile            |   9 +
 board/hoperun/hihope-rzg2/hihope-rzg2.c       |  75 ++++
 configs/hihope_rzg2_defconfig                 |  75 ++++
 include/configs/hihope-rzg2.h                 |  20 +
 15 files changed, 955 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/dts/hihope-common.dtsi
 create mode 100644 arch/arm/dts/hihope-rev4.dtsi
 create mode 100644 arch/arm/dts/hihope-rzg2-ex.dtsi
 create mode 100644 arch/arm/dts/r8a774a1-hihope-rzg2m-ex.dts
 create mode 100644 arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts
 create mode 100644 arch/arm/dts/r8a774a1-hihope-rzg2m.dts
 create mode 100644 arch/arm/dts/r8a774a1-u-boot.dtsi
 create mode 100644 board/hoperun/hihope-rzg2/Kconfig
 create mode 100644 board/hoperun/hihope-rzg2/MAINTAINERS
 create mode 100644 board/hoperun/hihope-rzg2/Makefile
 create mode 100644 board/hoperun/hihope-rzg2/hihope-rzg2.c
 create mode 100644 configs/hihope_rzg2_defconfig
 create mode 100644 include/configs/hihope-rzg2.h
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v5 1/3 arm: renesas: Add config option for R8A774B1 SoC

Add config support for RZ/G2N(a.k.a R8A774B1) SoC.

Also fixed the alignment issue on R8A774A1 config.

---
* Rebased to u-boot-sh/next.

---
 arch/arm/mach-rmobile/Kconfig.64 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm/mach-rmobile/Kconfig.64 +4 -1
index 07f607dd9d..3b53266a61 100644
@@ -3,7 +3,10 @@ if RCAR_GEN3
 menu "Select Target SoC"
 
 config R8A774A1
-        bool "Renesas SoC R8A774A1"
+	bool "Renesas SoC R8A774A1"
+
+config R8A774B1
+	bool "Renesas SoC R8A774B1"
 
 config R8A7795
 	bool "Renesas SoC R8A7795"
Signature · 1 line
2.17.1
Applied
#2 lore raw

PATCH v5 1/3 arm: renesas: Add config option for R8A774B1 SoC

Quoted 3 lines · Biju Das

Add config support for RZ/G2N(a.k.a R8A774B1) SoC.

Also fixed the alignment issue on R8A774A1 config.

Applied, thanks.

author
#3 lore raw

PATCH v5 2/3 arm: renesas: Add config option for R8A774E1 SoC

In reply to Biju Das

Add config support for RZ/G2H(a.k.a R8A774E1) SoC.

---
* Rebased to u-boot-sh/next.

---
 arch/arm/mach-rmobile/Kconfig.64 | 3 +++
 1 file changed, 3 insertions(+)
arch/arm/mach-rmobile/Kconfig.64 +3 -0
index 3b53266a61..0d55b74c42 100644
@@ -8,6 +8,9 @@ config R8A774A1
 config R8A774B1
 	bool "Renesas SoC R8A774B1"
 
+config R8A774E1
+	bool "Renesas SoC R8A774E1"
+
 config R8A7795
 	bool "Renesas SoC R8A7795"
 	imply CLK_R8A7795
Signature · 1 line
2.17.1
Applied
#4 lore raw

PATCH v5 2/3 arm: renesas: Add config option for R8A774E1 SoC

Quoted 1 line · Biju Das

Add config support for RZ/G2H(a.k.a R8A774E1) SoC.

Applied, thanks.

author
#5 lore raw

PATCH v5 3/3 arm: rmobile: Add HopeRun HiHope RZ/G2M board support

In reply to Biju Das

The HiHope RZ/G2M board from HopeRun consists of main board (HopeRun HiHope RZ/G2M main board) and sub board(HopeRun HiHope RZ/G2M sub board). The HiHope RZ/G2M sub board sits below the HiHope RZ/G2M main board.

DTS files apart from r8a774a1-hihope-rzg2m-u-boot.dts and r8a774a1-u-boot.dtsi have been imported from Linux kernel 5.9-rc4 commit f4d51dffc6c0 ("Linux 5.9-rc4")

This patch adds the required board support to boot HopeRun HiHope RZ/G2M board.

---
V4->V5
* Rebased to U-boot-sh/next

V3->V4
* Added USB0 channel0 Host support

    (Ref: https://patchwork.ozlabs.org/project/uboot/patch/20201001103658.4835-2-biju.das.jz at bp.renesas.com/)

V2->V3
* Reworked as per Marek's suggestion
* Added rzg2_get_cpu_type function to get cpu_type by matching TFA compatible string
* Removed SoC family type Enum
Ref: https://patchwork.ozlabs.org/project/uboot/patch/20200922160317.16296-3-biju.das.jz at bp.renesas.com/

V1->V2
* Fixed indentation for R8A774A1 config
* Used GPIO hog for setting WLAN/BT REG ON
* Removed USB related initialization
Ref: https://patchwork.ozlabs.org/project/uboot/patch/20200918160307.14323-2-biju.das.jz at bp.renesas.com/

V1:-
* New Patch
Ref: https://patchwork.ozlabs.org/project/uboot/patch/20200915143630.7678-5-biju.das.jz at bp.renesas.com/

---
 arch/arm/dts/Makefile                         |   1 +
 arch/arm/dts/hihope-common.dtsi               | 377 ++++++++++++++++++
 arch/arm/dts/hihope-rev4.dtsi                 | 124 ++++++
 arch/arm/dts/hihope-rzg2-ex.dtsi              |  92 +++++
 arch/arm/dts/r8a774a1-hihope-rzg2m-ex.dts     |  21 +
 arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts |  27 ++
 arch/arm/dts/r8a774a1-hihope-rzg2m.dts        |  37 ++
 arch/arm/dts/r8a774a1-u-boot.dtsi             |  55 +++
 arch/arm/mach-rmobile/Kconfig.64              |  14 +
 board/hoperun/hihope-rzg2/Kconfig             |  15 +
 board/hoperun/hihope-rzg2/MAINTAINERS         |   6 +
 board/hoperun/hihope-rzg2/Makefile            |   9 +
 board/hoperun/hihope-rzg2/hihope-rzg2.c       |  75 ++++
 configs/hihope_rzg2_defconfig                 |  75 ++++
 include/configs/hihope-rzg2.h                 |  20 +
 15 files changed, 948 insertions(+)
 create mode 100644 arch/arm/dts/hihope-common.dtsi
 create mode 100644 arch/arm/dts/hihope-rev4.dtsi
 create mode 100644 arch/arm/dts/hihope-rzg2-ex.dtsi
 create mode 100644 arch/arm/dts/r8a774a1-hihope-rzg2m-ex.dts
 create mode 100644 arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts
 create mode 100644 arch/arm/dts/r8a774a1-hihope-rzg2m.dts
 create mode 100644 arch/arm/dts/r8a774a1-u-boot.dtsi
 create mode 100644 board/hoperun/hihope-rzg2/Kconfig
 create mode 100644 board/hoperun/hihope-rzg2/MAINTAINERS
 create mode 100644 board/hoperun/hihope-rzg2/Makefile
 create mode 100644 board/hoperun/hihope-rzg2/hihope-rzg2.c
 create mode 100644 configs/hihope_rzg2_defconfig
 create mode 100644 include/configs/hihope-rzg2.h
arch/arm/dts/Makefile +1 -0
index 72b6fe1a3e..0de6bce873 100644
@@ -784,6 +784,7 @@ dtb-$(CONFIG_RCAR_GEN2) += \
 
 dtb-$(CONFIG_RCAR_GEN3) += \
 	r8a774a1-beacon-rzg2m-kit.dtb \
+	r8a774a1-hihope-rzg2m-u-boot.dtb \
 	r8a77950-ulcb-u-boot.dtb \
 	r8a77950-salvator-x-u-boot.dtb \
 	r8a77960-ulcb-u-boot.dtb \
arch/arm/dts/hihope-common.dtsi new file +377 -0

377 lines not on this page · raw message

arch/arm/dts/hihope-rev4.dtsi new file +124 -0

124 lines not on this page · raw message

arch/arm/dts/hihope-rzg2-ex.dtsi new file +92 -0

92 lines not on this page · raw message

arch/arm/dts/r8a774a1-hihope-rzg2m-ex.dts new file +21 -0
new file mode 100644
index 0000000000..a5ca86196a
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source for the HiHope RZ/G2M Rev.3.0/4.0 connected to
+ * sub board
+ *
+ * Copyright (C) 2020 Renesas Electronics Corp.
+ */
+
+#include "r8a774a1-hihope-rzg2m.dts"
+#include "hihope-rzg2-ex.dtsi"
+
+/ {
+	model = "HopeRun HiHope RZ/G2M with sub board";
+	compatible = "hoperun,hihope-rzg2-ex", "hoperun,hihope-rzg2m",
+		     "renesas,r8a774a1";
+};
+
+/* SW43 should be OFF, if in ON state SATA port will be activated */
+&pciec1 {
+	status = "okay";
+};
arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts new file +27 -0
new file mode 100644
index 0000000000..4881801eea
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source extras for U-Boot for the Hihope RZ/G2M board
+ *
+ * Copyright (C) 2020 Renesas Electronics Corporation
+ */
+
+#include "r8a774a1-hihope-rzg2m-ex.dts"
+#include "r8a774a1-u-boot.dtsi"
+
+&gpio3 {
+	bt_reg_on{
+		gpio-hog;
+		gpios = <13 GPIO_ACTIVE_HIGH>;
+		output-low;
+		line-name = "bt-reg-on";
+	};
+};
+
+&gpio4 {
+	wlan_reg_on{
+		gpio-hog;
+		gpios = <6 GPIO_ACTIVE_HIGH>;
+		output-low;
+		line-name = "wlan-reg-on";
+	};
+};
arch/arm/dts/r8a774a1-hihope-rzg2m.dts new file +37 -0
new file mode 100644
index 0000000000..25ae255de0
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source for the HiHope RZ/G2M Rev.3.0/4.0 main board
+ *
+ * Copyright (C) 2020 Renesas Electronics Corp.
+ */
+
+/dts-v1/;
+#include "r8a774a1.dtsi"
+#include "hihope-rev4.dtsi"
+
+/ {
+	model = "HopeRun HiHope RZ/G2M main board based on r8a774a1";
+	compatible = "hoperun,hihope-rzg2m", "renesas,r8a774a1";
+
+	memory at 48000000 {
+		device_type = "memory";
+		/* first 128MB is reserved for secure area. */
+		reg = <0x0 0x48000000 0x0 0x78000000>;
+	};
+
+	memory at 600000000 {
+		device_type = "memory";
+		reg = <0x6 0x00000000 0x0 0x80000000>;
+	};
+};
+
+&du {
+	clocks = <&cpg CPG_MOD 724>,
+		 <&cpg CPG_MOD 723>,
+		 <&cpg CPG_MOD 722>,
+		 <&versaclock5 1>,
+		 <&x302_clk>,
+		 <&versaclock5 2>;
+	clock-names = "du.0", "du.1", "du.2",
+		      "dclkin.0", "dclkin.1", "dclkin.2";
+};
arch/arm/dts/r8a774a1-u-boot.dtsi new file +55 -0

55 lines not on this page · raw message

arch/arm/mach-rmobile/Kconfig.64 +14 -0
index 0d55b74c42..6b815b9fb4 100644
@@ -4,6 +4,8 @@ menu "Select Target SoC"
 
 config R8A774A1
 	bool "Renesas SoC R8A774A1"
+	imply CLK_R8A774A1
+	imply PINCTRL_PFC_R8A774A1
 
 config R8A774B1
 	bool "Renesas SoC R8A774B1"
@@ -81,6 +83,15 @@ config TARGET_EBISU
 	help
           Support for Renesas R-Car Gen3 Ebisu platform
 
+config TARGET_HIHOPE_RZG2
+	bool "HiHope RZ/G2 board"
+	imply R8A774A1
+	imply SYS_MALLOC_F
+	imply MULTI_DTB_FIT
+	imply MULTI_DTB_FIT_USER_DEFINED_AREA
+	help
+          Support for RZG2 HiHope platform
+
 config TARGET_SALVATOR_X
 	bool "Salvator-X board"
 	imply R8A7795
@@ -115,12 +126,15 @@ source "board/renesas/ebisu/Kconfig"
 source "board/renesas/salvator-x/Kconfig"
 source "board/renesas/ulcb/Kconfig"
 source "board/beacon/beacon-rzg2m/Kconfig"
+source "board/hoperun/hihope-rzg2/Kconfig"
 
 config MULTI_DTB_FIT_UNCOMPRESS_SZ
+	default 0x80000 if TARGET_HIHOPE_RZG2
 	default 0x80000 if TARGET_SALVATOR_X
 	default 0x80000 if TARGET_ULCB
 
 config MULTI_DTB_FIT_USER_DEF_ADDR
+	default 0x49000000 if TARGET_HIHOPE_RZG2
 	default 0x49000000 if TARGET_SALVATOR_X
 	default 0x49000000 if TARGET_ULCB
 
board/hoperun/hihope-rzg2/Kconfig new file +15 -0
new file mode 100644
index 0000000000..ee422ba6c8
@@ -0,0 +1,15 @@
+if TARGET_HIHOPE_RZG2
+
+config SYS_SOC
+	default "rmobile"
+
+config SYS_BOARD
+	default "hihope-rzg2"
+
+config SYS_VENDOR
+	default "hoperun"
+
+config SYS_CONFIG_NAME
+	default "hihope-rzg2"
+
+endif
board/hoperun/hihope-rzg2/MAINTAINERS new file +6 -0
new file mode 100644
index 0000000000..e3702fd12e
@@ -0,0 +1,6 @@
+HIHOPE_RZG2 BOARD
+M:	Biju Das <[email protected]>
+S:	Maintained
+F:	board/hoperun/hihope-rzg2/
+F:	include/configs/hihope-rzg2.h
+F:	configs/hihope_rzg2_defconfig
board/hoperun/hihope-rzg2/Makefile new file +9 -0
new file mode 100644
index 0000000000..44f5da227c
@@ -0,0 +1,9 @@
+#
+# board/hoperun/hihope-rzg2/Makefile
+#
+# Copyright (C) 2020 Renesas Electronics Corporation
+#
+# SPDX-License-Identifier: GPL-2.0+
+#
+
+obj-y	:= hihope-rzg2.o ../../renesas/rcar-common/common.o
board/hoperun/hihope-rzg2/hihope-rzg2.c new file +75 -0

75 lines not on this page · raw message

configs/hihope_rzg2_defconfig new file +75 -0

75 lines not on this page · raw message

include/configs/hihope-rzg2.h new file +20 -0
new file mode 100644
index 0000000000..68a51176e3
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * include/configs/hihope-rzg2.h
+ *     This file is HOPERUN HiHope RZ/G2 board configuration.
+ *
+ * Copyright (C) 2020 Renesas Electronics Corporation
+ */
+
+#ifndef __HIHOPE_RZG2_H
+#define __HIHOPE_RZG2_H
+
+#include "rcar-gen3-common.h"
+
+/* Ethernet RAVB */
+#define CONFIG_BITBANGMII_MULTI
+
+/* Generic Timer Definitions (use in assembler source) */
+#define COUNTER_FREQUENCY	0xFE502A	/* 16.66MHz from CPclk */
+
+#endif /* __HIHOPE_RZG2_H */
Signature · 1 line
2.17.1