diff options
author | Tom Rini <trini@konsulko.com> | 2021-07-20 19:31:40 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-07-20 19:31:40 -0400 |
commit | c9204859bbdb924cda811813c545032971656480 (patch) | |
tree | cea4e4c9166f54ca0fa4313be45bb1652bf9b69d | |
parent | dd3dfa50d88cffeb244485594a7bf18c58ae6d63 (diff) | |
parent | cd7f92a096a46e5c2a54ca461a5b30739e3fa3e4 (diff) | |
download | u-boot-c9204859bbdb924cda811813c545032971656480.zip u-boot-c9204859bbdb924cda811813c545032971656480.tar.gz u-boot-c9204859bbdb924cda811813c545032971656480.tar.bz2 |
Merge branch 'master' of git://source.denx.de/u-boot-sh
- R-Car3 updates
-rw-r--r-- | arch/arm/dts/r8a77950-salvator-x-u-boot.dts | 19 | ||||
-rw-r--r-- | arch/arm/dts/r8a77950-ulcb-u-boot.dts | 20 | ||||
-rw-r--r-- | arch/arm/dts/r8a77960-salvator-x-u-boot.dts | 19 | ||||
-rw-r--r-- | arch/arm/dts/r8a77960-ulcb-u-boot.dts | 20 | ||||
-rw-r--r-- | arch/arm/dts/r8a77965-salvator-x-u-boot.dts | 19 | ||||
-rw-r--r-- | arch/arm/dts/r8a77965-ulcb-u-boot.dts | 20 | ||||
-rw-r--r-- | arch/arm/dts/r8a77990-ebisu-u-boot.dts | 25 | ||||
-rw-r--r-- | arch/arm/dts/r8a77995-draak-u-boot.dts | 2 | ||||
-rw-r--r-- | arch/arm/mach-rmobile/cpu_info.c | 2 | ||||
-rw-r--r-- | configs/r8a77970_eagle_defconfig | 2 | ||||
-rw-r--r-- | configs/r8a77980_condor_defconfig | 2 | ||||
-rw-r--r-- | configs/r8a77990_ebisu_defconfig | 10 | ||||
-rw-r--r-- | configs/r8a77995_draak_defconfig | 2 | ||||
-rw-r--r-- | configs/rcar3_salvator-x_defconfig | 10 | ||||
-rw-r--r-- | configs/rcar3_ulcb_defconfig | 10 | ||||
-rw-r--r-- | drivers/sysinfo/Kconfig | 7 | ||||
-rw-r--r-- | drivers/sysinfo/Makefile | 1 | ||||
-rw-r--r-- | drivers/sysinfo/rcar3.c | 197 |
18 files changed, 378 insertions, 9 deletions
diff --git a/arch/arm/dts/r8a77950-salvator-x-u-boot.dts b/arch/arm/dts/r8a77950-salvator-x-u-boot.dts index 36c8a44..d94ad91 100644 --- a/arch/arm/dts/r8a77950-salvator-x-u-boot.dts +++ b/arch/arm/dts/r8a77950-salvator-x-u-boot.dts @@ -8,9 +8,26 @@ #include "r8a77950-salvator-x.dts" #include "r8a77950-u-boot.dtsi" +/ { + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + u-boot,dm-pre-reloc; + }; +}; + +&i2c_dvfs { + u-boot,dm-pre-reloc; + + sysinfo_eeprom: eeprom@50 { + u-boot,dm-pre-reloc; + status = "okay"; + }; +}; + &rpc { reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "okay"; + status = "disabled"; }; &sdhi0 { diff --git a/arch/arm/dts/r8a77950-ulcb-u-boot.dts b/arch/arm/dts/r8a77950-ulcb-u-boot.dts index d3191c5..ff00ccd 100644 --- a/arch/arm/dts/r8a77950-ulcb-u-boot.dts +++ b/arch/arm/dts/r8a77950-ulcb-u-boot.dts @@ -17,11 +17,29 @@ gpio-miso = <&gpio6 10 0>; gpio-sstbz = <&gpio2 3 0>; }; + + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + u-boot,dm-pre-reloc; + }; +}; + +&i2c_dvfs { + u-boot,dm-pre-reloc; + + sysinfo_eeprom: eeprom@50 { + compatible = "rohm,br24t01", "atmel,24c01"; + reg = <0x50>; + pagesize = <8>; + u-boot,dm-pre-reloc; + status = "okay"; + }; }; &rpc { reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "okay"; + status = "disabled"; }; &sdhi0 { diff --git a/arch/arm/dts/r8a77960-salvator-x-u-boot.dts b/arch/arm/dts/r8a77960-salvator-x-u-boot.dts index 439fd6c..79a54f3 100644 --- a/arch/arm/dts/r8a77960-salvator-x-u-boot.dts +++ b/arch/arm/dts/r8a77960-salvator-x-u-boot.dts @@ -8,9 +8,26 @@ #include "r8a77960-salvator-x.dts" #include "r8a77960-u-boot.dtsi" +/ { + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + u-boot,dm-pre-reloc; + }; +}; + +&i2c_dvfs { + u-boot,dm-pre-reloc; + + sysinfo_eeprom: eeprom@50 { + u-boot,dm-pre-reloc; + status = "okay"; + }; +}; + &rpc { reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "okay"; + status = "disabled"; }; &sdhi0 { diff --git a/arch/arm/dts/r8a77960-ulcb-u-boot.dts b/arch/arm/dts/r8a77960-ulcb-u-boot.dts index aab9c95..1e9e8b8 100644 --- a/arch/arm/dts/r8a77960-ulcb-u-boot.dts +++ b/arch/arm/dts/r8a77960-ulcb-u-boot.dts @@ -17,11 +17,29 @@ gpio-miso = <&gpio6 10 0>; gpio-sstbz = <&gpio2 3 0>; }; + + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + u-boot,dm-pre-reloc; + }; +}; + +&i2c_dvfs { + u-boot,dm-pre-reloc; + + sysinfo_eeprom: eeprom@50 { + compatible = "rohm,br24t01", "atmel,24c01"; + reg = <0x50>; + pagesize = <8>; + u-boot,dm-pre-reloc; + status = "okay"; + }; }; &rpc { reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "okay"; + status = "disabled"; }; &sdhi0 { diff --git a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts index 8cbef83..4272ecc 100644 --- a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts +++ b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts @@ -8,9 +8,26 @@ #include "r8a77965-salvator-x.dts" #include "r8a77965-u-boot.dtsi" +/ { + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + u-boot,dm-pre-reloc; + }; +}; + +&i2c_dvfs { + u-boot,dm-pre-reloc; + + sysinfo_eeprom: eeprom@50 { + u-boot,dm-pre-reloc; + status = "okay"; + }; +}; + &rpc { reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "okay"; + status = "disabled"; }; &sdhi0 { diff --git a/arch/arm/dts/r8a77965-ulcb-u-boot.dts b/arch/arm/dts/r8a77965-ulcb-u-boot.dts index 38966bf..d9c680b 100644 --- a/arch/arm/dts/r8a77965-ulcb-u-boot.dts +++ b/arch/arm/dts/r8a77965-ulcb-u-boot.dts @@ -17,11 +17,29 @@ gpio-miso = <&gpio6 10 0>; gpio-sstbz = <&gpio2 3 0>; }; + + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + u-boot,dm-pre-reloc; + }; +}; + +&i2c_dvfs { + u-boot,dm-pre-reloc; + + sysinfo_eeprom: eeprom@50 { + compatible = "rohm,br24t01", "atmel,24c01"; + reg = <0x50>; + pagesize = <8>; + u-boot,dm-pre-reloc; + status = "okay"; + }; }; &rpc { reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "okay"; + status = "disabled"; }; &sdhi0 { diff --git a/arch/arm/dts/r8a77990-ebisu-u-boot.dts b/arch/arm/dts/r8a77990-ebisu-u-boot.dts index 6afc0be..55699ba 100644 --- a/arch/arm/dts/r8a77990-ebisu-u-boot.dts +++ b/arch/arm/dts/r8a77990-ebisu-u-boot.dts @@ -8,6 +8,29 @@ #include "r8a77990-ebisu.dts" #include "r8a77990-u-boot.dtsi" +/ { + sysinfo { + compatible = "renesas,rcar-sysinfo"; + i2c-eeprom = <&sysinfo_eeprom>; + u-boot,dm-pre-reloc; + }; +}; + +&i2c_dvfs { + compatible = "renesas,iic-r8a77990", + "renesas,rcar-gen3-iic", + "renesas,rmobile-iic"; + u-boot,dm-pre-reloc; + + sysinfo_eeprom: eeprom@50 { + compatible = "rohm,br24t01", "atmel,24c01"; + reg = <0x50>; + pagesize = <8>; + u-boot,dm-pre-reloc; + status = "okay"; + }; +}; + &pfc { pinctrl-0 = <&scif_clk_pins>; pinctrl-names = "default"; @@ -20,7 +43,7 @@ &rpc { reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "okay"; + status = "disabled"; }; &sdhi0 { diff --git a/arch/arm/dts/r8a77995-draak-u-boot.dts b/arch/arm/dts/r8a77995-draak-u-boot.dts index 10fb9cb..0ea2570 100644 --- a/arch/arm/dts/r8a77995-draak-u-boot.dts +++ b/arch/arm/dts/r8a77995-draak-u-boot.dts @@ -10,5 +10,5 @@ &rpc { reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>; - status = "okay"; + status = "disabled"; }; diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c index 2bb6d50..bd9e717 100644 --- a/arch/arm/mach-rmobile/cpu_info.c +++ b/arch/arm/mach-rmobile/cpu_info.c @@ -119,7 +119,7 @@ int print_cpuinfo(void) { int i = rmobile_cpuinfo_idx(); - printf("CPU: Renesas Electronics %s rev %d.%d\n", + printf("CPU: Renesas Electronics %s rev %d.%d\n", get_cpu_name(i), rmobile_get_cpu_rev_integer(), rmobile_get_cpu_rev_fraction()); diff --git a/configs/r8a77970_eagle_defconfig b/configs/r8a77970_eagle_defconfig index 2e5fb60..99a99e13 100644 --- a/configs/r8a77970_eagle_defconfig +++ b/configs/r8a77970_eagle_defconfig @@ -32,6 +32,8 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y +CONFIG_OF_DTB_PROPS_REMOVE=y +CONFIG_OF_REMOVE_PROPS="dmas dma-names interrupt-parent interrupts interrupts-extended interrupt-names interrupt-map interrupt-map-mask iommus" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/r8a77980_condor_defconfig b/configs/r8a77980_condor_defconfig index 1b9948b..d7c34a7 100644 --- a/configs/r8a77980_condor_defconfig +++ b/configs/r8a77980_condor_defconfig @@ -33,6 +33,8 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y +CONFIG_OF_DTB_PROPS_REMOVE=y +CONFIG_OF_REMOVE_PROPS="dmas dma-names interrupt-parent interrupts interrupts-extended interrupt-names interrupt-map interrupt-map-mask iommus" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/r8a77990_ebisu_defconfig b/configs/r8a77990_ebisu_defconfig index 15743c1..0c5dcb0 100644 --- a/configs/r8a77990_ebisu_defconfig +++ b/configs/r8a77990_ebisu_defconfig @@ -34,6 +34,8 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y +CONFIG_OF_DTB_PROPS_REMOVE=y +CONFIG_OF_REMOVE_PROPS="dmas dma-names interrupt-parent interrupts interrupts-extended interrupt-names interrupt-map interrupt-map-mask iommus" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y @@ -50,6 +52,13 @@ CONFIG_DFU_SF=y CONFIG_RCAR_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_RCAR_IIC=y +CONFIG_MISC=y +CONFIG_I2C_EEPROM=y +CONFIG_SYS_I2C_EEPROM_ADDR=0x70 +CONFIG_SYS_I2C_EEPROM_BUS=7 +CONFIG_SYS_EEPROM_SIZE=128 +CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=7 +CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10 CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y @@ -76,6 +85,7 @@ CONFIG_SCIF_CONSOLE=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_RENESAS_RPC_SPI=y +CONFIG_SYSINFO=y CONFIG_TEE=y CONFIG_OPTEE=y CONFIG_USB=y diff --git a/configs/r8a77995_draak_defconfig b/configs/r8a77995_draak_defconfig index 562b80b..b1186ee 100644 --- a/configs/r8a77995_draak_defconfig +++ b/configs/r8a77995_draak_defconfig @@ -33,6 +33,8 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y +CONFIG_OF_DTB_PROPS_REMOVE=y +CONFIG_OF_REMOVE_PROPS="dmas dma-names interrupt-parent interrupts interrupts-extended interrupt-names interrupt-map interrupt-map-mask iommus" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig index efd6ca2..8e492ce 100644 --- a/configs/rcar3_salvator-x_defconfig +++ b/configs/rcar3_salvator-x_defconfig @@ -36,6 +36,8 @@ CONFIG_OF_CONTROL=y CONFIG_OF_LIST="r8a77950-salvator-x-u-boot r8a77960-salvator-x-u-boot r8a77965-salvator-x-u-boot" CONFIG_MULTI_DTB_FIT_LZO=y CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y +CONFIG_OF_DTB_PROPS_REMOVE=y +CONFIG_OF_REMOVE_PROPS="dmas dma-names interrupt-parent interrupts interrupts-extended interrupt-names interrupt-map interrupt-map-mask iommus" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y @@ -52,6 +54,13 @@ CONFIG_DFU_SF=y CONFIG_RCAR_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_RCAR_IIC=y +CONFIG_MISC=y +CONFIG_I2C_EEPROM=y +CONFIG_SYS_I2C_EEPROM_ADDR=0x70 +CONFIG_SYS_I2C_EEPROM_BUS=7 +CONFIG_SYS_EEPROM_SIZE=128 +CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=7 +CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10 CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y @@ -83,6 +92,7 @@ CONFIG_SCIF_CONSOLE=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_RENESAS_RPC_SPI=y +CONFIG_SYSINFO=y CONFIG_TEE=y CONFIG_OPTEE=y CONFIG_USB=y diff --git a/configs/rcar3_ulcb_defconfig b/configs/rcar3_ulcb_defconfig index a857e5b..e348758 100644 --- a/configs/rcar3_ulcb_defconfig +++ b/configs/rcar3_ulcb_defconfig @@ -36,6 +36,8 @@ CONFIG_OF_CONTROL=y CONFIG_OF_LIST="r8a77950-ulcb-u-boot r8a77960-ulcb-u-boot r8a77965-ulcb-u-boot" CONFIG_MULTI_DTB_FIT_LZO=y CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y +CONFIG_OF_DTB_PROPS_REMOVE=y +CONFIG_OF_REMOVE_PROPS="dmas dma-names interrupt-parent interrupts interrupts-extended interrupt-names interrupt-map interrupt-map-mask iommus" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y @@ -52,6 +54,13 @@ CONFIG_DFU_SF=y CONFIG_RCAR_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_RCAR_IIC=y +CONFIG_MISC=y +CONFIG_I2C_EEPROM=y +CONFIG_SYS_I2C_EEPROM_ADDR=0x70 +CONFIG_SYS_I2C_EEPROM_BUS=7 +CONFIG_SYS_EEPROM_SIZE=128 +CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=7 +CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=10 CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y @@ -79,6 +88,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_RENESAS_RPC_SPI=y CONFIG_SYSRESET=y +CONFIG_SYSINFO=y CONFIG_TEE=y CONFIG_OPTEE=y CONFIG_USB=y diff --git a/drivers/sysinfo/Kconfig b/drivers/sysinfo/Kconfig index 381dcd8..e35f7cb 100644 --- a/drivers/sysinfo/Kconfig +++ b/drivers/sysinfo/Kconfig @@ -17,6 +17,13 @@ config SYSINFO_GAZERBEAM help Support querying device information for the gdsys Gazerbeam board. +config SYSINFO_RCAR3 + bool "Enable sysinfo driver for the Renesas R-Car Gen3" + depends on RCAR_GEN3 && I2C_EEPROM + default y if RCAR_GEN3 + help + Support querying SoC version information for Renesas R-Car Gen3. + config SYSINFO_SANDBOX bool "Enable sysinfo driver for the Sandbox board" help diff --git a/drivers/sysinfo/Makefile b/drivers/sysinfo/Makefile index d9f708b..680dde7 100644 --- a/drivers/sysinfo/Makefile +++ b/drivers/sysinfo/Makefile @@ -5,5 +5,6 @@ obj-y += sysinfo-uclass.o obj-$(CONFIG_SYSINFO_GAZERBEAM) += gazerbeam.o obj-$(CONFIG_SYSINFO_GPIO) += gpio.o +obj-$(CONFIG_SYSINFO_RCAR3) += rcar3.o obj-$(CONFIG_SYSINFO_SANDBOX) += sandbox.o obj-$(CONFIG_SYSINFO_SMBIOS) += smbios.o diff --git a/drivers/sysinfo/rcar3.c b/drivers/sysinfo/rcar3.c new file mode 100644 index 0000000..c2f4ddf --- /dev/null +++ b/drivers/sysinfo/rcar3.c @@ -0,0 +1,197 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2021 Marek Vasut <marek.vasut+renesas@gmail.com> + */ + +#include <common.h> +#include <dm.h> +#include <i2c_eeprom.h> +#include <log.h> +#include <sysinfo.h> + +#define BOARD_CODE_MASK 0xF8 +#define BOARD_REV_MASK 0x07 +#define BOARD_CODE_SHIFT 0x03 + +#define BOARD_SALVATOR_X 0x0 +#define BOARD_KRIEK 0x1 +#define BOARD_STARTER_KIT 0x2 +#define BOARD_SALVATOR_XS 0x4 +#define BOARD_EBISU 0x8 +#define BOARD_STARTER_KIT_PRE 0xB +#define BOARD_EBISU_4D 0xD +#define BOARD_DRAAK 0xE +#define BOARD_EAGLE 0xF + +/** + * struct sysinfo_rcar_priv - sysinfo private data + * @boardname: board model and revision + * @val: board ID value from eeprom + */ +struct sysinfo_rcar_priv { + char boardmodel[64]; + u8 val; +}; + +static int sysinfo_rcar_detect(struct udevice *dev) +{ + struct sysinfo_rcar_priv *priv = dev_get_priv(dev); + + return priv->val == 0xff; +} + +static int sysinfo_rcar_get_str(struct udevice *dev, int id, size_t size, char *val) +{ + struct sysinfo_rcar_priv *priv = dev_get_priv(dev); + + switch (id) { + case SYSINFO_ID_BOARD_MODEL: + strncpy(val, priv->boardmodel, size); + val[size - 1] = '\0'; + return 0; + default: + return -EINVAL; + }; +} + +static const struct sysinfo_ops sysinfo_rcar_ops = { + .detect = sysinfo_rcar_detect, + .get_str = sysinfo_rcar_get_str, +}; + +static void sysinfo_rcar_parse(struct sysinfo_rcar_priv *priv) +{ + const u8 board_id = (priv->val & BOARD_CODE_MASK) >> BOARD_CODE_SHIFT; + const u8 board_rev = priv->val & BOARD_REV_MASK; + bool salvator_xs = false; + bool ebisu_4d = false; + char rev_major = '?'; + char rev_minor = '?'; + + switch (board_id) { + case BOARD_SALVATOR_XS: + salvator_xs = true; + fallthrough; + case BOARD_SALVATOR_X: + if (!(board_rev & ~1)) { /* Only rev 0 and 1 is valid */ + rev_major = '1'; + rev_minor = '0' + (board_rev & BIT(0)); + } + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas Salvator-X%s board rev %c.%c", + salvator_xs ? "S" : "", rev_major, rev_minor); + return; + case BOARD_STARTER_KIT: + if (!(board_rev & ~1)) { /* Only rev 0 and 1 is valid */ + rev_major = (board_rev & BIT(0)) ? '3' : '1'; + rev_minor = '0'; + } + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas Starter Kit board rev %c.%c", + rev_major, rev_minor); + return; + case BOARD_STARTER_KIT_PRE: + if (!(board_rev & ~3)) { /* Only rev 0..3 is valid */ + rev_major = (board_rev & BIT(1)) ? '2' : '1'; + rev_minor = (board_rev == 3) ? '1' : '0'; + } + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas Starter Kit Premier board rev %c.%c", + rev_major, rev_minor); + return; + case BOARD_EAGLE: + if (!board_rev) { /* Only rev 0 is valid */ + rev_major = '1'; + rev_minor = '0'; + } + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas Eagle board rev %c.%c", + rev_major, rev_minor); + return; + case BOARD_EBISU_4D: + ebisu_4d = true; + fallthrough; + case BOARD_EBISU: + if (!board_rev) { /* Only rev 0 is valid */ + rev_major = '1'; + rev_minor = '0'; + } + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas Ebisu%s board rev %c.%c", + ebisu_4d ? "-4D" : "", rev_major, rev_minor); + return; + case BOARD_DRAAK: + if (!board_rev) { /* Only rev 0 is valid */ + rev_major = '1'; + rev_minor = '0'; + } + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas Draak board rev %c.%c", + rev_major, rev_minor); + return; + case BOARD_KRIEK: + if (!board_rev) { /* Only rev 0 is valid */ + rev_major = '1'; + rev_minor = '0'; + } + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas Kriek board rev %c.%c", + rev_major, rev_minor); + return; + default: + snprintf(priv->boardmodel, sizeof(priv->boardmodel), + "Renesas -Unknown- board rev ?.?"); + priv->val = 0xff; + return; + } +} + +static int sysinfo_rcar_probe(struct udevice *dev) +{ + struct sysinfo_rcar_priv *priv = dev_get_priv(dev); + struct ofnode_phandle_args phandle_args; + struct udevice *i2c_eeprom; + u32 offset; + int ret; + + offset = dev_read_u32_default(dev, "offset", 0x70); + + ret = dev_read_phandle_with_args(dev, "i2c-eeprom", NULL, + 0, 0, &phandle_args); + if (ret) { + debug("%s: i2c-eeprom backing device not specified\n", + dev->name); + return ret; + } + + ret = uclass_get_device_by_ofnode(UCLASS_I2C_EEPROM, phandle_args.node, + &i2c_eeprom); + if (ret) { + debug("%s: could not get backing device\n", dev->name); + return ret; + } + + ret = i2c_eeprom_read(i2c_eeprom, offset, &priv->val, 1); + if (ret < 0) { + debug("%s: read failed\n", __func__); + return -EIO; + } + + sysinfo_rcar_parse(priv); + + return 0; +} + +static const struct udevice_id sysinfo_rcar_ids[] = { + { .compatible = "renesas,rcar-sysinfo" }, + { /* sentinel */ } +}; + +U_BOOT_DRIVER(sysinfo_rcar) = { + .name = "sysinfo_rcar", + .id = UCLASS_SYSINFO, + .of_match = sysinfo_rcar_ids, + .ops = &sysinfo_rcar_ops, + .priv_auto = sizeof(struct sysinfo_rcar_priv), + .probe = sysinfo_rcar_probe, +}; |