spi: Kirkwood: Drop non-DM support and enable DM_SPI on all boards
PATCH v2 1/1 spi: Kirkwood: Drop non-DM support and enable DM_SPI on all boards
Dropped DM supprot for Kirkwood
Enable DM_SPI on all boards using Kirkwood
---
Changes for v2:
- Added more meaningful commit message
- Corrected typo from Krikwood to Kirkwood in commit message
---
configs/clearfog_defconfig +2 -0
@@ -67,6 +67,8 @@ CONFIG_PCI_MVEBU=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
configs/clearfog_gt_8k_defconfig +2 -0
@@ -67,6 +67,8 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
configs/controlcenterdc_defconfig +2 -0
@@ -73,6 +73,8 @@ CONFIG_PCI_MVEBU=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_TPM_ATMEL_TWI=y CONFIG_TPM_AUTH_SESSIONS=y
configs/crs305-1g-4s_defconfig +2 -0
@@ -48,4 +48,6 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y
configs/d2net_v2_defconfig +2 -0
@@ -46,7 +46,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y
configs/db-88f6281-bp-nand_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
configs/db-88f6720_defconfig +2 -0
@@ -56,6 +56,8 @@ CONFIG_MVPP2=y CONFIG_MII=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
configs/db-88f6820-amc_defconfig +2 -0
@@ -71,6 +71,8 @@ CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
configs/db-88f6820-gp_defconfig +2 -0
@@ -65,6 +65,8 @@ CONFIG_PCI_MVEBU=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
configs/db-mv784mp-gp_defconfig +2 -0
@@ -66,6 +66,8 @@ CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
configs/db-xc3-24g4xg_defconfig +2 -0
@@ -53,6 +53,8 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
configs/ds414_defconfig +2 -0
@@ -61,6 +61,8 @@ CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
configs/helios4_defconfig +2 -0
@@ -61,6 +61,8 @@ CONFIG_MII=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
configs/inetspace_v2_defconfig +2 -0
@@ -46,7 +46,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y
configs/km_kirkwood_128m16_defconfig +1 -0
@@ -49,5 +49,6 @@ CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y
configs/km_kirkwood_defconfig +1 -0
@@ -49,5 +49,6 @@ CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y
configs/km_kirkwood_pci_defconfig +1 -0
@@ -49,5 +49,6 @@ CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y
configs/kmcoge5un_defconfig +1 -0
@@ -53,5 +53,6 @@ CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y
configs/kmnusa_defconfig +1 -0
@@ -54,5 +54,6 @@ CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y
configs/kmsuse2_defconfig +1 -0
@@ -54,5 +54,6 @@ CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y
configs/maxbcm_defconfig +2 -0
@@ -46,4 +46,6 @@ CONFIG_MVNETA=y CONFIG_MII=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y
configs/mvebu_db_armada8k_defconfig +2 -0
@@ -61,6 +61,8 @@ CONFIG_PINCTRL_ARMADA_8K=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
configs/mvebu_mcbin-88f8040_defconfig +2 -0
@@ -66,6 +66,8 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
configs/net2big_v2_defconfig +2 -0
@@ -46,7 +46,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y
configs/netspace_lite_v2_defconfig +2 -0
@@ -46,7 +46,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y
configs/netspace_max_v2_defconfig +2 -0
@@ -46,7 +46,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y
configs/netspace_mini_v2_defconfig +2 -0
@@ -44,5 +44,7 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y
configs/netspace_v2_defconfig +2 -0
@@ -46,7 +46,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y
configs/theadorable_debug_defconfig +2 -0
@@ -72,6 +72,8 @@ CONFIG_DM_PCI_COMPAT=y CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
configs/turris_omnia_defconfig +2 -0
@@ -74,6 +74,8 @@ CONFIG_PCI_MVEBU=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
configs/x530_defconfig +2 -0
@@ -70,6 +70,8 @@ CONFIG_DM_RTC=y CONFIG_RTC_DS1307=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
drivers/spi/kirkwood_spi.c +0 -114
129 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 1/1 spi: Kirkwood: Drop non-DM support and enable DM_SPI on all boards
Thanks for the work.
Quoted 396 lines · Bhargav Shah
Dropped DM supprot for Kirkwood
EnableDM_SPIon all boards using KirkwoodSigned-off-by Bhargav Shah <[email protected]>Reviewed-by Stefan Roese <[email protected]>---
Changes for v2:
- Added more meaningful commit message
- Corrected typo from Krikwood to Kirkwood in commit message
---configs/clearfog_defconfig +2
-0@@ -67,6 +67,8 @@ CONFIG_PCI_MVEBU=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=yconfigs/clearfog_gt_8k_defconfig +2
-0@@ -67,6 +67,8 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=yconfigs/controlcenterdc_defconfig +2
-0@@ -73,6 +73,8 @@ CONFIG_PCI_MVEBU=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_TPM_ATMEL_TWI=y CONFIG_TPM_AUTH_SESSIONS=yconfigs/crs305-1g-4s_defconfig +2
-0@@ -48,4 +48,6 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=yconfigs/d2net_v2_defconfig +2
-0@@ -46,7 +46,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=yconfigs/db-88f6281-bp-nand_defconfig +1
-0@@ -53,6 +53,7 @@ CONFIG_DM_RTC=y CONFIG_RTC_MV=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=yconfigs/db-88f6720_defconfig +2
-0@@ -56,6 +56,8 @@ CONFIG_MVPP2=y CONFIG_MII=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=yconfigs/db-88f6820-amc_defconfig +2
-0@@ -71,6 +71,8 @@ CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=yconfigs/db-88f6820-gp_defconfig +2
-0@@ -65,6 +65,8 @@ CONFIG_PCI_MVEBU=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=yconfigs/db-mv784mp-gp_defconfig +2
-0@@ -66,6 +66,8 @@ CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=yconfigs/db-xc3-24g4xg_defconfig +2
-0@@ -53,6 +53,8 @@ CONFIG_SPI_FLASH_SST=y CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=yconfigs/ds414_defconfig +2
-0@@ -61,6 +61,8 @@ CONFIG_PCI=y CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=yconfigs/helios4_defconfig +2
-0@@ -61,6 +61,8 @@ CONFIG_MII=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=yconfigs/inetspace_v2_defconfig +2
-0@@ -46,7 +46,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=yconfigs/km_kirkwood_128m16_defconfig +1
-0@@ -49,5 +49,6 @@ CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=yconfigs/km_kirkwood_defconfig +1
-0@@ -49,5 +49,6 @@ CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=yconfigs/km_kirkwood_pci_defconfig +1
-0@@ -49,5 +49,6 @@ CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=yconfigs/kmcoge5un_defconfig +1
-0@@ -53,5 +53,6 @@ CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=yconfigs/kmnusa_defconfig +1
-0@@ -54,5 +54,6 @@ CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=yconfigs/kmsuse2_defconfig +1
-0@@ -54,5 +54,6 @@ CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=yconfigs/maxbcm_defconfig +2
-0@@ -46,4 +46,6 @@ CONFIG_MVNETA=y CONFIG_MII=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=yconfigs/mvebu_db_armada8k_defconfig +2
-0@@ -61,6 +61,8 @@ CONFIG_PINCTRL_ARMADA_8K=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=yconfigs/mvebu_mcbin-88f8040_defconfig +2
-0@@ -66,6 +66,8 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=yconfigs/net2big_v2_defconfig +2
-0@@ -46,7 +46,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=yconfigs/netspace_lite_v2_defconfig +2
-0@@ -46,7 +46,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=yconfigs/netspace_max_v2_defconfig +2
-0@@ -46,7 +46,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=yconfigs/netspace_mini_v2_defconfig +2
-0@@ -44,5 +44,7 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=yconfigs/netspace_v2_defconfig +2
-0@@ -46,7 +46,9 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_MVGBE=y CONFIG_MII=y CONFIG_SYS_NS16550=y +CONFIG_DM=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=yconfigs/theadorable_debug_defconfig +2
-0@@ -72,6 +72,8 @@ CONFIG_DM_PCI_COMPAT=y CONFIG_PCI_MVEBU=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=yconfigs/turris_omnia_defconfig +2
-0@@ -74,6 +74,8 @@ CONFIG_PCI_MVEBU=y CONFIG_SCSI=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=yconfigs/x530_defconfig +0
-0
configs/x530_defconfig CONFIG_DM_RTC=y · line 77
Quoted 8 lines
configs/x530_defconfig +2
-0@@ -70,6 +70,8 @@ CONFIG_DM_RTC=y CONFIG_RTC_DS1307=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y
All these defconfig enablements would follow savedefconfig, if not please do the same.
drivers/spi/kirkwood_spi.c
Quoted 1 line
drivers/spi/kirkwood_spi.c +0
-0
Move
config KIRCKWOOD_SPI definition into DM_SPI location in drivers/spi/Kconfig
Quoted 86 lines
index
3986b06b25..7ff9d935b8100644drivers/spi/kirkwood_spi.c +0
-72@@ -13,10 +13,6 @@#include <malloc.h> #include <spi.h> #include <asm/io.h> -#include <asm/arch/soc.h> -#ifdef CONFIG_ARCH_KIRKWOOD -#include <asm/arch/mpp.h> -#endif #include <asm/arch-mvebu/spi.h> static void _spi_cs_activate (struct kwspi_registers *reg)@@ -94,115 +90,6 @@ static int _spi_xfer(struct kwspi_registers *reg, unsigned int bitlen,return 0 ; } -#ifndef CONFIG_DM_SPI - -static struct kwspi_registers *spireg = - (struct kwspi_registers *)MVEBU_SPI_BASE ; - -#ifdef CONFIG_ARCH_KIRKWOOD -static u32 cs_spi_mpp_back[2 ]; -#endif - -struct spi_slave *spi_setup_slave (unsigned int bus,unsigned int cs, -unsigned int max_hz,unsigned int mode) -{ -struct spi_slave *slave; -u32 data; -#ifdef CONFIG_ARCH_KIRKWOOD -static const u32 kwspi_mpp_config[2 ][2 ] = { - { MPP0_SPI_SCn,0 },/* if cs == 0 */ - { MPP7_SPI_SCn,0 }/* if cs != 0 */ - }; -#endif - -if (!spi_cs_is_valid (bus, cs)) -return NULL ; - - slave =spi_alloc_slave_base (bus, cs); -if (!slave) -return NULL ; - -writel (KWSPI_SMEMRDY , &spireg->ctrl); - -/* calculate spi clock prescaller using max_hz */ - data = ((CONFIG_SYS_TCLK /2 ) / max_hz) +0x10 ; - data = data <KWSPI_CLKPRESCL_MIN ?KWSPI_CLKPRESCL_MIN : data; - data = data >KWSPI_CLKPRESCL_MASK ?KWSPI_CLKPRESCL_MASK : data; - -/* program spi clock prescaller using max_hz */ -writel (KWSPI_ADRLEN_3BYTE | data, &spireg->cfg); -debug ("data = 0x%08x\n" , data); - -writel (KWSPI_SMEMRDIRQ , &spireg->irq_cause); -writel (KWSPI_IRQMASK , &spireg->irq_mask); - -#ifdef CONFIG_ARCH_KIRKWOOD -/* program mpp registers to select SPI_CSn */ -kirkwood_mpp_conf (kwspi_mpp_config[cs ?1 :0 ], cs_spi_mpp_back); -#endif - -return slave; -} - -void spi_free_slave (struct spi_slave *slave) -{ -#ifdef CONFIG_ARCH_KIRKWOOD -kirkwood_mpp_conf (cs_spi_mpp_back,NULL ); -#endif -free (slave); -} - -__attribute__((weak))int board_spi_claim_bus (struct spi_slave *slave) -{ -return 0 ; -} - -int spi_claim_bus (struct spi_slave *slave) -{ -return board_spi_claim_bus (slave); -} -
drivers/spi/kirkwood_spi.c static int _spi_xfer(struct kwspi_registers *reg, unsigned int bitlen, · line 174
Quoted 10 lines
drivers/spi/kirkwood_spi.c +0
-10-__attribute__((weak))void board_spi_release_bus (struct spi_slave *slave) -{ -} - -void spi_release_bus (struct spi_slave *slave) -{ -board_spi_release_bus (slave); -} - -#ifndef CONFIG_SPI_CS_IS_VALID
remove this from scripts/config_whitelist.txt
Jagan.