sh: r2dplus: Enable DM_SERIAL and DM_CLK

Switch r2dplus to DM and DT probing for serial and clock.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig
index 53b7c2e05d30e3e15f1275a9a431cb90a6467169..fb873a88639ba1ecc31777d266a1b33546409df8 100644 (file)
--- a/configs/r2dplus_defconfig
+++ b/configs/r2dplus_defconfig
@@ -4,7 +4,6 @@ CONFIG_ENV_SIZE=0x40000
 CONFIG_ENV_SECT_SIZE=0x40000
 CONFIG_DEFAULT_DEVICE_TREE="sh7751-r2dplus"
 CONFIG_TARGET_R2DPLUS=y
-# CONFIG_SYS_MALLOC_F is not set
 CONFIG_BOOTDELAY=-1
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttySC0,115200"
@@ -26,6 +25,7 @@ CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0xA0040000
 CONFIG_DM=y
+CONFIG_CLK=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y
 CONFIG_SYS_FLASH_CFI=y
@@ -33,5 +33,8 @@ CONFIG_DM_ETH=y
 CONFIG_RTL8139=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
+CONFIG_SPECIFY_CONSOLE_INDEX=y
+CONFIG_DM_SERIAL=y
+CONFIG_SERIAL_RX_BUFFER=y
 CONFIG_SCIF_CONSOLE=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 4fdf0a5b576d679760091d8778a8b624ed638e39..61b6fb48465a5fbfca309e270a9fa9ff21bafdee 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -35,7 +35,6 @@
  * SuperH Clock setting
  */
 #define CONFIG_SYS_CLK_FREQ    60000000
-#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define        CONFIG_SYS_PLL_SETTLING_TIME    100/* in us */
 
 /*