diff options
| -rw-r--r-- | arch/arm/dts/rz-g2-beacon-u-boot.dtsi | 9 | ||||
| -rw-r--r-- | board/beacon/beacon-rzg2m/beacon-rzg2m.c | 10 | ||||
| -rw-r--r-- | configs/rzg2_beacon_defconfig | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/arch/arm/dts/rz-g2-beacon-u-boot.dtsi b/arch/arm/dts/rz-g2-beacon-u-boot.dtsi index ef0b96a71e..4d17854918 100644 --- a/arch/arm/dts/rz-g2-beacon-u-boot.dtsi +++ b/arch/arm/dts/rz-g2-beacon-u-boot.dtsi @@ -33,12 +33,21 @@ u-boot,dm-pre-reloc; }; +&pfc { + qspi_pins: qspi { + groups = "qspi_ctrl", "qspi_data4"; + function = "qspi"; + }; +}; + &prr { u-boot,dm-pre-reloc; }; &rpc { compatible = "renesas,rcar-gen3-rpc"; + pinctrl-0 = <&qspi_pins>; + pinctrl-names = "default"; num-cs = <1>; spi-max-frequency = <40000000>; #address-cells = <1>; diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c index df6044a429..4b41c6fdaa 100644 --- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c +++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c @@ -6,7 +6,6 @@ #include <common.h> #include <asm/global_data.h> #include <asm/io.h> -#include <asm/arch/rcar-mstp.h> DECLARE_GLOBAL_DATA_PTR; @@ -18,15 +17,6 @@ int board_init(void) return 0; } -#define RST_BASE 0xE6160000 -#define RST_CA57RESCNT (RST_BASE + 0x40) -#define RST_CODE 0xA5A5000F - -void reset_cpu(void) -{ - writel(RST_CODE, RST_CA57RESCNT); -} - #if IS_ENABLED(CONFIG_MULTI_DTB_FIT) int board_fit_config_name_match(const char *name) { diff --git a/configs/rzg2_beacon_defconfig b/configs/rzg2_beacon_defconfig index e1af7b4815..1ae12b1de6 100644 --- a/configs/rzg2_beacon_defconfig +++ b/configs/rzg2_beacon_defconfig @@ -72,6 +72,8 @@ CONFIG_SCIF_CONSOLE=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_RENESAS_RPC_SPI=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_PSCI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y |