Re: [U-Boot] [PATCH] MAINTAINERS: git-mailrc: Update the maintainer for rmobile
Hi,
2017-12-01 18:07 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> On 12/01/2017 06:02 AM, Nobuhiro Iwamatsu wrote:
>> Adding Marek Vasut to MAINTAINERS and git-mailrc for the Renesas ARM rmobile
>> architecture.
>>
>> Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
>
> This mailrc should be pointed to marek.vasut+rene...@gmail.com instead ,
> can you send V2 please ?
OK, I will resend.
Best regards,
Nobuhiro
>
>> ---
>> doc/git-mailrc | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/doc/git-mailrc b/doc/git-mailrc
>> index 5a365cddd9..f2fc6d4c5e 100644
>> --- a/doc/git-mailrc
>> +++ b/doc/git-mailrc
>> @@ -66,7 +66,7 @@ alias imxuboot, sbabic
>> alias kirkwood uboot, prafulla, luka
>> alias omap ti
>> alias pxauboot, marex
>> -alias rmobileuboot, iwamatsu
>> +alias rmobileuboot, iwamatsu, marex
>> alias s3c samsung
>> alias s5pc samsung
>> alias samsunguboot, prom
>>
>
>
> --
> Best regards,
> Marek Vasut
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] net: sh-eth: Add to Kconfig and convert
This adds SH_ETHER to drivers/net/Kconfig and convert to Kconfig. Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org> --- configs/ap_sh4a_4a_defconfig | 3 ++- configs/armadillo-800eva_defconfig | 3 ++- configs/ecovec_defconfig | 3 ++- configs/espt_defconfig | 3 ++- configs/gose_defconfig | 3 ++- configs/koelsch_defconfig | 3 ++- configs/lager_defconfig| 3 ++- configs/porter_defconfig | 3 ++- configs/r0p7734_defconfig | 3 ++- configs/sh7752evb_defconfig| 3 ++- configs/sh7753evb_defconfig| 3 ++- configs/sh7757lcr_defconfig| 3 ++- configs/sh7763rdp_defconfig| 3 ++- configs/silk_defconfig | 3 ++- configs/stout_defconfig| 3 ++- drivers/net/Kconfig| 6 ++ include/configs/alt.h | 1 - include/configs/ap_sh4a_4a.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/ecovec.h | 1 - include/configs/espt.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/lager.h| 1 - include/configs/porter.h | 1 - include/configs/r0p7734.h | 1 - include/configs/sh7752evb.h| 1 - include/configs/sh7753evb.h| 1 - include/configs/sh7757lcr.h| 1 - include/configs/sh7763rdp.h| 1 - include/configs/silk.h | 1 - include/configs/stout.h| 1 - scripts/config_whitelist.txt | 1 - 33 files changed, 36 insertions(+), 32 deletions(-) diff --git a/configs/ap_sh4a_4a_defconfig b/configs/ap_sh4a_4a_defconfig index ef14121273..976680aa51 100644 --- a/configs/ap_sh4a_4a_defconfig +++ b/configs/ap_sh4a_4a_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_PING=y # CONFIG_CMD_MISC is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y -CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig index d9a5169905..14d6c843ae 100644 --- a/configs/armadillo-800eva_defconfig +++ b/configs/armadillo-800eva_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_PING=y # CONFIG_CMD_MISC is not set CONFIG_ENV_IS_IN_FLASH=y # CONFIG_MMC is not set -CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y CONFIG_OF_LIBFDT=y diff --git a/configs/ecovec_defconfig b/configs/ecovec_defconfig index 5d65e9dc30..5c6c55fdb8 100644 --- a/configs/ecovec_defconfig +++ b/configs/ecovec_defconfig @@ -29,7 +29,8 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y -CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/espt_defconfig b/configs/espt_defconfig index 520bc9fa53..32ba9d0f6e 100644 --- a/configs/espt_defconfig +++ b/configs/espt_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_PING=y # CONFIG_CMD_MISC is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y -CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/gose_defconfig b/configs/gose_defconfig index bc3299033a..5f10d9a304 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -24,8 +24,9 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y CONFIG_USB=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index 5def33bac3..acc7289139 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -24,8 +24,9 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y CONFIG_USB=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index 5072045e89..c0778ee824 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -24,8 +24,9 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y CONFIG_USB=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index ac36dca972..7374a30ed2 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -24,8 +24,9 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_NETDEVICES=y +CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y CONFIG_USB=y diff --git a/configs/r0p7734_defconfig b/configs/r0p7734_defconfig index e0b19bbb7f..342365d8c5 100644 --- a/c
[U-Boot] [PATCH] cmd: i2c: Fix use sdram sub command with CONFIG_DM_I2C
sdram sub command of i2c command does not support Drivers Model.
This adds Drivers Model support to sdram sub command.
Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
---
cmd/i2c.c | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/cmd/i2c.c b/cmd/i2c.c
index 3dd7c6ba4d..bfddf8be1b 100644
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -1156,7 +1156,10 @@ static int do_sdram (cmd_tbl_t * cmdtp, int flag, int
argc, char * const argv[])
uintchip;
u_char data[128];
u_char cksum;
- int j;
+ int j, ret;
+#ifdef CONFIG_DM_I2C
+ struct udevice *dev;
+#endif
static const char *decode_CAS_DDR2[] = {
" TBD", " 6", " 5", " 4", " 3", " 2", " TBD", " TBD"
@@ -1210,7 +1213,14 @@ static int do_sdram (cmd_tbl_t * cmdtp, int flag, int
argc, char * const argv[])
*/
chip = simple_strtoul (argv[1], NULL, 16);
- if (i2c_read (chip, 0, 1, data, sizeof (data)) != 0) {
+#ifdef CONFIG_DM_I2C
+ ret = i2c_get_cur_bus_chip(chip, );
+ if (!ret)
+ ret = dm_i2c_read(dev, 0, data, sizeof(data));
+#else
+ ret = i2c_read(chip, 0, 1, data, sizeof(data));
+#endif
+ if (ret) {
puts ("No SDRAM Serial Presence Detect found.\n");
return 1;
}
--
2.15.0
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] MAINTAINERS: git-mailrc: Update the maintainer for rmobile
Adding Marek Vasut to MAINTAINERS and git-mailrc for the Renesas ARM rmobile architecture. Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org> --- doc/git-mailrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git-mailrc b/doc/git-mailrc index 5a365cddd9..f2fc6d4c5e 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -66,7 +66,7 @@ alias imxuboot, sbabic alias kirkwood uboot, prafulla, luka alias omap ti alias pxauboot, marex -alias rmobileuboot, iwamatsu +alias rmobileuboot, iwamatsu, marex alias s3csamsung alias s5pc samsung alias samsunguboot, prom -- 2.15.0 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] net: sh-eth: Fix misaligned cache operation warning
When we using network on board using sh-eth, it prints a lot of "CACHE: Misaligned operation at range" messages. This commit fixes this problem. Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org> --- drivers/net/sh_eth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index cb000dd18e..b7a0f413c6 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -29,7 +29,7 @@ #if defined(CONFIG_SH_ETHER_CACHE_WRITEBACK) && !defined(CONFIG_SYS_DCACHE_OFF) #define flush_cache_wback(addr, len)\ - flush_dcache_range((u32)addr, (u32)(addr + len - 1)) + flush_dcache_range((u32)addr, (u32)(addr + ALIGN(len, CONFIG_SH_ETHER_ALIGNE_SIZE))) #else #define flush_cache_wback(...) #endif @@ -205,7 +205,7 @@ static int sh_eth_tx_desc_init(struct sh_eth_dev *eth) goto err; } - flush_cache_wback((u32)port_info->tx_desc_alloc, alloc_desc_size); + flush_cache_wback(port_info->tx_desc_alloc, alloc_desc_size); /* Make sure we use a P2 address (non-cacheable) */ port_info->tx_desc_base = -- 2.15.0 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 2/3] ARM: rmobile: Move CONFIG_SYS_TEXT_BASE to Kconfig
Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org> --- v2: no change. board/atmark-techno/armadillo-800eva/Kconfig | 2 ++ board/kmc/kzm9g/Kconfig | 3 +++ board/renesas/alt/Kconfig| 4 board/renesas/blanche/Kconfig| 4 board/renesas/gose/Kconfig | 4 board/renesas/koelsch/Kconfig| 4 board/renesas/lager/Kconfig | 4 board/renesas/porter/Kconfig | 4 board/renesas/silk/Kconfig | 4 board/renesas/stout/Kconfig | 4 include/configs/alt.h| 6 -- include/configs/armadillo-800eva.h | 1 - include/configs/blanche.h| 2 -- include/configs/gose.h | 6 -- include/configs/koelsch.h| 6 -- include/configs/kzm9g.h | 1 - include/configs/lager.h | 6 -- include/configs/porter.h | 6 -- include/configs/silk.h | 6 -- include/configs/stout.h | 6 -- 20 files changed, 37 insertions(+), 46 deletions(-) diff --git a/board/atmark-techno/armadillo-800eva/Kconfig b/board/atmark-techno/armadillo-800eva/Kconfig index cd37dd4861..68ee5efa93 100644 --- a/board/atmark-techno/armadillo-800eva/Kconfig +++ b/board/atmark-techno/armadillo-800eva/Kconfig @@ -9,4 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "armadillo-800eva" +config SYS_TEXT_BASE + default 0xE80C endif diff --git a/board/kmc/kzm9g/Kconfig b/board/kmc/kzm9g/Kconfig index f163efd989..7d7e6ac244 100644 --- a/board/kmc/kzm9g/Kconfig +++ b/board/kmc/kzm9g/Kconfig @@ -9,4 +9,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kzm9g" +config SYS_TEXT_BASE + default 0x + endif diff --git a/board/renesas/alt/Kconfig b/board/renesas/alt/Kconfig index 39d53c185b..a7ed87ecf0 100644 --- a/board/renesas/alt/Kconfig +++ b/board/renesas/alt/Kconfig @@ -9,6 +9,10 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "alt" +config SYS_TEXT_BASE + default 0x7000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + config R8A7794_ETHERNET_B bool "Use ethernet B function" depends on TARGET_ALT diff --git a/board/renesas/blanche/Kconfig b/board/renesas/blanche/Kconfig index ac4730a62f..ed72638870 100644 --- a/board/renesas/blanche/Kconfig +++ b/board/renesas/blanche/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "blanche" +config SYS_TEXT_BASE + default 0x if MTD_NOR_FLASH + default 0x4000 + endif diff --git a/board/renesas/gose/Kconfig b/board/renesas/gose/Kconfig index 930a44559e..5111507dbd 100644 --- a/board/renesas/gose/Kconfig +++ b/board/renesas/gose/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "gose" +config SYS_TEXT_BASE + default 0x7000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/koelsch/Kconfig b/board/renesas/koelsch/Kconfig index 6475f02b66..503da62284 100644 --- a/board/renesas/koelsch/Kconfig +++ b/board/renesas/koelsch/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "koelsch" +config SYS_TEXT_BASE + default 0x7000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/lager/Kconfig b/board/renesas/lager/Kconfig index e990c2019c..0a5e86ded6 100644 --- a/board/renesas/lager/Kconfig +++ b/board/renesas/lager/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "lager" +config SYS_TEXT_BASE + default 0xB000 if RMOBILE_EXTRAM_BOOT + default 0xE808 + endif diff --git a/board/renesas/porter/Kconfig b/board/renesas/porter/Kconfig index a6f621b73f..b9ed2f7308 100644 --- a/board/renesas/porter/Kconfig +++ b/board/renesas/porter/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "porter" +config SYS_TEXT_BASE + default 0x7000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/silk/Kconfig b/board/renesas/silk/Kconfig index 07aee0e50f..56b1faa742 100644 --- a/board/renesas/silk/Kconfig +++ b/board/renesas/silk/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "silk" +config SYS_TEXT_BASE + default 0x7000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/stout/Kconfig b/board/renesas/stout/Kconfig index cbbc6dd9e4..06a0d26a2d 100644 --- a/board/renesas/stout/Kconfig +++ b/board/renesas/stout/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "stout" +config SYS_TEXT_BASE +
[U-Boot] [PATCH v2 3/3] ARM: rmobile: Move config of SoCs to Kconfig
Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org> --- v2: no change. arch/arm/mach-rmobile/Kconfig.32 | 31 +++ include/configs/alt.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/kzm9g.h| 1 - include/configs/lager.h| 1 - include/configs/porter.h | 1 - include/configs/silk.h | 1 - include/configs/stout.h| 1 - scripts/config_whitelist.txt | 7 --- 11 files changed, 31 insertions(+), 16 deletions(-) diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32 index 49d6206ac2..2b50163783 100644 --- a/arch/arm/mach-rmobile/Kconfig.32 +++ b/arch/arm/mach-rmobile/Kconfig.32 @@ -1,52 +1,83 @@ if RCAR_32 +config R8A7740 + bool + +config R8A7790 + bool + +config R8A7791 + bool + +config R8A7792 + bool + +config R8A7793 + bool + +config R8A7794 + bool + +config SH73A0 + bool + choice prompt "Renesas ARM SoCs board select" optional config TARGET_ARMADILLO_800EVA bool "armadillo 800 eva board" + select R8A7740 config TARGET_BLANCHE bool "Blanche board" + select R8A7792 select DM select DM_SERIAL config TARGET_GOSE bool "Gose board" + select R8A7793 select DM select DM_SERIAL config TARGET_KOELSCH bool "Koelsch board" + select R8A7791 select DM select DM_SERIAL config TARGET_LAGER bool "Lager board" + select R8A7790 select DM select DM_SERIAL config TARGET_KZM9G bool "KZM9D board" + select SH73A0 config TARGET_ALT bool "Alt board" + select R8A7794 select DM select DM_SERIAL config TARGET_SILK bool "Silk board" + select R8A7794 select DM select DM_SERIAL config TARGET_PORTER bool "Porter board" + select R8A7791 select DM select DM_SERIAL config TARGET_STOUT bool "Stout board" + select R8A7790 select DM select DM_SERIAL diff --git a/include/configs/alt.h b/include/configs/alt.h index d1bb984984..788368b959 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -11,7 +11,6 @@ #define __ALT_H #undef DEBUG -#define CONFIG_R8A7794 #include "rcar-gen2-common.h" diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index ca058bf1a1..4686f879bf 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -10,7 +10,6 @@ #define __ARMADILLO_800EVA_H #undef DEBUG -#define CONFIG_R8A7740 #define CONFIG_SH_GPIO_PFC #include diff --git a/include/configs/gose.h b/include/configs/gose.h index 2f171d358b..4abd9777f9 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -10,7 +10,6 @@ #define __GOSE_H #undef DEBUG -#define CONFIG_R8A7793 #include "rcar-gen2-common.h" diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 89680b7c8d..d8a670c48d 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -10,7 +10,6 @@ #define __KOELSCH_H #undef DEBUG -#define CONFIG_R8A7791 #include "rcar-gen2-common.h" diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 25e2f79c92..aecea73a00 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -10,7 +10,6 @@ #undef DEBUG -#define CONFIG_SH73A0 #define CONFIG_KZM_A9_GT #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G diff --git a/include/configs/lager.h b/include/configs/lager.h index f7ea95fce6..cb4c38027c 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -11,7 +11,6 @@ #define __LAGER_H #undef DEBUG -#define CONFIG_R8A7790 #include "rcar-gen2-common.h" diff --git a/include/configs/porter.h b/include/configs/porter.h index a966cf3c76..52b27c7537 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -12,7 +12,6 @@ #define __PORTER_H #undef DEBUG -#define CONFIG_R8A7791 #include "rcar-gen2-common.h" diff --git a/include/configs/silk.h b/include/configs/silk.h index 18c53e6b8c..c04f743520 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -12,7 +12,6 @@ #define __SILK_H #undef DEBUG -#define CONFIG_R8A7794 #include "rcar-gen2-common.h" diff --git a/include/configs/stout.h b/include/configs/stout.h index 92b9f85f92..dadee2d58c 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -13,7 +13,6 @@ #define __STOUT_H #undef DEBUG -#define CONFIG_R8A7790 #include "rcar-gen2-common.h" diff --git a/scripts/config_whitelist.txt
[U-Boot] [PATCH v2 1/3] ARM: rmobile: Use CONFIG_SYS_BOARD instaed of CONFIG_ARCH_RMOBILE_BOARD_STRING
CONFIG_SYS_BOARD is provided by Kconfig, this has the same value as
CONFIG_ARCH_RMOBILE_BOARD_STRING provided in .h.
This switches from CONFIG_ARCH_RMOBILE_BOARD_STRING to CONFIG_SYS_BOARD.
Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
---
v2: rebase.
board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 2 +-
board/kmc/kzm9g/kzm9g.c | 2 +-
board/renesas/alt/alt.c | 2 +-
board/renesas/blanche/blanche.c | 2 +-
board/renesas/gose/gose.c | 2 +-
board/renesas/koelsch/koelsch.c | 2 +-
board/renesas/lager/lager.c | 2 +-
board/renesas/porter/porter.c | 2 +-
board/renesas/silk/silk.c | 2 +-
board/renesas/stout/stout.c | 2 +-
include/configs/alt.h | 1 -
include/configs/armadillo-800eva.h | 1 -
include/configs/blanche.h | 1 -
include/configs/gose.h | 1 -
include/configs/koelsch.h | 1 -
include/configs/kzm9g.h | 1 -
include/configs/lager.h | 1 -
include/configs/porter.h| 1 -
include/configs/silk.h | 1 -
include/configs/stout.h | 1 -
scripts/config_whitelist.txt| 1 -
21 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
index abe69abcc8..dcb5c78f55 100644
--- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
+++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
@@ -315,7 +315,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD
};
int board_late_init(void)
diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c
index a284721cfd..679dff7084 100644
--- a/board/kmc/kzm9g/kzm9g.c
+++ b/board/kmc/kzm9g/kzm9g.c
@@ -349,7 +349,7 @@ int board_init(void)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD
};
int dram_init(void)
diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index 0bf8160f1f..a4e3cccf78 100644
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -217,7 +217,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD
};
void reset_cpu(ulong addr)
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 574dcda01b..434544d90f 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -468,7 +468,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD
};
void reset_cpu(ulong addr)
diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
index 54e126985b..465be87c01 100644
--- a/board/renesas/gose/gose.c
+++ b/board/renesas/gose/gose.c
@@ -201,7 +201,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD
};
void reset_cpu(ulong addr)
diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c
index 8fa648e40a..45a422044b 100644
--- a/board/renesas/koelsch/koelsch.c
+++ b/board/renesas/koelsch/koelsch.c
@@ -222,7 +222,7 @@ int board_phy_config(struct phy_device *phydev)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD
};
void reset_cpu(ulong addr)
diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index 562be04760..04343a9be6 100644
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -235,7 +235,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD
};
void reset_cpu(ulong addr)
diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index 5b1a167906..711baf04c5 100644
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -203,7 +203,7 @@ int board_phy_config(struct phy_device *phydev)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD,
};
void reset_cpu(ulong addr)
diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index a8de402d20..30be941a44 100644
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -192,7 +192,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo s
Re: [U-Boot] [PATCH 1/3] ARM: rmobile: Use CONFIG_SYS_BOARD instaed of CONFIG_ARCH_RMOBILE_BOARD_STRING
Hi,
2017-12-01 8:06 GMT+09:00 Nobuhiro Iwamatsu <iwama...@nigauri.org>:
> CONFIG_SYS_BOARD is provided by Kconfig, this has the same value as
> CONFIG_ARCH_RMOBILE_BOARD_STRING provided in .h.
> This switches from CONFIG_ARCH_RMOBILE_BOARD_STRING to CONFIG_SYS_BOARD.
Sorry, forgot the rebase. Ignore these patches for rmobile.
Best regards,
Nobuhiro
>
> Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 2 +-
> board/kmc/kzm9g/kzm9g.c | 2 +-
> board/renesas/alt/alt.c | 2 +-
> board/renesas/blanche/blanche.c | 2 +-
> board/renesas/gose/gose.c | 2 +-
> board/renesas/koelsch/koelsch.c | 2 +-
> board/renesas/lager/lager.c | 2 +-
> board/renesas/porter/porter.c | 2 +-
> board/renesas/salvator-x/salvator-x.c | 2 +-
> board/renesas/silk/silk.c | 2 +-
> board/renesas/stout/stout.c | 2 +-
> board/renesas/ulcb/ulcb.c | 2 +-
> include/configs/alt.h | 1 -
> include/configs/armadillo-800eva.h | 1 -
> include/configs/blanche.h | 1 -
> include/configs/gose.h | 1 -
> include/configs/koelsch.h | 1 -
> include/configs/kzm9g.h | 1 -
> include/configs/lager.h | 1 -
> include/configs/porter.h| 1 -
> include/configs/salvator-x.h| 2 --
> include/configs/silk.h | 1 -
> include/configs/stout.h | 1 -
> include/configs/ulcb.h | 2 --
> scripts/config_whitelist.txt| 1 -
> 25 files changed, 12 insertions(+), 27 deletions(-)
>
> diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
> b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
> index abe69abcc8..dcb5c78f55 100644
> --- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
> +++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
> @@ -315,7 +315,7 @@ int dram_init(void)
> }
>
> const struct rmobile_sysinfo sysinfo = {
> - CONFIG_ARCH_RMOBILE_BOARD_STRING
> + CONFIG_SYS_BOARD
> };
>
> int board_late_init(void)
> diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c
> index a284721cfd..679dff7084 100644
> --- a/board/kmc/kzm9g/kzm9g.c
> +++ b/board/kmc/kzm9g/kzm9g.c
> @@ -349,7 +349,7 @@ int board_init(void)
> }
>
> const struct rmobile_sysinfo sysinfo = {
> - CONFIG_ARCH_RMOBILE_BOARD_STRING
> + CONFIG_SYS_BOARD
> };
>
> int dram_init(void)
> diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
> index 0bf8160f1f..a4e3cccf78 100644
> --- a/board/renesas/alt/alt.c
> +++ b/board/renesas/alt/alt.c
> @@ -217,7 +217,7 @@ int dram_init(void)
> }
>
> const struct rmobile_sysinfo sysinfo = {
> - CONFIG_ARCH_RMOBILE_BOARD_STRING
> + CONFIG_SYS_BOARD
> };
>
> void reset_cpu(ulong addr)
> diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
> index 574dcda01b..434544d90f 100644
> --- a/board/renesas/blanche/blanche.c
> +++ b/board/renesas/blanche/blanche.c
> @@ -468,7 +468,7 @@ int dram_init(void)
> }
>
> const struct rmobile_sysinfo sysinfo = {
> - CONFIG_RMOBILE_BOARD_STRING
> + CONFIG_SYS_BOARD
> };
>
> void reset_cpu(ulong addr)
> diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
> index 54e126985b..465be87c01 100644
> --- a/board/renesas/gose/gose.c
> +++ b/board/renesas/gose/gose.c
> @@ -201,7 +201,7 @@ int dram_init(void)
> }
>
> const struct rmobile_sysinfo sysinfo = {
> - CONFIG_ARCH_RMOBILE_BOARD_STRING
> + CONFIG_SYS_BOARD
> };
>
> void reset_cpu(ulong addr)
> diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c
> index 8fa648e40a..45a422044b 100644
> --- a/board/renesas/koelsch/koelsch.c
> +++ b/board/renesas/koelsch/koelsch.c
> @@ -222,7 +222,7 @@ int board_phy_config(struct phy_device *phydev)
> }
>
> const struct rmobile_sysinfo sysinfo = {
> - CONFIG_ARCH_RMOBILE_BOARD_STRING
> + CONFIG_SYS_BOARD
> };
>
> void reset_cpu(ulong addr)
> diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
> index 562be04760..0434
[U-Boot] [PATCH] net: sh-eth: Change structure used in read/write function to struct sh_eth_info
This changes Change structure used in sh_eth_read and sh_eth_write function
from struct sh_eth_dev to struct sh_eth_info.
This is necessary to convert to Drivers model.
Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
---
drivers/net/sh_eth.c | 119 +--
drivers/net/sh_eth.h | 13 +++---
2 files changed, 75 insertions(+), 57 deletions(-)
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index aee2e57e97..cb000dd18e 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -86,8 +86,8 @@ int sh_eth_send(struct eth_device *dev, void *packet, int len)
flush_cache_wback(port_info->tx_desc_cur, sizeof(struct tx_desc_s));
/* Restart the transmitter if disabled */
- if (!(sh_eth_read(eth, EDTRR) & EDTRR_TRNS))
- sh_eth_write(eth, EDTRR_TRNS, EDTRR);
+ if (!(sh_eth_read(port_info, EDTRR) & EDTRR_TRNS))
+ sh_eth_write(port_info, EDTRR_TRNS, EDTRR);
/* Wait until packet is transmitted */
timeout = TIMEOUT_CNT;
@@ -147,24 +147,25 @@ int sh_eth_recv(struct eth_device *dev)
}
/* Restart the receiver if disabled */
- if (!(sh_eth_read(eth, EDRRR) & EDRRR_R))
- sh_eth_write(eth, EDRRR_R, EDRRR);
+ if (!(sh_eth_read(port_info, EDRRR) & EDRRR_R))
+ sh_eth_write(port_info, EDRRR_R, EDRRR);
return len;
}
static int sh_eth_reset(struct sh_eth_dev *eth)
{
+ struct sh_eth_info *port_info = >port_info[eth->port];
#if defined(SH_ETH_TYPE_GETHER) || defined(SH_ETH_TYPE_RZ)
int ret = 0, i;
/* Start e-dmac transmitter and receiver */
- sh_eth_write(eth, EDSR_ENALL, EDSR);
+ sh_eth_write(port_info, EDSR_ENALL, EDSR);
/* Perform a software reset and wait for it to complete */
- sh_eth_write(eth, EDMR_SRST, EDMR);
+ sh_eth_write(port_info, EDMR_SRST, EDMR);
for (i = 0; i < TIMEOUT_CNT; i++) {
- if (!(sh_eth_read(eth, EDMR) & EDMR_SRST))
+ if (!(sh_eth_read(port_info, EDMR) & EDMR_SRST))
break;
udelay(1000);
}
@@ -176,9 +177,10 @@ static int sh_eth_reset(struct sh_eth_dev *eth)
return ret;
#else
- sh_eth_write(eth, sh_eth_read(eth, EDMR) | EDMR_SRST, EDMR);
+ sh_eth_write(port_info, sh_eth_read(port_info, EDMR) | EDMR_SRST, EDMR);
udelay(3000);
- sh_eth_write(eth, sh_eth_read(eth, EDMR) & ~EDMR_SRST, EDMR);
+ sh_eth_write(port_info,
+sh_eth_read(port_info, EDMR) & ~EDMR_SRST, EDMR);
return 0;
#endif
@@ -226,11 +228,11 @@ static int sh_eth_tx_desc_init(struct sh_eth_dev *eth)
* Point the controller to the tx descriptor list. Must use physical
* addresses
*/
- sh_eth_write(eth, ADDR_TO_PHY(port_info->tx_desc_base), TDLAR);
+ sh_eth_write(port_info, ADDR_TO_PHY(port_info->tx_desc_base), TDLAR);
#if defined(SH_ETH_TYPE_GETHER) || defined(SH_ETH_TYPE_RZ)
- sh_eth_write(eth, ADDR_TO_PHY(port_info->tx_desc_base), TDFAR);
- sh_eth_write(eth, ADDR_TO_PHY(cur_tx_desc), TDFXR);
- sh_eth_write(eth, 0x01, TDFFR);/* Last discriptor bit */
+ sh_eth_write(port_info, ADDR_TO_PHY(port_info->tx_desc_base), TDFAR);
+ sh_eth_write(port_info, ADDR_TO_PHY(cur_tx_desc), TDFXR);
+ sh_eth_write(port_info, 0x01, TDFFR);/* Last discriptor bit */
#endif
err:
@@ -293,11 +295,11 @@ static int sh_eth_rx_desc_init(struct sh_eth_dev *eth)
cur_rx_desc->rd0 |= RD_RDLE;
/* Point the controller to the rx descriptor list */
- sh_eth_write(eth, ADDR_TO_PHY(port_info->rx_desc_base), RDLAR);
+ sh_eth_write(port_info, ADDR_TO_PHY(port_info->rx_desc_base), RDLAR);
#if defined(SH_ETH_TYPE_GETHER) || defined(SH_ETH_TYPE_RZ)
- sh_eth_write(eth, ADDR_TO_PHY(port_info->rx_desc_base), RDFAR);
- sh_eth_write(eth, ADDR_TO_PHY(cur_rx_desc), RDFXR);
- sh_eth_write(eth, RDFFR_RDLF, RDFFR);
+ sh_eth_write(port_info, ADDR_TO_PHY(port_info->rx_desc_base), RDFAR);
+ sh_eth_write(port_info, ADDR_TO_PHY(cur_rx_desc), RDFXR);
+ sh_eth_write(port_info, RDFFR_RDLF, RDFFR);
#endif
return ret;
@@ -382,45 +384,45 @@ static int sh_eth_config(struct sh_eth_dev *eth)
struct phy_device *phy;
/* Configure e-dmac registers */
- sh_eth_write(eth, (sh_eth_read(eth, EDMR) & ~EMDR_DESC_R) |
+ sh_eth_write(port_info, (sh_eth_read(port_info, EDMR) & ~EMDR_DESC_R) |
(EMDR_DESC | EDMR_EL), EDMR);
- sh_eth_write(eth, 0, EESIPR);
- sh_eth_write(eth, 0, TRSCER);
- sh_eth_write(eth, 0, TFTR);
- sh_eth_write(eth, (FIFO_SIZE_T | FIFO_SIZE_R), FDR);
- sh_eth_write(eth, RMCR_RST, RMCR);
+ sh_eth_write(port_info, 0, EESIPR);
+ sh_eth_write(port_info,
[U-Boot] [PATCH] net: sh-eth: Fix coding style checked by checkpatch.pl
This fixes the chord style checked by checkpatch.pl.
Details of change details are as follows:
- Fix typo
Change from alligned to aligned.
- Remove whitespace before ','
- Add spaces preferred around that '|'
- Fix missing a blank line after declarations
- Remove space after a cast declaration
- Fix format of block comments
- Add a blank line after function/struct/union/enum declarations
Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
---
drivers/net/sh_eth.c | 29 ++---
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 970d730e56..5c6278069c 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -67,7 +67,7 @@ int sh_eth_send(struct eth_device *dev, void *packet, int len)
/* packet must be a 4 byte boundary */
if ((int)packet & 3) {
- printf(SHETHER_NAME ": %s: packet not 4 byte alligned\n"
+ printf(SHETHER_NAME ": %s: packet not 4 byte aligned\n"
, __func__);
ret = -EFAULT;
goto err;
@@ -222,8 +222,10 @@ static int sh_eth_tx_desc_init(struct sh_eth_dev *eth)
cur_tx_desc--;
cur_tx_desc->td0 |= TD_TDLE;
- /* Point the controller to the tx descriptor list. Must use physical
- addresses */
+ /*
+* Point the controller to the tx descriptor list. Must use physical
+* addresses
+*/
sh_eth_write(eth, ADDR_TO_PHY(port_info->tx_desc_base), TDLAR);
#if defined(SH_ETH_TYPE_GETHER) || defined(SH_ETH_TYPE_RZ)
sh_eth_write(eth, ADDR_TO_PHY(port_info->tx_desc_base), TDFAR);
@@ -237,7 +239,7 @@ err:
static int sh_eth_rx_desc_init(struct sh_eth_dev *eth)
{
- int port = eth->port, i , ret = 0;
+ int port = eth->port, i, ret = 0;
u32 alloc_desc_size = NUM_RX_DESC * sizeof(struct rx_desc_s);
struct sh_eth_info *port_info = >port_info[port];
struct rx_desc_s *cur_rx_desc;
@@ -283,7 +285,7 @@ static int sh_eth_rx_desc_init(struct sh_eth_dev *eth)
i < NUM_RX_DESC; cur_rx_desc++, rx_buf += MAX_BUF_SIZE, i++) {
cur_rx_desc->rd0 = RD_RACT;
cur_rx_desc->rd1 = MAX_BUF_SIZE << 16;
- cur_rx_desc->rd2 = (u32) ADDR_TO_PHY(rx_buf);
+ cur_rx_desc->rd2 = (u32)ADDR_TO_PHY(rx_buf);
}
/* Mark the end of the descriptors */
@@ -465,11 +467,14 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)
/* Check if full duplex mode is supported by the phy */
if (phy->duplex) {
printf("Full\n");
- sh_eth_write(eth, val | (ECMR_CHG_DM|ECMR_RE|ECMR_TE|ECMR_DM),
+ sh_eth_write(eth,
+val | (ECMR_CHG_DM | ECMR_RE | ECMR_TE | ECMR_DM),
ECMR);
} else {
printf("Half\n");
- sh_eth_write(eth, val | (ECMR_CHG_DM|ECMR_RE|ECMR_TE), ECMR);
+ sh_eth_write(eth,
+val | (ECMR_CHG_DM | ECMR_RE | ECMR_TE),
+ECMR);
}
return ret;
@@ -524,6 +529,7 @@ err:
void sh_eth_halt(struct eth_device *dev)
{
struct sh_eth_dev *eth = dev->priv;
+
sh_eth_stop(eth);
}
@@ -532,6 +538,7 @@ int sh_eth_initialize(bd_t *bd)
int ret = 0;
struct sh_eth_dev *eth = NULL;
struct eth_device *dev = NULL;
+ struct mii_dev *mdiodev;
eth = (struct sh_eth_dev *)malloc(sizeof(struct sh_eth_dev));
if (!eth) {
@@ -566,16 +573,15 @@ int sh_eth_initialize(bd_t *bd)
eth_register(dev);
bb_miiphy_buses[0].priv = eth;
- int retval;
- struct mii_dev *mdiodev = mdio_alloc();
+ mdiodev = mdio_alloc();
if (!mdiodev)
return -ENOMEM;
strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN);
mdiodev->read = bb_miiphy_read;
mdiodev->write = bb_miiphy_write;
- retval = mdio_register(mdiodev);
- if (retval < 0)
+ retl = mdio_register(mdiodev);
+ if (ret < 0)
return retval;
if (!eth_env_get_enetaddr("ethaddr", dev->enetaddr))
@@ -670,4 +676,5 @@ struct bb_miiphy_bus bb_miiphy_buses[] = {
.delay = sh_eth_bb_delay,
}
};
+
int bb_miiphy_buses_num = ARRAY_SIZE(bb_miiphy_buses);
--
2.15.0
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] net: sh-eth: Remove bd_t from sh_eth_config()
bd_t is not used in sh_eth_config(). This deletes bd_t from sh_eth_config().
Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
---
drivers/net/sh_eth.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 5c6278069c..aee2e57e97 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -373,7 +373,7 @@ static int sh_eth_phy_config(struct sh_eth_dev *eth)
return ret;
}
-static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)
+static int sh_eth_config(struct sh_eth_dev *eth)
{
int port = eth->port, ret = 0;
u32 val;
@@ -510,7 +510,7 @@ int sh_eth_init(struct eth_device *dev, bd_t *bd)
if (ret)
goto err;
- ret = sh_eth_config(eth, bd);
+ ret = sh_eth_config(eth);
if (ret)
goto err_config;
--
2.15.0
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 3/3] ARM: rmobile: Move config of SoCs to Kconfig
Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org> --- arch/arm/mach-rmobile/Kconfig.32 | 31 +++ include/configs/alt.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/kzm9g.h| 1 - include/configs/lager.h| 1 - include/configs/porter.h | 1 - include/configs/silk.h | 1 - include/configs/stout.h| 1 - scripts/config_whitelist.txt | 7 --- 11 files changed, 31 insertions(+), 16 deletions(-) diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32 index 89588aaf72..59844ab071 100644 --- a/arch/arm/mach-rmobile/Kconfig.32 +++ b/arch/arm/mach-rmobile/Kconfig.32 @@ -1,52 +1,83 @@ if RCAR_32 +config R8A7740 + bool + +config R8A7790 + bool + +config R8A7791 + bool + +config R8A7792 + bool + +config R8A7793 + bool + +config R8A7794 + bool + +config SH73A0 + bool + choice prompt "Renesus ARM SoCs board select" optional config TARGET_ARMADILLO_800EVA bool "armadillo 800 eva board" + select R8A7740 config TARGET_BLANCHE bool "Blanche board" + select R8A7792 select DM select DM_SERIAL config TARGET_GOSE bool "Gose board" + select R8A7793 select DM select DM_SERIAL config TARGET_KOELSCH bool "Koelsch board" + select R8A7791 select DM select DM_SERIAL config TARGET_LAGER bool "Lager board" + select R8A7790 select DM select DM_SERIAL config TARGET_KZM9G bool "KZM9D board" + select SH73A0 config TARGET_ALT bool "Alt board" + select R8A7794 select DM select DM_SERIAL config TARGET_SILK bool "Silk board" + select R8A7794 select DM select DM_SERIAL config TARGET_PORTER bool "Porter board" + select R8A7791 select DM select DM_SERIAL config TARGET_STOUT bool "Stout board" + select R8A7790 select DM select DM_SERIAL diff --git a/include/configs/alt.h b/include/configs/alt.h index d1bb984984..788368b959 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -11,7 +11,6 @@ #define __ALT_H #undef DEBUG -#define CONFIG_R8A7794 #include "rcar-gen2-common.h" diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index ca058bf1a1..4686f879bf 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -10,7 +10,6 @@ #define __ARMADILLO_800EVA_H #undef DEBUG -#define CONFIG_R8A7740 #define CONFIG_SH_GPIO_PFC #include diff --git a/include/configs/gose.h b/include/configs/gose.h index 2f171d358b..4abd9777f9 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -10,7 +10,6 @@ #define __GOSE_H #undef DEBUG -#define CONFIG_R8A7793 #include "rcar-gen2-common.h" diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 89680b7c8d..d8a670c48d 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -10,7 +10,6 @@ #define __KOELSCH_H #undef DEBUG -#define CONFIG_R8A7791 #include "rcar-gen2-common.h" diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 25e2f79c92..aecea73a00 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -10,7 +10,6 @@ #undef DEBUG -#define CONFIG_SH73A0 #define CONFIG_KZM_A9_GT #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G diff --git a/include/configs/lager.h b/include/configs/lager.h index f7ea95fce6..cb4c38027c 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -11,7 +11,6 @@ #define __LAGER_H #undef DEBUG -#define CONFIG_R8A7790 #include "rcar-gen2-common.h" diff --git a/include/configs/porter.h b/include/configs/porter.h index a966cf3c76..52b27c7537 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -12,7 +12,6 @@ #define __PORTER_H #undef DEBUG -#define CONFIG_R8A7791 #include "rcar-gen2-common.h" diff --git a/include/configs/silk.h b/include/configs/silk.h index 18c53e6b8c..c04f743520 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -12,7 +12,6 @@ #define __SILK_H #undef DEBUG -#define CONFIG_R8A7794 #include "rcar-gen2-common.h" diff --git a/include/configs/stout.h b/include/configs/stout.h index 92b9f85f92..dadee2d58c 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -13,7 +13,6 @@ #define __STOUT_H #undef DEBUG -#define CONFIG_R8A7790 #include "rcar-gen2-common.h" diff --git a/scripts/config_whitelist.txt
[U-Boot] [PATCH 2/3] ARM: rmobile: Move CONFIG_SYS_TEXT_BASE to Kconfig
Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org> --- board/atmark-techno/armadillo-800eva/Kconfig | 2 ++ board/kmc/kzm9g/Kconfig | 3 +++ board/renesas/alt/Kconfig| 4 board/renesas/blanche/Kconfig| 4 board/renesas/gose/Kconfig | 4 board/renesas/koelsch/Kconfig| 4 board/renesas/lager/Kconfig | 4 board/renesas/porter/Kconfig | 4 board/renesas/silk/Kconfig | 4 board/renesas/stout/Kconfig | 4 include/configs/alt.h| 6 -- include/configs/armadillo-800eva.h | 1 - include/configs/blanche.h| 2 -- include/configs/gose.h | 6 -- include/configs/koelsch.h| 6 -- include/configs/kzm9g.h | 1 - include/configs/lager.h | 6 -- include/configs/porter.h | 6 -- include/configs/silk.h | 6 -- include/configs/stout.h | 6 -- 20 files changed, 37 insertions(+), 46 deletions(-) diff --git a/board/atmark-techno/armadillo-800eva/Kconfig b/board/atmark-techno/armadillo-800eva/Kconfig index cd37dd4861..68ee5efa93 100644 --- a/board/atmark-techno/armadillo-800eva/Kconfig +++ b/board/atmark-techno/armadillo-800eva/Kconfig @@ -9,4 +9,6 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "armadillo-800eva" +config SYS_TEXT_BASE + default 0xE80C endif diff --git a/board/kmc/kzm9g/Kconfig b/board/kmc/kzm9g/Kconfig index f163efd989..7d7e6ac244 100644 --- a/board/kmc/kzm9g/Kconfig +++ b/board/kmc/kzm9g/Kconfig @@ -9,4 +9,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "kzm9g" +config SYS_TEXT_BASE + default 0x + endif diff --git a/board/renesas/alt/Kconfig b/board/renesas/alt/Kconfig index 39d53c185b..a7ed87ecf0 100644 --- a/board/renesas/alt/Kconfig +++ b/board/renesas/alt/Kconfig @@ -9,6 +9,10 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "alt" +config SYS_TEXT_BASE + default 0x7000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + config R8A7794_ETHERNET_B bool "Use ethernet B function" depends on TARGET_ALT diff --git a/board/renesas/blanche/Kconfig b/board/renesas/blanche/Kconfig index ac4730a62f..ed72638870 100644 --- a/board/renesas/blanche/Kconfig +++ b/board/renesas/blanche/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "blanche" +config SYS_TEXT_BASE + default 0x if MTD_NOR_FLASH + default 0x4000 + endif diff --git a/board/renesas/gose/Kconfig b/board/renesas/gose/Kconfig index 930a44559e..5111507dbd 100644 --- a/board/renesas/gose/Kconfig +++ b/board/renesas/gose/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "gose" +config SYS_TEXT_BASE + default 0x7000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/koelsch/Kconfig b/board/renesas/koelsch/Kconfig index 6475f02b66..503da62284 100644 --- a/board/renesas/koelsch/Kconfig +++ b/board/renesas/koelsch/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "koelsch" +config SYS_TEXT_BASE + default 0x7000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/lager/Kconfig b/board/renesas/lager/Kconfig index e990c2019c..0a5e86ded6 100644 --- a/board/renesas/lager/Kconfig +++ b/board/renesas/lager/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "lager" +config SYS_TEXT_BASE + default 0xB000 if RMOBILE_EXTRAM_BOOT + default 0xE808 + endif diff --git a/board/renesas/porter/Kconfig b/board/renesas/porter/Kconfig index a6f621b73f..b9ed2f7308 100644 --- a/board/renesas/porter/Kconfig +++ b/board/renesas/porter/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "porter" +config SYS_TEXT_BASE + default 0x7000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/silk/Kconfig b/board/renesas/silk/Kconfig index 07aee0e50f..56b1faa742 100644 --- a/board/renesas/silk/Kconfig +++ b/board/renesas/silk/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "silk" +config SYS_TEXT_BASE + default 0x7000 if RMOBILE_EXTRAM_BOOT + default 0xE6304000 + endif diff --git a/board/renesas/stout/Kconfig b/board/renesas/stout/Kconfig index cbbc6dd9e4..06a0d26a2d 100644 --- a/board/renesas/stout/Kconfig +++ b/board/renesas/stout/Kconfig @@ -9,4 +9,8 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "stout" +config SYS_TEXT_BASE + default 0xB000 i
[U-Boot] [PATCH 1/3] ARM: rmobile: Use CONFIG_SYS_BOARD instaed of CONFIG_ARCH_RMOBILE_BOARD_STRING
CONFIG_SYS_BOARD is provided by Kconfig, this has the same value as
CONFIG_ARCH_RMOBILE_BOARD_STRING provided in .h.
This switches from CONFIG_ARCH_RMOBILE_BOARD_STRING to CONFIG_SYS_BOARD.
Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
---
board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 2 +-
board/kmc/kzm9g/kzm9g.c | 2 +-
board/renesas/alt/alt.c | 2 +-
board/renesas/blanche/blanche.c | 2 +-
board/renesas/gose/gose.c | 2 +-
board/renesas/koelsch/koelsch.c | 2 +-
board/renesas/lager/lager.c | 2 +-
board/renesas/porter/porter.c | 2 +-
board/renesas/salvator-x/salvator-x.c | 2 +-
board/renesas/silk/silk.c | 2 +-
board/renesas/stout/stout.c | 2 +-
board/renesas/ulcb/ulcb.c | 2 +-
include/configs/alt.h | 1 -
include/configs/armadillo-800eva.h | 1 -
include/configs/blanche.h | 1 -
include/configs/gose.h | 1 -
include/configs/koelsch.h | 1 -
include/configs/kzm9g.h | 1 -
include/configs/lager.h | 1 -
include/configs/porter.h| 1 -
include/configs/salvator-x.h| 2 --
include/configs/silk.h | 1 -
include/configs/stout.h | 1 -
include/configs/ulcb.h | 2 --
scripts/config_whitelist.txt| 1 -
25 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
index abe69abcc8..dcb5c78f55 100644
--- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
+++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
@@ -315,7 +315,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD
};
int board_late_init(void)
diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c
index a284721cfd..679dff7084 100644
--- a/board/kmc/kzm9g/kzm9g.c
+++ b/board/kmc/kzm9g/kzm9g.c
@@ -349,7 +349,7 @@ int board_init(void)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD
};
int dram_init(void)
diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index 0bf8160f1f..a4e3cccf78 100644
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -217,7 +217,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD
};
void reset_cpu(ulong addr)
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 574dcda01b..434544d90f 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -468,7 +468,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD
};
void reset_cpu(ulong addr)
diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
index 54e126985b..465be87c01 100644
--- a/board/renesas/gose/gose.c
+++ b/board/renesas/gose/gose.c
@@ -201,7 +201,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD
};
void reset_cpu(ulong addr)
diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c
index 8fa648e40a..45a422044b 100644
--- a/board/renesas/koelsch/koelsch.c
+++ b/board/renesas/koelsch/koelsch.c
@@ -222,7 +222,7 @@ int board_phy_config(struct phy_device *phydev)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD
};
void reset_cpu(ulong addr)
diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index 562be04760..04343a9be6 100644
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -235,7 +235,7 @@ int dram_init(void)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD
};
void reset_cpu(ulong addr)
diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index 5b1a167906..711baf04c5 100644
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -203,7 +203,7 @@ int board_phy_config(struct phy_device *phydev)
}
const struct rmobile_sysinfo sysinfo = {
- CONFIG_ARCH_RMOBILE_BOARD_STRING
+ CONFIG_SYS_BOARD,
};
void reset_cpu(ulong addr)
diff --git a/board/renesas/salvator-x/salvat
Re: [U-Boot] [PATCH v2 2/3] net: sh-eth: remove sh_eth_offset_rz table
Hi,
2017-11-03 22:30 GMT+09:00 Chris Brandt <chris.bra...@renesas.com>:
> First, this table could never be included in the build anyway because
> SH_ETH_TYPE_RZ is not defined until later in the file.
> Second, the register PIR was missing, so PHY MDIO never worked.
> Third, after adding the PIR register, the table is EXACTLY the same as
> sh_eth_offset_gigabit, so there is no value to it.
>
> Therefore, just delete it use the gigabit one.
>
> Signed-off-by: Chris Brandt <chris.bra...@renesas.com>
Acked-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Best regards,
Nobuhiro
> ---
> drivers/net/sh_eth.h | 59
> +---
> 1 file changed, 1 insertion(+), 58 deletions(-)
>
> diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
> index 2345c34368..a8339ebf33 100644
> --- a/drivers/net/sh_eth.h
> +++ b/drivers/net/sh_eth.h
> @@ -228,61 +228,6 @@ static const u16
> sh_eth_offset_gigabit[SH_ETH_MAX_REGISTER_OFFSET] = {
> [RMII_MII] = 0x0790,
> };
>
> -#if defined(SH_ETH_TYPE_RZ)
> -static const u16 sh_eth_offset_rz[SH_ETH_MAX_REGISTER_OFFSET] = {
> - [EDSR] = 0x,
> - [EDMR] = 0x0400,
> - [EDTRR] = 0x0408,
> - [EDRRR] = 0x0410,
> - [EESR] = 0x0428,
> - [EESIPR]= 0x0430,
> - [TDLAR] = 0x0010,
> - [TDFAR] = 0x0014,
> - [TDFXR] = 0x0018,
> - [TDFFR] = 0x001c,
> - [RDLAR] = 0x0030,
> - [RDFAR] = 0x0034,
> - [RDFXR] = 0x0038,
> - [RDFFR] = 0x003c,
> - [TRSCER]= 0x0438,
> - [RMFCR] = 0x0440,
> - [TFTR] = 0x0448,
> - [FDR] = 0x0450,
> - [RMCR] = 0x0458,
> - [RPADIR]= 0x0460,
> - [FCFTR] = 0x0468,
> - [CSMR] = 0x04E4,
> -
> - [ECMR] = 0x0500,
> - [ECSR] = 0x0510,
> - [ECSIPR]= 0x0518,
> - [PSR] = 0x0528,
> - [PIPR] = 0x052c,
> - [RFLR] = 0x0508,
> - [APR] = 0x0554,
> - [MPR] = 0x0558,
> - [PFTCR] = 0x055c,
> - [PFRCR] = 0x0560,
> - [TPAUSER] = 0x0564,
> - [GECMR] = 0x05b0,
> - [BCULR] = 0x05b4,
> - [MAHR] = 0x05c0,
> - [MALR] = 0x05c8,
> - [TROCR] = 0x0700,
> - [CDCR] = 0x0708,
> - [LCCR] = 0x0710,
> - [CEFCR] = 0x0740,
> - [FRECR] = 0x0748,
> - [TSFRCR]= 0x0750,
> - [TLFRCR]= 0x0758,
> - [RFCR] = 0x0760,
> - [CERCR] = 0x0768,
> - [CEECR] = 0x0770,
> - [MAFCR] = 0x0778,
> - [RMII_MII] = 0x0790,
> -};
> -#endif
> -
> static const u16 sh_eth_offset_fast_sh4[SH_ETH_MAX_REGISTER_OFFSET] = {
> [ECMR] = 0x0100,
> [RFLR] = 0x0108,
> @@ -659,12 +604,10 @@ enum FIFO_SIZE_BIT {
> static inline unsigned long sh_eth_reg_addr(struct sh_eth_dev *eth,
> int enum_index)
> {
> -#if defined(SH_ETH_TYPE_GETHER)
> +#if defined(SH_ETH_TYPE_GETHER) || defined(SH_ETH_TYPE_RZ)
> const u16 *reg_offset = sh_eth_offset_gigabit;
> #elif defined(SH_ETH_TYPE_ETHER)
> const u16 *reg_offset = sh_eth_offset_fast_sh4;
> -#elif defined(SH_ETH_TYPE_RZ)
> - const u16 *reg_offset = sh_eth_offset_rz;
> #else
> #error
> #endif
> --
> 2.14.1
>
>
> ___
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 3/3] net: miiphybb: fix casting error
Hi,
2017-11-03 22:30 GMT+09:00 Chris Brandt <chris.bra...@renesas.com>:
> Since the return value is a signed int, if the leading MSB of rdreg is a 1,
> it will get signed extended and will return a negative value which is an
> error even though we read the correct value.
>
> Fixes: dfcc496ed7e2 ("net: mii: Changes not made by spatch")
> Signed-off-by: Chris Brandt <chris.bra...@renesas.com>
Acked-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Best regards,
Nobuhiro
> ---
> drivers/net/phy/miiphybb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/phy/miiphybb.c b/drivers/net/phy/miiphybb.c
> index af676b9bae..d61722490e 100644
> --- a/drivers/net/phy/miiphybb.c
> +++ b/drivers/net/phy/miiphybb.c
> @@ -232,7 +232,7 @@ static void miiphy_pre(struct bb_miiphy_bus *bus, char
> read,
> */
> int bb_miiphy_read(struct mii_dev *miidev, int addr, int devad, int reg)
> {
> - short rdreg; /* register working value */
> + unsigned short rdreg; /* register working value */
> int v;
> int j; /* counter */
> struct bb_miiphy_bus *bus;
> --
> 2.14.1
>
>
> ___
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 1/3] net: sh-eth: fix inl and outl definitions
Hi,
2017-11-03 22:30 GMT+09:00 Chris Brandt <chris.bra...@renesas.com>:
> The macros inl and outl maybe already be defined from file
> arch/arm/include/asm/io.h so there may be no reason to define them.
> And if you do try defined them here, you get a redefined complier warning.
>
> Signed-off-by: Chris Brandt <chris.bra...@renesas.com>
Acked-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> drivers/net/sh_eth.h | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
> index 3645f0eca7..2345c34368 100644
> --- a/drivers/net/sh_eth.h
> +++ b/drivers/net/sh_eth.h
> @@ -25,8 +25,10 @@
> #define ADDR_TO_PHY(addr) ((int)(addr) & ~0xe000)
> #endif
> #elif defined(CONFIG_ARM)
> -#define inlreadl
> +#ifndef inl
> +#define inlreadl
> #define outl writel
> +#endif
> #define ADDR_TO_PHY(addr) ((int)(addr))
> #define ADDR_TO_P2(addr) (addr)
> #endif /* defined(CONFIG_SH) */
> --
> 2.14.1
>
>
> ___
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] Where should Renesas RZ/A go under arch/arm/ ????
Hi,
I am sorry that my comment was delayed.
2017-11-01 11:09 GMT+09:00 Tom Rini <tr...@konsulko.com>:
> On Tue, Oct 31, 2017 at 03:26:02PM +, Chris Brandt wrote:
>> Hi Tom,
>>
>> Thanks for the reply!
>>
>> On Tuesday, October 31, 2017 1, Tom Rini wrote:
>> > On Tue, Oct 31, 2017 at 12:13:22PM +, Chris Brandt wrote:
>> > > Hello,
>> > >
>> > > Since I've been supporting a u-boot for the Renesas RZ/A1 SoC for a
>> > > while now, I thought I'd start upstreaming the drivers/patches I've
>> > acquired
>> > > over the years.
>> > >
>> > > But, where should the core files and Kconfig go?
>> > >
>> > > The RZ/A1 series has a Cortex-A9.
>> > >
>> > > At first, I had made a directory under arch/arm/cpu/armv7/
>> > >
>> > > But, now I see things are moving under arch/arm/mach-.
>> > >
>> > > There is a arch/arm/mach-rmobile directory that has the Renesas R-Car
>> > > devices. But while the RZ/A1 uses some of the same HW IP blocks, for the
>> > > most part it's a different product line.
>> > >
>> > > So, Where should I put my RZ/A1 (and future RZ/A devices, or future RZ/N
>> > > devices)?
>> > >
>> > > 1. Keep all Renesas parts together like we do in the kernel (arm/mach-
>> > shmobile)?
>> > >
>> > >u-boot/arch/arm/mach-rmobile
>> >
>> > I would vote for renaming and matching the kernel here and using
>> > mach-shmobile. Thanks!
>>
>>
>> Ugh! That shmobile name is going to haunt us forever (even though we
>> don't even make SH-Mobile parts anymoreand they are all ARM cores now,
>> not SH).
>>
>> I will say that upstream in the kernel, most everything else has been
>> renamed to "renesas" (ie, ARCH_RENESAS, )...except that directory name. I
>> asked if/when they would rename it, but at the moment, there is not plan
>> as not to break anything.
>>
>> Maybe we can compromise on everything in mach-renesas??
>
> OK, I can go with mach-renesas, thanks again!
+1
Chirs,:
The reason we are using mach-rmobile is that the code merged first was
rmobile SoC.
As you say, these names are almost gone, and in the Linux kernel it is
already mach-renesas.
I am planning to move mach-rmobile to mach-renesas. How is your work situation?
Best regards,
Nopbuhiro
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] net: ravb: Fix reset GPIO handling
Hi,
2017-11-11 7:20 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Fix handling of the reset GPIO. Drop the _nodev() suffix from the
> gpio_request_by_name() call as there is now a proper DM capable
> GPIO driver. Also check if the GPIO is valid before freeing it in
> remove path, otherwise U-Boot will crash.
Thanks for this patch.
I was just struggling with this problem.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Joe Hershberger <joe.hershber...@ni.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Acked-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Best regards,
Nobuhiro
> ---
> drivers/net/ravb.c | 7 ---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
> index dc7a52534e..26d95f178f 100644
> --- a/drivers/net/ravb.c
> +++ b/drivers/net/ravb.c
> @@ -492,8 +492,8 @@ static int ravb_probe(struct udevice *dev)
> if (ret < 0)
> goto err_mdio_alloc;
>
> - gpio_request_by_name_nodev(dev_ofnode(dev), "reset-gpios", 0,
> - >reset_gpio, GPIOD_IS_OUT);
> + gpio_request_by_name(dev, "reset-gpios", 0, >reset_gpio,
> +GPIOD_IS_OUT);
>
> mdiodev = mdio_alloc();
> if (!mdiodev) {
> @@ -528,7 +528,8 @@ static int ravb_remove(struct udevice *dev)
> free(eth->phydev);
> mdio_unregister(eth->bus);
> mdio_free(eth->bus);
> - dm_gpio_free(dev, >reset_gpio);
> + if (dm_gpio_is_valid(>reset_gpio))
> + dm_gpio_free(dev, >reset_gpio);
> unmap_physmem(eth->iobase, MAP_NOCACHE);
>
> return 0;
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] clk: rmobile: Add R8A7796 xHCI clock
Hi,
2017-11-11 7:19 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Add xHCI entry into the clock tables, so that the xHCI USB driver
> can enable the clock for the xHCI block via clock framework.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Applied to rmobile branch.
Best regards,
Nobuhiro
> ---
> drivers/clk/renesas/clk-rcar-gen3.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/clk/renesas/clk-rcar-gen3.c
> b/drivers/clk/renesas/clk-rcar-gen3.c
> index c821bddc25..8dc4a657ee 100644
> --- a/drivers/clk/renesas/clk-rcar-gen3.c
> +++ b/drivers/clk/renesas/clk-rcar-gen3.c
> @@ -490,6 +490,7 @@ static const struct mssr_mod_clk r8a7796_mod_clks[] = {
> DEF_MOD("sdif0", 314, R8A7796_CLK_SD0),
> DEF_MOD("pcie1", 318, R8A7796_CLK_S3D1),
> DEF_MOD("pcie0", 319, R8A7796_CLK_S3D1),
> + DEF_MOD("usb3-if0", 328, R8A7796_CLK_S3D1),
> DEF_MOD("usb-dmac0", 330, R8A7796_CLK_S3D1),
> DEF_MOD("usb-dmac1", 331, R8A7796_CLK_S3D1),
> DEF_MOD("rwdt", 402, R8A7796_CLK_R),
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] ARM: rmobile: Enable xHCI on RCar Gen3 boards
Hi,
2017-10-15 22:02 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Enable the XHCI support on all boards.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Applied to rmobile branch.
Thanks,
Nobuhiro
> ---
> configs/r8a7795_salvator-x_defconfig | 1 +
> configs/r8a7795_ulcb_defconfig | 1 +
> configs/r8a7796_salvator-x_defconfig | 1 +
> configs/r8a7796_ulcb_defconfig | 1 +
> 4 files changed, 4 insertions(+)
>
> diff --git a/configs/r8a7795_salvator-x_defconfig
> b/configs/r8a7795_salvator-x_defconfig
> index e32aceba54..e010ce747c 100644
> --- a/configs/r8a7795_salvator-x_defconfig
> +++ b/configs/r8a7795_salvator-x_defconfig
> @@ -45,6 +45,7 @@ CONFIG_DM_REGULATOR_GPIO=y
> CONFIG_SCIF_CONSOLE=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> +CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_EHCI_GENERIC=y
> CONFIG_USB_STORAGE=y
> diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig
> index 50d36891cc..eab9c4c8a7 100644
> --- a/configs/r8a7795_ulcb_defconfig
> +++ b/configs/r8a7795_ulcb_defconfig
> @@ -42,6 +42,7 @@ CONFIG_DM_REGULATOR_GPIO=y
> CONFIG_SCIF_CONSOLE=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> +CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_EHCI_GENERIC=y
> CONFIG_USB_STORAGE=y
> diff --git a/configs/r8a7796_salvator-x_defconfig
> b/configs/r8a7796_salvator-x_defconfig
> index 8f22645efb..5ff803f0c2 100644
> --- a/configs/r8a7796_salvator-x_defconfig
> +++ b/configs/r8a7796_salvator-x_defconfig
> @@ -46,6 +46,7 @@ CONFIG_DM_REGULATOR_GPIO=y
> CONFIG_SCIF_CONSOLE=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> +CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_EHCI_GENERIC=y
> CONFIG_USB_STORAGE=y
> diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
> index c8edfabc91..1145b39919 100644
> --- a/configs/r8a7796_ulcb_defconfig
> +++ b/configs/r8a7796_ulcb_defconfig
> @@ -43,6 +43,7 @@ CONFIG_DM_REGULATOR_GPIO=y
> CONFIG_SCIF_CONSOLE=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> +CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_EHCI_GENERIC=y
> CONFIG_USB_STORAGE=y
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] [RFC] MAINTAINERS: Add myself as RCar/RMobile comaintainer
Hi,
2017-10-15 21:53 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> To help out with the RCar/RMobile upstreaming, I'm adding myself
> as the RCar/RMobile maintainer.
Thanks for your help.
Acked-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> MAINTAINERS | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index b167b028ec..b3a51ba7a8 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -127,6 +127,7 @@ F: arch/arm/include/asm/arch-pxa/
>
> ARM RENESAS RMOBILE/R-CAR
> M: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> +M: Marek Vasut <marek.vasut+rene...@gmail.com>
> S: Maintained
> T: git git://git.denx.de/u-boot-sh.git
> F: arch/arm/mach-rmobile/
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] Please pull u-boot-sh/rmobile branch
Hi, Tom. The following changes since commit 37a7908137a8c904f43c83f3e6c269cd51bf6126: ARM: dts: rmobile: Update DTS to match Linux 4.13 (2017-09-12 23:01:51 +0200) are available in the git repository at: git://git.denx.de/u-boot-sh.git rmobile for you to fetch changes up to 17cf99a5bb904a6e7c8797db2632bbe65ae1cfb5: ARM: rmobile: dts: Add SDR104/HS200 to Salvator-X (2017-10-10 08:22:54 +0900) Marek Vasut (29): ARM: rmobile: dts: Add EHCI USB nodes to r8a7796 ARM: rmobile: Move HSUSB configuration to board on Salvator-X ARM: rmobile: Move HSUSB configuration to board on ULCB ARM: rmobile: Enable EHCI generic on Salvator-X ARM: rmobile: Enable EHCI generic on ULCB ARM: rmobile: dts: Add XHCI USB node to r8a7796 ARM: rmobile: Move CONFIG_CMD_ from rcar-gen3-common to configs ARM: rmobile: Place initial stack right below U-Boot clk: rmobile: Add support for setting SDxCKCR clk: rmobile: Add RPC hyperflash clock net: ravb: Add PHY reset GPIO support serial: sh: Enable clock if available ARM: dts: rmobile: Add PHY reset GPIO ARM: rmobile: Remove SD clock configuration from board files ARM: rmobile: Remove AVB clock configuration from board files ARM: rmobile: Remove SCIF clock configuration from board files ARM: rmobile: Enable GPIO command ARM: rmobile: Switch to UniPhier SD driver on Gen3 ARM: rmobile: Enable DM regulator support pinctrl: rmobile: Add Renesas RCar pincontrol driver gpio: rmobile: Add Renesas RCar GPIO driver ARM: rmobile: Switch to DM PFC pinmux and GPIO driver ARM: rmobile: Zap ad-hoc PFC and GPIO setup in board files usb: Drop the EHCI RCar Gen3 pinctrl: rmobile: Add pinconf to Renesas RCar pincontrol driver ARM: rmobile: Enable pinconf doc: rmobile: Update README ARM: rmobile: Fixup ULCB CPLD support after PFC rework ARM: rmobile: dts: Add SDR104/HS200 to Salvator-X arch/arm/dts/r8a7796.dtsi | 59 +- arch/arm/dts/salvator-common.dtsi | 10 + arch/arm/dts/ulcb.dtsi|1 + board/renesas/salvator-x/salvator-x.c | 152 +--- board/renesas/ulcb/cpld.c |8 +- board/renesas/ulcb/ulcb.c | 114 +-- configs/r8a7795_salvator-x_defconfig | 16 +- configs/r8a7795_ulcb_defconfig| 17 +- configs/r8a7796_salvator-x_defconfig | 16 +- configs/r8a7796_ulcb_defconfig| 17 +- doc/README.rmobile| 41 +- drivers/clk/renesas/clk-rcar-gen3.c | 78 +- drivers/gpio/Kconfig |6 + drivers/gpio/Makefile |1 + drivers/gpio/gpio-rcar.c | 169 + drivers/net/ravb.c| 13 + drivers/pinctrl/Kconfig |1 + drivers/pinctrl/Makefile |1 + drivers/pinctrl/renesas/Kconfig | 31 + drivers/pinctrl/renesas/Makefile |3 + drivers/pinctrl/renesas/pfc-r8a7795.c | 4898 ++ drivers/pinctrl/renesas/pfc-r8a7796.c | 5728 +++ drivers/pinctrl/renesas/pfc.c | 752 +++ drivers/pinctrl/renesas/sh_pfc.h | 575 +++ drivers/serial/serial_sh.c|9 +- drivers/usb/host/Kconfig |8 - drivers/usb/host/Makefile |1 - drivers/usb/host/ehci-rcar_gen3.c | 106 --- include/configs/rcar-gen3-common.h|8 +- 29 files changed, 12455 insertions(+), 384 deletions(-) create mode 100644 drivers/gpio/gpio-rcar.c create mode 100644 drivers/pinctrl/renesas/Kconfig create mode 100644 drivers/pinctrl/renesas/Makefile create mode 100644 drivers/pinctrl/renesas/pfc-r8a7795.c create mode 100644 drivers/pinctrl/renesas/pfc-r8a7796.c create mode 100644 drivers/pinctrl/renesas/pfc.c create mode 100644 drivers/pinctrl/renesas/sh_pfc.h delete mode 100644 drivers/usb/host/ehci-rcar_gen3.c ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] ARM: rmobile: Enable DM regulator support
Hi,
Thanks for your work.
2017-09-16 4:12 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Regulators are needed for the MMC framework to let it toggle the SD power.
> Enable DM regulator support and support for fixed and GPIO regulator.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
I can not apply this patch by patch for configs/r8a7795_ulcb_defconfig.
Because this patch requires CONFIG_MMC_UNIPHIER in configs / r8a7795_
ulcb_defconfig.
I could not find the patch that made this fix.
If you know the patch that made this fix, would you please tell me?
Best regards,
Nobuhiro
> ---
> configs/r8a7795_salvator-x_defconfig | 3 +++
> configs/r8a7795_ulcb_defconfig | 3 +++
> configs/r8a7796_salvator-x_defconfig | 3 +++
> configs/r8a7796_ulcb_defconfig | 3 +++
> 4 files changed, 12 insertions(+)
>
> diff --git a/configs/r8a7795_salvator-x_defconfig
> b/configs/r8a7795_salvator-x_defconfig
> index 254116c630..6c1cf9144a 100644
> --- a/configs/r8a7795_salvator-x_defconfig
> +++ b/configs/r8a7795_salvator-x_defconfig
> @@ -34,6 +34,9 @@ CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ90X1=y
> CONFIG_DM_ETH=y
> CONFIG_RENESAS_RAVB=y
> +CONFIG_DM_REGULATOR=y
> +CONFIG_DM_REGULATOR_FIXED=y
> +CONFIG_DM_REGULATOR_GPIO=y
> CONFIG_SCIF_CONSOLE=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig
> index 02cd4f082d..c90c3e9203 100644
> --- a/configs/r8a7795_ulcb_defconfig
> +++ b/configs/r8a7795_ulcb_defconfig
> @@ -31,6 +31,9 @@ CONFIG_DM_MMC=y
> CONFIG_MMC_UNIPHIER=y
> CONFIG_DM_ETH=y
> CONFIG_RENESAS_RAVB=y
> +CONFIG_DM_REGULATOR=y
> +CONFIG_DM_REGULATOR_FIXED=y
> +CONFIG_DM_REGULATOR_GPIO=y
> CONFIG_SCIF_CONSOLE=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> diff --git a/configs/r8a7796_salvator-x_defconfig
> b/configs/r8a7796_salvator-x_defconfig
> index f798b5e14a..b88f5c648e 100644
> --- a/configs/r8a7796_salvator-x_defconfig
> +++ b/configs/r8a7796_salvator-x_defconfig
> @@ -35,6 +35,9 @@ CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ90X1=y
> CONFIG_DM_ETH=y
> CONFIG_RENESAS_RAVB=y
> +CONFIG_DM_REGULATOR=y
> +CONFIG_DM_REGULATOR_FIXED=y
> +CONFIG_DM_REGULATOR_GPIO=y
> CONFIG_SCIF_CONSOLE=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
> index bbf44ca09f..dc557405b6 100644
> --- a/configs/r8a7796_ulcb_defconfig
> +++ b/configs/r8a7796_ulcb_defconfig
> @@ -32,6 +32,9 @@ CONFIG_DM_MMC=y
> CONFIG_MMC_UNIPHIER=y
> CONFIG_DM_ETH=y
> CONFIG_RENESAS_RAVB=y
> +CONFIG_DM_REGULATOR=y
> +CONFIG_DM_REGULATOR_FIXED=y
> +CONFIG_DM_REGULATOR_GPIO=y
> CONFIG_SCIF_CONSOLE=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 6/6] usb: Drop the EHCI RCar Gen3
Hi,
2017-09-13 2:07 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Since we use EHCI generic driver on RCar Gen3 , this driver is useless.
> Remove it.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Acked-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Best regards,
Nobuhiro
> ---
> drivers/usb/host/Kconfig | 8 ---
> drivers/usb/host/Makefile | 1 -
> drivers/usb/host/ehci-rcar_gen3.c | 106
> --
> 3 files changed, 115 deletions(-)
> delete mode 100644 drivers/usb/host/ehci-rcar_gen3.c
>
> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> index eb035a476b..5438feb8f5 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -148,14 +148,6 @@ config USB_EHCI_PCI
> help
> Enables support for the PCI-based EHCI controller.
>
> -config USB_EHCI_RCAR_GEN3
> - bool "Support for Renesas RCar M3/H3 EHCI USB controller"
> - depends on RCAR_GEN3
> - default y
> - ---help---
> - Enables support for the on-chip EHCI controller on Renesas
> - R8A7795 and R8A7796 SoCs.
> -
> config USB_EHCI_ZYNQ
> bool "Support for Xilinx Zynq on-chip EHCI USB controller"
> depends on ARCH_ZYNQ
> diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
> index ab5a99faa8..d3ff591a71 100644
> --- a/drivers/usb/host/Makefile
> +++ b/drivers/usb/host/Makefile
> @@ -46,7 +46,6 @@ obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o
> obj-$(CONFIG_USB_EHCI_VCT) += ehci-vct.o
> obj-$(CONFIG_USB_EHCI_VF) += ehci-vf.o
> obj-$(CONFIG_USB_EHCI_RMOBILE) += ehci-rmobile.o
> -obj-$(CONFIG_USB_EHCI_RCAR_GEN3) += ehci-rcar_gen3.o
> obj-$(CONFIG_USB_EHCI_ZYNQ) += ehci-zynq.o
>
> # xhci
> diff --git a/drivers/usb/host/ehci-rcar_gen3.c
> b/drivers/usb/host/ehci-rcar_gen3.c
> deleted file mode 100644
> index 525e7f3573..00
> --- a/drivers/usb/host/ehci-rcar_gen3.c
> +++ /dev/null
> @@ -1,106 +0,0 @@
> -/*
> - * drivers/usb/host/ehci-rcar_gen3.
> - * This file is EHCI HCD (Host Controller Driver) for USB.
> - *
> - * Copyright (C) 2015-2017 Renesas Electronics Corporation
> - *
> - * SPDX-License-Identifier: GPL-2.0+
> - */
> -
> -#include
> -#include
> -#include
> -#include
> -#include
> -#include "ehci.h"
> -
> -#define RCAR_GEN3_USB_BASE(n) (0xEE08 + ((n) * 0x2))
> -
> -#define EHCI_USBCMD0x120
> -
> -#define CORE_SPD_RSM_TIMSET0x30c
> -#define CORE_OC_TIMSET 0x310
> -
> -/* Register offset */
> -#define AHB_OFFSET 0x200
> -
> -#define BASE_HSUSB 0xE659
> -#define REG_LPSTS (BASE_HSUSB + 0x0102) /* 16bit */
> -#define SUSPM 0x4000
> -#define SUSPM_NORMAL BIT(14)
> -#define REG_UGCTRL2(BASE_HSUSB + 0x0184) /* 32bit */
> -#define USB0SEL0x0030
> -#define USB0SEL_EHCI 0x0010
> -
> -#define SMSTPCR7 0xE615014C
> -#define SMSTPCR700 BIT(0) /* EHCI3 */
> -#define SMSTPCR701 BIT(1) /* EHCI2 */
> -#define SMSTPCR702 BIT(2) /* EHCI1 */
> -#define SMSTPCR703 BIT(3) /* EHCI0 */
> -#define SMSTPCR704 BIT(4) /* HSUSB */
> -
> -#define AHB_PLL_RSTBIT(1)
> -
> -#define USBH_INTBENBIT(2)
> -#define USBH_INTAENBIT(1)
> -
> -#define AHB_INT_ENABLE 0x200
> -#define AHB_USBCTR 0x20c
> -
> -int ehci_hcd_stop(int index)
> -{
> -#if defined(CONFIG_R8A7795)
> - const u32 mask = SMSTPCR703 | SMSTPCR702 | SMSTPCR701 | SMSTPCR700;
> -#else
> - const u32 mask = SMSTPCR703 | SMSTPCR702;
> -#endif
> - const u32 base = RCAR_GEN3_USB_BASE(index);
> - int ret;
> -
> - /* Reset EHCI */
> - setbits_le32((uintptr_t)(base + EHCI_USBCMD), CMD_RESET);
> - ret = wait_for_bit("ehci-rcar", (void *)(uintptr_t)base + EHCI_USBCMD,
> - CMD_RESET, false, 10, true);
> - if (ret) {
> - printf("ehci-rcar: reset failed (index=%i, ret=%i).\n",
> - index, ret);
> - }
> -
> - setbits_le32(SMSTPCR7, BIT(3 - index));
> -
> - if ((readl(SMSTPCR7) & mask) == mask)
> - setbits_le32(SMSTPCR7, SMSTPCR704);
> -
> - return 0;
> -}
> -
> -int ehci_hcd_init(int index, enum usb_init_type init,
> - struct ehci_hccr **hccr, struct ehci_hcor **hcor
Re: [U-Boot] [PATCH] ARM: dts: rmobile: Update DTS to match Linux 4.13
Hi,
2017-09-13 6:01 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Import the RCar Gen3 DTS and headers from upstream Linux kernel v4.13,
> commit 569dbb88e80deb68974ef6fdd6a13edb9d686261 . This includes both M3
> and H3 ULCB and Salvator-X boards.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Applied to rmobile branch.
Thanks,
Nobuhiro
> ---
> arch/arm/dts/r8a7795-h3ulcb.dts | 342 +---
> arch/arm/dts/r8a7795-salvator-x.dts | 565 +++-
> arch/arm/dts/r8a7795.dtsi | 133
> arch/arm/dts/r8a7796-m3ulcb.dts | 168 +-
> arch/arm/dts/r8a7796-salvator-x.dts | 244 +-
> arch/arm/dts/r8a7796.dtsi | 421
> arch/arm/dts/salvator-common.dtsi | 629
>
> arch/arm/dts/salvator-x.dtsi| 30 ++
> arch/arm/dts/ulcb.dtsi | 367 +
> 9 files changed, 1572 insertions(+), 1327 deletions(-)
> create mode 100644 arch/arm/dts/salvator-common.dtsi
> create mode 100644 arch/arm/dts/salvator-x.dtsi
> create mode 100644 arch/arm/dts/ulcb.dtsi
>
> diff --git a/arch/arm/dts/r8a7795-h3ulcb.dts b/arch/arm/dts/r8a7795-h3ulcb.dts
> index ab352159de..0426f41765 100644
> --- a/arch/arm/dts/r8a7795-h3ulcb.dts
> +++ b/arch/arm/dts/r8a7795-h3ulcb.dts
> @@ -9,24 +9,16 @@
> * kind, whether express or implied.
> */
>
> +#define CPG_AUDIO_CLK_IR8A7795_CLK_S0D4
> +
> /dts-v1/;
> #include "r8a7795.dtsi"
> -#include
> -#include
> +#include "ulcb.dtsi"
>
> / {
> - model = "Renesas H3ULCB board based on r8a7795";
> + model = "Renesas H3ULCB board based on r8a7795 ES2.0+";
> compatible = "renesas,h3ulcb", "renesas,r8a7795";
>
> - aliases {
> - serial0 =
> - ethernet0 =
> - };
> -
> - chosen {
> - stdout-path = "serial0:115200n8";
> - };
> -
> memory@4800 {
> device_type = "memory";
> /* first 128MB is reserved for secure area. */
> @@ -47,330 +39,4 @@
> device_type = "memory";
> reg = <0x7 0x 0x0 0x4000>;
> };
> -
> - leds {
> - compatible = "gpio-leds";
> -
> - led5 {
> - gpios = < 12 GPIO_ACTIVE_HIGH>;
> - };
> - led6 {
> - gpios = < 13 GPIO_ACTIVE_HIGH>;
> - };
> - };
> -
> - keyboard {
> - compatible = "gpio-keys";
> -
> - key-1 {
> - linux,code = ;
> - label = "SW3";
> - wakeup-source;
> - debounce-interval = <20>;
> - gpios = < 11 GPIO_ACTIVE_LOW>;
> - };
> - };
> -
> - x12_clk: x12 {
> - compatible = "fixed-clock";
> - #clock-cells = <0>;
> - clock-frequency = <24576000>;
> - };
> -
> - reg_1p8v: regulator0 {
> - compatible = "regulator-fixed";
> - regulator-name = "fixed-1.8V";
> - regulator-min-microvolt = <180>;
> - regulator-max-microvolt = <180>;
> - regulator-boot-on;
> - regulator-always-on;
> - };
> -
> - reg_3p3v: regulator1 {
> - compatible = "regulator-fixed";
> - regulator-name = "fixed-3.3V";
> - regulator-min-microvolt = <330>;
> - regulator-max-microvolt = <330>;
> - regulator-boot-on;
> - regulator-always-on;
> - };
> -
> - vcc_sdhi0: regulator-vcc-sdhi0 {
> - compatible = "regulator-fixed";
> -
> - regulator-name = "SDHI0 Vcc";
> - regulator-min-microvolt = <330>;
> - regulator-max-microvolt = <330>;
> -
> - gpio = < 2 GPIO_ACTIVE_HIGH>;
> - enable-active-high;
> - };
> -
> - vccq_sdhi0: regulator-vccq-sdhi0 {
> - compatible = "regulator-gpio";
> -
> - regulator-name = "SDHI0 VccQ";
Re: [U-Boot] [PATCH] serial: serial_sh: take into account port->clk_mode for SH7785/7786
Hi,
2017-09-14 7:27 GMT+09:00 Thomas Petazzoni
<thomas.petazz...@free-electrons.com>:
> Hello,
>
> On Mon, 28 Aug 2017 14:16:38 +0200, Thomas Petazzoni wrote:
>> In the SH7785/SH7786 case, the SCSCR value is harcoded to be 0x3a,
>> which means bits CKE1/CKE0 have the value 10b. This tells the SCIF
>> that the "External clock/SCIF_SCK pin functions as clock input".
>>
>> However, this is not the case in all designs, and it's the purpose of
>> the clk_mode = EXT_CLK to indicate such a setting.
>>
>> In order for the serial_sh driver to work on a SH7786 platform that
>> does not use SCIF_SCK as a clock input, we have to adjust the
>> SCSCR_INIT value, to have CKE1/CKE0 set to 00b. This is similar to
>> what is done for other SH platforms.
>>
>> Signed-off-by: Thomas Petazzoni <thomas.petazz...@free-electrons.com>
>
> Any comments on this patch ?
Sorry, reply is too late.
Applied, thanks.
>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
Best regards,
Nobuhiro
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] ARM: rmobile: dts: Add XHCI USB node to r8a7796
Hi,
2017-09-13 6:02 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> The R8A7796 XHCI USB nodes are missing from r8a7796 dtsi, add them.
> These nodes don't come from mainline Linux, yet the DT binding is
> similar enough to R8A7795 which already has those in mainline and
> once the nodes hit mainline, this DT should be resynched.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Applied to rmobile branch.
Thanks,
Nobuhiro
> ---
> arch/arm/dts/r8a7796.dtsi | 8 +++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/dts/r8a7796.dtsi b/arch/arm/dts/r8a7796.dtsi
> index 7e3b1d82a1..9e6a5f231e 100644
> --- a/arch/arm/dts/r8a7796.dtsi
> +++ b/arch/arm/dts/r8a7796.dtsi
> @@ -1120,7 +1120,13 @@
> };
>
> xhci0: usb@ee00 {
> - /* placeholder */
> + compatible = "renesas,xhci-r8a7796",
> "renesas,rcar-gen3-xhci";
> + reg = <0 0xee00 0 0xc00>;
> + interrupts = ;
> + clocks = < CPG_MOD 328>;
> + power-domains = < R8A7796_PD_ALWAYS_ON>;
> + resets = < 328>;
> + status = "disabled";
> };
>
> ohci0: usb@ee08 {
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] ARM: rmobile: Move CONFIG_CMD_ from rcar-gen3-common to configs
Hi,
2017-09-13 2:08 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Just move those config options from macros to configs.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Applied to rmobile branch.
Thanks,
Nobuhiro
> ---
> configs/r8a7795_salvator-x_defconfig | 4
> configs/r8a7795_ulcb_defconfig | 5 +
> configs/r8a7796_salvator-x_defconfig | 4
> configs/r8a7796_ulcb_defconfig | 5 +
> include/configs/rcar-gen3-common.h | 4
> 5 files changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/configs/r8a7795_salvator-x_defconfig
> b/configs/r8a7795_salvator-x_defconfig
> index 585eb64973..c5f86464d6 100644
> --- a/configs/r8a7795_salvator-x_defconfig
> +++ b/configs/r8a7795_salvator-x_defconfig
> @@ -19,7 +19,11 @@ CONFIG_CMD_USB=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_MII=y
> CONFIG_CMD_PING=y
> +CONFIG_CMD_EXT2=y
> +CONFIG_CMD_EXT4=y
> +CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> +CONFIG_CMD_FS_GENERIC=y
> CONFIG_OF_CONTROL=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_CLK=y
> diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig
> index 6f30c8d870..63fdb8d697 100644
> --- a/configs/r8a7795_ulcb_defconfig
> +++ b/configs/r8a7795_ulcb_defconfig
> @@ -18,6 +18,11 @@ CONFIG_CMD_USB=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_MII=y
> CONFIG_CMD_PING=y
> +CONFIG_CMD_EXT2=y
> +CONFIG_CMD_EXT4=y
> +CONFIG_CMD_EXT4_WRITE=y
> +CONFIG_CMD_FAT=y
> +CONFIG_CMD_FS_GENERIC=y
> CONFIG_OF_CONTROL=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_CLK=y
> diff --git a/configs/r8a7796_salvator-x_defconfig
> b/configs/r8a7796_salvator-x_defconfig
> index 302e8999a6..4273f4186f 100644
> --- a/configs/r8a7796_salvator-x_defconfig
> +++ b/configs/r8a7796_salvator-x_defconfig
> @@ -20,7 +20,11 @@ CONFIG_CMD_USB=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_MII=y
> CONFIG_CMD_PING=y
> +CONFIG_CMD_EXT2=y
> +CONFIG_CMD_EXT4=y
> +CONFIG_CMD_EXT4_WRITE=y
> CONFIG_CMD_FAT=y
> +CONFIG_CMD_FS_GENERIC=y
> CONFIG_OF_CONTROL=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_CLK=y
> diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
> index 2ff91dfbf3..77a5018dc7 100644
> --- a/configs/r8a7796_ulcb_defconfig
> +++ b/configs/r8a7796_ulcb_defconfig
> @@ -19,6 +19,11 @@ CONFIG_CMD_USB=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_MII=y
> CONFIG_CMD_PING=y
> +CONFIG_CMD_EXT2=y
> +CONFIG_CMD_EXT4=y
> +CONFIG_CMD_EXT4_WRITE=y
> +CONFIG_CMD_FAT=y
> +CONFIG_CMD_FS_GENERIC=y
> CONFIG_OF_CONTROL=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_CLK=y
> diff --git a/include/configs/rcar-gen3-common.h
> b/include/configs/rcar-gen3-common.h
> index 49b1b5ade4..745291a971 100644
> --- a/include/configs/rcar-gen3-common.h
> +++ b/include/configs/rcar-gen3-common.h
> @@ -12,10 +12,6 @@
>
> #include
>
> -#define CONFIG_CMD_EXT2
> -#define CONFIG_CMD_EXT4
> -#define CONFIG_CMD_EXT4_WRITE
> -
> #define CONFIG_REMAKE_ELF
>
> /* boot option */
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 4/6] ARM: rmobile: Enable EHCI generic on Salvator-X
Hi,
2017-09-13 2:07 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Enable the EHCI generic driver, which is superior to ad-hoc SoC specific one.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Applied to rmobile branch.
Thanks,
Nobuhiro
> ---
> configs/r8a7795_salvator-x_defconfig | 1 +
> configs/r8a7796_salvator-x_defconfig | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/configs/r8a7795_salvator-x_defconfig
> b/configs/r8a7795_salvator-x_defconfig
> index 271b15da42..585eb64973 100644
> --- a/configs/r8a7795_salvator-x_defconfig
> +++ b/configs/r8a7795_salvator-x_defconfig
> @@ -34,5 +34,6 @@ CONFIG_SCIF_CONSOLE=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI_GENERIC=y
> CONFIG_USB_STORAGE=y
> CONFIG_SMBIOS_MANUFACTURER=""
> diff --git a/configs/r8a7796_salvator-x_defconfig
> b/configs/r8a7796_salvator-x_defconfig
> index 921fdf77ff..302e8999a6 100644
> --- a/configs/r8a7796_salvator-x_defconfig
> +++ b/configs/r8a7796_salvator-x_defconfig
> @@ -35,5 +35,6 @@ CONFIG_SCIF_CONSOLE=y
> CONFIG_USB=y
> CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI_GENERIC=y
> CONFIG_USB_STORAGE=y
> CONFIG_SMBIOS_MANUFACTURER=""
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 3/6] ARM: rmobile: Move HSUSB configuration to board on ULCB
Hi,
2017-09-13 2:07 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> In order to use ehci-generic driver, move the configuration of HSUSB
> block into the board file. This configuration should not have been in
> the Gen3 EHCI USB driver in the first place, so move it to the board
> file until there is a proper infrastructure and driver for the HSUSB
> block.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Applied to rmobile branch.
Thanks,
Nobuhiro
> ---
> board/renesas/ulcb/ulcb.c | 16
> 1 file changed, 16 insertions(+)
>
> diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
> index dc23228f4f..578b14be7b 100644
> --- a/board/renesas/ulcb/ulcb.c
> +++ b/board/renesas/ulcb/ulcb.c
> @@ -53,6 +53,7 @@ void s_init(void)
> #define SD0_MSTP314BIT(14)
> #define SD1_MSTP313BIT(13)
> #define SD2_MSTP312BIT(12) /* either MMC0 */
> +#define HSUSB_MSTP704 BIT(4) /* HSUSB */
>
> #define SD0CKCR0xE6150074
> #define SD1CKCR0xE6150078
> @@ -90,6 +91,13 @@ int board_early_init_f(void)
> /* -/W 32 Power resume control register 2 (3DG) */
> #defineSYSC_PWRONCR2 0xE618010C
>
> +/* HSUSB block registers */
> +#define HSUSB_REG_LPSTS0xE6590102
> +#define HSUSB_REG_LPSTS_SUSPM_NORMAL BIT(14)
> +#define HSUSB_REG_UGCTRL2 0xE6590184
> +#define HSUSB_REG_UGCTRL2_USB0SEL 0x30
> +#define HSUSB_REG_UGCTRL2_USB0SEL_EHCI 0x10
> +
> int board_init(void)
> {
> /* adress of boot parameters */
> @@ -105,6 +113,14 @@ int board_init(void)
> /* USB1 pull-up */
> setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN);
>
> + /* Configure the HSUSB block */
> + mstp_clrbits_le32(MSTPSR7, SMSTPCR7, HSUSB_MSTP704);
> + /* Choice USB0SEL */
> + clrsetbits_le32(HSUSB_REG_UGCTRL2, HSUSB_REG_UGCTRL2_USB0SEL,
> + HSUSB_REG_UGCTRL2_USB0SEL_EHCI);
> + /* low power status */
> + setbits_le16(HSUSB_REG_LPSTS, HSUSB_REG_LPSTS_SUSPM_NORMAL);
> +
> #ifdef CONFIG_RENESAS_RAVB
> /* EtherAVB Enable */
> /* GPSR2 */
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/6] ARM: rmobile: dts: Add EHCI USB nodes to r8a7796
Hi,
2017-09-13 2:07 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> The R8A7796 EHCI USB nodes are missing from r8a7796 dtsi, add them.
> These nodes don't come from mainline Linux, yet the DT binding is
> similar enough to R8A7795 which already has those in mainline and
> once the nodes hit mainline, this DT should be resynched.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Applied to rmobile branch.
Thanks,
Nobuhiro
> ---
> arch/arm/dts/r8a7796.dtsi | 51
> ++-
> 1 file changed, 46 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/dts/r8a7796.dtsi b/arch/arm/dts/r8a7796.dtsi
> index c0cb4a952f..7e3b1d82a1 100644
> --- a/arch/arm/dts/r8a7796.dtsi
> +++ b/arch/arm/dts/r8a7796.dtsi
> @@ -1106,7 +1106,17 @@
> };
>
> hsusb: usb@e659 {
> - /* placeholder */
> + compatible = "renesas,usbhs-r8a7796",
> +"renesas,rcar-gen3-usbhs";
> + reg = <0 0xe659 0 0x100>;
> + interrupts = ;
> + clocks = < CPG_MOD 704>;
> + renesas,buswait = <11>;
> + phys = <_phy0>;
> + phy-names = "usb";
> + power-domains = < R8A7796_PD_ALWAYS_ON>;
> + resets = < 704>;
> + status = "disabled";
> };
>
> xhci0: usb@ee00 {
> @@ -1118,11 +1128,27 @@
> };
>
> ehci0: usb@ee080100 {
> - /* placeholder */
> + compatible = "generic-ehci";
> + reg = <0 0xee080100 0 0x100>;
> + interrupts = ;
> + clocks = < CPG_MOD 703>;
> + phys = <_phy0>;
> + phy-names = "usb";
> + power-domains = < R8A7796_PD_ALWAYS_ON>;
> + resets = < 703>;
> + status = "disabled";
> };
>
> usb2_phy0: usb-phy@ee080200 {
> - /* placeholder */
> + compatible = "renesas,usb2-phy-r8a7796",
> +"renesas,rcar-gen3-usb2-phy";
> + reg = <0 0xee080200 0 0x700>;
> + interrupts = ;
> + clocks = < CPG_MOD 703>;
> + power-domains = < R8A7796_PD_ALWAYS_ON>;
> + resets = < 703>;
> + #phy-cells = <0>;
> + status = "disabled";
> };
>
> ohci1: usb@ee0a {
> @@ -1130,11 +1156,26 @@
> };
>
> ehci1: usb@ee0a0100 {
> - /* placeholder */
> + compatible = "generic-ehci";
> + reg = <0 0xee0a0100 0 0x100>;
> + interrupts = ;
> + clocks = < CPG_MOD 702>;
> + phys = <_phy1>;
> + phy-names = "usb";
> + power-domains = < R8A7796_PD_ALWAYS_ON>;
> + resets = < 702>;
> + status = "disabled";
> };
>
> usb2_phy1: usb-phy@ee0a0200 {
> - /* placeholder */
> + compatible = "renesas,usb2-phy-r8a7796",
> +"renesas,rcar-gen3-usb2-phy";
> + reg = <0 0xee0a0200 0 0x700>;
> + clocks = < CPG_MOD 702>;
> + power-domains = < R8A7796_PD_ALWAYS_ON>;
> + resets = < 702>;
> + #phy-cells = <0>;
> + status = "disabled";
> };
>
> sdhi0: sd@ee10 {
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/6] ARM: rmobile: Move HSUSB configuration to board on Salvator-X
Hi,
2017-09-13 2:07 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> In order to use ehci-generic driver, move the configuration of HSUSB
> block into the board file. This configuration should not have been in
> the Gen3 EHCI USB driver in the first place, so move it to the board
> file until there is a proper infrastructure and driver for the HSUSB
> block.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Applied to rmobile branch.
Thanks,
Nobuhiro
> ---
> board/renesas/salvator-x/salvator-x.c | 16
> 1 file changed, 16 insertions(+)
>
> diff --git a/board/renesas/salvator-x/salvator-x.c
> b/board/renesas/salvator-x/salvator-x.c
> index e260117802..37fcbbd448 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -55,6 +55,7 @@ void s_init(void)
> #define SD1_MSTP313BIT(13)
> #define SD2_MSTP312BIT(12) /* either MMC0 */
> #define SD3_MSTP311BIT(11) /* either MMC1 */
> +#define HSUSB_MSTP704 BIT(4) /* HSUSB */
>
> #define SD0CKCR0xE6150074
> #define SD1CKCR0xE6150078
> @@ -92,6 +93,13 @@ int board_early_init_f(void)
> /* -/W 32 Power resume control register 2 (3DG) */
> #defineSYSC_PWRONCR2 0xE618010C
>
> +/* HSUSB block registers */
> +#define HSUSB_REG_LPSTS0xE6590102
> +#define HSUSB_REG_LPSTS_SUSPM_NORMAL BIT(14)
> +#define HSUSB_REG_UGCTRL2 0xE6590184
> +#define HSUSB_REG_UGCTRL2_USB0SEL 0x30
> +#define HSUSB_REG_UGCTRL2_USB0SEL_EHCI 0x10
> +
> int board_init(void)
> {
> /* adress of boot parameters */
> @@ -116,6 +124,14 @@ int board_init(void)
> /* USB1 pull-up */
> setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN);
>
> + /* Configure the HSUSB block */
> + mstp_clrbits_le32(MSTPSR7, SMSTPCR7, HSUSB_MSTP704);
> + /* Choice USB0SEL */
> + clrsetbits_le32(HSUSB_REG_UGCTRL2, HSUSB_REG_UGCTRL2_USB0SEL,
> + HSUSB_REG_UGCTRL2_USB0SEL_EHCI);
> + /* low power status */
> + setbits_le16(HSUSB_REG_LPSTS, HSUSB_REG_LPSTS_SUSPM_NORMAL);
> +
> #ifdef CONFIG_RENESAS_RAVB
> /* EtherAVB Enable */
> /* GPSR2 */
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] Please pull u-boot-sh/rmobile branch
Hi Tom,
git request-pull f7f79b4493b8beeb1de099d1d1c86049b018ef5c
git://git.denx.de/u-boot-sh.git rmobile
The following changes since commit f7f79b4493b8beeb1de099d1d1c86049b018ef5c:
ARM: rmobile: Enable MMC and USB DM on ULCB (2017-08-26 07:04:49 +0900)
are available in the git repository at:
git://git.denx.de/u-boot-sh.git rmobile
for you to fetch changes up to 0d0915bef756cb708c84462b8b2ade2606370167:
ARM: rmobile: Add missing IPSR18 bits to R8A7795 PFC (2017-09-05
07:51:39 +0900)
Marek Vasut (3):
ARM: rmobile: Replace CONFIG_RAVB with CONFIG_RENESAS_RAVB in boards
ARM: rmobile: Drop board_mmc_init
ARM: rmobile: Add missing IPSR18 bits to R8A7795 PFC
arch/arm/mach-rmobile/pfc-r8a7795.c | 42
++
board/renesas/salvator-x/salvator-x.c | 11 +++
board/renesas/ulcb/ulcb.c | 11 +++
3 files changed, 48 insertions(+), 16 deletions(-)
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] Please pull u-boot-sh/master branch
Hi, Tom.
The following changes since commit 90ae53ce1ae665a1b43ecf5ccafc339839392427:
fastboot: Ensure we treat CONFIG_FASTBOOT_BUF_ADDR as long
(2017-08-22 08:20:02 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-sh.git master
for you to fetch changes up to f40ad66fa066c7eacbcbb11c2e2f251bb82426e0:
arch/sh: don't bring common/env_embedded.o into the link (2017-08-26
07:40:36 +0900)
Thomas Petazzoni (2):
arch/sh: allow building in big-endian mode
arch/sh: don't bring common/env_embedded.o into the link
arch/sh/cpu/u-boot.lds | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] README: Fix typo in description of CONFIG_OF_EMBED
The correct name is 'gd->fdt_blob', not 'gd->blob'. Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org> CC: Simon Glass <s...@chromium.org> --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 1edf3dbbd8..6adbe6b435 100644 --- a/README +++ b/README @@ -892,7 +892,7 @@ The following options need to be configured: binary in its image. This device tree file should be in the board directory and called -.dts. The binary file is then picked up in board_init_f() and made available through - the global data structure as gd->blob. + the global data structure as gd->fdt_blob. CONFIG_OF_SEPARATE If this variable is defined, U-Boot will build a device tree -- 2.13.2 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] Please pull u-boot-sh/rmobile branch
Hi Tom,
The following changes since commit 90ae53ce1ae665a1b43ecf5ccafc339839392427:
fastboot: Ensure we treat CONFIG_FASTBOOT_BUF_ADDR as long
(2017-08-22 08:20:02 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-sh.git rmobile
for you to fetch changes up to f7f79b4493b8beeb1de099d1d1c86049b018ef5c:
ARM: rmobile: Enable MMC and USB DM on ULCB (2017-08-26 07:04:49 +0900)
Marek Vasut (12):
clk: rmobile: Split R8A7795 and R8A7796 core clock tables
ARM: rmobile: Add u-boot, dm-pre-reloc to clock nodes on Gen3
ARM: rmobile: Enable KSZ90X1 PHY on Salvator-X
ARM: rmobile: Enable HUSH parser
ARM: rmobile: Remove RAVB probing from Salvator-X board
ARM: rmobile: Remove RAVB probing from ULCB board
ARM: rmobile: Remove Serial SH probing from Salvator-X board
ARM: rmobile: Remove Serial SH probing from ULCB board
ARM: rmobile: Remove SH SDHI probing from Salvator-X board
ARM: rmobile: Remove SH SDHI probing from ULCB board
ARM: rmobile: Enable MMC and USB DM on Salvator-X
ARM: rmobile: Enable MMC and USB DM on ULCB
arch/arm/dts/r8a7795.dtsi | 4 ++
arch/arm/dts/r8a7796.dtsi | 4 ++
board/renesas/salvator-x/salvator-x.c | 39 +-
board/renesas/ulcb/ulcb.c | 35 +
configs/r8a7795_salvator-x_defconfig | 4 ++
configs/r8a7795_ulcb_defconfig| 3 +
configs/r8a7796_salvator-x_defconfig | 4 ++
configs/r8a7796_ulcb_defconfig| 3 +
drivers/clk/renesas/clk-rcar-gen3.c | 129 +-
9 files changed, 120 insertions(+), 105 deletions(-)
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 04/12] ARM: rmobile: Enable HUSH parser
Hi,
2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> The HUSH parser was disabled somewhere along the way, reenable it.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Alexandru Gagniuc <ale...@adaptrum.com>
> Cc: Joe Hershberger <joe.hershber...@ni.com>
> ---
> configs/r8a7795_salvator-x_defconfig | 1 +
> configs/r8a7795_ulcb_defconfig | 1 +
> configs/r8a7796_salvator-x_defconfig | 1 +
> configs/r8a7796_ulcb_defconfig | 1 +
> 4 files changed, 4 insertions(+)
Applied, thanks.
Best regards,
Nobuhiro
>
> diff --git a/configs/r8a7795_salvator-x_defconfig
> b/configs/r8a7795_salvator-x_defconfig
> index 3d36698127..d83eaf2b67 100644
> --- a/configs/r8a7795_salvator-x_defconfig
> +++ b/configs/r8a7795_salvator-x_defconfig
> @@ -10,6 +10,7 @@ CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs
> nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
> CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb"
> CONFIG_VERSION_VARIABLE=y
> +CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> CONFIG_CMD_MMC=y
> diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig
> index 8b6b03ba32..82e5942091 100644
> --- a/configs/r8a7795_ulcb_defconfig
> +++ b/configs/r8a7795_ulcb_defconfig
> @@ -9,6 +9,7 @@ CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs
> nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
> CONFIG_DEFAULT_FDT_FILE="r8a7795-h3ulcb.dtb"
> CONFIG_VERSION_VARIABLE=y
> +CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> CONFIG_CMD_MMC=y
> diff --git a/configs/r8a7796_salvator-x_defconfig
> b/configs/r8a7796_salvator-x_defconfig
> index 10aa0bed44..141316127a 100644
> --- a/configs/r8a7796_salvator-x_defconfig
> +++ b/configs/r8a7796_salvator-x_defconfig
> @@ -11,6 +11,7 @@ CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs
> nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
> CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb"
> CONFIG_VERSION_VARIABLE=y
> +CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> CONFIG_CMD_MMC=y
> diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
> index bc995deea0..160bde2ef3 100644
> --- a/configs/r8a7796_ulcb_defconfig
> +++ b/configs/r8a7796_ulcb_defconfig
> @@ -10,6 +10,7 @@ CONFIG_USE_BOOTARGS=y
> CONFIG_BOOTARGS="console=ttySC0,115200 rw root=/dev/nfs
> nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20"
> CONFIG_DEFAULT_FDT_FILE="r8a7796-m3ulcb.dtb"
> CONFIG_VERSION_VARIABLE=y
> +CONFIG_HUSH_PARSER=y
> CONFIG_CMD_BOOTZ=y
> # CONFIG_CMD_IMLS is not set
> CONFIG_CMD_MMC=y
> --
> 2.11.0
>
> ___
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 03/12] ARM: rmobile: Enable KSZ90X1 PHY on Salvator-X
Hi,
2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Commit da3b9e7fd6a1 (Move PHY_MICREL and PHY_MICREL_KSZ90X1 to Kconfig)
> broke ethernet support on R8A779x Salvator-X boards by disabling the
> KSZ90x1 PHY in Kconfig. Reenable it.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Alexandru Gagniuc <ale...@adaptrum.com>
> Cc: Joe Hershberger <joe.hershber...@ni.com>
> ---
> configs/r8a7795_salvator-x_defconfig | 1 +
> configs/r8a7796_salvator-x_defconfig | 1 +
> 2 files changed, 2 insertions(+)
Applied, thanks.
Best regards,
Nobuhiro
>
> diff --git a/configs/r8a7795_salvator-x_defconfig
> b/configs/r8a7795_salvator-x_defconfig
> index f517e0e7ab..3d36698127 100644
> --- a/configs/r8a7795_salvator-x_defconfig
> +++ b/configs/r8a7795_salvator-x_defconfig
> @@ -24,6 +24,7 @@ CONFIG_CLK=y
> CONFIG_CLK_RENESAS=y
> CONFIG_SH_SDHI=y
> CONFIG_PHY_MICREL=y
> +CONFIG_PHY_MICREL_KSZ90X1=y
> CONFIG_DM_ETH=y
> CONFIG_RENESAS_RAVB=y
> CONFIG_SCIF_CONSOLE=y
> diff --git a/configs/r8a7796_salvator-x_defconfig
> b/configs/r8a7796_salvator-x_defconfig
> index 247f8785e3..10aa0bed44 100644
> --- a/configs/r8a7796_salvator-x_defconfig
> +++ b/configs/r8a7796_salvator-x_defconfig
> @@ -25,6 +25,7 @@ CONFIG_CLK=y
> CONFIG_CLK_RENESAS=y
> CONFIG_SH_SDHI=y
> CONFIG_PHY_MICREL=y
> +CONFIG_PHY_MICREL_KSZ90X1=y
> CONFIG_DM_ETH=y
> CONFIG_RENESAS_RAVB=y
> CONFIG_SCIF_CONSOLE=y
> --
> 2.11.0
>
> ___
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 11/12] ARM: rmobile: Enable MMC and USB DM on Salvator-X
Hi,
2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Enable the MMC and USB DM on the board since it's the modern method
> and now supported by the drivers.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> configs/r8a7795_salvator-x_defconfig | 2 ++
> configs/r8a7796_salvator-x_defconfig | 2 ++
> 2 files changed, 4 insertions(+)
Applied, thanks.
Best regards,
Nobuhiro
>
> diff --git a/configs/r8a7795_salvator-x_defconfig
> b/configs/r8a7795_salvator-x_defconfig
> index d83eaf2b67..d53504a5bb 100644
> --- a/configs/r8a7795_salvator-x_defconfig
> +++ b/configs/r8a7795_salvator-x_defconfig
> @@ -23,6 +23,7 @@ CONFIG_CMD_FAT=y
> CONFIG_OF_CONTROL=y
> CONFIG_CLK=y
> CONFIG_CLK_RENESAS=y
> +CONFIG_DM_MMC=y
> CONFIG_SH_SDHI=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ90X1=y
> @@ -30,6 +31,7 @@ CONFIG_DM_ETH=y
> CONFIG_RENESAS_RAVB=y
> CONFIG_SCIF_CONSOLE=y
> CONFIG_USB=y
> +CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_SMBIOS_MANUFACTURER=""
> diff --git a/configs/r8a7796_salvator-x_defconfig
> b/configs/r8a7796_salvator-x_defconfig
> index 141316127a..d18bf2e965 100644
> --- a/configs/r8a7796_salvator-x_defconfig
> +++ b/configs/r8a7796_salvator-x_defconfig
> @@ -24,6 +24,7 @@ CONFIG_CMD_FAT=y
> CONFIG_OF_CONTROL=y
> CONFIG_CLK=y
> CONFIG_CLK_RENESAS=y
> +CONFIG_DM_MMC=y
> CONFIG_SH_SDHI=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ90X1=y
> @@ -31,6 +32,7 @@ CONFIG_DM_ETH=y
> CONFIG_RENESAS_RAVB=y
> CONFIG_SCIF_CONSOLE=y
> CONFIG_USB=y
> +CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_SMBIOS_MANUFACTURER=""
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 12/12] ARM: rmobile: Enable MMC and USB DM on ULCB
Hi,
2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Enable the MMC and USB DM on the board since it's the modern method
> and now supported by the drivers.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> configs/r8a7795_ulcb_defconfig | 2 ++
> configs/r8a7796_ulcb_defconfig | 2 ++
> 2 files changed, 4 insertions(+)
Applied, thanks.
Best regards,
Nobuhiro
>
> diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig
> index 82e5942091..42913dffaf 100644
> --- a/configs/r8a7795_ulcb_defconfig
> +++ b/configs/r8a7795_ulcb_defconfig
> @@ -21,11 +21,13 @@ CONFIG_OF_CONTROL=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_CLK=y
> CONFIG_CLK_RENESAS=y
> +CONFIG_DM_MMC=y
> CONFIG_SH_SDHI=y
> CONFIG_DM_ETH=y
> CONFIG_RENESAS_RAVB=y
> CONFIG_SCIF_CONSOLE=y
> CONFIG_USB=y
> +CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_SMBIOS_MANUFACTURER=""
> diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
> index 160bde2ef3..e5f560612b 100644
> --- a/configs/r8a7796_ulcb_defconfig
> +++ b/configs/r8a7796_ulcb_defconfig
> @@ -22,11 +22,13 @@ CONFIG_OF_CONTROL=y
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_CLK=y
> CONFIG_CLK_RENESAS=y
> +CONFIG_DM_MMC=y
> CONFIG_SH_SDHI=y
> CONFIG_DM_ETH=y
> CONFIG_RENESAS_RAVB=y
> CONFIG_SCIF_CONSOLE=y
> CONFIG_USB=y
> +CONFIG_DM_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> CONFIG_SMBIOS_MANUFACTURER=""
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 09/12] ARM: rmobile: Remove SH SDHI probing from Salvator-X board
Hi,
2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Drop the SH SDHI bit from the board since SD now probes from DT instead.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/salvator-x/salvator-x.c | 16 +---
> 1 file changed, 1 insertion(+), 15 deletions(-)
Applied, thanks.
Best regards,
Nobuhiro
>
> diff --git a/board/renesas/salvator-x/salvator-x.c
> b/board/renesas/salvator-x/salvator-x.c
> index 4ed80f5493..a09cd56d66 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -164,8 +164,6 @@ int board_init(void)
> #ifdef CONFIG_SH_SDHI
> int board_mmc_init(bd_t *bis)
> {
> - int ret = -ENODEV;
> -
> /* SDHI0 */
> gpio_request(GPIO_GFN_SD0_DAT0, NULL);
> gpio_request(GPIO_GFN_SD0_DAT1, NULL);
> @@ -181,11 +179,6 @@ int board_mmc_init(bd_t *bis)
> gpio_direction_output(GPIO_GP_5_2, 1); /* power on */
> gpio_direction_output(GPIO_GP_5_1, 1); /* 1: 3.3V, 0: 1.8V */
>
> - ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI0_BASE, 0,
> - SH_SDHI_QUIRK_64BIT_BUF);
> - if (ret)
> - return ret;
> -
> /* SDHI1/SDHI2 eMMC */
> gpio_request(GPIO_GFN_SD1_DAT0, NULL);
> gpio_request(GPIO_GFN_SD1_DAT1, NULL);
> @@ -208,11 +201,6 @@ int board_mmc_init(bd_t *bis)
> gpio_direction_output(GPIO_GP_5_3, 0); /* 1: 3.3V, 0: 1.8V */
> gpio_direction_output(GPIO_GP_5_9, 0); /* 1: 3.3V, 0: 1.8V */
>
> - ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI2_BASE, 1,
> - SH_SDHI_QUIRK_64BIT_BUF);
> - if (ret)
> - return ret;
> -
> #if defined(CONFIG_R8A7795)
> /* SDHI3 */
> gpio_request(GPIO_GFN_SD3_DAT0, NULL); /* GP_4_9 */
> @@ -240,9 +228,7 @@ int board_mmc_init(bd_t *bis)
> gpio_direction_output(GPIO_GP_3_15, 1); /* power on */
> gpio_direction_output(GPIO_GP_3_14, 1); /* 1: 3.3V, 0: 1.8V */
>
> - ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI3_BASE, 2,
> - SH_SDHI_QUIRK_64BIT_BUF);
> - return ret;
> + return 0;
> }
> #endif
>
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 07/12] ARM: rmobile: Remove Serial SH probing from Salvator-X board
Hi,
2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Drop the Serial SH bit from the board since UART now probes from DT instead.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/salvator-x/salvator-x.c | 12
> 1 file changed, 12 deletions(-)
Applied, thanks.
Best regards,
Nobuhiro
>
> diff --git a/board/renesas/salvator-x/salvator-x.c
> b/board/renesas/salvator-x/salvator-x.c
> index ce3892da90..4ed80f5493 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -300,15 +300,3 @@ void reset_cpu(ulong addr)
> writel(RST_CODE, RST_CA57RESCNT);
> #endif
> }
> -
> -static const struct sh_serial_platdata serial_platdata = {
> - .base = SCIF2_BASE,
> - .type = PORT_SCIF,
> - .clk = CONFIG_SH_SCIF_CLK_FREQ,
> - .clk_mode = INT_CLK,
> -};
> -
> -U_BOOT_DEVICE(salvator_x_scif2) = {
> - .name = "serial_sh",
> - .platdata = _platdata,
> -};
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 10/12] ARM: rmobile: Remove SH SDHI probing from ULCB board
Hi,
2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Drop the SH SDHI bit from the board since SD now probes from DT instead.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/ulcb/ulcb.c | 12 +---
> 1 file changed, 1 insertion(+), 11 deletions(-)
Applied, thanks.
Best regards,
Nobuhiro
>
> diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
> index 6b080311d0..068cbdea03 100644
> --- a/board/renesas/ulcb/ulcb.c
> +++ b/board/renesas/ulcb/ulcb.c
> @@ -143,8 +143,6 @@ int board_init(void)
> #ifdef CONFIG_SH_SDHI
> int board_mmc_init(bd_t *bis)
> {
> - int ret = -ENODEV;
> -
> /* SDHI0 */
> gpio_request(GPIO_GFN_SD0_DAT0, NULL);
> gpio_request(GPIO_GFN_SD0_DAT1, NULL);
> @@ -160,11 +158,6 @@ int board_mmc_init(bd_t *bis)
> gpio_direction_output(GPIO_GP_5_2, 1); /* power on */
> gpio_direction_output(GPIO_GP_5_1, 1); /* 1: 3.3V, 0: 1.8V */
>
> - ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI0_BASE, 0,
> - SH_SDHI_QUIRK_64BIT_BUF);
> - if (ret)
> - return ret;
> -
> /* SDHI1/SDHI2 eMMC */
> gpio_request(GPIO_GFN_SD1_DAT0, NULL);
> gpio_request(GPIO_GFN_SD1_DAT1, NULL);
> @@ -187,10 +180,7 @@ int board_mmc_init(bd_t *bis)
> gpio_direction_output(GPIO_GP_5_3, 0); /* 1: 3.3V, 0: 1.8V */
> gpio_direction_output(GPIO_GP_5_9, 0); /* 1: 3.3V, 0: 1.8V */
>
> - ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI2_BASE, 1,
> - SH_SDHI_QUIRK_64BIT_BUF);
> -
> - return ret;
> + return 0;
> }
> #endif
>
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 08/12] ARM: rmobile: Remove Serial SH probing from ULCB board
Hi,
2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Drop the Serial SH bit from the board since UART now probes from DT instead.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/ulcb/ulcb.c | 12
> 1 file changed, 12 deletions(-)
Applied, thanks.
Best regards,
Nobuhiro
>
> diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
> index e249bd27d4..6b080311d0 100644
> --- a/board/renesas/ulcb/ulcb.c
> +++ b/board/renesas/ulcb/ulcb.c
> @@ -232,15 +232,3 @@ int dram_init_banksize(void)
> const struct rmobile_sysinfo sysinfo = {
> CONFIG_RCAR_BOARD_STRING
> };
> -
> -static const struct sh_serial_platdata serial_platdata = {
> - .base = SCIF2_BASE,
> - .type = PORT_SCIF,
> - .clk = CONFIG_SH_SCIF_CLK_FREQ,
> - .clk_mode = INT_CLK,
> -};
> -
> -U_BOOT_DEVICE(salvator_x_scif2) = {
> - .name = "serial_sh",
> - .platdata = _platdata,
> -};
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 06/12] ARM: rmobile: Remove RAVB probing from ULCB board
Hi,
2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Drop the RAVB bit from the board since RAVB now probes from DT instead.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/ulcb/ulcb.c | 11 ---
> 1 file changed, 11 deletions(-)
Applied, thanks.
Best regards,
Nobuhiro
>
> diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
> index 4005ec8ad5..e249bd27d4 100644
> --- a/board/renesas/ulcb/ulcb.c
> +++ b/board/renesas/ulcb/ulcb.c
> @@ -140,17 +140,6 @@ int board_init(void)
> return 0;
> }
>
> -static struct eth_pdata salvator_x_ravb_platdata = {
> - .iobase = 0xE680,
> - .phy_interface = 0,
> - .max_speed = 1000,
> -};
> -
> -U_BOOT_DEVICE(salvator_x_ravb) = {
> - .name = "ravb",
> - .platdata = _x_ravb_platdata,
> -};
> -
> #ifdef CONFIG_SH_SDHI
> int board_mmc_init(bd_t *bis)
> {
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 05/12] ARM: rmobile: Remove RAVB probing from Salvator-X board
Hi,
2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Drop the RAVB bit from the board since RAVB now probes from DT instead.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/salvator-x/salvator-x.c | 11 ---
> 1 file changed, 11 deletions(-)
Applied, thanks.
Best regards,
Nobuhiro
>
> diff --git a/board/renesas/salvator-x/salvator-x.c
> b/board/renesas/salvator-x/salvator-x.c
> index 6270de4e40..ce3892da90 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -161,17 +161,6 @@ int board_init(void)
> return 0;
> }
>
> -static struct eth_pdata salvator_x_ravb_platdata = {
> - .iobase = 0xE680,
> - .phy_interface = 0,
> - .max_speed = 1000,
> -};
> -
> -U_BOOT_DEVICE(salvator_x_ravb) = {
> - .name = "ravb",
> - .platdata = _x_ravb_platdata,
> -};
> -
> #ifdef CONFIG_SH_SDHI
> int board_mmc_init(bd_t *bis)
> {
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 02/12] ARM: rmobile: Add u-boot, dm-pre-reloc to clock nodes on Gen3
Hi,
2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> We need the clock available very early, add the u-boot,dm-pre-reloc
> DT property on those nodes, so they come up very in the process.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> arch/arm/dts/r8a7795.dtsi | 4
> arch/arm/dts/r8a7796.dtsi | 4
> 2 files changed, 8 insertions(+)
Applied, thanks.
Best regards,
Nobuhiro
>
> diff --git a/arch/arm/dts/r8a7795.dtsi b/arch/arm/dts/r8a7795.dtsi
> index e99d6443b3..110d0681c8 100644
> --- a/arch/arm/dts/r8a7795.dtsi
> +++ b/arch/arm/dts/r8a7795.dtsi
> @@ -129,6 +129,7 @@
> #clock-cells = <0>;
> /* This value must be overridden by the board */
> clock-frequency = <0>;
> + u-boot,dm-pre-reloc;
> };
>
> extalr_clk: extalr {
> @@ -136,6 +137,7 @@
> #clock-cells = <0>;
> /* This value must be overridden by the board */
> clock-frequency = <0>;
> + u-boot,dm-pre-reloc;
> };
>
> /*
> @@ -189,6 +191,7 @@
> #address-cells = <2>;
> #size-cells = <2>;
> ranges;
> + u-boot,dm-pre-reloc;
>
> gic: interrupt-controller@f101 {
> compatible = "arm,gic-400";
> @@ -380,6 +383,7 @@
> #clock-cells = <2>;
> #power-domain-cells = <0>;
> #reset-cells = <1>;
> + u-boot,dm-pre-reloc;
> };
>
> rst: reset-controller@e616 {
> diff --git a/arch/arm/dts/r8a7796.dtsi b/arch/arm/dts/r8a7796.dtsi
> index 2ec1ed5f49..298df5db9f 100644
> --- a/arch/arm/dts/r8a7796.dtsi
> +++ b/arch/arm/dts/r8a7796.dtsi
> @@ -111,6 +111,7 @@
> #clock-cells = <0>;
> /* This value must be overridden by the board */
> clock-frequency = <0>;
> + u-boot,dm-pre-reloc;
> };
>
> extalr_clk: extalr {
> @@ -118,6 +119,7 @@
> #clock-cells = <0>;
> /* This value must be overridden by the board */
> clock-frequency = <0>;
> + u-boot,dm-pre-reloc;
> };
>
> /* External CAN clock - to be overridden by boards that provide it */
> @@ -140,6 +142,7 @@
> #address-cells = <2>;
> #size-cells = <2>;
> ranges;
> + u-boot,dm-pre-reloc;
>
> gic: interrupt-controller@f101 {
> compatible = "arm,gic-400";
> @@ -333,6 +336,7 @@
> #clock-cells = <2>;
> #power-domain-cells = <0>;
> #reset-cells = <1>;
> + u-boot,dm-pre-reloc;
> };
>
> rst: reset-controller@e616 {
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 01/12] clk: rmobile: Split R8A7795 and R8A7796 core clock tables
Hi,
2017-08-21 0:13 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> The R8A7795 and R8A7796 tables use different constants to identify
> clock in DT, so split the tables and use the correct constants on
> R8A7795. This fixes UART clock misconfiguration on R8A7795.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> drivers/clk/renesas/clk-rcar-gen3.c | 129
> +++-
> 1 file changed, 96 insertions(+), 33 deletions(-)
Applied, thanks.
Best regards,
Nobuhiro
>
> diff --git a/drivers/clk/renesas/clk-rcar-gen3.c
> b/drivers/clk/renesas/clk-rcar-gen3.c
> index 5ea7d9a1f5..4e74856940 100644
> --- a/drivers/clk/renesas/clk-rcar-gen3.c
> +++ b/drivers/clk/renesas/clk-rcar-gen3.c
> @@ -73,6 +73,8 @@ struct gen3_clk_priv {
> struct clk clk_extal;
> struct clk clk_extalr;
> const struct rcar_gen3_cpg_pll_config *cpg_pll_config;
> + const struct cpg_core_clk *core_clk;
> + u32 core_clk_size;
> const struct mssr_mod_clk *mod_clk;
> u32 mod_clk_size;
> };
> @@ -181,7 +183,7 @@ enum clk_ids {
> MOD_CLK_BASE
> };
>
> -static const struct cpg_core_clk gen3_core_clks[] = {
> +static const struct cpg_core_clk r8a7795_core_clks[] = {
> /* External Clock Inputs */
> DEF_INPUT("extal", CLK_EXTAL),
> DEF_INPUT("extalr", CLK_EXTALR),
> @@ -203,38 +205,38 @@ static const struct cpg_core_clk gen3_core_clks[] = {
> DEF_FIXED(".sdsrc", CLK_SDSRC, CLK_PLL1_DIV2, 2, 1),
>
> /* Core Clock Outputs */
> - DEF_FIXED("ztr",R8A7796_CLK_ZTR, CLK_PLL1_DIV2, 6, 1),
> - DEF_FIXED("ztrd2", R8A7796_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
> - DEF_FIXED("zt", R8A7796_CLK_ZT,CLK_PLL1_DIV2, 4, 1),
> - DEF_FIXED("zx", R8A7796_CLK_ZX,CLK_PLL1_DIV2, 2, 1),
> - DEF_FIXED("s0d1", R8A7796_CLK_S0D1, CLK_S0, 1, 1),
> - DEF_FIXED("s0d2", R8A7796_CLK_S0D2, CLK_S0, 2, 1),
> - DEF_FIXED("s0d3", R8A7796_CLK_S0D3, CLK_S0, 3, 1),
> - DEF_FIXED("s0d4", R8A7796_CLK_S0D4, CLK_S0, 4, 1),
> - DEF_FIXED("s0d6", R8A7796_CLK_S0D6, CLK_S0, 6, 1),
> - DEF_FIXED("s0d8", R8A7796_CLK_S0D8, CLK_S0, 8, 1),
> - DEF_FIXED("s0d12", R8A7796_CLK_S0D12, CLK_S0,12, 1),
> - DEF_FIXED("s1d1", R8A7796_CLK_S1D1, CLK_S1, 1, 1),
> - DEF_FIXED("s1d2", R8A7796_CLK_S1D2, CLK_S1, 2, 1),
> - DEF_FIXED("s1d4", R8A7796_CLK_S1D4, CLK_S1, 4, 1),
> - DEF_FIXED("s2d1", R8A7796_CLK_S2D1, CLK_S2, 1, 1),
> - DEF_FIXED("s2d2", R8A7796_CLK_S2D2, CLK_S2, 2, 1),
> - DEF_FIXED("s2d4", R8A7796_CLK_S2D4, CLK_S2, 4, 1),
> - DEF_FIXED("s3d1", R8A7796_CLK_S3D1, CLK_S3, 1, 1),
> - DEF_FIXED("s3d2", R8A7796_CLK_S3D2, CLK_S3, 2, 1),
> - DEF_FIXED("s3d4", R8A7796_CLK_S3D4, CLK_S3, 4, 1),
> -
> - DEF_GEN3_SD("sd0", R8A7796_CLK_SD0, CLK_SDSRC, 0x074),
> - DEF_GEN3_SD("sd1", R8A7796_CLK_SD1, CLK_SDSRC, 0x078),
> - DEF_GEN3_SD("sd2", R8A7796_CLK_SD2, CLK_SDSRC, 0x268),
> - DEF_GEN3_SD("sd3", R8A7796_CLK_SD3, CLK_SDSRC, 0x26c),
> -
> - DEF_FIXED("cl", R8A7796_CLK_CL,CLK_PLL1_DIV2, 48, 1),
> - DEF_FIXED("cp", R8A7796_CLK_CP,CLK_EXTAL, 2, 1),
> + DEF_FIXED("ztr",R8A7795_CLK_ZTR, CLK_PLL1_DIV2, 6, 1),
> + DEF_FIXED("ztrd2", R8A7795_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
> + DEF_FIXED("zt", R8A7795_CLK_ZT,CLK_PLL1_DIV2, 4, 1),
> + DEF_FIXED("zx", R8A7795_CLK_ZX,CLK_PLL1_DIV2, 2, 1),
> + DEF_FIXED("s0d1", R8A7795_CLK_S0D1, CLK_S0, 1, 1),
> + DEF_FIXED("s0d2", R8A7795_CLK_S0D2, CLK_S0, 2, 1),
> + DEF_FIXED("s0d3", R8A7795_CLK_S0D3, CLK_S0, 3, 1),
> + DEF_FIXED("s0d4", R8A7795_CLK_S0D4, CLK_S0, 4, 1),
> + DEF_FIXED("s0d6", R8A7795_CLK_S0D6, CLK_S0, 6, 1),
> + DEF_FIXED("s0d8",
[U-Boot] [PATCH] boot_fit: Change return value from FDT_ERROR to -EINVAL in fdt_offset()
FDT_ERROR is defined as unsigned long. However, since the return value of
fdt_offset() is int, a warning will occur when compiling. Also, it is better
to use -EINVAL than FDT_ERROR.
This fixes this problem by change return value from FDT_ERROR to -EINVAL.
Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
CC: Franklin S Cooper Jr <fcoo...@ti.com>
---
common/boot_fit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/boot_fit.c b/common/boot_fit.c
index 51440a6e6f..0a723150b5 100644
--- a/common/boot_fit.c
+++ b/common/boot_fit.c
@@ -25,7 +25,7 @@ int fdt_offset(void *fit)
images = fdt_path_offset(fit, FIT_IMAGES_PATH);
if (images < 0) {
debug("%s: Cannot find /images node: %d\n", __func__, images);
- return FDT_ERROR;
+ return -EINVAL;
}
fdt_name = fdt_getprop(fit, node, FIT_FDT_PROP, _len);
--
2.13.2
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] boot_fit: Fix warning: overflow in implicit constant conversion in fdt_offset()
Hi,
2017-08-03 8:56 GMT+09:00 Franklin S Cooper Jr <fcoo...@ti.com>:
>
> Hi
> On 08/02/2017 06:10 PM, Nobuhiro Iwamatsu wrote:
>> FDT_ERROR is defined as unsigned long. However, since the return value of
>> fdt_offset() is int, a warning will occur when compiling.
>> This fixes this problem by cast to int when setting FDT_ERROR as return
>> value.
>>
>> Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
>> CC: Franklin S Cooper Jr <fcoo...@ti.com>
>> ---
>> common/boot_fit.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/common/boot_fit.c b/common/boot_fit.c
>> index 51440a6e6f..ca130f2308 100644
>> --- a/common/boot_fit.c
>> +++ b/common/boot_fit.c
>> @@ -25,7 +25,7 @@ int fdt_offset(void *fit)
>> images = fdt_path_offset(fit, FIT_IMAGES_PATH);
>> if (images < 0) {
>> debug("%s: Cannot find /images node: %d\n", __func__, images);
>> - return FDT_ERROR;
>> + return (int)FDT_ERROR;
>
> Returning -EINVAL would be better. Doing essentially (int)((ulong)(-1))
> doesn't look right and to function properly that function needs to
> return any kind of negative value. Thanks for catching this problem.
I see. I will resend new patch.
Thanks!
Nobuhiro
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] Please pull u-boot-sh/rmobile branch
Hi Tom, The following changes since commit 07d778382200a05a8b86cc135f79ec48e386f25a: Merge git://git.denx.de/u-boot-x86 (2017-08-01 15:38:32 -0400) are available in the git repository at: git://git.denx.de/u-boot-sh.git rmobile for you to fetch changes up to 9c552db619b2ab373dbf048714518c74c53e6c2b: ARM: rmobile: Update defconfig of R-Car Gen3 (2017-08-03 04:29:23 +0900) Marek Vasut (13): ARM: rmobile: Add PFC PUEN bank 5 address ARM: rmobile: ulcb: Add ULCB board support ARM: rmobile: Increase console buffer sizes ARM: dts: rmobile: Import DTS from Linux 4.12 ARM: rmobile: Enable OF_CONTROL on RCar Gen3 clk: rmobile: Add RCar Gen3 clock driver ARM: rmobile: Enable clock framework on Salvator-X ARM: rmobile: Enable clock framework on ULCB serial: sh: Convert to Kconfig serial: sh: Use the clock framework to obtain clock config net: ravb: Add OF probing support net: ravb: Detect PHY correctly net: ravb: Add clock handling support Nobuhiro Iwamatsu (1): ARM: rmobile: Update defconfig of R-Car Gen3 arch/arm/dts/Makefile |6 + arch/arm/dts/r8a7795-h3ulcb.dts | 376 arch/arm/dts/r8a7795-salvator-x.dts | 584 + arch/arm/dts/r8a7795.dtsi | 1866 arch/arm/dts/r8a7796-m3ulcb.dts | 188 arch/arm/dts/r8a7796-salvator-x.dts | 269 arch/arm/dts/r8a7796.dtsi | 1037 arch/arm/mach-rmobile/Kconfig.64|6 + arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h |2 + board/renesas/ulcb/Kconfig | 15 + board/renesas/ulcb/MAINTAINERS |7 + board/renesas/ulcb/Makefile |9 + board/renesas/ulcb/cpld.c | 167 board/renesas/ulcb/ulcb.c | 257 +++ configs/MigoR_defconfig |1 + configs/alt_defconfig |1 + configs/ap325rxa_defconfig |1 + configs/ap_sh4a_4a_defconfig|1 + configs/armadillo-800eva_defconfig |1 + configs/blanche_defconfig |1 + configs/ecovec_defconfig|1 + configs/espt_defconfig |1 + configs/gose_defconfig |1 + configs/koelsch_defconfig |1 + configs/kzm9g_defconfig |1 + configs/lager_defconfig |1 + configs/mpr2_defconfig |1 + configs/ms7720se_defconfig |1 + configs/ms7722se_defconfig |1 + configs/ms7750se_defconfig |1 + configs/porter_defconfig|1 + configs/r0p7734_defconfig |1 + configs/r2dplus_defconfig |1 + configs/r7780mp_defconfig |1 + configs/r8a7795_salvator-x_defconfig|8 +- configs/r8a7795_ulcb_defconfig | 27 ++ configs/r8a7796_salvator-x_defconfig|8 +- configs/r8a7796_ulcb_defconfig | 28 ++ configs/rsk7203_defconfig |1 + configs/rsk7264_defconfig |1 + configs/rsk7269_defconfig |1 + configs/sh7752evb_defconfig |1 + configs/sh7753evb_defconfig |1 + configs/sh7757lcr_defconfig |1 + configs/sh7763rdp_defconfig |1 + configs/sh7785lcr_32bit_defconfig |1 + configs/sh7785lcr_defconfig |1 + configs/shmin_defconfig |1 + configs/silk_defconfig |1 + configs/stout_defconfig |1 + drivers/clk/Kconfig |1 + drivers/clk/Makefile|1 + drivers/clk/renesas/Kconfig | 13 + drivers/clk/renesas/Makefile|1 + drivers/clk/renesas/clk-rcar-gen3.c | 951 + drivers/net/ravb.c | 65 ++- drivers/serial/Kconfig |8 + drivers/serial/serial_sh.c
Re: [U-Boot] [PATCH 1/3] arch/sh: don't bring common/env_embedded.o into the link
Hi,
2017-07-29 6:46 GMT+09:00 Thomas Petazzoni
<thomas.petazz...@free-electrons.com>:
> The linker script for SuperH brings the .ppcenv and .ppcenvr section
> of common/env_embedded.o into the .text section. However, the .ppcenv
> section is only ever filled in by env_embedded.o when
> CONFIG_SYS_USE_PPCENV is defined, but no platforms in mainline U-Boot
> use this.
>
> In addition, common/env_embedded.o is not always built (when you use
> CONFIG_ENV_IS_NOWHERE for example), which causes the following build
> failure:
>
> Fixes:
>
> LD u-boot
> /home/thomas/sh4aeb-linux-musl/bin/sh4aeb-linux-ld.bfd: cannot find
> common/env_embedded.o
>
> We fix this by no longer adding the .ppcenv and .ppcenvr sections from
> common/env_embedded.o into the .text section.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazz...@free-electrons.com>
Acked-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> arch/sh/cpu/u-boot.lds | 4
> 1 file changed, 4 deletions(-)
>
> diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds
> index f185b4d..2f2bdb5 100644
> --- a/arch/sh/cpu/u-boot.lds
> +++ b/arch/sh/cpu/u-boot.lds
> @@ -38,10 +38,6 @@ SECTIONS
> KEEP(CONFIG_BOARDDIR/lowlevel_init.o(.text
> .spiboot1.text))
> KEEP(*(.spiboot2.text))
> . = ALIGN(8192);
> - common/env_embedded.o (.ppcenv)
> - . = ALIGN(8192);
> - common/env_embedded.o (.ppcenvr)
> - . = ALIGN(8192);
> *(.text)
> . = ALIGN(4);
> } >ram =0xFF
> --
> 2.9.4
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] arch/sh: allow building in big-endian mode
Applied, thanks!
2017-07-29 6:14 GMT+09:00 Thomas Petazzoni
<thomas.petazz...@free-electrons.com>:
> The SuperH architecture allows to be run in either little or big
> endian mode. Some SuperH SoCs get the little vs. big endian decision
> through mode pins sampled at reset, so if big endian has been choosen
> by HW designers, it cannot be easily changed.
>
> Therefore, it makes sense to allow building U-Boot for SuperH in big
> endian mode. To allow this, the only change needed is to adjust the
> OUTPUT_FORMAT() in the linker script.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazz...@free-electrons.com>
> ---
> arch/sh/cpu/u-boot.lds | 5 +
> 1 file changed, 5 insertions(+)
>
> diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds
> index bbf9ff4..f185b4d 100644
> --- a/arch/sh/cpu/u-boot.lds
> +++ b/arch/sh/cpu/u-boot.lds
> @@ -9,7 +9,12 @@
>
> #include "config.h"
>
> +#ifdef CONFIG_SYS_BIG_ENDIAN
> +OUTPUT_FORMAT("elf32-shbig-linux", "elf32-shbig-linux", "elf32-sh-linux")
> +#else
> OUTPUT_FORMAT("elf32-sh-linux", "elf32-sh-linux", "elf32-sh-linux")
> +#endif
> +
> OUTPUT_ARCH(sh)
>
> MEMORY
> --
> 2.9.4
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] mmc: sd_sdhi: Enable clock using clock framework
Hi,
2017-07-22 6:22 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Since we now have clock driver for the RCar Gen3 , add support for
> enabling the clock into the SH SDHI driver to prevent hacks in the
> board files.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> Cc: Jaehoon Chung <jh80.ch...@samsung.com>
Reviewed-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> drivers/mmc/sh_sdhi.c | 15 +++
> 1 file changed, 15 insertions(+)
>
> diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
> index 3c5616e507..eef061abb2 100644
> --- a/drivers/mmc/sh_sdhi.c
> +++ b/drivers/mmc/sh_sdhi.c
> @@ -20,6 +20,7 @@
> #include
> #include
> #include
> +#include
>
> #define DRIVER_NAME "sh-sdhi"
>
> @@ -824,8 +825,10 @@ static int sh_sdhi_dm_probe(struct udevice *dev)
> struct sh_sdhi_plat *plat = dev_get_platdata(dev);
> struct sh_sdhi_host *host = dev_get_priv(dev);
> struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
> + struct clk sh_sdhi_clk;
> const u32 quirks = dev_get_driver_data(dev);
> fdt_addr_t base;
> + int ret;
>
> base = devfdt_get_addr(dev);
> if (base == FDT_ADDR_T_NONE)
> @@ -835,6 +838,18 @@ static int sh_sdhi_dm_probe(struct udevice *dev)
> if (!host->addr)
> return -ENOMEM;
>
> + ret = clk_get_by_index(dev, 0, _sdhi_clk);
> + if (ret) {
> + debug("failed to get clock, ret=%d\n", ret);
> + return ret;
> + }
> +
> + ret = clk_enable(_sdhi_clk);
> + if (ret) {
> + debug("failed to enable clock, ret=%d\n", ret);
> + return ret;
> + }
> +
> host->quirks = quirks;
>
> if (host->quirks & SH_SDHI_QUIRK_64BIT_BUF)
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/3] mmc: sh_sdhi: Fix the ACMD handling
Hi,
2017-07-22 6:22 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> The command handling in this driver is awful, esp. because the driver
> depends on command numbers to determine whether this is APPCMD or not.
> Also, handling of command RSP response types is totally wrong.
>
> This patch at least plucks out some of the custom command encoding and
> fixes the APPCMD handling. The RSP handling still needs work, yet that
> might not be needed as it turns out the uniphier-sd.c driver is in much
> better shape and supports the same IP, so we might be able to just drop
> this driver in favor of the uniphier one.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> Cc: Jaehoon Chung <jh80.ch...@samsung.com>
Reviewed-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> arch/arm/mach-rmobile/include/mach/sh_sdhi.h | 5 --
> drivers/mmc/sh_sdhi.c| 103
> ++-
> 2 files changed, 55 insertions(+), 53 deletions(-)
>
> diff --git a/arch/arm/mach-rmobile/include/mach/sh_sdhi.h
> b/arch/arm/mach-rmobile/include/mach/sh_sdhi.h
> index 1fb0648b12..00a135faa1 100644
> --- a/arch/arm/mach-rmobile/include/mach/sh_sdhi.h
> +++ b/arch/arm/mach-rmobile/include/mach/sh_sdhi.h
> @@ -49,11 +49,6 @@
>
> /* SDHI CMD VALUE */
> #define CMD_MASK 0x
> -#define SDHI_APP 0x0040
> -#define SDHI_MMC_SEND_OP_COND 0x0701
> -#define SDHI_SD_APP_SEND_SCR 0x0073
> -#define SDHI_SD_SWITCH 0x1C06
> -#define SDHI_MMC_SEND_EXT_CSD 0x1C08
>
> /* SDHI_PORTSEL */
> #define USE_1PORT (1 << 8) /* 1 port */
> diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
> index fd710399b6..3c5616e507 100644
> --- a/drivers/mmc/sh_sdhi.c
> +++ b/drivers/mmc/sh_sdhi.c
> @@ -31,6 +31,7 @@ struct sh_sdhi_host {
> unsigned char wait_int;
> unsigned char sd_error;
> unsigned char detect_waiting;
> + unsigned char app_cmd;
> };
>
> static inline void sh_sdhi_writeq(struct sh_sdhi_host *host, int reg, u64
> val)
> @@ -475,65 +476,64 @@ static void sh_sdhi_get_response(struct sh_sdhi_host
> *host, struct mmc_cmd *cmd)
> static unsigned short sh_sdhi_set_cmd(struct sh_sdhi_host *host,
> struct mmc_data *data, unsigned short opc)
> {
> - switch (opc) {
> - case SD_CMD_APP_SEND_OP_COND:
> - case SD_CMD_APP_SEND_SCR:
> - opc |= SDHI_APP;
> - break;
> - case SD_CMD_APP_SET_BUS_WIDTH:
> -/* SD_APP_SET_BUS_WIDTH*/
> + if (host->app_cmd) {
> if (!data)
> - opc |= SDHI_APP;
> - else /* SD_SWITCH */
> - opc = SDHI_SD_SWITCH;
> - break;
> - case MMC_CMD_SEND_OP_COND:
> - opc = SDHI_MMC_SEND_OP_COND;
> - break;
> + host->app_cmd = 0;
> + return opc | BIT(6);
> + }
> +
> + switch (opc) {
> + case MMC_CMD_SWITCH:
> + return opc | (data ? 0x1c00 : 0x40);
> case MMC_CMD_SEND_EXT_CSD:
> - if (data)
> - opc = SDHI_MMC_SEND_EXT_CSD;
> - break;
> + return opc | (data ? 0x1c00 : 0);
> + case MMC_CMD_SEND_OP_COND:
> + return opc | 0x0700;
> + case MMC_CMD_APP_CMD:
> + host->app_cmd = 1;
> default:
> - break;
> + return opc;
> }
> - return opc;
> }
>
> static unsigned short sh_sdhi_data_trans(struct sh_sdhi_host *host,
> struct mmc_data *data, unsigned short opc)
> {
> - unsigned short ret;
> -
> - switch (opc) {
> - case MMC_CMD_READ_MULTIPLE_BLOCK:
> - ret = sh_sdhi_multi_read(host, data);
> - break;
> - case MMC_CMD_WRITE_MULTIPLE_BLOCK:
> - ret = sh_sdhi_multi_write(host, data);
> - break;
> - case MMC_CMD_WRITE_SINGLE_BLOCK:
> - ret = sh_sdhi_single_write(host, data);
> - break;
> - case MMC_CMD_READ_SINGLE_BLOCK:
> - case SDHI_SD_APP_SEND_SCR:
> - case SDHI_SD_SWITCH: /* SD_SWITCH */
> - case SDHI_MMC_SEND_EXT_CSD:
> - ret = sh_sdhi_single_read(host, data);
> - break;
> - default:
> -
Re: [U-Boot] [PATCH 1/3] mmc: sh_sdhi: Add DM and DT probing support
Hi,
2017-07-22 6:22 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Add MMC DM and DT probing support into the SH SDHI driver.
> This patch abstracts out the common bits of the send command
> and set ios functions, so they can be used both by DM and non
> DM setups and adds the DM probe support.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> Cc: Jaehoon Chung <jh80.ch...@samsung.com>
Reviewed-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> drivers/mmc/sh_sdhi.c | 165
> --
> 1 file changed, 145 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
> index d181b63905..fd710399b6 100644
> --- a/drivers/mmc/sh_sdhi.c
> +++ b/drivers/mmc/sh_sdhi.c
> @@ -13,15 +13,18 @@
> #include
> #include
> #include
> +#include
> #include
> -#include
> +#include
> +#include
> +#include
> #include
> #include
>
> #define DRIVER_NAME "sh-sdhi"
>
> struct sh_sdhi_host {
> - unsigned long addr;
> + void __iomem *addr;
> int ch;
> int bus_shift;
> unsigned long quirks;
> @@ -50,11 +53,6 @@ static inline u16 sh_sdhi_readw(struct sh_sdhi_host *host,
> int reg)
> return readw(host->addr + (reg << host->bus_shift));
> }
>
> -static void *mmc_priv(struct mmc *mmc)
> -{
> - return (void *)mmc->priv;
> -}
> -
> static void sh_sdhi_detect(struct sh_sdhi_host *host)
> {
> sh_sdhi_writew(host, SDHI_OPTION,
> @@ -634,23 +632,17 @@ static int sh_sdhi_start_cmd(struct sh_sdhi_host *host,
> return ret;
> }
>
> -static int sh_sdhi_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
> - struct mmc_data *data)
> +static int sh_sdhi_send_cmd_common(struct sh_sdhi_host *host,
> + struct mmc_cmd *cmd, struct mmc_data *data)
> {
> - struct sh_sdhi_host *host = mmc_priv(mmc);
> - int ret;
> -
> host->sd_error = 0;
>
> - ret = sh_sdhi_start_cmd(host, data, cmd);
> -
> - return ret;
> + return sh_sdhi_start_cmd(host, data, cmd);
> }
>
> -static int sh_sdhi_set_ios(struct mmc *mmc)
> +static int sh_sdhi_set_ios_common(struct sh_sdhi_host *host, struct mmc *mmc)
> {
> int ret;
> - struct sh_sdhi_host *host = mmc_priv(mmc);
>
> ret = sh_sdhi_clock_control(host, mmc->clock);
> if (ret)
> @@ -674,9 +666,8 @@ static int sh_sdhi_set_ios(struct mmc *mmc)
> return 0;
> }
>
> -static int sh_sdhi_initialize(struct mmc *mmc)
> +static int sh_sdhi_initialize_common(struct sh_sdhi_host *host)
> {
> - struct sh_sdhi_host *host = mmc_priv(mmc);
> int ret = sh_sdhi_sync_reset(host);
>
> sh_sdhi_writew(host, SDHI_PORTSEL, USE_1PORT);
> @@ -692,6 +683,34 @@ static int sh_sdhi_initialize(struct mmc *mmc)
> return ret;
> }
>
> +#ifndef CONFIG_DM_MMC
> +static void *mmc_priv(struct mmc *mmc)
> +{
> + return (void *)mmc->priv;
> +}
> +
> +static int sh_sdhi_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
> + struct mmc_data *data)
> +{
> + struct sh_sdhi_host *host = mmc_priv(mmc);
> +
> + return sh_sdhi_send_cmd_common(host, cmd, data);
> +}
> +
> +static int sh_sdhi_set_ios(struct mmc *mmc)
> +{
> + struct sh_sdhi_host *host = mmc_priv(mmc);
> +
> + return sh_sdhi_set_ios_common(host, mmc);
> +}
> +
> +static int sh_sdhi_initialize(struct mmc *mmc)
> +{
> + struct sh_sdhi_host *host = mmc_priv(mmc);
> +
> + return sh_sdhi_initialize_common(host);
> +}
> +
> static const struct mmc_ops sh_sdhi_ops = {
> .send_cmd = sh_sdhi_send_cmd,
> .set_ios= sh_sdhi_set_ios,
> @@ -743,7 +762,7 @@ int sh_sdhi_init(unsigned long addr, int ch, unsigned
> long quirks)
> }
>
> host->ch = ch;
> - host->addr = addr;
> + host->addr = (void __iomem *)addr;
> host->quirks = quirks;
>
> if (host->quirks & SH_SDHI_QUIRK_64BIT_BUF)
> @@ -757,3 +776,109 @@ error:
> free(host);
> return ret;
> }
> +
> +#else
> +
> +struct sh_sdhi_plat {
> + struct mmc_config cfg;
> + struct mmc mmc;
> +};
> +
> +int sh_sdhi_dm_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,
> + struct mmc_data *data)
> +{
> + st
Re: [U-Boot] [PATCH 3/3] net: ravb: Add clock handling support
Applied to rmobile branch, thanks!
2017-07-22 6:20 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Add support for enabling and disabling the clock using the clock
> framework based on the content of OF instead of doing it manually
> in the board file.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Joe Hershberger <joe.hershber...@ni.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> drivers/net/ravb.c | 21 +++--
> 1 file changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
> index ce0eacceb6..8db127ba06 100644
> --- a/drivers/net/ravb.c
> +++ b/drivers/net/ravb.c
> @@ -10,6 +10,7 @@
> */
>
> #include
> +#include
> #include
> #include
> #include
> @@ -120,6 +121,7 @@ struct ravb_priv {
> struct phy_device *phydev;
> struct mii_dev *bus;
> void __iomem*iobase;
> + struct clk clk;
> };
>
> static inline void ravb_flush_dcache(u32 addr, u32 len)
> @@ -432,27 +434,38 @@ int ravb_start(struct udevice *dev)
> struct ravb_priv *eth = dev_get_priv(dev);
> int ret;
>
> - ret = ravb_reset(dev);
> + ret = clk_enable(>clk);
> if (ret)
> return ret;
>
> + ret = ravb_reset(dev);
> + if (ret)
> + goto err;
> +
> ravb_base_desc_init(eth);
> ravb_tx_desc_init(eth);
> ravb_rx_desc_init(eth);
>
> ret = ravb_config(dev);
> if (ret)
> - return ret;
> + goto err;
>
> /* Setting the control will start the AVB-DMAC process. */
> writel(CCC_OPC_OPERATION, eth->iobase + RAVB_REG_CCC);
>
> return 0;
> +
> +err:
> + clk_disable(>clk);
> + return ret;
> }
>
> static void ravb_stop(struct udevice *dev)
> {
> + struct ravb_priv *eth = dev_get_priv(dev);
> +
> ravb_reset(dev);
> + clk_disable(>clk);
> }
>
> static int ravb_probe(struct udevice *dev)
> @@ -466,6 +479,10 @@ static int ravb_probe(struct udevice *dev)
> iobase = map_physmem(pdata->iobase, 0x1000, MAP_NOCACHE);
> eth->iobase = iobase;
>
> + ret = clk_get_by_index(dev, 0, >clk);
> + if (ret < 0)
> + goto err_mdio_alloc;
> +
> mdiodev = mdio_alloc();
> if (!mdiodev) {
> ret = -ENOMEM;
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/3] net: ravb: Detect PHY correctly
Applied to rmobile branch, thanks!
2017-07-22 6:20 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> The order of parameters passed to the phy_connect() was wrong.
> Moreover, only PHY address 0 was used. Replace this with code
> capable of detecting the PHY address.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Joe Hershberger <joe.hershber...@ni.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> drivers/net/ravb.c | 7 ---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
> index 7f0e2568b7..ce0eacceb6 100644
> --- a/drivers/net/ravb.c
> +++ b/drivers/net/ravb.c
> @@ -298,13 +298,14 @@ static int ravb_phy_config(struct udevice *dev)
> struct ravb_priv *eth = dev_get_priv(dev);
> struct eth_pdata *pdata = dev_get_platdata(dev);
> struct phy_device *phydev;
> - int reg;
> + int mask = 0x, reg;
>
> - phydev = phy_connect(eth->bus, pdata->phy_interface,
> -dev, PHY_INTERFACE_MODE_RGMII_ID);
> + phydev = phy_find_by_mask(eth->bus, mask, pdata->phy_interface);
> if (!phydev)
> return -ENODEV;
>
> + phy_connect_dev(phydev, dev);
> +
> eth->phydev = phydev;
>
> /* 10BASE is not supported for Ethernet AVB MAC */
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/3] net: ravb: Add OF probing support
Applied to rmobile branch, thanks!
2017-07-22 6:20 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Add support for probing the RAVB Ethernet block from device tree.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Joe Hershberger <joe.hershber...@ni.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> drivers/net/ravb.c | 37 +
> 1 file changed, 37 insertions(+)
>
> diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
> index ab45a31d6a..7f0e2568b7 100644
> --- a/drivers/net/ravb.c
> +++ b/drivers/net/ravb.c
> @@ -589,9 +589,46 @@ static const struct eth_ops ravb_ops = {
> .write_hwaddr = ravb_write_hwaddr,
> };
>
> +int ravb_ofdata_to_platdata(struct udevice *dev)
> +{
> + struct eth_pdata *pdata = dev_get_platdata(dev);
> + const char *phy_mode;
> + const fdt32_t *cell;
> + int ret = 0;
> +
> + pdata->iobase = devfdt_get_addr(dev);
> + pdata->phy_interface = -1;
> + phy_mode = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "phy-mode",
> + NULL);
> + if (phy_mode)
> + pdata->phy_interface = phy_get_interface_by_name(phy_mode);
> + if (pdata->phy_interface == -1) {
> + debug("%s: Invalid PHY interface '%s'\n", __func__, phy_mode);
> + return -EINVAL;
> + }
> +
> + pdata->max_speed = 1000;
> + cell = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "max-speed",
> NULL);
> + if (cell)
> + pdata->max_speed = fdt32_to_cpu(*cell);
> +
> + sprintf(bb_miiphy_buses[0].name, dev->name);
> +
> + return ret;
> +}
> +
> +static const struct udevice_id ravb_ids[] = {
> + { .compatible = "renesas,etheravb-r8a7795" },
> + { .compatible = "renesas,etheravb-r8a7796" },
> + { .compatible = "renesas,etheravb-rcar-gen3" },
> + { }
> +};
> +
> U_BOOT_DRIVER(eth_ravb) = {
> .name = "ravb",
> .id = UCLASS_ETH,
> + .of_match = ravb_ids,
> + .ofdata_to_platdata = ravb_ofdata_to_platdata,
> .probe = ravb_probe,
> .remove = ravb_remove,
> .ops= _ops,
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] serial: sh: Use the clock framework to obtain clock config
Applied, thanks!
2017-07-22 6:19 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Since we now have clock driver on the RCar Gen3 , obtain the clock
> configuration using the clock framework functions. In case this
> fails, fall back to the original code for pulling the clock config
> directly out of OF.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> drivers/serial/serial_sh.c | 13 +++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
> index 51f7fbcfb7..087785f9a2 100644
> --- a/drivers/serial/serial_sh.c
> +++ b/drivers/serial/serial_sh.c
> @@ -9,6 +9,7 @@
>
> #include
> #include
> +#include
> #include
> #include
> #include
> @@ -214,15 +215,23 @@ static const struct udevice_id sh_serial_id[] ={
> static int sh_serial_ofdata_to_platdata(struct udevice *dev)
> {
> struct sh_serial_platdata *plat = dev_get_platdata(dev);
> + struct clk sh_serial_clk;
> fdt_addr_t addr;
> + int ret;
>
> addr = fdtdec_get_addr(gd->fdt_blob, dev_of_offset(dev), "reg");
> if (addr == FDT_ADDR_T_NONE)
> return -EINVAL;
>
> plat->base = addr;
> - plat->clk = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "clock",
> - 1);
> +
> + ret = clk_get_by_name(dev, "fck", _serial_clk);
> + if (!ret)
> + plat->clk = clk_get_rate(_serial_clk);
> + else
> + plat->clk = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
> + "clock", 1);
> +
> plat->type = dev_get_driver_data(dev);
> return 0;
> }
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/3] ARM: rmobile: Enable clock framework on Salvator-X
Applied to rmobile branch, thanks!
2017-07-22 6:18 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Since there is now a clock driver for RCar Gen3, enable it on this board.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> configs/r8a7795_salvator-x_defconfig | 2 ++
> configs/r8a7796_salvator-x_defconfig | 2 ++
> 2 files changed, 4 insertions(+)
>
> diff --git a/configs/r8a7795_salvator-x_defconfig
> b/configs/r8a7795_salvator-x_defconfig
> index a562431208..e50e457b35 100644
> --- a/configs/r8a7795_salvator-x_defconfig
> +++ b/configs/r8a7795_salvator-x_defconfig
> @@ -14,6 +14,8 @@ CONFIG_CMD_DHCP=y
> CONFIG_CMD_MII=y
> CONFIG_CMD_PING=y
> CONFIG_CMD_FAT=y
> +CONFIG_CLK=y
> +CONFIG_CLK_RENESAS=y
> CONFIG_SH_SDHI=y
> CONFIG_DM_ETH=y
> CONFIG_RENESAS_RAVB=y
> diff --git a/configs/r8a7796_salvator-x_defconfig
> b/configs/r8a7796_salvator-x_defconfig
> index 4927e45588..062882c667 100644
> --- a/configs/r8a7796_salvator-x_defconfig
> +++ b/configs/r8a7796_salvator-x_defconfig
> @@ -15,6 +15,8 @@ CONFIG_CMD_DHCP=y
> CONFIG_CMD_MII=y
> CONFIG_CMD_PING=y
> CONFIG_CMD_FAT=y
> +CONFIG_CLK=y
> +CONFIG_CLK_RENESAS=y
> CONFIG_SH_SDHI=y
> CONFIG_DM_ETH=y
> CONFIG_RENESAS_RAVB=y
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] serial: sh: Convert to Kconfig
Applied, thanks! 2017-07-22 6:18 GMT+09:00 Marek Vasut <marek.va...@gmail.com>: > Convert the SH Serial to Kconfig using tools/moveconfig.py tool > and a bit of manual adjustment to cater for failed conversions. > > Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com> > Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org> > --- > configs/MigoR_defconfig | 1 + > configs/alt_defconfig| 1 + > configs/ap325rxa_defconfig | 1 + > configs/ap_sh4a_4a_defconfig | 1 + > configs/armadillo-800eva_defconfig | 1 + > configs/blanche_defconfig| 1 + > configs/ecovec_defconfig | 1 + > configs/espt_defconfig | 1 + > configs/gose_defconfig | 1 + > configs/koelsch_defconfig| 1 + > configs/kzm9g_defconfig | 1 + > configs/lager_defconfig | 1 + > configs/mpr2_defconfig | 1 + > configs/ms7720se_defconfig | 1 + > configs/ms7722se_defconfig | 1 + > configs/ms7750se_defconfig | 1 + > configs/porter_defconfig | 1 + > configs/r0p7734_defconfig| 1 + > configs/r2dplus_defconfig| 1 + > configs/r7780mp_defconfig| 1 + > configs/r8a7795_salvator-x_defconfig | 1 + > configs/r8a7795_ulcb_defconfig | 1 + > configs/r8a7796_salvator-x_defconfig | 1 + > configs/r8a7796_ulcb_defconfig | 1 + > configs/rsk7203_defconfig| 1 + > configs/rsk7264_defconfig| 1 + > configs/rsk7269_defconfig| 1 + > configs/sh7752evb_defconfig | 1 + > configs/sh7753evb_defconfig | 1 + > configs/sh7757lcr_defconfig | 1 + > configs/sh7763rdp_defconfig | 1 + > configs/sh7785lcr_32bit_defconfig| 1 + > configs/sh7785lcr_defconfig | 1 + > configs/shmin_defconfig | 1 + > configs/silk_defconfig | 1 + > configs/stout_defconfig | 1 + > drivers/serial/Kconfig | 8 > include/configs/MigoR.h | 1 - > include/configs/alt.h| 1 - > include/configs/ap325rxa.h | 1 - > include/configs/ap_sh4a_4a.h | 1 - > include/configs/armadillo-800eva.h | 1 - > include/configs/blanche.h| 1 - > include/configs/ecovec.h | 1 - > include/configs/espt.h | 1 - > include/configs/gose.h | 1 - > include/configs/koelsch.h| 1 - > include/configs/kzm9g.h | 1 - > include/configs/lager.h | 1 - > include/configs/mpr2.h | 1 - > include/configs/ms7720se.h | 1 - > include/configs/ms7722se.h | 1 - > include/configs/ms7750se.h | 1 - > include/configs/porter.h | 1 - > include/configs/r0p7734.h| 1 - > include/configs/r2dplus.h| 1 - > include/configs/r7780mp.h| 1 - > include/configs/rsk7203.h| 1 - > include/configs/rsk7264.h| 1 - > include/configs/rsk7269.h| 1 - > include/configs/salvator-x.h | 1 - > include/configs/sh7752evb.h | 1 - > include/configs/sh7753evb.h | 1 - > include/configs/sh7757lcr.h | 1 - > include/configs/sh7763rdp.h | 1 - > include/configs/sh7785lcr.h | 1 - > include/configs/shmin.h | 1 - > include/configs/silk.h | 1 - > include/configs/stout.h | 1 - > include/configs/ulcb.h | 1 - > scripts/config_whitelist.txt | 1 - > 71 files changed, 44 insertions(+), 34 deletions(-) > > diff --git a/configs/MigoR_defconfig b/configs/MigoR_defconfig > index f09794e13c..b7ae01c69a 100644 > --- a/configs/MigoR_defconfig > +++ b/configs/MigoR_defconfig > @@ -19,4 +19,5 @@ CONFIG_VERSION_VARIABLE=y > CONFIG_CMD_PING=y > # CONFIG_CMD_MISC is not set > CONFIG_MTD_NOR_FLASH=y > +CONFIG_SCIF_CONSOLE=y > CONFIG_USE_PRIVATE_LIBGCC=y > diff --git a/configs/alt_defconfig b/configs/alt_defconfig > index 04dda72532..95955d36db 100644 > --- a/configs/alt_defconfig > +++ b/configs/alt_defconfig > @@ -24,6 +24,7 @@ CONFIG_SPI_FLASH=y > CONFIG_SPI_FLASH_BAR=y > CONFIG_SPI_FLASH_SPANSION=y > CONFIG_BAUDRATE=38400 > +CONFIG_SCIF_CONSOLE=y > CONFIG_USB=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_STORAGE=y > diff --git a/configs/ap325rxa_defconfig b/configs/ap325rxa_defconfig > index ebefd126a8..394d263d3a 100644 > --- a/configs/ap325rxa_defconfig > +++ b/configs/ap325rxa_defconfig > @@ -23,4 +23,5 @@ CONFIG_CMD_EXT2=y > CONFIG_DOS_PARTITION=y > CONFIG_MTD_NOR_FLASH=y >
Re: [U-Boot] [PATCH 3/3] ARM: rmobile: Enable clock framework on ULCB
Applied to rmobile branch, thanks!
2017-07-22 6:18 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Since there is now a clock driver for RCar Gen3, enable it on this board.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> configs/r8a7795_ulcb_defconfig | 2 ++
> configs/r8a7796_ulcb_defconfig | 2 ++
> 2 files changed, 4 insertions(+)
>
> diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig
> index 46715f952b..ebe5cffab8 100644
> --- a/configs/r8a7795_ulcb_defconfig
> +++ b/configs/r8a7795_ulcb_defconfig
> @@ -13,6 +13,8 @@ CONFIG_CMD_USB=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_MII=y
> CONFIG_CMD_PING=y
> +CONFIG_CLK=y
> +CONFIG_CLK_RENESAS=y
> CONFIG_SH_SDHI=y
> CONFIG_DM_ETH=y
> CONFIG_RENESAS_RAVB=y
> diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
> index 0bec182577..d7c4cf3535 100644
> --- a/configs/r8a7796_ulcb_defconfig
> +++ b/configs/r8a7796_ulcb_defconfig
> @@ -14,6 +14,8 @@ CONFIG_CMD_USB=y
> CONFIG_CMD_DHCP=y
> CONFIG_CMD_MII=y
> CONFIG_CMD_PING=y
> +CONFIG_CLK=y
> +CONFIG_CLK_RENESAS=y
> CONFIG_SH_SDHI=y
> CONFIG_DM_ETH=y
> CONFIG_RENESAS_RAVB=y
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] ARM: rmobile: Enable OF_CONTROL on RCar Gen3
Applied to rmobile branch, thanks!
2017-07-22 6:17 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Since the DTs are now in place, enable OF control so that they get
> bundled into the U-Boot.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> arch/arm/mach-rmobile/Kconfig| 1 +
> configs/r8a7795_salvator-x_defconfig | 2 +-
> configs/r8a7795_ulcb_defconfig | 2 +-
> configs/r8a7796_salvator-x_defconfig | 2 +-
> configs/r8a7796_ulcb_defconfig | 2 +-
> 5 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig
> index 4b05d78839..8922554d59 100644
> --- a/arch/arm/mach-rmobile/Kconfig
> +++ b/arch/arm/mach-rmobile/Kconfig
> @@ -11,6 +11,7 @@ config RCAR_32
> config RCAR_GEN3
> bool "Renesas ARM SoCs R-Car Gen3 (64bit)"
> select ARM64
> + select OF_CONTROL
>
> endchoice
>
> diff --git a/configs/r8a7795_salvator-x_defconfig
> b/configs/r8a7795_salvator-x_defconfig
> index c0e3999f96..a562431208 100644
> --- a/configs/r8a7795_salvator-x_defconfig
> +++ b/configs/r8a7795_salvator-x_defconfig
> @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y
> CONFIG_SYS_MALLOC_F_LEN=0x2000
> CONFIG_RCAR_GEN3=y
> CONFIG_TARGET_SALVATOR_X=y
> +CONFIG_DEFAULT_DEVICE_TREE="r8a7795-salvator-x"
> CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb"
> CONFIG_VERSION_VARIABLE=y
> CONFIG_CMD_BOOTZ=y
> @@ -19,4 +20,3 @@ CONFIG_RENESAS_RAVB=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig
> index fd5fd55b80..46715f952b 100644
> --- a/configs/r8a7795_ulcb_defconfig
> +++ b/configs/r8a7795_ulcb_defconfig
> @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y
> CONFIG_SYS_MALLOC_F_LEN=0x2000
> CONFIG_RCAR_GEN3=y
> CONFIG_TARGET_ULCB=y
> +CONFIG_DEFAULT_DEVICE_TREE="r8a7795-h3ulcb"
> CONFIG_DEFAULT_FDT_FILE="r8a7795-h3ulcb.dtb"
> CONFIG_VERSION_VARIABLE=y
> CONFIG_CMD_BOOTZ=y
> @@ -18,4 +19,3 @@ CONFIG_RENESAS_RAVB=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/r8a7796_salvator-x_defconfig
> b/configs/r8a7796_salvator-x_defconfig
> index d57305112b..4927e45588 100644
> --- a/configs/r8a7796_salvator-x_defconfig
> +++ b/configs/r8a7796_salvator-x_defconfig
> @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
> CONFIG_RCAR_GEN3=y
> CONFIG_R8A7796=y
> CONFIG_TARGET_SALVATOR_X=y
> +CONFIG_DEFAULT_DEVICE_TREE="r8a7796-salvator-x"
> CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb"
> CONFIG_VERSION_VARIABLE=y
> CONFIG_CMD_BOOTZ=y
> @@ -20,4 +21,3 @@ CONFIG_RENESAS_RAVB=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig
> index 96f903bb52..0bec182577 100644
> --- a/configs/r8a7796_ulcb_defconfig
> +++ b/configs/r8a7796_ulcb_defconfig
> @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
> CONFIG_RCAR_GEN3=y
> CONFIG_R8A7796=y
> CONFIG_TARGET_ULCB=y
> +CONFIG_DEFAULT_DEVICE_TREE="r8a7796-m3ulcb"
> CONFIG_DEFAULT_FDT_FILE="r8a7796-m3ulcb.dtb"
> CONFIG_VERSION_VARIABLE=y
> CONFIG_CMD_BOOTZ=y
> @@ -19,4 +20,3 @@ CONFIG_RENESAS_RAVB=y
> CONFIG_USB=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_STORAGE=y
> -CONFIG_OF_LIBFDT=y
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/3] clk: rmobile: Add RCar Gen3 clock driver
Applied to rmobile branch, thanks!
2017-07-22 6:18 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Add clock driver for the RCar Gen3 R8A7795 and R8A7796 SoCs .
> This driver allows reading out the clock configuration set by
> previous boot stages and enabling and disabling clock using
> the MSTP registers. Setting clock is not supported thus far.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> drivers/clk/Kconfig | 1 +
> drivers/clk/Makefile| 1 +
> drivers/clk/renesas/Kconfig | 13 +
> drivers/clk/renesas/Makefile| 1 +
> drivers/clk/renesas/clk-rcar-gen3.c | 951
>
> 5 files changed, 967 insertions(+)
> create mode 100644 drivers/clk/renesas/Kconfig
> create mode 100644 drivers/clk/renesas/Makefile
> create mode 100644 drivers/clk/renesas/clk-rcar-gen3.c
>
> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
> index 44da716b26..60bd706fa2 100644
> --- a/drivers/clk/Kconfig
> +++ b/drivers/clk/Kconfig
> @@ -55,5 +55,6 @@ source "drivers/clk/tegra/Kconfig"
> source "drivers/clk/uniphier/Kconfig"
> source "drivers/clk/exynos/Kconfig"
> source "drivers/clk/at91/Kconfig"
> +source "drivers/clk/renesas/Kconfig"
>
> endmenu
> diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
> index 2746a8016a..159f285f9a 100644
> --- a/drivers/clk/Makefile
> +++ b/drivers/clk/Makefile
> @@ -10,6 +10,7 @@ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/
> obj-$(CONFIG_SANDBOX) += clk_sandbox.o
> obj-$(CONFIG_SANDBOX) += clk_sandbox_test.o
> obj-$(CONFIG_MACH_PIC32) += clk_pic32.o
> +obj-$(CONFIG_CLK_RENESAS) += renesas/
> obj-$(CONFIG_CLK_ZYNQ) += clk_zynq.o
> obj-$(CONFIG_CLK_ZYNQMP) += clk_zynqmp.o
>
> diff --git a/drivers/clk/renesas/Kconfig b/drivers/clk/renesas/Kconfig
> new file mode 100644
> index 00..07640d1ccf
> --- /dev/null
> +++ b/drivers/clk/renesas/Kconfig
> @@ -0,0 +1,13 @@
> +config CLK_RENESAS
> + bool "Renesas clock drivers"
> + depends on CLK && ARCH_RMOBILE
> + help
> + Enable support for clock present on Renesas RCar SoCs.
> +
> +config CLK_RCAR_GEN3
> + bool "Renesas RCar Gen3 R8A7795/R8A7796 clock driver"
> + def_bool y if RCAR_GEN3
> + depends on CLK_RENESAS
> + help
> + Enable this to support the clocks on Renesas RCar Gen3
> + R8A7795 and R8A7796 SoC.
> diff --git a/drivers/clk/renesas/Makefile b/drivers/clk/renesas/Makefile
> new file mode 100644
> index 00..bd635052be
> --- /dev/null
> +++ b/drivers/clk/renesas/Makefile
> @@ -0,0 +1 @@
> +obj-$(CONFIG_CLK_RCAR_GEN3) += clk-rcar-gen3.o
> diff --git a/drivers/clk/renesas/clk-rcar-gen3.c
> b/drivers/clk/renesas/clk-rcar-gen3.c
> new file mode 100644
> index 00..5ea7d9a1f5
> --- /dev/null
> +++ b/drivers/clk/renesas/clk-rcar-gen3.c
> @@ -0,0 +1,951 @@
> +/*
> + * Renesas RCar Gen3 R8A7795/R8A7796 CPG MSSR driver
> + *
> + * Copyright (C) 2017 Marek Vasut <marek.va...@gmail.com>
> + *
> + * Based on the following driver from Linux kernel:
> + * r8a7796 Clock Pulse Generator / Module Standby and Software Reset
> + *
> + * Copyright (C) 2016 Glider bvba
> + *
> + * SPDX-License-Identifier:GPL-2.0+
> + */
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +
> +#include
> +#include
> +
> +#define CPG_RST_MODEMR 0x0060
> +
> +#define CPG_PLL0CR 0x00d8
> +#define CPG_PLL2CR 0x002c
> +#define CPG_PLL4CR 0x01f4
> +
> +/*
> + * Module Standby and Software Reset register offets.
> + *
> + * If the registers exist, these are valid for SH-Mobile, R-Mobile,
> + * R-Car Gen2, R-Car Gen3, and RZ/G1.
> + * These are NOT valid for R-Car Gen1 and RZ/A1!
> + */
> +
> +/*
> + * Module Stop Status Register offsets
> + */
> +
> +static const u16 mstpsr[] = {
> + 0x030, 0x038, 0x040, 0x048, 0x04C, 0x03C, 0x1C0, 0x1C4,
> + 0x9A0, 0x9A4, 0x9A8, 0x9AC,
> +};
> +
> +#defineMSTPSR(i) mstpsr[i]
> +
> +
> +/*
> + * System Module Stop Control Register offsets
> + */
> +
> +static const u16 smstpcr[] = {
> + 0x130, 0x134, 0x138, 0x13C, 0x140, 0x144, 0x148, 0x14C,
> + 0x990, 0x994, 0x998, 0x99C,
> +};
> +
> +#defineSMSTPCR(i) smstpcr[i]
> +
> +
> +/* Realtime Module Stop Control Register offsets */
> +#define RMSTPCR(i) (smstpcr[i] - 0x20)
> +
> +/* Modem Module Stop Co
Re: [U-Boot] [PATCH 2/2] ARM: rmobile: ulcb: Add ULCB board support
Applied to rmobile branch, thanks!
2017-07-22 6:15 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Add initial support for the R8A7795 and R8A7796 based ULCB board.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> arch/arm/mach-rmobile/Kconfig.64 | 6 +
> board/renesas/ulcb/Kconfig | 15 +++
> board/renesas/ulcb/MAINTAINERS | 7 ++
> board/renesas/ulcb/Makefile | 9 ++
> board/renesas/ulcb/cpld.c| 167 +
> board/renesas/ulcb/ulcb.c| 257
> +++
> configs/r8a7795_ulcb_defconfig | 21
> configs/r8a7796_ulcb_defconfig | 22
> include/configs/ulcb.h | 110 +
> 9 files changed, 614 insertions(+)
> create mode 100644 board/renesas/ulcb/Kconfig
> create mode 100644 board/renesas/ulcb/MAINTAINERS
> create mode 100644 board/renesas/ulcb/Makefile
> create mode 100644 board/renesas/ulcb/cpld.c
> create mode 100644 board/renesas/ulcb/ulcb.c
> create mode 100644 configs/r8a7795_ulcb_defconfig
> create mode 100644 configs/r8a7796_ulcb_defconfig
> create mode 100644 include/configs/ulcb.h
>
> diff --git a/arch/arm/mach-rmobile/Kconfig.64
> b/arch/arm/mach-rmobile/Kconfig.64
> index 5db93ac8d6..c79b39ded6 100644
> --- a/arch/arm/mach-rmobile/Kconfig.64
> +++ b/arch/arm/mach-rmobile/Kconfig.64
> @@ -20,11 +20,17 @@ config TARGET_SALVATOR_X
> help
>Support for Renesas R-Car Gen3 platform
>
> +config TARGET_ULCB
> + bool "ULCB board"
> + help
> + Support for Renesas R-Car Gen3 ULCB platform
> +
> endchoice
>
> config SYS_SOC
> default "rmobile"
>
> source "board/renesas/salvator-x/Kconfig"
> +source "board/renesas/ulcb/Kconfig"
>
> endif
> diff --git a/board/renesas/ulcb/Kconfig b/board/renesas/ulcb/Kconfig
> new file mode 100644
> index 00..1e9a10d281
> --- /dev/null
> +++ b/board/renesas/ulcb/Kconfig
> @@ -0,0 +1,15 @@
> +if TARGET_ULCB
> +
> +config SYS_SOC
> + default "rmobile"
> +
> +config SYS_BOARD
> + default "ulcb"
> +
> +config SYS_VENDOR
> + default "renesas"
> +
> +config SYS_CONFIG_NAME
> + default "ulcb"
> +
> +endif
> diff --git a/board/renesas/ulcb/MAINTAINERS b/board/renesas/ulcb/MAINTAINERS
> new file mode 100644
> index 00..e7cdc5217f
> --- /dev/null
> +++ b/board/renesas/ulcb/MAINTAINERS
> @@ -0,0 +1,7 @@
> +ULCB BOARD
> +M: Marek Vasut <marek.vasut+rene...@gmail.com>
> +S: Maintained
> +F: board/renesas/ulcb/
> +F: include/configs/ulcb.h
> +F: configs/r8a7795_ulcb_defconfig
> +F: configs/r8a7796_ulcb_defconfig
> diff --git a/board/renesas/ulcb/Makefile b/board/renesas/ulcb/Makefile
> new file mode 100644
> index 00..6fe0b480f7
> --- /dev/null
> +++ b/board/renesas/ulcb/Makefile
> @@ -0,0 +1,9 @@
> +#
> +# board/renesas/ulcb/Makefile
> +#
> +# Copyright (C) 2017 Renesas Electronics Corporation
> +#
> +# SPDX-License-Identifier: GPL-2.0+
> +#
> +
> +obj-y := ulcb.o cpld.o ../rcar-common/common.o
> diff --git a/board/renesas/ulcb/cpld.c b/board/renesas/ulcb/cpld.c
> new file mode 100644
> index 00..f9384b09ef
> --- /dev/null
> +++ b/board/renesas/ulcb/cpld.c
> @@ -0,0 +1,167 @@
> +/*
> + * ULCB board CPLD access support
> + *
> + * Copyright (C) 2017 Renesas Electronics Corporation
> + * Copyright (C) 2017 Cogent Embedded, Inc.
> + *
> + * SPDX-License-Identifier:GPL-2.0+
> + */
> +
> +#include
> +#include
> +#include
> +#include
> +
> +#define SCLK GPIO_GP_6_8
> +#define SSTBZ GPIO_GP_2_3
> +#define MOSI GPIO_GP_6_7
> +#define MISO GPIO_GP_6_10
> +
> +#define CPLD_ADDR_MODE 0x00 /* RW */
> +#define CPLD_ADDR_MUX 0x02 /* RW */
> +#define CPLD_ADDR_DIPSW6 0x08 /* R */
> +#define CPLD_ADDR_RESET0x80 /* RW */
> +#define CPLD_ADDR_VERSION 0xFF /* R */
> +
> +static int cpld_initialized;
> +
> +int spi_cs_is_valid(unsigned int bus, unsigned int cs)
> +{
> + /* Always valid */
> + return 1;
> +}
> +
> +void spi_cs_activate(struct spi_slave *slave)
> +{
> + /* Always active */
> +}
> +
> +void spi_cs_deactivate(struct spi_slave *slave)
> +{
> + /* Always active */
> +}
> +
> +void ulcb_softspi_sda(int set)
> +{
> + gpio_set_value(MOSI, set);
> +}
> +
> +voi
Re: [U-Boot] [PATCH] ARM: rmobile: Increase console buffer sizes
Applied to rmobile branch, thanks!
2017-07-22 6:16 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Allow pasting extra long lines into the U-Boot console on RCar Gen3.
> This is OK since we have plenty of resources and it's convenient.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> include/configs/rcar-gen3-common.h | 10 +-
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/include/configs/rcar-gen3-common.h
> b/include/configs/rcar-gen3-common.h
> index 8da3e7a235..6c23249861 100644
> --- a/include/configs/rcar-gen3-common.h
> +++ b/include/configs/rcar-gen3-common.h
> @@ -39,12 +39,12 @@
> #define CONFIG_SH_GPIO_PFC
>
> /* console */
> -
> +#define CONFIG_SYS_CBSIZE 2048
> +#define CONFIG_SYS_PBSIZE \
> + (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> +#define CONFIG_SYS_BARGSIZECONFIG_SYS_CBSIZE
> #define CONFIG_SYS_LONGHELP
> -#define CONFIG_SYS_CBSIZE 256
> -#define CONFIG_SYS_PBSIZE 256
> -#define CONFIG_SYS_MAXARGS 16
> -#define CONFIG_SYS_BARGSIZE512
> +#define CONFIG_SYS_MAXARGS 64
> #define CONFIG_SYS_BAUDRATE_TABLE { 115200, 38400 }
>
> /* MEMORY */
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] ARM: rmobile: Add PFC PUEN bank 5 address
Applied to rmobile branch, thanks!
2017-07-22 6:15 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Add the PFC5 PUEN address and SSI SDATA4 bit offset into the
> rcar-gen3-base.h .
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h
> b/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h
> index c197642fe4..39726355e6 100644
> --- a/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h
> +++ b/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h
> @@ -75,6 +75,8 @@
> #define CONFIG_SYS_SH_SDHI3_BASE 0xEE16
>
> /* PFC */
> +#define PFC_PUEN5 0xE6060414
> +#define PUEN_SSI_SDATA4BIT(17)
> #define PFC_PUEN6 0xE6060418
> #define PUEN_USB1_OVC (1 << 2)
> #define PUEN_USB1_PWEN (1 << 1)
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] boot_fit: Fix warning: overflow in implicit constant conversion in fdt_offset()
FDT_ERROR is defined as unsigned long. However, since the return value of
fdt_offset() is int, a warning will occur when compiling.
This fixes this problem by cast to int when setting FDT_ERROR as return value.
Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
CC: Franklin S Cooper Jr <fcoo...@ti.com>
---
common/boot_fit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/boot_fit.c b/common/boot_fit.c
index 51440a6e6f..ca130f2308 100644
--- a/common/boot_fit.c
+++ b/common/boot_fit.c
@@ -25,7 +25,7 @@ int fdt_offset(void *fit)
images = fdt_path_offset(fit, FIT_IMAGES_PATH);
if (images < 0) {
debug("%s: Cannot find /images node: %d\n", __func__, images);
- return FDT_ERROR;
+ return (int)FDT_ERROR;
}
fdt_name = fdt_getprop(fit, node, FIT_FDT_PROP, _len);
--
2.13.2
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] ARM: rmobile: Update defconfig of R-Car Gen3
This updates defconfig of R-Car Gen3 to keep with the latest Kconfig. Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org> --- configs/r8a7795_salvator-x_defconfig | 3 +++ configs/r8a7795_ulcb_defconfig | 3 +++ configs/r8a7796_salvator-x_defconfig | 3 +++ configs/r8a7796_ulcb_defconfig | 3 +++ 4 files changed, 12 insertions(+) diff --git a/configs/r8a7795_salvator-x_defconfig b/configs/r8a7795_salvator-x_defconfig index 3d67ff41d2..1a11099e0c 100644 --- a/configs/r8a7795_salvator-x_defconfig +++ b/configs/r8a7795_salvator-x_defconfig @@ -5,6 +5,7 @@ CONFIG_RCAR_GEN3=y CONFIG_TARGET_SALVATOR_X=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DEFAULT_DEVICE_TREE="r8a7795-salvator-x" +CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_DEFAULT_FDT_FILE="r8a7795-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y @@ -14,6 +15,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_OF_CONTROL=y CONFIG_CMD_FAT=y CONFIG_CLK=y CONFIG_CLK_RENESAS=y @@ -24,3 +26,4 @@ CONFIG_SCIF_CONSOLE=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_SMBIOS_MANUFACTURER="" diff --git a/configs/r8a7795_ulcb_defconfig b/configs/r8a7795_ulcb_defconfig index dfd5be1b35..3eacc4d2d5 100644 --- a/configs/r8a7795_ulcb_defconfig +++ b/configs/r8a7795_ulcb_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_RCAR_GEN3=y CONFIG_TARGET_ULCB=y CONFIG_DEFAULT_DEVICE_TREE="r8a7795-h3ulcb" +CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_DEFAULT_FDT_FILE="r8a7795-h3ulcb.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y @@ -13,6 +14,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_OF_CONTROL=y CONFIG_CLK=y CONFIG_CLK_RENESAS=y CONFIG_SH_SDHI=y @@ -22,3 +24,4 @@ CONFIG_SCIF_CONSOLE=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_SMBIOS_MANUFACTURER="" diff --git a/configs/r8a7796_salvator-x_defconfig b/configs/r8a7796_salvator-x_defconfig index 1fd4505ad2..2c8e7ddb99 100644 --- a/configs/r8a7796_salvator-x_defconfig +++ b/configs/r8a7796_salvator-x_defconfig @@ -6,6 +6,7 @@ CONFIG_R8A7796=y CONFIG_TARGET_SALVATOR_X=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DEFAULT_DEVICE_TREE="r8a7796-salvator-x" +CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_DEFAULT_FDT_FILE="r8a7796-salvator-x.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y @@ -15,6 +16,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_OF_CONTROL=y CONFIG_CMD_FAT=y CONFIG_CLK=y CONFIG_CLK_RENESAS=y @@ -25,3 +27,4 @@ CONFIG_SCIF_CONSOLE=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_SMBIOS_MANUFACTURER="" diff --git a/configs/r8a7796_ulcb_defconfig b/configs/r8a7796_ulcb_defconfig index b5443c0035..33bcc0cf42 100644 --- a/configs/r8a7796_ulcb_defconfig +++ b/configs/r8a7796_ulcb_defconfig @@ -5,6 +5,7 @@ CONFIG_RCAR_GEN3=y CONFIG_R8A7796=y CONFIG_TARGET_ULCB=y CONFIG_DEFAULT_DEVICE_TREE="r8a7796-m3ulcb" +CONFIG_SMBIOS_PRODUCT_NAME="" CONFIG_DEFAULT_FDT_FILE="r8a7796-m3ulcb.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_CMD_BOOTZ=y @@ -14,6 +15,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y +CONFIG_OF_CONTROL=y CONFIG_CLK=y CONFIG_CLK_RENESAS=y CONFIG_SH_SDHI=y @@ -23,3 +25,4 @@ CONFIG_SCIF_CONSOLE=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y +CONFIG_SMBIOS_MANUFACTURER="" -- 2.13.2 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/5] mmc: sh_sdhi: Fix Kconfig entry
Hi!
2017-05-31 11:06 GMT+09:00 Jaehoon Chung <jh80.ch...@samsung.com>:
> On 05/31/2017 07:59 AM, Nobuhiro Iwamatsu wrote:
>> Hi, Jaehoon.
>>
>> Could you pickup this patch series to your mmc repository, and PR to u-boot?
>
> Sure, I will pick this patch series. After that, i will do PR..
> But i have sent the PR about a few days ago..but it doesn't accept yet..
> After accepting it, i will resend PR.
I see. Thanks for your great work!
>
> Thanks!
>
> Best Regards,
> Jaehoon Chung
Best regards,
Nobuhiro
>
>>
>> Best regards,
>> Nobuhiro
>>
>>
>> 2017-05-25 22:39 GMT+09:00 Jaehoon Chung <jh80.ch...@samsung.com>:
>>> On 05/13/2017 10:51 PM, Marek Vasut wrote:
>>>> The Kconfig entry depends on RMOBILE, but this was renamed
>>>> to ARCH_RMOBILE in commit 1cc95f6e1b38 (ARM: Rmobile: Rename
>>>> CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE) . Fix this omission.
>>>>
>>>> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
>>>> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
>>>> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
>>>> Cc: Jaehoon Chung <jh80.ch...@samsung.com>
>>>
>>> Reviewed-by: Jaehoon Chung <jh80.ch...@samsung.com>
>>>
>>>> ---
>>>> drivers/mmc/Kconfig | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
>>>> index 6ac26dd137..b2d70a37bd 100644
>>>> --- a/drivers/mmc/Kconfig
>>>> +++ b/drivers/mmc/Kconfig
>>>> @@ -159,7 +159,7 @@ config MMC_OMAP36XX_PINS
>>>>
>>>> config SH_SDHI
>>>> bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
>>>> - depends on RMOBILE
>>>> + depends on ARCH_RMOBILE
>>>> help
>>>> Support for the on-chip SDHI host controller on SuperH/Renesas ARM
>>>> SoCs platform
>>>>
>>>>
>>>
>>
>>
>>
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/5] mmc: sh_sdhi: Fix Kconfig entry
Hi, Jaehoon.
Could you pickup this patch series to your mmc repository, and PR to u-boot?
Best regards,
Nobuhiro
2017-05-25 22:39 GMT+09:00 Jaehoon Chung <jh80.ch...@samsung.com>:
> On 05/13/2017 10:51 PM, Marek Vasut wrote:
>> The Kconfig entry depends on RMOBILE, but this was renamed
>> to ARCH_RMOBILE in commit 1cc95f6e1b38 (ARM: Rmobile: Rename
>> CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE) . Fix this omission.
>>
>> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
>> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
>> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
>> Cc: Jaehoon Chung <jh80.ch...@samsung.com>
>
> Reviewed-by: Jaehoon Chung <jh80.ch...@samsung.com>
>
>> ---
>> drivers/mmc/Kconfig | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
>> index 6ac26dd137..b2d70a37bd 100644
>> --- a/drivers/mmc/Kconfig
>> +++ b/drivers/mmc/Kconfig
>> @@ -159,7 +159,7 @@ config MMC_OMAP36XX_PINS
>>
>> config SH_SDHI
>> bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
>> - depends on RMOBILE
>> + depends on ARCH_RMOBILE
>> help
>> Support for the on-chip SDHI host controller on SuperH/Renesas ARM
>> SoCs platform
>>
>>
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [GIT PULL] u-boot-sh/rmobile
Hi Tom,
Please pull ARM/r-mobile updates for v2017.07.
The following changes since commit a375ff8e14bea0a5cbfff99d6456aa8d9a3320ab:
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
(2017-05-18 17:17:45 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-sh.git rmobile
for you to fetch changes up to 16071b1ba1ef0c938718d1544bb78937a896a4c1:
ARM: rmobile: Move address of IICDVFS(I2C) to rcar-gen3-base.h
(2017-05-22 15:07:31 +0900)
Hiroyuki Yokoyama (1):
serial: sh: Add r8a7796 support
Kouei Abe (1):
gpio: rcar_gen3: Fix GPIO read support
Marek Vasut (24):
net: ravb: Add Renesas Ethernet RAVB driver
ARM: rmobile: Update R8A7795 PFC and GPIO tables
ARM: rmobile: Import R8A7796 PFC and GPIO tables
ARM: rmobile: Zap RCAR_GEN3_EXTRAM_BOOT
ARM: rmobile: Update link address to match latest BL2
ARM: rmobile: Make the Gen3 SoC configurable
ARM: rmobile: Add R8A7795 into the CPU table
ARM: rmobile: Add R8A7796 into the CPU table
ARM: rmobile: Handle R8A7796 r1.1 in the PRR code
ARM: rmobile: Add R8A7796 support
ARM: rmobile: Allow R8A7796 Salvator-X configuration
ARM: rmobile: salvator-x: Use BIT() macro in board file
ARM: rmobile: salvator-x: Move OF_LIBFDT and CMD_FDT to board config
ARM: rmobile: salvator-x: Set default device tree
ARM: rmobile: salvator-x: Zap redefined DECLARE_GLOBAL_DATA_PTR
ARM: rmobile: salvator-x: Adjust UART clock
ARM: rmobile: salvator-x: Add SD support
ARM: rmobile: salvator-x: Add RAVB ethernet support
ARM: rmobile: salvator-x: Add DVFS and PMIC support
ARM: rmobile: salvator-x: Add USB support
ARM: rmobile: salvator-x: Count all DRAM in all slots
ARM: rmobile: salvator-x: Enable SCIF2 clock
ARM: rmobile: salvator-x: Rename the defconfig to match the SoC
ARM: rmobile: salvator-x: Add R8A7796 support
Nobuhiro Iwamatsu (1):
ARM: rmobile: Move address of IICDVFS(I2C) to rcar-gen3-base.h
arch/arm/mach-rmobile/Kconfig.64| 18 +-
arch/arm/mach-rmobile/Makefile |1 +
arch/arm/mach-rmobile/cpu_info-rcar.c | 19 +-
arch/arm/mach-rmobile/cpu_info.c|2 +
arch/arm/mach-rmobile/include/mach/gpio.h |3 +
arch/arm/mach-rmobile/include/mach/r8a7795-gpio.h | 182 ++--
arch/arm/mach-rmobile/include/mach/r8a7796-gpio.h | 1084 ++
arch/arm/mach-rmobile/include/mach/r8a7796.h| 36 +
arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h |3 +
arch/arm/mach-rmobile/include/mach/rmobile.h|2 +
arch/arm/mach-rmobile/memmap-r8a7796.c | 30 +
arch/arm/mach-rmobile/pfc-r8a7795.c | 1465
+
arch/arm/mach-rmobile/pfc-r8a7796.c | 5253
board/renesas/salvator-x/MAINTAINERS|3 +-
board/renesas/salvator-x/salvator-x.c | 225 +++-
configs/r8a7795_salvator-x_defconfig| 31 +
configs/r8a7796_salvator-x_defconfig| 31 +
configs/salvator-x_defconfig| 12 -
drivers/gpio/sh_pfc.c | 17 +-
drivers/net/Kconfig |8 +
drivers/net/Makefile|1 +
drivers/net/ravb.c | 601 ++
drivers/serial/serial_sh.h |3 +-
include/configs/rcar-gen3-common.h | 37 +-
include/configs/salvator-x.h| 42 +-
scripts/config_whitelist.txt|1 +
26 files changed, 8307 insertions(+), 803 deletions(-)
create mode 100644 arch/arm/mach-rmobile/include/mach/r8a7796-gpio.h
create mode 100644 arch/arm/mach-rmobile/include/mach/r8a7796.h
create mode 100644 arch/arm/mach-rmobile/memmap-r8a7796.c
create mode 100644 arch/arm/mach-rmobile/pfc-r8a7796.c
create mode 100644 configs/r8a7795_salvator-x_defconfig
create mode 100644 configs/r8a7796_salvator-x_defconfig
delete mode 100644 configs/salvator-x_defconfig
create mode 100644 drivers/net/ravb.c
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] ARM: rmobile: Move address of IICDVFS(I2C) to rcar-gen3-base.h
The IICDVFS(I2C) set in r8a7796.h is common in rcar-gen3. This moves CONFIG_SYS_I2C_SH_BASE0 in rcar-gen3-base.h. Signed-off-by: Nobuhiro Iwamatsu <iwama...@nigauri.org> --- arch/arm/mach-rmobile/include/mach/r8a7796.h| 3 --- arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rmobile/include/mach/r8a7796.h b/arch/arm/mach-rmobile/include/mach/r8a7796.h index a7d1ba23bb..dab6082012 100644 --- a/arch/arm/mach-rmobile/include/mach/r8a7796.h +++ b/arch/arm/mach-rmobile/include/mach/r8a7796.h @@ -33,7 +33,4 @@ #define CONFIG_SYS_SH_SDHI3_BASE 0xEE16/* either MMC1 */ #define CONFIG_SYS_SH_SDHI_NR_CHANNEL 4 -/* SH-I2C */ -#define CONFIG_SYS_I2C_SH_BASE00xE60B - #endif /* __ASM_ARCH_R8A7796_H */ diff --git a/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h b/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h index fbd87c4a01..c197642fe4 100644 --- a/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h +++ b/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h @@ -79,6 +79,9 @@ #define PUEN_USB1_OVC (1 << 2) #define PUEN_USB1_PWEN (1 << 1) +/* IICDVFS (I2C) */ +#define CONFIG_SYS_I2C_SH_BASE00xE60B + #ifndef __ASSEMBLY__ #include -- 2.11.0 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] usb: ehci: Add Renesas RCar M3/H3 EHCI support
Hi!
2017-05-13 22:56 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> From: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
>
> Add a USB controller driver for the EHCI block in R8A7795/R8A7796 SoC.
> This is a stopgap measure until we have proper DT support, clock and
> reset framework in place, at which point we can switch to ehci-generic.
>
> Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Reviewed-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> drivers/usb/host/Kconfig | 8 +++
> drivers/usb/host/Makefile | 1 +
> drivers/usb/host/ehci-rcar_gen3.c | 106
> ++
> 3 files changed, 115 insertions(+)
> create mode 100644 drivers/usb/host/ehci-rcar_gen3.c
>
> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> index fb5aa6f889..18971acf54 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -130,6 +130,14 @@ config USB_EHCI_MSM
> This driver supports combination of Chipidea USB controller
> and Synapsys USB PHY in host mode only.
>
> +config USB_EHCI_RCAR_GEN3
> + bool "Support for Renesas RCar M3/H3 EHCI USB controller"
> + depends on RCAR_GEN3
> + default y
> + ---help---
> + Enables support for the on-chip EHCI controller on Renesas
> + R8A7795 and R8A7796 SoCs.
> +
> config USB_EHCI_ZYNQ
> bool "Support for Xilinx Zynq on-chip EHCI USB controller"
> depends on ARCH_ZYNQ
> diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
> index 58c0cf54c2..5d481757e5 100644
> --- a/drivers/usb/host/Makefile
> +++ b/drivers/usb/host/Makefile
> @@ -51,6 +51,7 @@ obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o
> obj-$(CONFIG_USB_EHCI_VCT) += ehci-vct.o
> obj-$(CONFIG_USB_EHCI_VF) += ehci-vf.o
> obj-$(CONFIG_USB_EHCI_RMOBILE) += ehci-rmobile.o
> +obj-$(CONFIG_USB_EHCI_RCAR_GEN3) += ehci-rcar_gen3.o
> obj-$(CONFIG_USB_EHCI_ZYNQ) += ehci-zynq.o
>
> # xhci
> diff --git a/drivers/usb/host/ehci-rcar_gen3.c
> b/drivers/usb/host/ehci-rcar_gen3.c
> new file mode 100644
> index 00..525e7f3573
> --- /dev/null
> +++ b/drivers/usb/host/ehci-rcar_gen3.c
> @@ -0,0 +1,106 @@
> +/*
> + * drivers/usb/host/ehci-rcar_gen3.
> + * This file is EHCI HCD (Host Controller Driver) for USB.
> + *
> + * Copyright (C) 2015-2017 Renesas Electronics Corporation
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include "ehci.h"
> +
> +#define RCAR_GEN3_USB_BASE(n) (0xEE08 + ((n) * 0x2))
> +
> +#define EHCI_USBCMD0x120
> +
> +#define CORE_SPD_RSM_TIMSET0x30c
> +#define CORE_OC_TIMSET 0x310
> +
> +/* Register offset */
> +#define AHB_OFFSET 0x200
> +
> +#define BASE_HSUSB 0xE659
> +#define REG_LPSTS (BASE_HSUSB + 0x0102) /* 16bit */
> +#define SUSPM 0x4000
> +#define SUSPM_NORMAL BIT(14)
> +#define REG_UGCTRL2(BASE_HSUSB + 0x0184) /* 32bit */
> +#define USB0SEL0x0030
> +#define USB0SEL_EHCI 0x0010
> +
> +#define SMSTPCR7 0xE615014C
> +#define SMSTPCR700 BIT(0) /* EHCI3 */
> +#define SMSTPCR701 BIT(1) /* EHCI2 */
> +#define SMSTPCR702 BIT(2) /* EHCI1 */
> +#define SMSTPCR703 BIT(3) /* EHCI0 */
> +#define SMSTPCR704 BIT(4) /* HSUSB */
> +
> +#define AHB_PLL_RSTBIT(1)
> +
> +#define USBH_INTBENBIT(2)
> +#define USBH_INTAENBIT(1)
> +
> +#define AHB_INT_ENABLE 0x200
> +#define AHB_USBCTR 0x20c
> +
> +int ehci_hcd_stop(int index)
> +{
> +#if defined(CONFIG_R8A7795)
> + const u32 mask = SMSTPCR703 | SMSTPCR702 | SMSTPCR701 | SMSTPCR700;
> +#else
> + const u32 mask = SMSTPCR703 | SMSTPCR702;
> +#endif
> + const u32 base = RCAR_GEN3_USB_BASE(index);
> + int ret;
> +
> + /* Reset EHCI */
> + setbits_le32((uintptr_t)(base + EHCI_USBCMD), CMD_RESET);
> + ret = wait_for_bit("ehci-rcar", (void *)(uintptr_t)base + EHCI_USBCMD,
> + CMD_RESET, false, 10, true);
> + if (ret) {
> + printf("ehci-rcar: reset failed (index=%i, ret=%i).\n",
> +
Re: [U-Boot] [PATCH 5/5] mmc: sh_sdhi: Add SDHI support
Hi,
2017-05-13 22:51 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> From: Kouei Abe <kouei.abe...@renesas.com>
>
> R-Car Gen3 series have four SD card interfaces (SDHI0 to SDHI3),
> two of which can also be used as MMC interfaces (SDHI2 and SDHI3).
> This adds High-speed mode SD clock frequency between 25MHz and 50MHz,
> 8bit/4bit bus width, high capacity and low voltage device support.
>
> Signed-off-by: Kouei Abe <kouei.abe...@renesas.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> Cc: Jaehoon Chung <jh80.ch...@samsung.com>
Reviewed-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> drivers/mmc/sh_sdhi.c | 14 ++
> 1 file changed, 14 insertions(+)
>
> diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
> index c64beb6e2a..d181b63905 100644
> --- a/drivers/mmc/sh_sdhi.c
> +++ b/drivers/mmc/sh_sdhi.c
> @@ -698,6 +698,19 @@ static const struct mmc_ops sh_sdhi_ops = {
> .init = sh_sdhi_initialize,
> };
>
> +#ifdef CONFIG_RCAR_GEN3
> +static struct mmc_config sh_sdhi_cfg = {
> + .name = DRIVER_NAME,
> + .ops= _sdhi_ops,
> + .f_min = CLKDEV_INIT,
> + .f_max = CLKDEV_HS_DATA,
> + .voltages = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
> + .host_caps = MMC_MODE_4BIT | MMC_MODE_8BIT | MMC_MODE_HS |
> + MMC_MODE_HS_52MHz,
> + .part_type = PART_TYPE_DOS,
> + .b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT,
> +};
> +#else
> static struct mmc_config sh_sdhi_cfg = {
> .name = DRIVER_NAME,
> .ops= _sdhi_ops,
> @@ -708,6 +721,7 @@ static struct mmc_config sh_sdhi_cfg = {
> .part_type = PART_TYPE_DOS,
> .b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT,
> };
> +#endif
>
> int sh_sdhi_init(unsigned long addr, int ch, unsigned long quirks)
> {
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 18/23] ARM: rmobile: salvator-x: Add DVFS and PMIC support
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Add support for rebooting the board using the ROHM BD9571MWV I2C PMIC,
> but keep the CPU reboot option as a fallback.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/salvator-x/salvator-x.c | 9 +
> include/configs/salvator-x.h | 12
> 2 files changed, 21 insertions(+)
>
> diff --git a/board/renesas/salvator-x/salvator-x.c
> b/board/renesas/salvator-x/salvator-x.c
> index 38ff99a17c..acc541df0c 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -50,6 +50,7 @@ void s_init(void)
> #define TMU1_MSTP124 BIT(24) /* non-secure */
> #define SCIF2_MSTP310 BIT(10) /* SCIF2 */
> #define ETHERAVB_MSTP812 BIT(12)
> +#define DVFS_MSTP926 BIT(26)
> #define SD0_MSTP314BIT(14)
> #define SD1_MSTP313BIT(13)
> #define SD2_MSTP312BIT(12) /* either MMC0 */
> @@ -78,6 +79,10 @@ int board_early_init_f(void)
> writel(0, SD2CKCR);
> writel(0, SD3CKCR);
>
> +#if defined(CONFIG_SYS_I2C) && defined(CONFIG_SYS_I2C_SH)
> + /* DVFS for reset */
> + mstp_clrbits_le32(MSTPSR9, SMSTPCR9, DVFS_MSTP926);
> +#endif
> return 0;
> }
>
> @@ -235,8 +240,12 @@ const struct rmobile_sysinfo sysinfo = {
>
> void reset_cpu(ulong addr)
> {
> +#if defined(CONFIG_SYS_I2C) && defined(CONFIG_SYS_I2C_SH)
> + i2c_reg_write(CONFIG_SYS_I2C_POWERIC_ADDR, 0x20, 0x80);
> +#else
> /* only CA57 ? */
> writel(RST_CODE, RST_CA57RESCNT);
> +#endif
> }
>
> static const struct sh_serial_platdata serial_platdata = {
> diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
> index b5a98d6db2..0e5c130b13 100644
> --- a/include/configs/salvator-x.h
> +++ b/include/configs/salvator-x.h
> @@ -50,6 +50,18 @@
> #define GICD_BASE 0xF101
> #define GICC_BASE 0xF102
>
> +/* i2c */
> +#define CONFIG_SYS_I2C
> +#define CONFIG_SYS_I2C_SH
> +#define CONFIG_SYS_I2C_SLAVE 0x60
> +#define CONFIG_SYS_I2C_SH_NUM_CONTROLLERS 1
> +#define CONFIG_SYS_I2C_SH_SPEED0 40
> +#define CONFIG_SH_I2C_DATA_HIGH4
> +#define CONFIG_SH_I2C_DATA_LOW 5
> +#define CONFIG_SH_I2C_CLOCK1000
> +
> +#define CONFIG_SYS_I2C_POWERIC_ADDR0x30
> +
> /* SDHI */
> #define CONFIG_SH_SDHI_FREQ2
>
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 23/23] ARM: rmobile: salvator-x: Add R8A7796 support
Applied to rmobile branch, thanks! 2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>: > Add minor ifdeffery and default board config for the Salvator-XS board > with R8A7796 M3 SoC. > > Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com> > Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com> > Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org> > --- > board/renesas/salvator-x/MAINTAINERS | 1 + > board/renesas/salvator-x/salvator-x.c | 28 ++-- > configs/r8a7796_salvator-x_defconfig | 31 +++ > 3 files changed, 58 insertions(+), 2 deletions(-) > create mode 100644 configs/r8a7796_salvator-x_defconfig > > diff --git a/board/renesas/salvator-x/MAINTAINERS > b/board/renesas/salvator-x/MAINTAINERS > index 33c105d0cc..f7b98fb097 100644 > --- a/board/renesas/salvator-x/MAINTAINERS > +++ b/board/renesas/salvator-x/MAINTAINERS > @@ -4,3 +4,4 @@ S: Maintained > F: board/renesas/salvator-x/ > F: include/configs/salvator-x.h > F: configs/r8a7795_salvator-x_defconfig > +F: configs/r8a7796_salvator-x_defconfig > diff --git a/board/renesas/salvator-x/salvator-x.c > b/board/renesas/salvator-x/salvator-x.c > index 14385d7361..6270de4e40 100644 > --- a/board/renesas/salvator-x/salvator-x.c > +++ b/board/renesas/salvator-x/salvator-x.c > @@ -1,6 +1,6 @@ > /* > * board/renesas/salvator-x/salvator-x.c > - * This file is Salvator-X board support. > + * This file is Salvator-X/Salvator-XS board support. > * > * Copyright (C) 2015-2017 Renesas Electronics Corporation > * Copyright (C) 2015 Nobuhiro Iwamatsu <iwama...@nigauri.org> > @@ -98,14 +98,20 @@ int board_init(void) > gd->bd->bi_boot_params = CONFIG_SYS_TEXT_BASE + 0x5; > > /* Init PFC controller */ > +#if defined(CONFIG_R8A7795) > r8a7795_pinmux_init(); > +#elif defined(CONFIG_R8A7796) > + r8a7796_pinmux_init(); > +#endif > > +#if defined(CONFIG_R8A7795) > /* GSX: force power and clock supply */ > writel(0x001F, SYSC_PWRONCR2); > while (readl(SYSC_PWRSR2) != 0x03E0) > mdelay(20); > > mstp_clrbits_le32(MSTPSR1, SMSTPCR1, GSX_MSTP112); > +#endif > > /* USB1 pull-up */ > setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN); > @@ -134,6 +140,7 @@ int board_init(void) > /* IPSR3 */ > gpio_request(GPIO_FN_AVB_AVTP_CAPTURE_B, NULL); > > +#if defined(CONFIG_R8A7795) > /* USB2_OVC */ > gpio_request(GPIO_GP_6_15, NULL); > gpio_direction_input(GPIO_GP_6_15); > @@ -142,7 +149,7 @@ int board_init(void) > gpio_request(GPIO_GP_6_14, NULL); > gpio_direction_output(GPIO_GP_6_14, 1); > gpio_set_value(GPIO_GP_6_14, 1); > - > +#endif > /* AVB_PHY_RST */ > gpio_request(GPIO_GP_2_10, NULL); > gpio_direction_output(GPIO_GP_2_10, 0); > @@ -200,7 +207,13 @@ int board_mmc_init(bd_t *bis) > gpio_request(GPIO_GFN_SD2_DAT2, NULL); > gpio_request(GPIO_GFN_SD2_DAT3, NULL); > gpio_request(GPIO_GFN_SD2_CLK, NULL); > +#if defined(CONFIG_R8A7795) > gpio_request(GPIO_GFN_SD2_CMD, NULL); > +#elif defined(CONFIG_R8A7796) > + gpio_request(GPIO_FN_SD2_CMD, NULL); > +#else > +#error Only R8A7795 and R87796 is supported > +#endif > gpio_request(GPIO_GP_5_3, NULL); > gpio_request(GPIO_GP_5_9, NULL); > gpio_direction_output(GPIO_GP_5_3, 0); /* 1: 3.3V, 0: 1.8V */ > @@ -211,6 +224,7 @@ int board_mmc_init(bd_t *bis) > if (ret) > return ret; > > +#if defined(CONFIG_R8A7795) > /* SDHI3 */ > gpio_request(GPIO_GFN_SD3_DAT0, NULL); /* GP_4_9 */ > gpio_request(GPIO_GFN_SD3_DAT1, NULL); /* GP_4_10 */ > @@ -218,6 +232,16 @@ int board_mmc_init(bd_t *bis) > gpio_request(GPIO_GFN_SD3_DAT3, NULL); /* GP_4_12 */ > gpio_request(GPIO_GFN_SD3_CLK, NULL); /* GP_4_7 */ > gpio_request(GPIO_GFN_SD3_CMD, NULL); /* GP_4_8 */ > +#elif defined(CONFIG_R8A7796) > + gpio_request(GPIO_FN_SD3_DAT0, NULL); /* GP_4_9 */ > + gpio_request(GPIO_FN_SD3_DAT1, NULL); /* GP_4_10 */ > + gpio_request(GPIO_FN_SD3_DAT2, NULL); /* GP_4_11 */ > + gpio_request(GPIO_FN_SD3_DAT3, NULL); /* GP_4_12 */ > + gpio_request(GPIO_FN_SD3_CLK, NULL);/* GP_4_7 */ > + gpio_request(GPIO_FN_SD3_CMD, NULL);/* GP_4_8 */ > +#else > +#error Only R8A7795 and R87796 is supported > +#endif > /* IPSR10 */ > gpio_request(GPIO_FN_SD3_CD, NULL); > gpio_request(GPIO_FN_SD3_WP, NULL); > d
Re: [U-Boot] [PATCH 3/5] mmc: sh_sdhi: Add 64-bit access to sd_buf support
Hi!
2017-05-13 22:51 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> From: Kouei Abe <kouei.abe...@renesas.com>
>
> Renesas SDHI SD/MMC driver has 16-bit width bus access to SD_BUF.
> This adds 64-bit width bus access to SD_BUF.
>
> Signed-off-by: Kouei Abe <kouei.abe...@renesas.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> Cc: Jaehoon Chung <jh80.ch...@samsung.com>
Reviewed-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> arch/arm/mach-rmobile/include/mach/sh_sdhi.h | 8 +++--
> drivers/mmc/sh_sdhi.c| 53
> ++--
> 2 files changed, 48 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/mach-rmobile/include/mach/sh_sdhi.h
> b/arch/arm/mach-rmobile/include/mach/sh_sdhi.h
> index 057bf3f8bb..a5ea45b707 100644
> --- a/arch/arm/mach-rmobile/include/mach/sh_sdhi.h
> +++ b/arch/arm/mach-rmobile/include/mach/sh_sdhi.h
> @@ -1,9 +1,9 @@
> /*
> * drivers/mmc/sh-sdhi.h
> *
> - * SD/MMC driver for Reneas rmobile ARM SoCs
> + * SD/MMC driver for Renesas rmobile ARM SoCs
> *
> - * Copyright (C) 2013-2014 Renesas Electronics Corporation
> + * Copyright (C) 2013-2017 Renesas Electronics Corporation
> * Copyright (C) 2008-2009 Renesas Solutions Corp.
> *
> * SPDX-License-Identifier:GPL-2.0
> @@ -162,7 +162,9 @@
> #defineCLKDEV_INIT 40 /* 100 - 400
> KHz */
>
> /* For quirk */
> -#define SH_SDHI_QUIRK_16BIT_BUF(1)
> +#define SH_SDHI_QUIRK_16BIT_BUFBIT(0)
> +#define SH_SDHI_QUIRK_64BIT_BUFBIT(1)
> +
> int sh_sdhi_init(unsigned long addr, int ch, unsigned long quirks);
>
> #endif /* _SH_SDHI_H */
> diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
> index 7f0b4c2603..d1dd0f0fc3 100644
> --- a/drivers/mmc/sh_sdhi.c
> +++ b/drivers/mmc/sh_sdhi.c
> @@ -3,7 +3,7 @@
> *
> * SD/MMC driver for Renesas rmobile ARM SoCs.
> *
> - * Copyright (C) 2011,2013-2014 Renesas Electronics Corporation
> + * Copyright (C) 2011,2013-2017 Renesas Electronics Corporation
> * Copyright (C) 2014 Nobuhiro Iwamatsu <nobuhiro.iwamatsu...@renesas.com>
> * Copyright (C) 2008-2009 Renesas Solutions Corp.
> *
> @@ -29,6 +29,17 @@ struct sh_sdhi_host {
> unsigned char sd_error;
> unsigned char detect_waiting;
> };
> +
> +static inline void sh_sdhi_writeq(struct sh_sdhi_host *host, int reg, u64
> val)
> +{
> + writeq(val, host->addr + (reg << host->bus_shift));
> +}
> +
> +static inline u64 sh_sdhi_readq(struct sh_sdhi_host *host, int reg)
> +{
> + return readq(host->addr + (reg << host->bus_shift));
> +}
> +
> static inline void sh_sdhi_writew(struct sh_sdhi_host *host, int reg, u16
> val)
> {
> writew(val, host->addr + (reg << host->bus_shift));
> @@ -261,6 +272,7 @@ static int sh_sdhi_single_read(struct sh_sdhi_host *host,
> struct mmc_data *data)
> long time;
> unsigned short blocksize, i;
> unsigned short *p = (unsigned short *)data->dest;
> + u64 *q = (u64 *)data->dest;
>
> if ((unsigned long)p & 0x0001) {
> debug(DRIVER_NAME": %s: The data pointer is unaligned.",
> @@ -281,8 +293,12 @@ static int sh_sdhi_single_read(struct sh_sdhi_host
> *host, struct mmc_data *data)
>
> host->wait_int = 0;
> blocksize = sh_sdhi_readw(host, SDHI_SIZE);
> - for (i = 0; i < blocksize / 2; i++)
> - *p++ = sh_sdhi_readw(host, SDHI_BUF0);
> + if (host->quirks & SH_SDHI_QUIRK_64BIT_BUF)
> + for (i = 0; i < blocksize / 8; i++)
> + *q++ = sh_sdhi_readq(host, SDHI_BUF0);
> + else
> + for (i = 0; i < blocksize / 2; i++)
> + *p++ = sh_sdhi_readw(host, SDHI_BUF0);
>
> time = sh_sdhi_wait_interrupt_flag(host);
> if (time == 0 || host->sd_error != 0)
> @@ -297,6 +313,7 @@ static int sh_sdhi_multi_read(struct sh_sdhi_host *host,
> struct mmc_data *data)
> long time;
> unsigned short blocksize, i, sec;
> unsigned short *p = (unsigned short *)data->dest;
> + u64 *q = (u64 *)data->dest;
>
> if ((unsigned long)p & 0x0001) {
> debug(DRIVER_NAME": %s: The data pointer is unaligned.",
> @@ -319,8 +336,12 @@ static int sh_sdhi_multi_read(struct sh_sdhi_host *host,
> struct mmc_data *data)
>
> host->wait_int = 0;
> blocksi
Re: [U-Boot] [PATCH 1/5] mmc: sh_sdhi: Fix Kconfig entry
Hi!
2017-05-13 22:51 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> The Kconfig entry depends on RMOBILE, but this was renamed
> to ARCH_RMOBILE in commit 1cc95f6e1b38 (ARM: Rmobile: Rename
> CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE) . Fix this omission.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> Cc: Jaehoon Chung <jh80.ch...@samsung.com>
Reviewed-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> drivers/mmc/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
> index 6ac26dd137..b2d70a37bd 100644
> --- a/drivers/mmc/Kconfig
> +++ b/drivers/mmc/Kconfig
> @@ -159,7 +159,7 @@ config MMC_OMAP36XX_PINS
>
> config SH_SDHI
> bool "SuperH/Renesas ARM SoCs on-chip SDHI host controller support"
> - depends on RMOBILE
> + depends on ARCH_RMOBILE
> help
> Support for the on-chip SDHI host controller on SuperH/Renesas ARM
> SoCs platform
>
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 4/5] mmc: sh_sdhi: Add MMC version 5.0 support
Hi,
2017-05-13 22:51 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> From: Kouei Abe <kouei.abe...@renesas.com>
>
> Renesas SDHI SD/MMC driver did not support MMC version 5.0 devices.
> This adds MMC version 5.0 device support.
>
> Signed-off-by: Kouei Abe <kouei.abe...@renesas.com>
> Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> Cc: Jaehoon Chung <jh80.ch...@samsung.com>
Reviewed-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> arch/arm/mach-rmobile/include/mach/sh_sdhi.h | 7 ++-
> drivers/mmc/sh_sdhi.c| 24 +++-
> 2 files changed, 25 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-rmobile/include/mach/sh_sdhi.h
> b/arch/arm/mach-rmobile/include/mach/sh_sdhi.h
> index a5ea45b707..1fb0648b12 100644
> --- a/arch/arm/mach-rmobile/include/mach/sh_sdhi.h
> +++ b/arch/arm/mach-rmobile/include/mach/sh_sdhi.h
> @@ -50,8 +50,10 @@
> /* SDHI CMD VALUE */
> #define CMD_MASK 0x
> #define SDHI_APP 0x0040
> +#define SDHI_MMC_SEND_OP_COND 0x0701
> #define SDHI_SD_APP_SEND_SCR 0x0073
> #define SDHI_SD_SWITCH 0x1C06
> +#define SDHI_MMC_SEND_EXT_CSD 0x1C08
>
> /* SDHI_PORTSEL */
> #define USE_1PORT (1 << 8) /* 1 port */
> @@ -120,7 +122,10 @@
> #define CLK_ENABLE (1 << 8)
>
> /* SDHI_OPTION */
> -#define OPT_BUS_WIDTH_1(1 << 15) /* bus width
> = 1 bit */
> +#define OPT_BUS_WIDTH_M(5 << 13) /* 101b
> (15-13bit) */
> +#define OPT_BUS_WIDTH_1(4 << 13) /* bus width
> = 1 bit */
> +#define OPT_BUS_WIDTH_4(0 << 13) /* bus width
> = 4 bit */
> +#define OPT_BUS_WIDTH_8(1 << 13) /* bus width
> = 8 bit */
>
> /* SDHI_ERR_STS1 */
> #define ERR_STS1_CRC_ERROR ((1 << 11) | (1 << 10) | (1 << 9) | \
> diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
> index d1dd0f0fc3..c64beb6e2a 100644
> --- a/drivers/mmc/sh_sdhi.c
> +++ b/drivers/mmc/sh_sdhi.c
> @@ -489,6 +489,13 @@ static unsigned short sh_sdhi_set_cmd(struct
> sh_sdhi_host *host,
> else /* SD_SWITCH */
> opc = SDHI_SD_SWITCH;
> break;
> + case MMC_CMD_SEND_OP_COND:
> + opc = SDHI_MMC_SEND_OP_COND;
> + break;
> + case MMC_CMD_SEND_EXT_CSD:
> + if (data)
> + opc = SDHI_MMC_SEND_EXT_CSD;
> + break;
> default:
> break;
> }
> @@ -513,6 +520,7 @@ static unsigned short sh_sdhi_data_trans(struct
> sh_sdhi_host *host,
> case MMC_CMD_READ_SINGLE_BLOCK:
> case SDHI_SD_APP_SEND_SCR:
> case SDHI_SD_SWITCH: /* SD_SWITCH */
> + case SDHI_MMC_SEND_EXT_CSD:
> ret = sh_sdhi_single_read(host, data);
> break;
> default:
> @@ -648,12 +656,18 @@ static int sh_sdhi_set_ios(struct mmc *mmc)
> if (ret)
> return -EINVAL;
>
> - if (mmc->bus_width == 4)
> - sh_sdhi_writew(host, SDHI_OPTION, ~OPT_BUS_WIDTH_1 &
> - sh_sdhi_readw(host, SDHI_OPTION));
> + if (mmc->bus_width == 8)
> + sh_sdhi_writew(host, SDHI_OPTION,
> + OPT_BUS_WIDTH_8 | (~OPT_BUS_WIDTH_M &
> + sh_sdhi_readw(host, SDHI_OPTION)));
> + else if (mmc->bus_width == 4)
> + sh_sdhi_writew(host, SDHI_OPTION,
> + OPT_BUS_WIDTH_4 | (~OPT_BUS_WIDTH_M &
> + sh_sdhi_readw(host, SDHI_OPTION)));
> else
> - sh_sdhi_writew(host, SDHI_OPTION, OPT_BUS_WIDTH_1 |
> - sh_sdhi_readw(host, SDHI_OPTION));
> + sh_sdhi_writew(host, SDHI_OPTION,
> + OPT_BUS_WIDTH_1 | (~OPT_BUS_WIDTH_M &
> + sh_sdhi_readw(host, SDHI_OPTION)));
>
> debug("clock = %d, buswidth = %d\n", mmc->clock, mmc->bus_width);
>
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 22/23] ARM: rmobile: salvator-x: Rename the defconfig to match the SoC
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Rename the salvator-x_defconfig to r8a7795_salvator-x_defconfig in
> preparation for the r8a7796 support on salvator-x board.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/salvator-x/MAINTAINERS | 2 +-
> configs/{salvator-x_defconfig => r8a7795_salvator-x_defconfig} | 0
> 2 files changed, 1 insertion(+), 1 deletion(-)
> rename configs/{salvator-x_defconfig => r8a7795_salvator-x_defconfig} (100%)
>
> diff --git a/board/renesas/salvator-x/MAINTAINERS
> b/board/renesas/salvator-x/MAINTAINERS
> index abd05c88e0..33c105d0cc 100644
> --- a/board/renesas/salvator-x/MAINTAINERS
> +++ b/board/renesas/salvator-x/MAINTAINERS
> @@ -3,4 +3,4 @@ M: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> S: Maintained
> F: board/renesas/salvator-x/
> F: include/configs/salvator-x.h
> -F: configs/salvator-x_defconfig
> +F: configs/r8a7795_salvator-x_defconfig
> diff --git a/configs/salvator-x_defconfig
> b/configs/r8a7795_salvator-x_defconfig
> similarity index 100%
> rename from configs/salvator-x_defconfig
> rename to configs/r8a7795_salvator-x_defconfig
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/5] mmc: sh_sdhi: Set SD_INFOx interrupt mask before command starting
Hi,
2017-05-13 22:51 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> From: Kouei Abe <kouei.abe...@renesas.com>
>
> When setting interrupt mask after command starting, an unintended
> interrupt status sometimes occurs.
>
> Signed-off-by: Kouei Abe <kouei.abe...@renesas.com>
> Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> Cc: Jaehoon Chung <jh80.ch...@samsung.com>
Reviewed-by: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> drivers/mmc/sh_sdhi.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/sh_sdhi.c b/drivers/mmc/sh_sdhi.c
> index 25224e2e1d..7f0b4c2603 100644
> --- a/drivers/mmc/sh_sdhi.c
> +++ b/drivers/mmc/sh_sdhi.c
> @@ -546,8 +546,6 @@ static int sh_sdhi_start_cmd(struct sh_sdhi_host *host,
> break;
> }
>
> - sh_sdhi_writew(host, SDHI_CMD, (unsigned short)(opc & CMD_MASK));
> -
> host->wait_int = 0;
> sh_sdhi_writew(host, SDHI_INFO1_MASK,
>~INFO1M_RESP_END & sh_sdhi_readw(host,
> SDHI_INFO1_MASK));
> @@ -557,6 +555,8 @@ static int sh_sdhi_start_cmd(struct sh_sdhi_host *host,
>INFO2M_RESP_TIMEOUT | INFO2M_ILA) &
>sh_sdhi_readw(host, SDHI_INFO2_MASK));
>
> + sh_sdhi_writew(host, SDHI_CMD, (unsigned short)(opc & CMD_MASK));
> +
> time = sh_sdhi_wait_interrupt_flag(host);
> if (!time)
> return sh_sdhi_error_manage(host);
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 11/23] ARM: rmobile: salvator-x: Use BIT() macro in board file
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Cosmetic change, replace (1 << (n)) with BIT(n) .
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/salvator-x/salvator-x.c | 8
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/board/renesas/salvator-x/salvator-x.c
> b/board/renesas/salvator-x/salvator-x.c
> index 0164306b52..d0e21ab667 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -44,10 +44,10 @@ void s_init(void)
> writel(0x, CPGWPR);
> }
>
> -#define GSX_MSTP112(1 << 12) /* 3DG */
> -#define TMU0_MSTP125 (1 << 25) /* secure */
> -#define TMU1_MSTP124 (1 << 24) /* non-secure */
> -#define SCIF2_MSTP310 (1 << 10) /* SCIF2 */
> +#define GSX_MSTP112BIT(12) /* 3DG */
> +#define TMU0_MSTP125 BIT(25) /* secure */
> +#define TMU1_MSTP124 BIT(24) /* non-secure */
> +#define SCIF2_MSTP310 BIT(10) /* SCIF2 */
>
> int board_early_init_f(void)
> {
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 17/23] ARM: rmobile: salvator-x: Add RAVB ethernet support
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Add support for the AVB ethernet on the Salvator-X board.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/salvator-x/salvator-x.c | 46
> +++
> configs/salvator-x_defconfig | 7 ++
> include/configs/salvator-x.h | 6 +
> 3 files changed, 59 insertions(+)
>
> diff --git a/board/renesas/salvator-x/salvator-x.c
> b/board/renesas/salvator-x/salvator-x.c
> index 1ee5cf1051..38ff99a17c 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -49,6 +49,7 @@ void s_init(void)
> #define TMU0_MSTP125 BIT(25) /* secure */
> #define TMU1_MSTP124 BIT(24) /* non-secure */
> #define SCIF2_MSTP310 BIT(10) /* SCIF2 */
> +#define ETHERAVB_MSTP812 BIT(12)
> #define SD0_MSTP314BIT(14)
> #define SD1_MSTP313BIT(13)
> #define SD2_MSTP312BIT(12) /* either MMC0 */
> @@ -65,6 +66,8 @@ int board_early_init_f(void)
> mstp_clrbits_le32(MSTPSR1, SMSTPCR1, TMU0_MSTP125 | TMU1_MSTP124);
> /* SCIF2 */
> mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SCIF2_MSTP310);
> + /* EHTERAVB */
> + mstp_clrbits_le32(MSTPSR8, SMSTPCR8, ETHERAVB_MSTP812);
> /* eMMC */
> mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SD1_MSTP313 | SD2_MSTP312);
> /* SDHI0, 3 */
> @@ -99,9 +102,52 @@ int board_init(void)
>
> mstp_clrbits_le32(MSTPSR1, SMSTPCR1, GSX_MSTP112);
>
> +#ifdef CONFIG_RAVB
> + /* EtherAVB Enable */
> + /* GPSR2 */
> + gpio_request(GPIO_GFN_AVB_AVTP_CAPTURE_A, NULL);
> + gpio_request(GPIO_GFN_AVB_AVTP_MATCH_A, NULL);
> + gpio_request(GPIO_GFN_AVB_LINK, NULL);
> + gpio_request(GPIO_GFN_AVB_PHY_INT, NULL);
> + gpio_request(GPIO_GFN_AVB_MAGIC, NULL);
> + gpio_request(GPIO_GFN_AVB_MDC, NULL);
> +
> + /* IPSR0 */
> + gpio_request(GPIO_IFN_AVB_MDC, NULL);
> + gpio_request(GPIO_IFN_AVB_MAGIC, NULL);
> + gpio_request(GPIO_IFN_AVB_PHY_INT, NULL);
> + gpio_request(GPIO_IFN_AVB_LINK, NULL);
> + gpio_request(GPIO_IFN_AVB_AVTP_MATCH_A, NULL);
> + gpio_request(GPIO_IFN_AVB_AVTP_CAPTURE_A, NULL);
> + /* IPSR1 */
> + gpio_request(GPIO_FN_AVB_AVTP_PPS, NULL);
> + /* IPSR2 */
> + gpio_request(GPIO_FN_AVB_AVTP_MATCH_B, NULL);
> + /* IPSR3 */
> + gpio_request(GPIO_FN_AVB_AVTP_CAPTURE_B, NULL);
> +
> + /* AVB_PHY_RST */
> + gpio_request(GPIO_GP_2_10, NULL);
> + gpio_direction_output(GPIO_GP_2_10, 0);
> + mdelay(20);
> + gpio_set_value(GPIO_GP_2_10, 1);
> + udelay(1);
> +#endif
> +
> return 0;
> }
>
> +static struct eth_pdata salvator_x_ravb_platdata = {
> + .iobase = 0xE680,
> + .phy_interface = 0,
> + .max_speed = 1000,
> +};
> +
> +U_BOOT_DEVICE(salvator_x_ravb) = {
> + .name = "ravb",
> + .platdata = _x_ravb_platdata,
> +};
> +
> #ifdef CONFIG_SH_SDHI
> int board_mmc_init(bd_t *bis)
> {
> diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig
> index 1478b6ae3b..3738fe4536 100644
> --- a/configs/salvator-x_defconfig
> +++ b/configs/salvator-x_defconfig
> @@ -12,7 +12,14 @@ CONFIG_SH_SDHI=y
> # CONFIG_CMD_IMLS is not set
> CONFIG_CMD_EDITENV=y
> CONFIG_CMD_SAVEENV=y
> +CONFIG_CMD_NET=y
> +CONFIG_CMD_NFS=y
> +CONFIG_CMD_MII=y
> +CONFIG_CMD_PING=y
> +CONFIG_CMD_DHCP=y
> CONFIG_DOS_PARTITION=y
> CONFIG_MMC=y
> CONFIG_GENERIC_MMC=y
> CONFIG_OF_LIBFDT=y
> +CONFIG_DM_ETH=y
> +CONFIG_RENESAS_RAVB=y
> diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
> index 91307eb353..b5a98d6db2 100644
> --- a/include/configs/salvator-x.h
> +++ b/include/configs/salvator-x.h
> @@ -25,6 +25,12 @@
> /* [A] Hyper Flash */
> /* use to RPC(SPI Multi I/O Bus Controller) */
>
> +/* Ethernet RAVB */
> +#define CONFIG_NET_MULTI
> +#define CONFIG_PHY_MICREL
> +#define CONFIG_BITBANGMII
> +#define CONFIG_BITBANGMII_MULTI
> +
> /* Board Clock */
> /* XTAL_CLK : 33.33MHz */
> #define RCAR_XTAL_CLK u
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 16/23] ARM: rmobile: salvator-x: Add SD support
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Add support for the SD card slots on the Salvator-X board.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/salvator-x/salvator-x.c | 89
> ++-
> configs/salvator-x_defconfig | 8 ++--
> include/configs/salvator-x.h | 10 +++-
> 3 files changed, 102 insertions(+), 5 deletions(-)
>
> diff --git a/board/renesas/salvator-x/salvator-x.c
> b/board/renesas/salvator-x/salvator-x.c
> index 3f2bebf74f..1ee5cf1051 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -2,7 +2,7 @@
> * board/renesas/salvator-x/salvator-x.c
> * This file is Salvator-X board support.
> *
> - * Copyright (C) 2015 Renesas Electronics Corporation
> + * Copyright (C) 2015-2017 Renesas Electronics Corporation
> * Copyright (C) 2015 Nobuhiro Iwamatsu <iwama...@nigauri.org>
> *
> * SPDX-License-Identifier: GPL-2.0+
> @@ -22,6 +22,7 @@
> #include
> #include
> #include
> +#include
> #include
> #include
>
> @@ -48,6 +49,15 @@ void s_init(void)
> #define TMU0_MSTP125 BIT(25) /* secure */
> #define TMU1_MSTP124 BIT(24) /* non-secure */
> #define SCIF2_MSTP310 BIT(10) /* SCIF2 */
> +#define SD0_MSTP314BIT(14)
> +#define SD1_MSTP313BIT(13)
> +#define SD2_MSTP312BIT(12) /* either MMC0 */
> +#define SD3_MSTP311BIT(11) /* either MMC1 */
> +
> +#define SD0CKCR0xE6150074
> +#define SD1CKCR0xE6150078
> +#define SD2CKCR0xE6150268
> +#define SD3CKCR0xE615026C
>
> int board_early_init_f(void)
> {
> @@ -55,6 +65,15 @@ int board_early_init_f(void)
> mstp_clrbits_le32(MSTPSR1, SMSTPCR1, TMU0_MSTP125 | TMU1_MSTP124);
> /* SCIF2 */
> mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SCIF2_MSTP310);
> + /* eMMC */
> + mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SD1_MSTP313 | SD2_MSTP312);
> + /* SDHI0, 3 */
> + mstp_clrbits_le32(MSTPSR3, SMSTPCR3, SD0_MSTP314 | SD3_MSTP311);
> +
> + writel(0, SD0CKCR);
> + writel(0, SD1CKCR);
> + writel(0, SD2CKCR);
> + writel(0, SD3CKCR);
>
> return 0;
> }
> @@ -83,6 +102,74 @@ int board_init(void)
> return 0;
> }
>
> +#ifdef CONFIG_SH_SDHI
> +int board_mmc_init(bd_t *bis)
> +{
> + int ret = -ENODEV;
> +
> + /* SDHI0 */
> + gpio_request(GPIO_GFN_SD0_DAT0, NULL);
> + gpio_request(GPIO_GFN_SD0_DAT1, NULL);
> + gpio_request(GPIO_GFN_SD0_DAT2, NULL);
> + gpio_request(GPIO_GFN_SD0_DAT3, NULL);
> + gpio_request(GPIO_GFN_SD0_CLK, NULL);
> + gpio_request(GPIO_GFN_SD0_CMD, NULL);
> + gpio_request(GPIO_GFN_SD0_CD, NULL);
> + gpio_request(GPIO_GFN_SD0_WP, NULL);
> +
> + gpio_request(GPIO_GP_5_2, NULL);
> + gpio_request(GPIO_GP_5_1, NULL);
> + gpio_direction_output(GPIO_GP_5_2, 1); /* power on */
> + gpio_direction_output(GPIO_GP_5_1, 1); /* 1: 3.3V, 0: 1.8V */
> +
> + ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI0_BASE, 0,
> + SH_SDHI_QUIRK_64BIT_BUF);
> + if (ret)
> + return ret;
> +
> + /* SDHI1/SDHI2 eMMC */
> + gpio_request(GPIO_GFN_SD1_DAT0, NULL);
> + gpio_request(GPIO_GFN_SD1_DAT1, NULL);
> + gpio_request(GPIO_GFN_SD1_DAT2, NULL);
> + gpio_request(GPIO_GFN_SD1_DAT3, NULL);
> + gpio_request(GPIO_GFN_SD2_DAT0, NULL);
> + gpio_request(GPIO_GFN_SD2_DAT1, NULL);
> + gpio_request(GPIO_GFN_SD2_DAT2, NULL);
> + gpio_request(GPIO_GFN_SD2_DAT3, NULL);
> + gpio_request(GPIO_GFN_SD2_CLK, NULL);
> + gpio_request(GPIO_GFN_SD2_CMD, NULL);
> + gpio_request(GPIO_GP_5_3, NULL);
> + gpio_request(GPIO_GP_5_9, NULL);
> + gpio_direction_output(GPIO_GP_5_3, 0); /* 1: 3.3V, 0: 1.8V */
> + gpio_direction_output(GPIO_GP_5_9, 0); /* 1: 3.3V, 0: 1.8V */
> +
> + ret = sh_sdhi_init(CONFIG_SYS_SH_SDHI2_BASE, 1,
> + SH_SDHI_QUIRK_64BIT_BUF);
> + if (ret)
> + return ret;
> +
> + /* SDHI3 */
> + gpio_request(GPIO_GFN_SD3_DAT0, NULL); /* GP_4_9 */
> + gpio_request(GPIO_GFN_SD3_DAT1, NULL); /* GP_4_10 */
> + gpio_request(GPIO_GFN_SD3_DAT2, NULL); /* GP_4_11 */
>
Re: [U-Boot] [PATCH 19/23] ARM: rmobile: salvator-x: Add USB support
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Add support for the EHCI USB.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/salvator-x/salvator-x.c | 12
> configs/salvator-x_defconfig | 6 ++
> include/configs/salvator-x.h | 7 +++
> 3 files changed, 25 insertions(+)
>
> diff --git a/board/renesas/salvator-x/salvator-x.c
> b/board/renesas/salvator-x/salvator-x.c
> index acc541df0c..44e4006f5c 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -107,6 +107,9 @@ int board_init(void)
>
> mstp_clrbits_le32(MSTPSR1, SMSTPCR1, GSX_MSTP112);
>
> + /* USB1 pull-up */
> + setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN);
> +
> #ifdef CONFIG_RAVB
> /* EtherAVB Enable */
> /* GPSR2 */
> @@ -131,6 +134,15 @@ int board_init(void)
> /* IPSR3 */
> gpio_request(GPIO_FN_AVB_AVTP_CAPTURE_B, NULL);
>
> + /* USB2_OVC */
> + gpio_request(GPIO_GP_6_15, NULL);
> + gpio_direction_input(GPIO_GP_6_15);
> +
> + /* USB2_PWEN */
> + gpio_request(GPIO_GP_6_14, NULL);
> + gpio_direction_output(GPIO_GP_6_14, 1);
> + gpio_set_value(GPIO_GP_6_14, 1);
> +
> /* AVB_PHY_RST */
> gpio_request(GPIO_GP_2_10, NULL);
> gpio_direction_output(GPIO_GP_2_10, 0);
> diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig
> index 3738fe4536..60e0b720bb 100644
> --- a/configs/salvator-x_defconfig
> +++ b/configs/salvator-x_defconfig
> @@ -17,6 +17,12 @@ CONFIG_CMD_NFS=y
> CONFIG_CMD_MII=y
> CONFIG_CMD_PING=y
> CONFIG_CMD_DHCP=y
> +CONFIG_CMD_USB=y
> +CONFIG_USB=y
> +CONFIG_USB_HOST=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_STORAGE=y
> +CONFIG_USB_EHCI_RCAR_GEN3=y
> CONFIG_DOS_PARTITION=y
> CONFIG_MMC=y
> CONFIG_GENERIC_MMC=y
> diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
> index 0e5c130b13..4ac9328e1b 100644
> --- a/include/configs/salvator-x.h
> +++ b/include/configs/salvator-x.h
> @@ -62,6 +62,13 @@
>
> #define CONFIG_SYS_I2C_POWERIC_ADDR0x30
>
> +/* USB */
> +#ifdef CONFIG_R8A7795
> +#define CONFIG_USB_MAX_CONTROLLER_COUNT3
> +#else
> +#define CONFIG_USB_MAX_CONTROLLER_COUNT2
> +#endif
> +
> /* SDHI */
> #define CONFIG_SH_SDHI_FREQ2
>
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 21/23] ARM: rmobile: salvator-x: Enable SCIF2 clock
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> There are two UARTs on the board, so enable the clock for the
> second one as well.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> include/configs/salvator-x.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
> index 4ac9328e1b..0ac3900326 100644
> --- a/include/configs/salvator-x.h
> +++ b/include/configs/salvator-x.h
> @@ -81,6 +81,8 @@
> /* Module stop status bits */
> /* MFIS, SCIF1 */
> #define CONFIG_SMSTP2_ENA 0x2040
> +/* SCIF2 */
> +#define CONFIG_SMSTP3_ENA 0x0400
> /* INTC-AP, IRQC */
> #define CONFIG_SMSTP4_ENA 0x0180
>
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 14/23] ARM: rmobile: salvator-x: Zap redefined DECLARE_GLOBAL_DATA_PTR
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> The macro is used twice in the salvator-x board file, drop one.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/salvator-x/salvator-x.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/board/renesas/salvator-x/salvator-x.c
> b/board/renesas/salvator-x/salvator-x.c
> index d0e21ab667..038d6de610 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -65,7 +65,6 @@ int board_early_init_f(void)
> /* -/W 32 Power resume control register 2 (3DG) */
> #defineSYSC_PWRONCR2 0xE618010C
>
> -DECLARE_GLOBAL_DATA_PTR;
> int board_init(void)
> {
> /* adress of boot parameters */
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 20/23] ARM: rmobile: salvator-x: Count all DRAM in all slots
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Instead of counting only the DRAM in the first slot, count
> all the DRAM in all slots and report it accordingly.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/salvator-x/salvator-x.c | 30 +-
> 1 file changed, 29 insertions(+), 1 deletion(-)
>
> diff --git a/board/renesas/salvator-x/salvator-x.c
> b/board/renesas/salvator-x/salvator-x.c
> index 44e4006f5c..14385d7361 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -235,8 +235,36 @@ int board_mmc_init(bd_t *bis)
>
> int dram_init(void)
> {
> - gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
> + gd->ram_size = PHYS_SDRAM_1_SIZE;
> +#if (CONFIG_NR_DRAM_BANKS >= 2)
> + gd->ram_size += PHYS_SDRAM_2_SIZE;
> +#endif
> +#if (CONFIG_NR_DRAM_BANKS >= 3)
> + gd->ram_size += PHYS_SDRAM_3_SIZE;
> +#endif
> +#if (CONFIG_NR_DRAM_BANKS >= 4)
> + gd->ram_size += PHYS_SDRAM_4_SIZE;
> +#endif
> +
> + return 0;
> +}
>
> +int dram_init_banksize(void)
> +{
> + gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
> + gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
> +#if (CONFIG_NR_DRAM_BANKS >= 2)
> + gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
> + gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
> +#endif
> +#if (CONFIG_NR_DRAM_BANKS >= 3)
> + gd->bd->bi_dram[2].start = PHYS_SDRAM_3;
> + gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE;
> +#endif
> +#if (CONFIG_NR_DRAM_BANKS >= 4)
> + gd->bd->bi_dram[3].start = PHYS_SDRAM_4;
> + gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE;
> +#endif
> return 0;
> }
>
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 12/23] ARM: rmobile: salvator-x: Move OF_LIBFDT and CMD_FDT to board config
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Move these two Kconfig symbols to the salvator-x_defconfig.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> configs/salvator-x_defconfig | 2 ++
> include/configs/rcar-gen3-common.h | 2 --
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig
> index 8f9b5b5328..9fb0b898f1 100644
> --- a/configs/salvator-x_defconfig
> +++ b/configs/salvator-x_defconfig
> @@ -5,9 +5,11 @@ CONFIG_RCAR_GEN3=y
> CONFIG_TARGET_SALVATOR_X=y
> CONFIG_VERSION_VARIABLE=y
> CONFIG_CMD_BOOTZ=y
> +CONFIG_CMD_FDT=y
> CONFIG_R8A7795=y
> # CONFIG_CMD_IMI is not set
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_XIMG is not set
> CONFIG_DOS_PARTITION=y
> # CONFIG_MMC is not set
> +CONFIG_OF_LIBFDT=y
> diff --git a/include/configs/rcar-gen3-common.h
> b/include/configs/rcar-gen3-common.h
> index 304478af07..6bc8ab18b6 100644
> --- a/include/configs/rcar-gen3-common.h
> +++ b/include/configs/rcar-gen3-common.h
> @@ -17,7 +17,6 @@
> #define CONFIG_CMD_EXT2
> #define CONFIG_CMD_EXT4
> #define CONFIG_CMD_EXT4_WRITE
> -#define CONFIG_CMD_FDT
>
> #define CONFIG_REMAKE_ELF
>
> @@ -34,7 +33,6 @@
> #define CONFIG_SETUP_MEMORY_TAGS
> #define CONFIG_INITRD_TAG
> #define CONFIG_CMDLINE_EDITING
> -#define CONFIG_OF_LIBFDT
>
> #undef CONFIG_SHOW_BOOT_PROGRESS
>
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 13/23] ARM: rmobile: salvator-x: Set default device tree
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Set default device tree file in the salvator-x_defconfig
> and use it in the environment.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> configs/salvator-x_defconfig | 1 +
> include/configs/rcar-gen3-common.h | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig
> index 9fb0b898f1..8cef6075e9 100644
> --- a/configs/salvator-x_defconfig
> +++ b/configs/salvator-x_defconfig
> @@ -3,6 +3,7 @@ CONFIG_ARCH_RMOBILE=y
> CONFIG_SYS_MALLOC_F_LEN=0x2000
> CONFIG_RCAR_GEN3=y
> CONFIG_TARGET_SALVATOR_X=y
> +CONFIG_DEFAULT_FDT_FILE=r8a7795-salvator-x.dtb
> CONFIG_VERSION_VARIABLE=y
> CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_FDT=y
> diff --git a/include/configs/rcar-gen3-common.h
> b/include/configs/rcar-gen3-common.h
> index 6bc8ab18b6..e73bc61856 100644
> --- a/include/configs/rcar-gen3-common.h
> +++ b/include/configs/rcar-gen3-common.h
> @@ -100,7 +100,7 @@
>
> #define CONFIG_BOOTCOMMAND \
> "tftp 0x4808 Image; " \
> - "tftp 0x4800 Image-r8a7795-salvator-x.dtb; " \
> + "tftp 0x4800 Image-"CONFIG_DEFAULT_FDT_FILE"; " \
> "booti 0x4808 - 0x4800"
>
> #endif /* __RCAR_GEN3_COMMON_H */
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 15/23] ARM: rmobile: salvator-x: Adjust UART clock
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> The UART uses internal SCIF clock except on R8A7795 H3 WS1.0 .
> Use the internal clock and ignore the early version of the chip.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> board/renesas/salvator-x/salvator-x.c | 4 ++--
> include/configs/salvator-x.h | 5 +++--
> scripts/config_whitelist.txt | 1 +
> 3 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/board/renesas/salvator-x/salvator-x.c
> b/board/renesas/salvator-x/salvator-x.c
> index 038d6de610..3f2bebf74f 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -109,8 +109,8 @@ void reset_cpu(ulong addr)
> static const struct sh_serial_platdata serial_platdata = {
> .base = SCIF2_BASE,
> .type = PORT_SCIF,
> - .clk = 14745600,/* 0xE1 */
> - .clk_mode = EXT_CLK,
> + .clk = CONFIG_SH_SCIF_CLK_FREQ,
> + .clk_mode = INT_CLK,
> };
>
> U_BOOT_DEVICE(salvator_x_scif2) = {
> diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
> index 81a7226d62..94f62a7358 100644
> --- a/include/configs/salvator-x.h
> +++ b/include/configs/salvator-x.h
> @@ -20,7 +20,7 @@
> #define CONFIG_SCIF_CONSOLE
> #define CONFIG_CONS_SCIF2
> #define CONFIG_CONS_INDEX 2
> -#define CONFIG_SH_SCIF_CLK_FREQCONFIG_SYS_CLK_FREQ
> +#define CONFIG_SH_SCIF_CLK_FREQCONFIG_S3D4_CLK_FREQ
>
> /* [A] Hyper Flash */
> /* use to RPC(SPI Multi I/O Bus Controller) */
> @@ -31,10 +31,11 @@
> #define RCAR_XTAL_CLK u
> #define CONFIG_SYS_CLK_FREQRCAR_XTAL_CLK
> /* ch0to2 CPclk, ch3to11 S3D2_PEREclk, ch12to14 S3D2_RTclk */
> -/* CPclk 16.66MHz, S3D2 133.33MHz */
> +/* CPclk 16.66MHz, S3D2 133.33MHz , S3D4 66.66MHz */
> #define CONFIG_CP_CLK_FREQ (CONFIG_SYS_CLK_FREQ / 2)
> #define CONFIG_PLL1_CLK_FREQ (CONFIG_SYS_CLK_FREQ * 192 / 2)
> #define CONFIG_S3D2_CLK_FREQ (2u/2)
> +#define CONFIG_S3D4_CLK_FREQ (2u/4)
>
> /* Generic Timer Definitions (use in assembler source) */
> #define COUNTER_FREQUENCY 0xFE502A/* 16.66MHz from CPclk */
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 7646bb6842..2ab6217433 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -2396,6 +2396,7 @@ CONFIG_S3C24XX_TACLS
> CONFIG_S3C24XX_TWRPH0
> CONFIG_S3C24XX_TWRPH1
> CONFIG_S3D2_CLK_FREQ
> +CONFIG_S3D4_CLK_FREQ
> CONFIG_S5P
> CONFIG_S5PC100
> CONFIG_S5PC110
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 09/23] ARM: rmobile: Add R8A7796 support
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Add Kconfig entry for the R8A7796 RCar M3 SoC.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> arch/arm/mach-rmobile/Kconfig.64 | 3 +++
> arch/arm/mach-rmobile/Makefile | 1 +
> arch/arm/mach-rmobile/include/mach/r8a7796.h | 39
>
> arch/arm/mach-rmobile/include/mach/rmobile.h | 2 ++
> arch/arm/mach-rmobile/memmap-r8a7796.c | 30 +
> include/configs/rcar-gen3-common.h | 31 ++
> 6 files changed, 101 insertions(+), 5 deletions(-)
> create mode 100644 arch/arm/mach-rmobile/include/mach/r8a7796.h
> create mode 100644 arch/arm/mach-rmobile/memmap-r8a7796.c
>
> diff --git a/arch/arm/mach-rmobile/Kconfig.64
> b/arch/arm/mach-rmobile/Kconfig.64
> index e0c27ed9c6..4ffc40edc6 100644
> --- a/arch/arm/mach-rmobile/Kconfig.64
> +++ b/arch/arm/mach-rmobile/Kconfig.64
> @@ -6,6 +6,9 @@ choice
> config R8A7795
> bool "Renesas SoC R8A7795"
>
> +config R8A7796
> + bool "Renesas SoC R8A7796"
> +
> endchoice
>
> choice
> diff --git a/arch/arm/mach-rmobile/Makefile b/arch/arm/mach-rmobile/Makefile
> index 3b56fcf96f..2aea527bae 100644
> --- a/arch/arm/mach-rmobile/Makefile
> +++ b/arch/arm/mach-rmobile/Makefile
> @@ -17,5 +17,6 @@ obj-$(CONFIG_R8A7792) += lowlevel_init_ca15.o
> cpu_info-rcar.o pfc-r8a7792.o
> obj-$(CONFIG_R8A7793) += lowlevel_init_ca15.o cpu_info-rcar.o pfc-r8a7793.o
> obj-$(CONFIG_R8A7794) += lowlevel_init_ca15.o cpu_info-rcar.o pfc-r8a7794.o
> obj-$(CONFIG_R8A7795) += lowlevel_init_gen3.o cpu_info-rcar.o pfc-r8a7795.o
> memmap-r8a7795.o
> +obj-$(CONFIG_R8A7796) += lowlevel_init_gen3.o cpu_info-rcar.o pfc-r8a7796.o
> memmap-r8a7796.o
> obj-$(CONFIG_SH73A0) += lowlevel_init.o cpu_info-sh73a0.o pfc-sh73a0.o
> obj-$(CONFIG_TMU_TIMER) += ../../sh/lib/time.o
> diff --git a/arch/arm/mach-rmobile/include/mach/r8a7796.h
> b/arch/arm/mach-rmobile/include/mach/r8a7796.h
> new file mode 100644
> index 00..a7d1ba23bb
> --- /dev/null
> +++ b/arch/arm/mach-rmobile/include/mach/r8a7796.h
> @@ -0,0 +1,39 @@
> +/*
> + * arch/arm/include/asm/arch-rcar_gen3/r8a7796.h
> + * This file defines registers and value for r8a7796.
> + *
> + * Copyright (C) 2016 Renesas Electronics Corporation
> + *
> + * SPDX-License-Identifier:GPL-2.0+
> + */
> +
> +#ifndef __ASM_ARCH_R8A7796_H
> +#define __ASM_ARCH_R8A7796_H
> +
> +#include "rcar-gen3-base.h"
> +
> +/* Module stop control/status register bits */
> +#define MSTP0_BITS 0x0020
> +#define MSTP1_BITS 0x
> +#define MSTP2_BITS 0x340E2FDC
> +#define MSTP3_BITS 0xFFDF
> +#define MSTP4_BITS 0x8184
> +#define MSTP5_BITS 0xC3FF
> +#define MSTP6_BITS 0x
> +#define MSTP7_BITS 0x
> +#define MSTP8_BITS 0x01F1FFF7
> +#define MSTP9_BITS 0xFFFE
> +#define MSTP10_BITS0xFFFEFFE0
> +#define MSTP11_BITS0x00B7
> +
> +/* SDHI */
> +#define CONFIG_SYS_SH_SDHI0_BASE 0xEE10
> +#define CONFIG_SYS_SH_SDHI1_BASE 0xEE12
> +#define CONFIG_SYS_SH_SDHI2_BASE 0xEE14/* either MMC0 */
> +#define CONFIG_SYS_SH_SDHI3_BASE 0xEE16/* either MMC1 */
> +#define CONFIG_SYS_SH_SDHI_NR_CHANNEL 4
> +
> +/* SH-I2C */
> +#define CONFIG_SYS_I2C_SH_BASE00xE60B
> +
> +#endif /* __ASM_ARCH_R8A7796_H */
> diff --git a/arch/arm/mach-rmobile/include/mach/rmobile.h
> b/arch/arm/mach-rmobile/include/mach/rmobile.h
> index 22d97b19ab..654349b0b3 100644
> --- a/arch/arm/mach-rmobile/include/mach/rmobile.h
> +++ b/arch/arm/mach-rmobile/include/mach/rmobile.h
> @@ -18,6 +18,8 @@
> #include
> #elif defined(CONFIG_R8A7795)
> #include
> +#elif defined(CONFIG_R8A7796)
> +#include
> #else
> #error "SOC Name not defined"
> #endif
> diff --git a/arch/arm/mach-rmobile/memmap-r8a7796.c
> b/arch/arm/mach-rmobile/memmap-r8a7796.c
> new file mode 100644
> index 00..648743d51e
> --- /dev/null
> +++ b/arch/arm/mach-rmobile/memmap-r8a7796.c
> @@ -0,0 +1,30 @@
> +/*
> + * Copyright (C) 2017 Marek Vasut <marek.vasut+rene...@gmail.com>
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> +#include
> +#include
> +
> +static struct mm_region r8a7796_mem_map[] = {
> + {
> + .virt = 0x0UL,
> + .phys = 0x0UL,
>
Re: [U-Boot] [PATCH 07/23] ARM: rmobile: Add R8A7796 into the CPU table
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Add entry for the R8A7796 RCar M3 SoC into the CPU info table.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> arch/arm/mach-rmobile/cpu_info.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/mach-rmobile/cpu_info.c
> b/arch/arm/mach-rmobile/cpu_info.c
> index 208228ff45..faa53197d5 100644
> --- a/arch/arm/mach-rmobile/cpu_info.c
> +++ b/arch/arm/mach-rmobile/cpu_info.c
> @@ -57,6 +57,7 @@ static const struct {
> { 0x4B, "R8A7793" },
> { 0x4C, "R8A7794" },
> { 0x4F, "R8A7795" },
> + { 0x52, "R8A7796" },
> { 0x0, "CPU" },
> };
>
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 10/23] ARM: rmobile: Allow R8A7796 Salvator-X configuration
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> The Salvator-X can have both H3 and M3 CPU on it, drop the
> select R8A7795 to allow both configurations.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> arch/arm/mach-rmobile/Kconfig.64 | 3 +--
> configs/salvator-x_defconfig | 1 +
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-rmobile/Kconfig.64
> b/arch/arm/mach-rmobile/Kconfig.64
> index 4ffc40edc6..5db93ac8d6 100644
> --- a/arch/arm/mach-rmobile/Kconfig.64
> +++ b/arch/arm/mach-rmobile/Kconfig.64
> @@ -17,9 +17,8 @@ choice
>
> config TARGET_SALVATOR_X
> bool "Salvator-X board"
> - select R8A7795
> help
> - Support for Renesas R-Car Gen3 R8a7795 platform
> + Support for Renesas R-Car Gen3 platform
>
> endchoice
>
> diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig
> index b1500296da..8f9b5b5328 100644
> --- a/configs/salvator-x_defconfig
> +++ b/configs/salvator-x_defconfig
> @@ -5,6 +5,7 @@ CONFIG_RCAR_GEN3=y
> CONFIG_TARGET_SALVATOR_X=y
> CONFIG_VERSION_VARIABLE=y
> CONFIG_CMD_BOOTZ=y
> +CONFIG_R8A7795=y
> # CONFIG_CMD_IMI is not set
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_XIMG is not set
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 05/23] ARM: rmobile: Make the Gen3 SoC configurable
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Allow selecting the Gen3 SoC in preparation for RCar M3 .
> No functional change.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> arch/arm/mach-rmobile/Kconfig.64 | 7 ++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-rmobile/Kconfig.64
> b/arch/arm/mach-rmobile/Kconfig.64
> index f748c33a3e..e0c27ed9c6 100644
> --- a/arch/arm/mach-rmobile/Kconfig.64
> +++ b/arch/arm/mach-rmobile/Kconfig.64
> @@ -1,7 +1,12 @@
> if RCAR_GEN3
>
> +choice
> + prompt "Select Target SoC"
> +
> config R8A7795
> - bool
> + bool "Renesas SoC R8A7795"
> +
> +endchoice
>
> choice
> prompt "Renesus ARM64 SoCs board select"
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 06/23] ARM: rmobile: Add R8A7795 into the CPU table
Applied to rmobile branch, thanks!
2017-05-13 22:57 GMT+09:00 Marek Vasut <marek.va...@gmail.com>:
> Add entry for the R8A7795 RCar H3 SoC into the CPU info table.
>
> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
> Cc: Hiroyuki Yokoyama <hiroyuki.yokoyama...@renesas.com>
> Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
> ---
> arch/arm/mach-rmobile/cpu_info.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/mach-rmobile/cpu_info.c
> b/arch/arm/mach-rmobile/cpu_info.c
> index 129ab0c0f7..208228ff45 100644
> --- a/arch/arm/mach-rmobile/cpu_info.c
> +++ b/arch/arm/mach-rmobile/cpu_info.c
> @@ -56,6 +56,7 @@ static const struct {
> { 0x4A, "R8A7792" },
> { 0x4B, "R8A7793" },
> { 0x4C, "R8A7794" },
> + { 0x4F, "R8A7795" },
> { 0x0, "CPU" },
> };
>
> --
> 2.11.0
>
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
