Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-21 07:01:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-sh

Browse source 
- Gen2/Gen3 fixes for warnings and sdhi
This commit is contained in:
Tom Rini 2019-02-28 18:57:17 -05:00
commit 35b05146f6
17 changed files with 32 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/mach-rmobile/Kconfig.32
View file

@ -16,25 +16,35 @@ config R8A7790
bool "Renesas SoC R8A7790"
select RCAR_GEN2
select ARM_CORTEX_A15_CVE_2017_5715
imply CLK_R8A7790
imply PINCTRL_PFC_R8A7790
config R8A7791
bool "Renesas SoC R8A7791"
select RCAR_GEN2
select ARM_CORTEX_A15_CVE_2017_5715
imply CLK_R8A7791
imply PINCTRL_PFC_R8A7791
config R8A7792
bool "Renesas SoC R8A7792"
select RCAR_GEN2
select ARM_CORTEX_A15_CVE_2017_5715
imply CLK_R8A7792
imply PINCTRL_PFC_R8A7792
config R8A7793
bool "Renesas SoC R8A7793"
select RCAR_GEN2
select ARM_CORTEX_A15_CVE_2017_5715
imply CLK_R8A7793
imply PINCTRL_PFC_R8A7793
config R8A7794
bool "Renesas SoC R8A7794"
select RCAR_GEN2
imply CLK_R8A7794
imply PINCTRL_PFC_R8A7794
choice
prompt "Renesas ARM SoCs board select"

24
arch/arm/mach-rmobile/Kconfig.64
View file

@ -1,51 +1,67 @@
if RCAR_GEN3
choice
prompt "Select Target SoC"
menu "Select Target SoC"
config R8A7795
bool "Renesas SoC R8A7795"
imply CLK_R8A7795
imply PINCTRL_PFC_R8A7795
config R8A7796
bool "Renesas SoC R8A7796"
imply CLK_R8A7796
imply PINCTRL_PFC_R8A7796
config R8A77970
bool "Renesas SoC R8A77970"
imply CLK_R8A77970
imply PINCTRL_PFC_R8A77970
config R8A77990
bool "Renesas SoC R8A77990"
imply CLK_R8A77990
imply PINCTRL_PFC_R8A77990
config R8A77995
bool "Renesas SoC R8A77995"
imply CLK_R8A77995
imply PINCTRL_PFC_R8A77995
endchoice
endmenu
choice
prompt "Renesus ARM64 SoCs board select"
prompt "Renesas ARM64 SoCs board select"
optional
config TARGET_DRAAK
bool "Draak board"
imply R8A77995
help
Support for Renesas R-Car Gen3 Draak platform
config TARGET_EAGLE
bool "Eagle board"
imply R8A77970
help
Support for Renesas R-Car Gen3 Eagle platform
config TARGET_EBISU
bool "Ebisu board"
imply R8A77990
help
Support for Renesas R-Car Gen3 Ebisu platform
config TARGET_SALVATOR_X
bool "Salvator-X board"
imply R8A7795
imply R8A7796
help
Support for Renesas R-Car Gen3 platform
config TARGET_ULCB
bool "ULCB board"
imply R8A7795
imply R8A7796
help
Support for Renesas R-Car Gen3 ULCB platform

1
configs/alt_defconfig
View file

@ -50,7 +50,6 @@ CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_DEFAULT_DEVICE_TREE="r8a7794-alt-u-boot"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CLK=y

1
configs/blanche_defconfig
View file

@ -32,7 +32,6 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_DEFAULT_DEVICE_TREE="r8a7792-blanche-u-boot"
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_ENV_IS_IN_SPI_FLASH=y

1
configs/gose_defconfig
View file

@ -50,7 +50,6 @@ CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_DEFAULT_DEVICE_TREE="r8a7793-gose-u-boot"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CLK=y

1
configs/koelsch_defconfig
View file

@ -50,7 +50,6 @@ CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_DEFAULT_DEVICE_TREE="r8a7791-koelsch-u-boot"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CLK=y

1
configs/lager_defconfig
View file

@ -50,7 +50,6 @@ CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_DEFAULT_DEVICE_TREE="r8a7790-lager-u-boot"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CLK=y

1
configs/porter_defconfig
View file

@ -50,7 +50,6 @@ CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_DEFAULT_DEVICE_TREE="r8a7791-porter-u-boot"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CLK=y

1
configs/r8a77965_salvator-x_defconfig
View file

@ -3,7 +3,6 @@ CONFIG_ARCH_RMOBILE=y
CONFIG_SYS_TEXT_BASE=0x50000000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_RCAR_GEN3=y
CONFIG_R8A7796=y
CONFIG_TARGET_SALVATOR_X=y
CONFIG_SMBIOS_PRODUCT_NAME=""
CONFIG_FIT=y

1
configs/r8a7796_salvator-x_defconfig
View file

@ -3,7 +3,6 @@ CONFIG_ARCH_RMOBILE=y
CONFIG_SYS_TEXT_BASE=0x50000000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_RCAR_GEN3=y
CONFIG_R8A7796=y
CONFIG_TARGET_SALVATOR_X=y
CONFIG_SMBIOS_PRODUCT_NAME=""
CONFIG_FIT=y

1
configs/r8a7796_ulcb_defconfig
View file

@ -3,7 +3,6 @@ CONFIG_ARCH_RMOBILE=y
CONFIG_SYS_TEXT_BASE=0x50000000
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_RCAR_GEN3=y
CONFIG_R8A7796=y
CONFIG_TARGET_ULCB=y
CONFIG_SMBIOS_PRODUCT_NAME=""
CONFIG_FIT=y

1
configs/silk_defconfig
View file

@ -50,7 +50,6 @@ CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_DEFAULT_DEVICE_TREE="r8a7794-silk-u-boot"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CLK=y

1
configs/stout_defconfig
View file

@ -50,7 +50,6 @@ CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
CONFIG_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_DEFAULT_DEVICE_TREE="r8a7790-stout-u-boot"
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_CLK=y

10
drivers/clk/renesas/Kconfig
View file

@ -13,35 +13,30 @@ config CLK_RCAR_GEN2
config CLK_R8A7790
bool "Renesas R8A7790 clock driver"
def_bool y if R8A7790
depends on CLK_RCAR_GEN2
help
Enable this to support the clocks on Renesas R8A7790 SoC.
config CLK_R8A7791
bool "Renesas R8A7791 clock driver"
def_bool y if R8A7791
depends on CLK_RCAR_GEN2
help
Enable this to support the clocks on Renesas R8A7791 SoC.
config CLK_R8A7792
bool "Renesas R8A7792 clock driver"
def_bool y if R8A7792
depends on CLK_RCAR_GEN2
help
Enable this to support the clocks on Renesas R8A7792 SoC.
config CLK_R8A7793
bool "Renesas R8A7793 clock driver"
def_bool y if R8A7793
depends on CLK_RCAR_GEN2
help
Enable this to support the clocks on Renesas R8A7793 SoC.
config CLK_R8A7794
bool "Renesas R8A7794 clock driver"
def_bool y if R8A7794
depends on CLK_RCAR_GEN2
help
Enable this to support the clocks on Renesas R8A7794 SoC.
@ -55,35 +50,30 @@ config CLK_RCAR_GEN3
config CLK_R8A7795
bool "Renesas R8A7795 clock driver"
def_bool y if R8A7795
depends on CLK_RCAR_GEN3
help
Enable this to support the clocks on Renesas R8A7795 SoC.
config CLK_R8A7796
bool "Renesas R8A7796 clock driver"
def_bool y if R8A7796
depends on CLK_RCAR_GEN3
help
Enable this to support the clocks on Renesas R8A7796 SoC.
config CLK_R8A77970
bool "Renesas R8A77970 clock driver"
def_bool y if R8A77970
depends on CLK_RCAR_GEN3
help
Enable this to support the clocks on Renesas R8A77970 SoC.
config CLK_R8A77990
bool "Renesas R8A77990 clock driver"
def_bool y if R8A77990
depends on CLK_RCAR_GEN3
help
Enable this to support the clocks on Renesas R8A77990 SoC.
config CLK_R8A77995
bool "Renesas R8A77995 clock driver"
def_bool y if R8A77995
depends on CLK_RCAR_GEN3
help
Enable this to support the clocks on Renesas R8A77995 SoC.

2
drivers/mmc/renesas-sdhi.c
View file

@ -137,7 +137,7 @@ static int renesas_sdhi_hs400(struct udevice *dev)
tmio_sd_writel(priv, reg, RENESAS_SDHI_SCC_TMPPORT2);
tmio_sd_writel(priv, (taps << RENESAS_SDHI_SCC_DTCNTL_TAPNUM_SHIFT) |
tmio_sd_writel(priv, (0x8 << RENESAS_SDHI_SCC_DTCNTL_TAPNUM_SHIFT) |
RENESAS_SDHI_SCC_DTCNTL_TAPEN,
RENESAS_SDHI_SCC_DTCNTL);

2
drivers/mmc/tmio-common.c
View file

@ -707,7 +707,7 @@ static void tmio_sd_host_init(struct tmio_sd_priv *priv)
*/
if (priv->version >= 0x10) {
if (priv->caps & TMIO_SD_CAP_64BIT)
tmio_sd_writel(priv, 0x100, TMIO_SD_HOST_MODE);
tmio_sd_writel(priv, 0x000, TMIO_SD_HOST_MODE);
else
tmio_sd_writel(priv, 0x101, TMIO_SD_HOST_MODE);
} else {

10
drivers/pinctrl/renesas/Kconfig
View file

@ -8,7 +8,6 @@ config PINCTRL_PFC
config PINCTRL_PFC_R8A7790
bool "Renesas RCar Gen2 R8A7790 pin control driver"
def_bool y if R8A7790
depends on PINCTRL_PFC
help
Support pin multiplexing control on Renesas RCar Gen3 R8A7790 SoCs.
@ -19,7 +18,6 @@ config PINCTRL_PFC_R8A7790
config PINCTRL_PFC_R8A7791
bool "Renesas RCar Gen2 R8A7791 pin control driver"
def_bool y if R8A7791
depends on PINCTRL_PFC
help
Support pin multiplexing control on Renesas RCar Gen3 R8A7791 SoCs.
@ -30,7 +28,6 @@ config PINCTRL_PFC_R8A7791
config PINCTRL_PFC_R8A7792
bool "Renesas RCar Gen2 R8A7792 pin control driver"
def_bool y if R8A7792
depends on PINCTRL_PFC
help
Support pin multiplexing control on Renesas RCar Gen3 R8A7792 SoCs.
@ -41,7 +38,6 @@ config PINCTRL_PFC_R8A7792
config PINCTRL_PFC_R8A7793
bool "Renesas RCar Gen2 R8A7793 pin control driver"
def_bool y if R8A7793
depends on PINCTRL_PFC
help
Support pin multiplexing control on Renesas RCar Gen3 R8A7793 SoCs.
@ -52,7 +48,6 @@ config PINCTRL_PFC_R8A7793
config PINCTRL_PFC_R8A7794
bool "Renesas RCar Gen2 R8A7794 pin control driver"
def_bool y if R8A7794
depends on PINCTRL_PFC
help
Support pin multiplexing control on Renesas RCar Gen3 R8A7794 SoCs.
@ -63,7 +58,6 @@ config PINCTRL_PFC_R8A7794
config PINCTRL_PFC_R8A7795
bool "Renesas RCar Gen3 R8A7795 pin control driver"
def_bool y if R8A7795
depends on PINCTRL_PFC
help
Support pin multiplexing control on Renesas RCar Gen3 R8A7795 SoCs.
@ -74,7 +68,6 @@ config PINCTRL_PFC_R8A7795
config PINCTRL_PFC_R8A7796
bool "Renesas RCar Gen3 R8A7796 pin control driver"
def_bool y if R8A7796
depends on PINCTRL_PFC
help
Support pin multiplexing control on Renesas RCar Gen3 R8A7796 SoCs.
@ -85,7 +78,6 @@ config PINCTRL_PFC_R8A7796
config PINCTRL_PFC_R8A77970
bool "Renesas RCar Gen3 R8A77970 pin control driver"
def_bool y if R8A77970
depends on PINCTRL_PFC
help
Support pin multiplexing control on Renesas RCar Gen3 R8A77970 SoCs.
@ -96,7 +88,6 @@ config PINCTRL_PFC_R8A77970
config PINCTRL_PFC_R8A77990
bool "Renesas RCar Gen3 R8A77990 pin control driver"
def_bool y if R8A77990
depends on PINCTRL_PFC
help
Support pin multiplexing control on Renesas RCar Gen3 R8A77990 SoCs.
@ -107,7 +98,6 @@ config PINCTRL_PFC_R8A77990
config PINCTRL_PFC_R8A77995
bool "Renesas RCar Gen3 R8A77995 pin control driver"
def_bool y if R8A77995
depends on PINCTRL_PFC
help
Support pin multiplexing control on Renesas RCar Gen3 R8A77995 SoCs.