| Message ID | 20200529103059.476-1-bhargavshah1988@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
| Series | [v2] spi: Kirkwood: Drop non-DM support and enable DM_SPI on all boards | expand |
Thanks for the work. On Fri, May 29, 2020 at 4:01 PM Bhargav Shah <bhargavshah1988@gmail.com> wrote: > > Dropped DM supprot for Kirkwood > Enable DM_SPI on all boards using Kirkwood > > Signed-off-by: Bhargav Shah <bhargavshah1988@gmail.com> > Reviewed-by: Stefan Roese <sr@denx.de> > > --- > Changes for v2: > - Added more meaningful commit message > - Corrected typo from Krikwood to Kirkwood in commit message > --- > > diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig > index 449c3a435e..2022779c47 100644 > --- a/configs/clearfog_defconfig > +++ b/configs/clearfog_defconfig > @@ -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 > diff --git a/configs/clearfog_gt_8k_defconfig b/configs/clearfog_gt_8k_defconfig > index 2b6445a3f1..11035ff86c 100644 > --- a/configs/clearfog_gt_8k_defconfig > +++ b/configs/clearfog_gt_8k_defconfig > @@ -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 > diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig > index 4ac46ff759..ca2121ef47 100644 > --- a/configs/controlcenterdc_defconfig > +++ b/configs/controlcenterdc_defconfig > @@ -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 > diff --git a/configs/crs305-1g-4s_defconfig b/configs/crs305-1g-4s_defconfig > index 7632fc4254..0e61b889bd 100644 > --- a/configs/crs305-1g-4s_defconfig > +++ b/configs/crs305-1g-4s_defconfig > @@ -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 > diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig > index fe3c6c4762..82295906ef 100644 > --- a/configs/d2net_v2_defconfig > +++ b/configs/d2net_v2_defconfig > @@ -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 > diff --git a/configs/db-88f6281-bp-nand_defconfig b/configs/db-88f6281-bp-nand_defconfig > index f98e462d42..87813b67aa 100644 > --- a/configs/db-88f6281-bp-nand_defconfig > +++ b/configs/db-88f6281-bp-nand_defconfig > @@ -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 > diff --git a/configs/db-88f6720_defconfig b/configs/db-88f6720_defconfig > index e5a18d8096..865a8bb583 100644 > --- a/configs/db-88f6720_defconfig > +++ b/configs/db-88f6720_defconfig > @@ -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 > diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig > index 146ea50b89..0ed553c7ba 100644 > --- a/configs/db-88f6820-amc_defconfig > +++ b/configs/db-88f6820-amc_defconfig > @@ -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 > diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig > index 20848abae2..9fd54b7ea2 100644 > --- a/configs/db-88f6820-gp_defconfig > +++ b/configs/db-88f6820-gp_defconfig > @@ -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 > diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig > index ab96622873..2924be41b2 100644 > --- a/configs/db-mv784mp-gp_defconfig > +++ b/configs/db-mv784mp-gp_defconfig > @@ -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 > diff --git a/configs/db-xc3-24g4xg_defconfig b/configs/db-xc3-24g4xg_defconfig > index 2bbff64665..a33a0bcabc 100644 > --- a/configs/db-xc3-24g4xg_defconfig > +++ b/configs/db-xc3-24g4xg_defconfig > @@ -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 > diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig > index 7d395d1e26..8b2fa7d081 100644 > --- a/configs/ds414_defconfig > +++ b/configs/ds414_defconfig > @@ -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 > diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig > index e15f10cdd5..efe012f539 100644 > --- a/configs/helios4_defconfig > +++ b/configs/helios4_defconfig > @@ -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 > diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig > index 6144eb5fad..0e5cb76e4a 100644 > --- a/configs/inetspace_v2_defconfig > +++ b/configs/inetspace_v2_defconfig > @@ -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 > diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig > index 9bbbfd9442..45ea933184 100644 > --- a/configs/km_kirkwood_128m16_defconfig > +++ b/configs/km_kirkwood_128m16_defconfig > @@ -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 > diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig > index 887893ef33..86585ab3b1 100644 > --- a/configs/km_kirkwood_defconfig > +++ b/configs/km_kirkwood_defconfig > @@ -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 > diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig > index 81c9f697bb..1ec80e1e95 100644 > --- a/configs/km_kirkwood_pci_defconfig > +++ b/configs/km_kirkwood_pci_defconfig > @@ -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 > diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig > index 169d895203..8b480f62f6 100644 > --- a/configs/kmcoge5un_defconfig > +++ b/configs/kmcoge5un_defconfig > @@ -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 > diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig > index 8d90cdab0f..ee065bd608 100644 > --- a/configs/kmnusa_defconfig > +++ b/configs/kmnusa_defconfig > @@ -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 > diff --git a/configs/kmsuse2_defconfig b/configs/kmsuse2_defconfig > index 82006010ed..4a959088f6 100644 > --- a/configs/kmsuse2_defconfig > +++ b/configs/kmsuse2_defconfig > @@ -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 > diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig > index 1bdb151d0f..4407c07bbd 100644 > --- a/configs/maxbcm_defconfig > +++ b/configs/maxbcm_defconfig > @@ -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 > diff --git a/configs/mvebu_db_armada8k_defconfig b/configs/mvebu_db_armada8k_defconfig > index fb02f61b56..c4ab376999 100644 > --- a/configs/mvebu_db_armada8k_defconfig > +++ b/configs/mvebu_db_armada8k_defconfig > @@ -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 > diff --git a/configs/mvebu_mcbin-88f8040_defconfig b/configs/mvebu_mcbin-88f8040_defconfig > index 0975ed386f..2fc5846424 100644 > --- a/configs/mvebu_mcbin-88f8040_defconfig > +++ b/configs/mvebu_mcbin-88f8040_defconfig > @@ -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 > diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig > index 1389d30900..f417063de2 100644 > --- a/configs/net2big_v2_defconfig > +++ b/configs/net2big_v2_defconfig > @@ -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 > diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig > index c744d2c58e..25cc538061 100644 > --- a/configs/netspace_lite_v2_defconfig > +++ b/configs/netspace_lite_v2_defconfig > @@ -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 > diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig > index 8602729fcb..8cd0492e96 100644 > --- a/configs/netspace_max_v2_defconfig > +++ b/configs/netspace_max_v2_defconfig > @@ -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 > diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig > index ba9301de4d..a6fcb6b66f 100644 > --- a/configs/netspace_mini_v2_defconfig > +++ b/configs/netspace_mini_v2_defconfig > @@ -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 > diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig > index 6ba1ef423e..896de6e892 100644 > --- a/configs/netspace_v2_defconfig > +++ b/configs/netspace_v2_defconfig > @@ -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 > diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig > index ab4a460959..2acde3960f 100644 > --- a/configs/theadorable_debug_defconfig > +++ b/configs/theadorable_debug_defconfig > @@ -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 > diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig > index fff98733bf..2c74cf69e0 100644 > --- a/configs/turris_omnia_defconfig > +++ b/configs/turris_omnia_defconfig > @@ -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 > diff --git a/configs/x530_defconfig b/configs/x530_defconfig > index 67c8fbf663..b970c2624d 100644 > --- a/configs/x530_defconfig > +++ b/configs/x530_defconfig > @@ -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. > diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c Move config KIRCKWOOD_SPI definition into DM_SPI location in drivers/spi/Kconfig > index 3986b06b25..7ff9d935b8 100644 > --- a/drivers/spi/kirkwood_spi.c > +++ b/drivers/spi/kirkwood_spi.c > @@ -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); > -} > - > -__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.
diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index 449c3a435e..2022779c47 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -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 diff --git a/configs/clearfog_gt_8k_defconfig b/configs/clearfog_gt_8k_defconfig index 2b6445a3f1..11035ff86c 100644 --- a/configs/clearfog_gt_8k_defconfig +++ b/configs/clearfog_gt_8k_defconfig @@ -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 diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index 4ac46ff759..ca2121ef47 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -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 diff --git a/configs/crs305-1g-4s_defconfig b/configs/crs305-1g-4s_defconfig index 7632fc4254..0e61b889bd 100644 --- a/configs/crs305-1g-4s_defconfig +++ b/configs/crs305-1g-4s_defconfig @@ -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 diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig index fe3c6c4762..82295906ef 100644 --- a/configs/d2net_v2_defconfig +++ b/configs/d2net_v2_defconfig @@ -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 diff --git a/configs/db-88f6281-bp-nand_defconfig b/configs/db-88f6281-bp-nand_defconfig index f98e462d42..87813b67aa 100644 --- a/configs/db-88f6281-bp-nand_defconfig +++ b/configs/db-88f6281-bp-nand_defconfig @@ -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 diff --git a/configs/db-88f6720_defconfig b/configs/db-88f6720_defconfig index e5a18d8096..865a8bb583 100644 --- a/configs/db-88f6720_defconfig +++ b/configs/db-88f6720_defconfig @@ -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 diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig index 146ea50b89..0ed553c7ba 100644 --- a/configs/db-88f6820-amc_defconfig +++ b/configs/db-88f6820-amc_defconfig @@ -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 diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig index 20848abae2..9fd54b7ea2 100644 --- a/configs/db-88f6820-gp_defconfig +++ b/configs/db-88f6820-gp_defconfig @@ -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 diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig index ab96622873..2924be41b2 100644 --- a/configs/db-mv784mp-gp_defconfig +++ b/configs/db-mv784mp-gp_defconfig @@ -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 diff --git a/configs/db-xc3-24g4xg_defconfig b/configs/db-xc3-24g4xg_defconfig index 2bbff64665..a33a0bcabc 100644 --- a/configs/db-xc3-24g4xg_defconfig +++ b/configs/db-xc3-24g4xg_defconfig @@ -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 diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index 7d395d1e26..8b2fa7d081 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -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 diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig index e15f10cdd5..efe012f539 100644 --- a/configs/helios4_defconfig +++ b/configs/helios4_defconfig @@ -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 diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig index 6144eb5fad..0e5cb76e4a 100644 --- a/configs/inetspace_v2_defconfig +++ b/configs/inetspace_v2_defconfig @@ -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 diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig index 9bbbfd9442..45ea933184 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -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 diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig index 887893ef33..86585ab3b1 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -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 diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig index 81c9f697bb..1ec80e1e95 100644 --- a/configs/km_kirkwood_pci_defconfig +++ b/configs/km_kirkwood_pci_defconfig @@ -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 diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index 169d895203..8b480f62f6 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -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 diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig index 8d90cdab0f..ee065bd608 100644 --- a/configs/kmnusa_defconfig +++ b/configs/kmnusa_defconfig @@ -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 diff --git a/configs/kmsuse2_defconfig b/configs/kmsuse2_defconfig index 82006010ed..4a959088f6 100644 --- a/configs/kmsuse2_defconfig +++ b/configs/kmsuse2_defconfig @@ -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 diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig index 1bdb151d0f..4407c07bbd 100644 --- a/configs/maxbcm_defconfig +++ b/configs/maxbcm_defconfig @@ -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 diff --git a/configs/mvebu_db_armada8k_defconfig b/configs/mvebu_db_armada8k_defconfig index fb02f61b56..c4ab376999 100644 --- a/configs/mvebu_db_armada8k_defconfig +++ b/configs/mvebu_db_armada8k_defconfig @@ -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 diff --git a/configs/mvebu_mcbin-88f8040_defconfig b/configs/mvebu_mcbin-88f8040_defconfig index 0975ed386f..2fc5846424 100644 --- a/configs/mvebu_mcbin-88f8040_defconfig +++ b/configs/mvebu_mcbin-88f8040_defconfig @@ -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 diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig index 1389d30900..f417063de2 100644 --- a/configs/net2big_v2_defconfig +++ b/configs/net2big_v2_defconfig @@ -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 diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig index c744d2c58e..25cc538061 100644 --- a/configs/netspace_lite_v2_defconfig +++ b/configs/netspace_lite_v2_defconfig @@ -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 diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig index 8602729fcb..8cd0492e96 100644 --- a/configs/netspace_max_v2_defconfig +++ b/configs/netspace_max_v2_defconfig @@ -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 diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig index ba9301de4d..a6fcb6b66f 100644 --- a/configs/netspace_mini_v2_defconfig +++ b/configs/netspace_mini_v2_defconfig @@ -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 diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig index 6ba1ef423e..896de6e892 100644 --- a/configs/netspace_v2_defconfig +++ b/configs/netspace_v2_defconfig @@ -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 diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig index ab4a460959..2acde3960f 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -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 diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig index fff98733bf..2c74cf69e0 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig @@ -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 diff --git a/configs/x530_defconfig b/configs/x530_defconfig index 67c8fbf663..b970c2624d 100644 --- a/configs/x530_defconfig +++ b/configs/x530_defconfig @@ -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 diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c index 3986b06b25..7ff9d935b8 100644 --- a/drivers/spi/kirkwood_spi.c +++ b/drivers/spi/kirkwood_spi.c @@ -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); -} - -__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 -/* - * you can define this function board specific - * define above CONFIG in board specific config file and - * provide the function in board specific src file - */ -int spi_cs_is_valid(unsigned int bus, unsigned int cs) -{ - return bus == 0 && (cs == 0 || cs == 1); -} -#endif - -void spi_cs_activate(struct spi_slave *slave) -{ - _spi_cs_activate(spireg); -} - -void spi_cs_deactivate(struct spi_slave *slave) -{ - _spi_cs_deactivate(spireg); -} - -int spi_xfer(struct spi_slave *slave, unsigned int bitlen, - const void *dout, void *din, unsigned long flags) -{ - return _spi_xfer(spireg, bitlen, dout, din, flags); -} - -#else - -/* Here now the DM part */ - struct mvebu_spi_dev { bool is_errata_50mhz_ac; }; @@ -409,4 +296,3 @@ U_BOOT_DRIVER(mvebu_spi) = { .priv_auto_alloc_size = sizeof(struct mvebu_spi_priv), .probe = mvebu_spi_probe, }; -#endif