diff options
| -rw-r--r-- | arch/arm/dts/r8a7794-alt-u-boot.dts | 5 | ||||
| -rw-r--r-- | board/renesas/alt/Kconfig | 9 | ||||
| -rw-r--r-- | board/renesas/alt/alt.c | 5 | ||||
| -rw-r--r-- | board/renesas/gose/gose.c | 2 | ||||
| -rw-r--r-- | board/renesas/koelsch/koelsch.c | 2 | ||||
| -rw-r--r-- | board/renesas/lager/lager.c | 2 | ||||
| -rw-r--r-- | board/renesas/porter/porter.c | 2 | ||||
| -rw-r--r-- | board/renesas/silk/silk.c | 2 | ||||
| -rw-r--r-- | board/renesas/stout/stout.c | 2 | ||||
| -rw-r--r-- | configs/alt_defconfig | 3 | ||||
| -rw-r--r-- | include/configs/rcar-gen2-common.h | 1 |
11 files changed, 16 insertions, 19 deletions
diff --git a/arch/arm/dts/r8a7794-alt-u-boot.dts b/arch/arm/dts/r8a7794-alt-u-boot.dts index 593a418c3b..14cd39297e 100644 --- a/arch/arm/dts/r8a7794-alt-u-boot.dts +++ b/arch/arm/dts/r8a7794-alt-u-boot.dts @@ -8,6 +8,11 @@ #include "r8a7794-alt.dts" #include "r8a7794-u-boot.dtsi" +&i2c7 { + status = "okay"; + clock-frequency = <100000>; +}; + &scif2 { u-boot,dm-pre-reloc; }; diff --git a/board/renesas/alt/Kconfig b/board/renesas/alt/Kconfig index 39d53c185b..957962de20 100644 --- a/board/renesas/alt/Kconfig +++ b/board/renesas/alt/Kconfig @@ -9,13 +9,4 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "alt" -config R8A7794_ETHERNET_B - bool "Use ethernet B function" - depends on TARGET_ALT - default n - help - ALT board can use default ethernet and etnernet B function. - This config set pin function of ethenet B. You also needt to change - DIP switch of board in order to use this function. - endif diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c index b18ab7ce88..0726776a57 100644 --- a/board/renesas/alt/alt.c +++ b/board/renesas/alt/alt.c @@ -28,7 +28,6 @@ DECLARE_GLOBAL_DATA_PTR; -#define CLK2MHZ(clk) (clk / 1000 / 1000) void s_init(void) { struct rcar_rwdt *rwdt = (struct rcar_rwdt *)RWDT_BASE; @@ -93,7 +92,7 @@ int dram_init_banksize(void) /* KSZ8041RNLI */ #define PHY_CONTROL1 0x1E -#define PHY_LED_MODE 0xC0000 +#define PHY_LED_MODE 0xC000 #define PHY_LED_MODE_ACK 0x4000 int board_phy_config(struct phy_device *phydev) { @@ -108,7 +107,7 @@ int board_phy_config(struct phy_device *phydev) void reset_cpu(ulong addr) { struct udevice *dev; - const u8 pmic_bus = 1; + const u8 pmic_bus = 7; const u8 pmic_addr = 0x58; u8 data; int ret; diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c index 282381ede5..7c61008739 100644 --- a/board/renesas/gose/gose.c +++ b/board/renesas/gose/gose.c @@ -98,7 +98,7 @@ int dram_init_banksize(void) /* KSZ8041RNLI */ #define PHY_CONTROL1 0x1E -#define PHY_LED_MODE 0xC0000 +#define PHY_LED_MODE 0xC000 #define PHY_LED_MODE_ACK 0x4000 int board_phy_config(struct phy_device *phydev) { diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c index 52f37c970e..d07a7ca2ab 100644 --- a/board/renesas/koelsch/koelsch.c +++ b/board/renesas/koelsch/koelsch.c @@ -100,7 +100,7 @@ int dram_init_banksize(void) /* Koelsch has KSZ8041NL/RNL */ #define PHY_CONTROL1 0x1E -#define PHY_LED_MODE 0xC0000 +#define PHY_LED_MODE 0xC000 #define PHY_LED_MODE_ACK 0x4000 int board_phy_config(struct phy_device *phydev) { diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c index 062e88c198..f062bb0172 100644 --- a/board/renesas/lager/lager.c +++ b/board/renesas/lager/lager.c @@ -109,7 +109,7 @@ int dram_init_banksize(void) /* KSZ8041NL/RNL */ #define PHY_CONTROL1 0x1E -#define PHY_LED_MODE 0xC0000 +#define PHY_LED_MODE 0xC000 #define PHY_LED_MODE_ACK 0x4000 int board_phy_config(struct phy_device *phydev) { diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c index 663b8001ef..2e15a4cbbd 100644 --- a/board/renesas/porter/porter.c +++ b/board/renesas/porter/porter.c @@ -98,7 +98,7 @@ int dram_init_banksize(void) /* porter has KSZ8041RNLI */ #define PHY_CONTROL1 0x1E -#define PHY_LED_MODE 0xC0000 +#define PHY_LED_MODE 0xC000 #define PHY_LED_MODE_ACK 0x4000 int board_phy_config(struct phy_device *phydev) { diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c index 966c0717b2..59ba262ad7 100644 --- a/board/renesas/silk/silk.c +++ b/board/renesas/silk/silk.c @@ -93,7 +93,7 @@ int dram_init_banksize(void) /* porter has KSZ8041RNLI */ #define PHY_CONTROL1 0x1E -#define PHY_LED_MODE 0xC0000 +#define PHY_LED_MODE 0xC000 #define PHY_LED_MODE_ACK 0x4000 int board_phy_config(struct phy_device *phydev) { diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c index 85e30db635..7c515950d6 100644 --- a/board/renesas/stout/stout.c +++ b/board/renesas/stout/stout.c @@ -112,7 +112,7 @@ int dram_init_banksize(void) /* Stout has KSZ8041NL/RNL */ #define PHY_CONTROL1 0x1E -#define PHY_LED_MODE 0xC0000 +#define PHY_LED_MODE 0xC000 #define PHY_LED_MODE_ACK 0x4000 int board_phy_config(struct phy_device *phydev) { diff --git a/configs/alt_defconfig b/configs/alt_defconfig index c4ece79507..5e5467fe2f 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -57,12 +57,14 @@ CONFIG_CLK_RENESAS=y CONFIG_DM_GPIO=y CONFIG_RCAR_GPIO=y CONFIG_DM_I2C=y +CONFIG_SYS_I2C_RCAR_I2C=y CONFIG_SYS_I2C_RCAR_IIC=y CONFIG_DM_MMC=y CONFIG_SH_MMCIF=y CONFIG_RENESAS_SDHI=y CONFIG_MTD=y CONFIG_MTD_DEVICE=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_MTD=y @@ -80,6 +82,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_SH_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 9213d33e21..7f72ff2e11 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -38,7 +38,6 @@ #define CONFIG_SYS_MONITOR_BASE 0x00000000 #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) -#define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) /* ENV setting */ #define CONFIG_ENV_ADDR 0xC0000 |