From fe82ca8f7148295c1b04c02f20ea2ecde859c253 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Tue, 20 Nov 2018 09:02:04 +0100 Subject: spi: Remove used spi_init spi_init used in some areas in tree, but the respective drivers will remove in future patches. So remove the same instances. Signed-off-by: Jagan Teki --- common/board_f.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'common') diff --git a/common/board_f.c b/common/board_f.c index f1a1432d869..60634e52cd7 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -262,7 +261,6 @@ __weak int init_func_vid(void) static int init_func_spi(void) { puts("SPI: "); - spi_init(); puts("ready\n"); return 0; } -- cgit v1.2.3 From efbeabee79a28760837fcd5e75ff53d8bb857835 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Thu, 22 Nov 2018 21:38:38 +0530 Subject: spi: Remove unused mpc8xx code - spi_init_f - spi_init_r - spi_read - spi_write these spi calls are exclusively for mpc8xx, but the relevant driver is not available so remove it. Signed-off-by: Jagan Teki --- common/board_r.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'common') diff --git a/common/board_r.c b/common/board_r.c index c55e33eec27..3ccef5467b9 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -382,13 +382,6 @@ static int initr_flash(void) #if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI) static int initr_spi(void) { - /* MPC8xx does this here */ -#ifdef CONFIG_MPC8XX_SPI -#if !defined(CONFIG_ENV_IS_IN_EEPROM) - spi_init_f(); -#endif - spi_init_r(); -#endif return 0; } #endif -- cgit v1.2.3 From 35f9d9bdd07d5e508272421b215ffaffd867bad8 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Sat, 24 Nov 2018 14:31:12 +0530 Subject: spi: Zap CONFIG_HARD_SPI In legacy CONFIG_HARD_SPI initalizing spi_init code, which was removed during dm conversion cleanup. So remove the dead instances of CONFIG_HARD_SPI, and related code. Signed-off-by: Jagan Teki --- common/board_f.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'common') diff --git a/common/board_f.c b/common/board_f.c index 60634e52cd7..a3e80ca9512 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -257,15 +257,6 @@ __weak int init_func_vid(void) } #endif -#if defined(CONFIG_HARD_SPI) -static int init_func_spi(void) -{ - puts("SPI: "); - puts("ready\n"); - return 0; -} -#endif - static int setup_mon_len(void) { #if defined(__ARM__) || defined(__MICROBLAZE__) @@ -863,9 +854,6 @@ static const init_fnc_t init_sequence_f[] = { #endif #if defined(CONFIG_VID) && !defined(CONFIG_SPL) init_func_vid, -#endif -#if defined(CONFIG_HARD_SPI) - init_func_spi, #endif announce_dram_init, dram_init, /* configure available RAM banks */ -- cgit v1.2.3 From ef6ce46ad889d935dce26133232943aa302bd901 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Wed, 21 Nov 2018 12:14:07 +0530 Subject: board_r: Remove initr_spi Drop unused initr_spi, which just return 0, no usage. Signed-off-by: Jagan Teki --- common/board_r.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'common') diff --git a/common/board_r.c b/common/board_r.c index 3ccef5467b9..2f982b16460 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -379,13 +378,6 @@ static int initr_flash(void) } #endif -#if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI) -static int initr_spi(void) -{ - return 0; -} -#endif - #ifdef CONFIG_CMD_NAND /* go init the NAND */ static int initr_nand(void) @@ -736,9 +728,6 @@ static init_fnc_t init_sequence_r[] = { /* initialize higher level parts of CPU like time base and timers */ cpu_init_r, #endif -#ifdef CONFIG_PPC - initr_spi, -#endif #ifdef CONFIG_CMD_NAND initr_nand, #endif -- cgit v1.2.3