Skip to contentSkip to conversation

spi: Zap mpc52xx_spi.c, config and related code

PATCH New Jagan Teki 1 participant 2 messages Dec 15, 2016 – Dec 23, 2016 SPI

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/1 spi: Zap mpc52xx_spi.c, config and related code

armada100_spi.c, related config options and related codes are zapping becuase of "no DM conversion".

---
Changes for v2:
- Remove cmd_mtc and related code.

 board/intercontrol/digsy_mtc/Makefile    |   2 +-
 board/intercontrol/digsy_mtc/cmd_mtc.c   | 369 -------------------------------
 board/intercontrol/digsy_mtc/cmd_mtc.h   |  45 ----
 board/intercontrol/digsy_mtc/digsy_mtc.c |   9 -
 configs/digsy_mtc_RAMBOOT_defconfig      |   1 -
 configs/digsy_mtc_defconfig              |   1 -
 configs/digsy_mtc_rev5_RAMBOOT_defconfig |   1 -
 configs/digsy_mtc_rev5_defconfig         |   1 -
 drivers/spi/Makefile                     |   1 -
 drivers/spi/mpc52xx_spi.c                |  90 --------
 include/configs/digsy_mtc.h              |   6 -
 scripts/config_whitelist.txt             |   1 -
 12 files changed, 1 insertion(+), 526 deletions(-)
 delete mode 100644 board/intercontrol/digsy_mtc/cmd_mtc.c
 delete mode 100644 board/intercontrol/digsy_mtc/cmd_mtc.h
 delete mode 100644 drivers/spi/mpc52xx_spi.c
board/intercontrol/digsy_mtc/Makefile +1 -1
index fd0c2f9..4d13ead 100644
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y	:= digsy_mtc.o cmd_mtc.o
+obj-y	:= digsy_mtc.o
 obj-$(CONFIG_VIDEO) += cmd_disp.o
board/intercontrol/digsy_mtc/cmd_mtc.c deleted +0 -369

369 lines not on this page · raw message

board/intercontrol/digsy_mtc/cmd_mtc.h deleted +0 -45

45 lines not on this page · raw message

board/intercontrol/digsy_mtc/digsy_mtc.c +0 -9
index 2e52d51..37eb6c7 100644
@@ -250,9 +250,6 @@ static inline void exbo_hw_init(void) {}
 
 int board_early_init_r(void)
 {
-#ifdef CONFIG_MPC52XX_SPI
-	struct mpc5xxx_gpt *gpt = (struct mpc5xxx_gpt*)MPC5XXX_GPT;
-#endif
 	/*
 	 * Now, when we are in RAM, enable flash write access for detection
 	 * process.  Note that CS_BOOT cannot be cleared when executing in
@@ -269,12 +266,6 @@ int board_early_init_r(void)
 	/* Low level USB init, required for proper kernel operation */
 	usb_cpu_init();
 #endif
-#ifdef CONFIG_MPC52XX_SPI
-	/* GPT 6 Output Enable */
-	out_be32(&gpt[6].emsr, 0x00000034);
-	/* GPT 7 Output Enable */
-	out_be32(&gpt[7].emsr, 0x00000034);
-#endif
 
 	return (0);
 }
configs/digsy_mtc_RAMBOOT_defconfig +0 -1
index 71fa0b7..66c3393 100644
@@ -13,7 +13,6 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_LOOPW=y
-CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
configs/digsy_mtc_defconfig +0 -1
index 20491a4..daf08ce 100644
@@ -11,7 +11,6 @@ CONFIG_AUTOBOOT_KEYED=y
 CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR=" "
 CONFIG_LOOPW=y
-CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
configs/digsy_mtc_rev5_RAMBOOT_defconfig +0 -1
index 0db5f92..e55653b 100644
@@ -13,7 +13,6 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_LOOPW=y
-CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
configs/digsy_mtc_rev5_defconfig +0 -1
index 713fa3d..f1f5f2e 100644
@@ -13,7 +13,6 @@ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 CONFIG_AUTOBOOT_DELAY_STR="d"
 CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_LOOPW=y
-CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
drivers/spi/Makefile +0 -1
index 247c5f6..70d2e49 100644
@@ -35,7 +35,6 @@ obj-$(CONFIG_FSL_QSPI) += fsl_qspi.o
 obj-$(CONFIG_ICH_SPI) +=  ich.o
 obj-$(CONFIG_KIRKWOOD_SPI) += kirkwood_spi.o
 obj-$(CONFIG_LPC32XX_SSP) += lpc32xx_ssp.o
-obj-$(CONFIG_MPC52XX_SPI) += mpc52xx_spi.o
 obj-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o
 obj-$(CONFIG_MVEBU_A3700_SPI) += mvebu_a3700_spi.o
 obj-$(CONFIG_MXC_SPI) += mxc_spi.o
drivers/spi/mpc52xx_spi.c deleted +0 -90

90 lines not on this page · raw message

include/configs/digsy_mtc.h +0 -6
index b2120b9..ae0d3d4 100644
@@ -216,12 +216,6 @@
 #define CONFIG_BOOTCOMMAND	"run mtcb_start"
 
 /*
- * SPI configuration
- */
-#define CONFIG_HARD_SPI		1
-#define CONFIG_MPC52XX_SPI	1
-
-/*
  * I2C configuration
  */
 #define CONFIG_HARD_I2C		1
scripts/config_whitelist.txt +0 -1
index 8814841..339c6fd 100644
@@ -3095,7 +3095,6 @@ CONFIG_MPC5121ADS_REV2
 CONFIG_MPC512x_FEC
 CONFIG_MPC5200
 CONFIG_MPC5200_DDR
-CONFIG_MPC52XX_SPI
 CONFIG_MPC555
 CONFIG_MPC5xxx_FEC
 CONFIG_MPC5xxx_FEC_MII10
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 spi: Zap mpc52xx_spi.c, config and related code

Quoted 6 lines · Jagan Teki

armada100_spi.c, related config options and related codes are zapping becuase of "no DM conversion".

Applied to u-boot-spi/master

thanks!

Signature · 4 lines
Jagan Teki
Free Software Engineer | www.openedev.com
U-Boot, Linux | Upstream Maintainer
Hyderabad, India.