From a88026c51ddc51f54d2154e6e979b047796fdc14 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 20 Aug 2017 17:13:43 +0200 Subject: ARM: rmobile: Remove RAVB probing from Salvator-X board Drop the RAVB bit from the board since RAVB now probes from DT instead. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu Signed-off-by: Nobuhiro Iwamatsu --- board/renesas/salvator-x/salvator-x.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'board') 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 = 0xE6800000, - .phy_interface = 0, - .max_speed = 1000, -}; - -U_BOOT_DEVICE(salvator_x_ravb) = { - .name = "ravb", - .platdata = &salvator_x_ravb_platdata, -}; - #ifdef CONFIG_SH_SDHI int board_mmc_init(bd_t *bis) { -- cgit v1.2.1 From 75ba2bf99f3aaae3f05bf281159ffd6af31dc89e Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 20 Aug 2017 17:13:44 +0200 Subject: ARM: rmobile: Remove RAVB probing from ULCB board Drop the RAVB bit from the board since RAVB now probes from DT instead. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu Signed-off-by: Nobuhiro Iwamatsu --- board/renesas/ulcb/ulcb.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'board') 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 = 0xE6800000, - .phy_interface = 0, - .max_speed = 1000, -}; - -U_BOOT_DEVICE(salvator_x_ravb) = { - .name = "ravb", - .platdata = &salvator_x_ravb_platdata, -}; - #ifdef CONFIG_SH_SDHI int board_mmc_init(bd_t *bis) { -- cgit v1.2.1 From 1c30aea5b14ff6a6f9c490865048acebccb8f30e Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 20 Aug 2017 17:13:45 +0200 Subject: ARM: rmobile: Remove Serial SH probing from Salvator-X board Drop the Serial SH bit from the board since UART now probes from DT instead. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu Signed-off-by: Nobuhiro Iwamatsu --- board/renesas/salvator-x/salvator-x.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'board') 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 = &serial_platdata, -}; -- cgit v1.2.1 From 3f63551471b6cf72bf81e497aac9bada705b4f57 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 20 Aug 2017 17:13:46 +0200 Subject: ARM: rmobile: Remove Serial SH probing from ULCB board Drop the Serial SH bit from the board since UART now probes from DT instead. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu Signed-off-by: Nobuhiro Iwamatsu --- board/renesas/ulcb/ulcb.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'board') 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 = &serial_platdata, -}; -- cgit v1.2.1 From ddb39a075b9ea020e71b8fce234332f4f00df290 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 20 Aug 2017 17:13:47 +0200 Subject: ARM: rmobile: Remove SH SDHI probing from Salvator-X board Drop the SH SDHI bit from the board since SD now probes from DT instead. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu Signed-off-by: Nobuhiro Iwamatsu --- board/renesas/salvator-x/salvator-x.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'board') 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 -- cgit v1.2.1 From 6f380854923aae93fd0d7310459c2d130f48f90e Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 20 Aug 2017 17:13:48 +0200 Subject: ARM: rmobile: Remove SH SDHI probing from ULCB board Drop the SH SDHI bit from the board since SD now probes from DT instead. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu Signed-off-by: Nobuhiro Iwamatsu --- board/renesas/ulcb/ulcb.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'board') 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 -- cgit v1.2.1