From patchwork Wed Feb 7 00:42:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tuomas Tynkkynen X-Patchwork-Id: 870160 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zbjHb3dfhz9ryk for ; Wed, 7 Feb 2018 11:43:39 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 35DDFC21E08; Wed, 7 Feb 2018 00:43:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id CD956C21DD9; Wed, 7 Feb 2018 00:42:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 24704C21C29; Wed, 7 Feb 2018 00:42:37 +0000 (UTC) Received: from mx1.mpynet.fi (mx1.mpynet.fi [82.197.21.84]) by lists.denx.de (Postfix) with ESMTPS id C072CC21C50 for ; Wed, 7 Feb 2018 00:42:36 +0000 (UTC) From: Tuomas Tynkkynen To: Date: Wed, 7 Feb 2018 02:42:16 +0200 Message-ID: <20180207004223.10932-2-tuomas@tuxera.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180207004223.10932-1-tuomas@tuxera.com> References: <20180207004223.10932-1-tuomas@tuxera.com> MIME-Version: 1.0 X-ClientProxiedBy: tuxera-exch.ad.tuxera.com (10.20.48.11) To tuxera-exch.ad.tuxera.com (10.20.48.11) Received-SPF: none Cc: Tom Rini , Jagan Teki Subject: [U-Boot] [PATCH 1/8] spi: Migrate CONFIG_SH_SPI to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Tuomas Tynkkynen --- README | 5 ----- configs/sh7752evb_defconfig | 1 + configs/sh7753evb_defconfig | 1 + configs/sh7757lcr_defconfig | 1 + drivers/spi/Kconfig | 6 ++++++ include/configs/sh7752evb.h | 1 - include/configs/sh7753evb.h | 1 - include/configs/sh7757lcr.h | 1 - scripts/config_whitelist.txt | 1 - 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README b/README index b055ae7ef2..4044e8575f 100644 --- a/README +++ b/README @@ -2001,11 +2001,6 @@ The following options need to be configured: SPI EEPROM, also an instance works with Crystal A/D and D/As on the SACSng board) - CONFIG_SH_SPI - - Enables the driver for SPI controller on SuperH. Currently - only SH7757 is supported. - CONFIG_SOFT_SPI Enables a software (bit-bang) SPI driver rather than diff --git a/configs/sh7752evb_defconfig b/configs/sh7752evb_defconfig index bbab9c06f3..d56992dc0a 100644 --- a/configs/sh7752evb_defconfig +++ b/configs/sh7752evb_defconfig @@ -36,4 +36,5 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y +CONFIG_SH_SPI=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/sh7753evb_defconfig b/configs/sh7753evb_defconfig index 919e00d5a4..c50285a146 100644 --- a/configs/sh7753evb_defconfig +++ b/configs/sh7753evb_defconfig @@ -35,4 +35,5 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y +CONFIG_SH_SPI=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig index e47bbcf175..3a3a8c9e63 100644 --- a/configs/sh7757lcr_defconfig +++ b/configs/sh7757lcr_defconfig @@ -35,4 +35,5 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_SH_ETHER=y CONFIG_SCIF_CONSOLE=y +CONFIG_SH_SPI=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 1e95dc4559..3d2cd2db00 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -239,6 +239,12 @@ config DAVINCI_SPI help Enable the Davinci SPI driver +config SH_SPI + bool "SuperH SPI driver" + help + Enable the SuperH SPI controller driver. This driver can be used + on various SuperH SoCs, such as SH7757. + config TI_QSPI bool "TI QSPI driver" help diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index ee57eb2fd1..401c2e550a 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -63,7 +63,6 @@ #define SH7752EVB_ETHERNET_NUM_CH 2 /* SPI */ -#define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000 /* MMCIF */ diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index e7f9f61974..6db33ed41d 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -63,7 +63,6 @@ #define SH7753EVB_ETHERNET_NUM_CH 2 /* SPI */ -#define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000 /* MMCIF */ diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index a2b3307804..5f720c20e2 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -65,7 +65,6 @@ #define SH7757LCR_GIGA_ETHERNET_NUM_CH 2 /* SPI */ -#define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000 /* MMCIF */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ef83c00c1b..dabc171f1e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1909,7 +1909,6 @@ CONFIG_SH_QSPI_BASE CONFIG_SH_SCIF_CLK_FREQ CONFIG_SH_SDHI_FREQ CONFIG_SH_SDRAM_OFFSET -CONFIG_SH_SPI CONFIG_SH_SPI_BASE CONFIG_SH_TMU_CLK_FREQ CONFIG_SIEMENS_DRACO From patchwork Wed Feb 7 00:42:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tuomas Tynkkynen X-Patchwork-Id: 870161 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zbjHt0WYJz9ryk for ; Wed, 7 Feb 2018 11:43:54 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A487BC21E11; Wed, 7 Feb 2018 00:43:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C4C11C21E26; Wed, 7 Feb 2018 00:42:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 50D9AC21C50; Wed, 7 Feb 2018 00:42:37 +0000 (UTC) Received: from mx1.mpynet.fi (mx1.mpynet.fi [82.197.21.84]) by lists.denx.de (Postfix) with ESMTPS id EEBBAC21D6A for ; Wed, 7 Feb 2018 00:42:36 +0000 (UTC) From: Tuomas Tynkkynen To: Date: Wed, 7 Feb 2018 02:42:17 +0200 Message-ID: <20180207004223.10932-3-tuomas@tuxera.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180207004223.10932-1-tuomas@tuxera.com> References: <20180207004223.10932-1-tuomas@tuxera.com> MIME-Version: 1.0 X-ClientProxiedBy: tuxera-exch.ad.tuxera.com (10.20.48.11) To tuxera-exch.ad.tuxera.com (10.20.48.11) Received-SPF: none Cc: Tom Rini , Jagan Teki Subject: [U-Boot] [PATCH 2/8] spi: Migrate CONFIG_SH_QSPI to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Tuomas Tynkkynen --- configs/alt_defconfig | 1 + configs/gose_defconfig | 1 + configs/koelsch_defconfig | 1 + configs/lager_defconfig | 1 + configs/porter_defconfig | 1 + configs/silk_defconfig | 1 + configs/stout_defconfig | 1 + drivers/spi/Kconfig | 6 ++++++ include/configs/alt.h | 1 - include/configs/blanche.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/lager.h | 1 - include/configs/porter.h | 1 - include/configs/silk.h | 1 - include/configs/stout.h | 1 - scripts/config_whitelist.txt | 1 - 17 files changed, 13 insertions(+), 9 deletions(-) diff --git a/configs/alt_defconfig b/configs/alt_defconfig index 49f838e01a..58d849073a 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -32,6 +32,7 @@ CONFIG_NETDEVICES=y CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y +CONFIG_SH_QSPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 2c0fd0bee5..ea68887249 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -32,6 +32,7 @@ CONFIG_NETDEVICES=y CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y +CONFIG_SH_QSPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index 65e96e69de..31993b0824 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -32,6 +32,7 @@ CONFIG_NETDEVICES=y CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y +CONFIG_SH_QSPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index e5a6244512..3acca7a5ab 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -32,6 +32,7 @@ CONFIG_NETDEVICES=y CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y +CONFIG_SH_QSPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 614ee608e7..13dd65d040 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -48,6 +48,7 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SCIF_CONSOLE=y +CONFIG_SH_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 81d449cb98..dc898eb370 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -32,6 +32,7 @@ CONFIG_NETDEVICES=y CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y +CONFIG_SH_QSPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/stout_defconfig b/configs/stout_defconfig index 99574c3134..fc5f3a24c3 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -32,6 +32,7 @@ CONFIG_NETDEVICES=y CONFIG_SH_ETHER=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y +CONFIG_SH_QSPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 3d2cd2db00..a1f9373af1 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -245,6 +245,12 @@ config SH_SPI Enable the SuperH SPI controller driver. This driver can be used on various SuperH SoCs, such as SH7757. +config SH_QSPI + bool "Renesas Quad SPI driver" + help + Enable the Renesas Quad SPI controller driver. This driver can be + used on Renesas SoCs. + config TI_QSPI bool "TI QSPI driver" help diff --git a/include/configs/alt.h b/include/configs/alt.h index 84fc705a04..f9926b01a3 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -39,7 +39,6 @@ /* FLASH */ #define CONFIG_SPI -#define CONFIG_SH_QSPI #define CONFIG_SPI_FLASH_QUAD /* SH Ether */ diff --git a/include/configs/blanche.h b/include/configs/blanche.h index 4948bbb063..f2bbfca8b8 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -40,7 +40,6 @@ #if !defined(CONFIG_MTD_NOR_FLASH) #define CONFIG_SYS_TEXT_BASE 0x40000000 #define CONFIG_SPI -#define CONFIG_SH_QSPI #define CONFIG_SH_QSPI_BASE 0xE6B10000 #else #define CONFIG_SYS_TEXT_BASE 0x00000000 diff --git a/include/configs/gose.h b/include/configs/gose.h index dcd2130080..dccea0962f 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -40,7 +40,6 @@ /* FLASH */ #define CONFIG_SPI -#define CONFIG_SH_QSPI /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index f1571a4576..ca644395f9 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -40,7 +40,6 @@ /* FLASH */ #define CONFIG_SPI -#define CONFIG_SH_QSPI /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 diff --git a/include/configs/lager.h b/include/configs/lager.h index 53b717f260..be7a35a3d0 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -40,7 +40,6 @@ /* SPI */ #define CONFIG_SPI -#define CONFIG_SH_QSPI /* SH Ether */ #define CONFIG_SH_ETHER_USE_PORT 0 diff --git a/include/configs/porter.h b/include/configs/porter.h index b0a4efc304..772b3a160a 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -40,7 +40,6 @@ /* FLASH */ #define CONFIG_SPI -#define CONFIG_SH_QSPI #define CONFIG_SPI_FLASH_QUAD /* SH Ether */ diff --git a/include/configs/silk.h b/include/configs/silk.h index 0ece76f799..51a8fe6c09 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -40,7 +40,6 @@ /* FLASH */ #define CONFIG_SPI -#define CONFIG_SH_QSPI #define CONFIG_SPI_FLASH_QUAD /* SH Ether */ diff --git a/include/configs/stout.h b/include/configs/stout.h index 0a02216cd5..a384b55d7b 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -43,7 +43,6 @@ /* SPI */ #define CONFIG_SPI -#define CONFIG_SH_QSPI #define CONFIG_SPI_FLASH_QUAD /* SH Ether */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index dabc171f1e..052031e1be 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1904,7 +1904,6 @@ CONFIG_SH_I2C_DATA_LOW CONFIG_SH_MMCIF CONFIG_SH_MMCIF_ADDR CONFIG_SH_MMCIF_CLK -CONFIG_SH_QSPI CONFIG_SH_QSPI_BASE CONFIG_SH_SCIF_CLK_FREQ CONFIG_SH_SDHI_FREQ From patchwork Wed Feb 7 00:42:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tuomas Tynkkynen X-Patchwork-Id: 870163 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zbjKj01d0z9ryk for ; Wed, 7 Feb 2018 11:45:28 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A67B5C21DB0; Wed, 7 Feb 2018 00:43:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E6006C21E39; Wed, 7 Feb 2018 00:42:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8BDBDC21C29; Wed, 7 Feb 2018 00:42:37 +0000 (UTC) Received: from mx1.mpynet.fi (mx1.mpynet.fi [82.197.21.84]) by lists.denx.de (Postfix) with ESMTPS id 273D6C21DA1 for ; Wed, 7 Feb 2018 00:42:37 +0000 (UTC) From: Tuomas Tynkkynen To: Date: Wed, 7 Feb 2018 02:42:18 +0200 Message-ID: <20180207004223.10932-4-tuomas@tuxera.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180207004223.10932-1-tuomas@tuxera.com> References: <20180207004223.10932-1-tuomas@tuxera.com> MIME-Version: 1.0 X-ClientProxiedBy: tuxera-exch.ad.tuxera.com (10.20.48.11) To tuxera-exch.ad.tuxera.com (10.20.48.11) Received-SPF: none Cc: Tom Rini , Jagan Teki Subject: [U-Boot] [PATCH 3/8] spi: Migrate CONFIG_MXS_SPI to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Tuomas Tynkkynen --- configs/bg0900_defconfig | 1 + configs/m28evk_defconfig | 1 + configs/mx28evk_auart_console_defconfig | 1 + configs/mx28evk_defconfig | 1 + configs/mx28evk_nand_defconfig | 1 + configs/mx28evk_spi_defconfig | 1 + drivers/spi/Kconfig | 6 ++++++ include/configs/mxs.h | 1 - scripts/config_whitelist.txt | 1 - 9 files changed, 12 insertions(+), 2 deletions(-) diff --git a/configs/bg0900_defconfig b/configs/bg0900_defconfig index 72616ae5e5..cf2abc6b4c 100644 --- a/configs/bg0900_defconfig +++ b/configs/bg0900_defconfig @@ -29,4 +29,5 @@ CONFIG_DOS_PARTITION=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_MXS_SPI=y CONFIG_OF_LIBFDT=y diff --git a/configs/m28evk_defconfig b/configs/m28evk_defconfig index 3bc6b1835f..dd2d25d251 100644 --- a/configs/m28evk_defconfig +++ b/configs/m28evk_defconfig @@ -43,6 +43,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/mx28evk_auart_console_defconfig b/configs/mx28evk_auart_console_defconfig index c4977564e4..c1360f1a50 100644 --- a/configs/mx28evk_auart_console_defconfig +++ b/configs/mx28evk_auart_console_defconfig @@ -38,6 +38,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/mx28evk_defconfig b/configs/mx28evk_defconfig index 40c9df2809..de739e0c37 100644 --- a/configs/mx28evk_defconfig +++ b/configs/mx28evk_defconfig @@ -38,6 +38,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/mx28evk_nand_defconfig b/configs/mx28evk_nand_defconfig index ea97f401d1..103cc8c0c7 100644 --- a/configs/mx28evk_nand_defconfig +++ b/configs/mx28evk_nand_defconfig @@ -37,6 +37,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/mx28evk_spi_defconfig b/configs/mx28evk_spi_defconfig index 34e9927c0f..17bc73030c 100644 --- a/configs/mx28evk_spi_defconfig +++ b/configs/mx28evk_spi_defconfig @@ -37,6 +37,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_MMC_MXS=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y +CONFIG_MXS_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index a1f9373af1..686105c0e2 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -263,6 +263,12 @@ config MPC8XX_SPI help Enable support for SPI on MPC8XX +config MXS_SPI + bool "MXS SPI Driver" + help + Enable the MXS SPI controller driver. This driver can be used + on the i.MX23 and i.MX28 SoCs. + config OMAP3_SPI bool "McSPI driver for OMAP" help diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 3a27c15060..5beea7fcea 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -150,7 +150,6 @@ /* SPI */ #ifdef CONFIG_CMD_SPI #define CONFIG_HARD_SPI -#define CONFIG_MXS_SPI #define CONFIG_SPI_HALF_DUPLEX #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 052031e1be..1b43512bc8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1444,7 +1444,6 @@ CONFIG_MXS_AUART CONFIG_MXS_AUART_BASE CONFIG_MXS_GPIO CONFIG_MXS_OCOTP -CONFIG_MXS_SPI CONFIG_MX_CYCLIC CONFIG_MY_OPTION CONFIG_NANDFLASH_SIZE From patchwork Wed Feb 7 00:42:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tuomas Tynkkynen X-Patchwork-Id: 870162 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zbjK00nLpz9ryk for ; Wed, 7 Feb 2018 11:44:52 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C9612C21D6A; Wed, 7 Feb 2018 00:44:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 303FBC21E51; Wed, 7 Feb 2018 00:42:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 52E22C21D9F; Wed, 7 Feb 2018 00:42:38 +0000 (UTC) Received: from mx1.mpynet.fi (mx1.mpynet.fi [82.197.21.84]) by lists.denx.de (Postfix) with ESMTPS id AEBF6C21C50 for ; Wed, 7 Feb 2018 00:42:37 +0000 (UTC) From: Tuomas Tynkkynen To: Date: Wed, 7 Feb 2018 02:42:19 +0200 Message-ID: <20180207004223.10932-5-tuomas@tuxera.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180207004223.10932-1-tuomas@tuxera.com> References: <20180207004223.10932-1-tuomas@tuxera.com> MIME-Version: 1.0 X-ClientProxiedBy: tuxera-exch.ad.tuxera.com (10.20.48.11) To tuxera-exch.ad.tuxera.com (10.20.48.11) Received-SPF: none Cc: Tom Rini , Jagan Teki Subject: [U-Boot] [PATCH 4/8] spi: Migrate CONFIG_MXC_SPI to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Tuomas Tynkkynen --- README | 5 ----- configs/aristainetos2_defconfig | 1 + configs/aristainetos2b_defconfig | 1 + configs/aristainetos_defconfig | 1 + configs/cgtqmx6eval_defconfig | 1 + configs/cl-som-imx7_defconfig | 1 + configs/cm_fx6_defconfig | 1 + configs/dh_imx6_defconfig | 1 + configs/display5_defconfig | 1 + configs/display5_factory_defconfig | 1 + configs/dms-ba16-1g_defconfig | 1 + configs/dms-ba16_defconfig | 1 + configs/flea3_defconfig | 1 + configs/ge_b450v3_defconfig | 1 + configs/ge_b650v3_defconfig | 1 + configs/ge_b850v3_defconfig | 1 + configs/imx31_phycore_eet_defconfig | 1 + configs/marsboard_defconfig | 1 + configs/mccmon6_nor_defconfig | 1 + configs/mccmon6_sd_defconfig | 1 + configs/mx31ads_defconfig | 1 + configs/mx31pdk_defconfig | 1 + configs/mx35pdk_defconfig | 1 + configs/mx51evk_defconfig | 1 + configs/mx6qsabrelite_defconfig | 1 + configs/mx6sabreauto_defconfig | 1 + configs/mx6sabresd_defconfig | 1 + configs/mx6slevk_defconfig | 1 + configs/mx6slevk_spinor_defconfig | 1 + configs/mx6slevk_spl_defconfig | 1 + configs/nitrogen6dl2g_defconfig | 1 + configs/nitrogen6dl_defconfig | 1 + configs/nitrogen6q2g_defconfig | 1 + configs/nitrogen6q_defconfig | 1 + configs/nitrogen6s1g_defconfig | 1 + configs/nitrogen6s_defconfig | 1 + configs/ot1200_defconfig | 1 + configs/ot1200_spl_defconfig | 1 + configs/pcm058_defconfig | 1 + configs/pfla02_defconfig | 1 + configs/riotboard_defconfig | 1 + configs/tqma6dl_mba6_mmc_defconfig | 1 + configs/tqma6dl_mba6_spi_defconfig | 1 + configs/tqma6q_mba6_mmc_defconfig | 1 + configs/tqma6q_mba6_spi_defconfig | 1 + configs/tqma6s_mba6_mmc_defconfig | 1 + configs/tqma6s_mba6_spi_defconfig | 1 + configs/ts4800_defconfig | 1 + configs/woodburn_defconfig | 1 + configs/woodburn_sd_defconfig | 1 + configs/zc5202_defconfig | 1 + configs/zc5601_defconfig | 1 + drivers/spi/Kconfig | 6 ++++++ include/configs/advantech_dms-ba16.h | 1 - include/configs/aristainetos-common.h | 1 - include/configs/cgtqmx6eval.h | 1 - include/configs/cl-som-imx7.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/dh_imx6.h | 1 - include/configs/display5.h | 1 - include/configs/el6x_common.h | 1 - include/configs/embestmx6boards.h | 1 - include/configs/flea3.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/imx31_phycore.h | 1 - include/configs/mccmon6.h | 1 - include/configs/mx31ads.h | 1 - include/configs/mx31pdk.h | 1 - include/configs/mx35pdk.h | 1 - include/configs/mx51evk.h | 6 ------ include/configs/mx6sabre_common.h | 1 - include/configs/mx6slevk.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/ot1200.h | 1 - include/configs/pcm058.h | 1 - include/configs/pfla02.h | 1 - include/configs/tqma6.h | 3 --- include/configs/tqma6_wru4.h | 6 ------ include/configs/ts4800.h | 1 - include/configs/woodburn_common.h | 1 - scripts/config_whitelist.txt | 1 - 82 files changed, 57 insertions(+), 46 deletions(-) diff --git a/README b/README index 4044e8575f..0cec47dadf 100644 --- a/README +++ b/README @@ -2019,11 +2019,6 @@ The following options need to be configured: Currently supported on some MPC8xxx processors. For an example, see include/configs/mpc8349emds.h. - CONFIG_MXC_SPI - - Enables the driver for the SPI controllers on i.MX and MXC - SoCs. Currently i.MX31/35/51 are supported. - CONFIG_SYS_SPI_MXC_WAIT Timeout for waiting until spi transfer completed. default: (CONFIG_SYS_HZ/100) /* 10 ms */ diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig index 288dab0d3c..12fbc61dd1 100644 --- a/configs/aristainetos2_defconfig +++ b/configs/aristainetos2_defconfig @@ -39,6 +39,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig index 115ae07ad6..d14edd8372 100644 --- a/configs/aristainetos2b_defconfig +++ b/configs/aristainetos2b_defconfig @@ -39,6 +39,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig index cad8b4af8a..68bd97a30e 100644 --- a/configs/aristainetos_defconfig +++ b/configs/aristainetos_defconfig @@ -37,6 +37,7 @@ CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1 CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig index 418e4e2d8c..4c430f0e3b 100644 --- a/configs/cgtqmx6eval_defconfig +++ b/configs/cgtqmx6eval_defconfig @@ -49,6 +49,7 @@ CONFIG_DWC_AHSATA=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y CONFIG_PHYLIB=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig index 0c93159032..6064650f65 100644 --- a/configs/cl-som-imx7_defconfig +++ b/configs/cl-som-imx7_defconfig @@ -45,6 +45,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_MXC_USB_OTG_HACTIVE=y diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 4ce07759e4..234c6aa0c5 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -60,6 +60,7 @@ CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y CONFIG_DM_PMIC=y CONFIG_DM_REGULATOR=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index 1fd7c50e31..fb2e9e559d 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -48,6 +48,7 @@ CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y CONFIG_FEC_MXC=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y diff --git a/configs/display5_defconfig b/configs/display5_defconfig index 1a4c16f013..8cee3cb570 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -59,3 +59,4 @@ CONFIG_NETDEVICES=y CONFIG_FEC_MXC=y # CONFIG_SPL_DM_SERIAL is not set CONFIG_MXC_UART=y +CONFIG_MXC_SPI=y diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index 76270dfffc..356a27a149 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -65,6 +65,7 @@ CONFIG_NETDEVICES=y CONFIG_FEC_MXC=y # CONFIG_SPL_DM_SERIAL is not set CONFIG_MXC_UART=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Liebherr" diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig index 144a86bcbf..a1b9d7812d 100644 --- a/configs/dms-ba16-1g_defconfig +++ b/configs/dms-ba16-1g_defconfig @@ -32,6 +32,7 @@ CONFIG_DWC_AHSATA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig index 075e5070f0..7a72b780b3 100644 --- a/configs/dms-ba16_defconfig +++ b/configs/dms-ba16_defconfig @@ -31,6 +31,7 @@ CONFIG_DWC_AHSATA=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/flea3_defconfig b/configs/flea3_defconfig index 9f9d8ee26e..467e4d52f1 100644 --- a/configs/flea3_defconfig +++ b/configs/flea3_defconfig @@ -25,6 +25,7 @@ CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_MXC_SPI=y CONFIG_OF_LIBFDT=y CONFIG_FDT_FIXUP_PARTITIONS=y # CONFIG_EFI_LOADER is not set diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig index 7472b316be..fa9ce8e84f 100644 --- a/configs/ge_b450v3_defconfig +++ b/configs/ge_b450v3_defconfig @@ -29,5 +29,6 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_CMD_E1000=y +CONFIG_MXC_SPI=y CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig index dfa4bca43b..987bd74c18 100644 --- a/configs/ge_b650v3_defconfig +++ b/configs/ge_b650v3_defconfig @@ -29,5 +29,6 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_CMD_E1000=y +CONFIG_MXC_SPI=y CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig index 6bce64932c..7bcf1deec9 100644 --- a/configs/ge_b850v3_defconfig +++ b/configs/ge_b850v3_defconfig @@ -29,5 +29,6 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_E1000=y CONFIG_CMD_E1000=y +CONFIG_MXC_SPI=y CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set diff --git a/configs/imx31_phycore_eet_defconfig b/configs/imx31_phycore_eet_defconfig index 5defae827c..0c485e6261 100644 --- a/configs/imx31_phycore_eet_defconfig +++ b/configs/imx31_phycore_eet_defconfig @@ -18,4 +18,5 @@ CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0xa8000000 CONFIG_SMC911X_32_BIT=y +CONFIG_MXC_SPI=y CONFIG_VIDEO=y diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig index e199ca0cb2..9f34ef4ae9 100644 --- a/configs/marsboard_defconfig +++ b/configs/marsboard_defconfig @@ -21,6 +21,7 @@ CONFIG_DM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig index 7c4657922a..f688f2ddc6 100644 --- a/configs/mccmon6_nor_defconfig +++ b/configs/mccmon6_nor_defconfig @@ -39,6 +39,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig index 97f7f9aa73..b3d6b2c987 100644 --- a/configs/mccmon6_sd_defconfig +++ b/configs/mccmon6_sd_defconfig @@ -40,6 +40,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/mx31ads_defconfig b/configs/mx31ads_defconfig index da716708c3..e89312336d 100644 --- a/configs/mx31ads_defconfig +++ b/configs/mx31ads_defconfig @@ -9,3 +9,4 @@ CONFIG_CMD_DATE=y CONFIG_ENV_IS_IN_FLASH=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y +CONFIG_MXC_SPI=y diff --git a/configs/mx31pdk_defconfig b/configs/mx31pdk_defconfig index ea6daf2754..3a510b5c79 100644 --- a/configs/mx31pdk_defconfig +++ b/configs/mx31pdk_defconfig @@ -21,3 +21,4 @@ CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0xB6000000 CONFIG_SMC911X_32_BIT=y +CONFIG_MXC_SPI=y diff --git a/configs/mx35pdk_defconfig b/configs/mx35pdk_defconfig index 61d2013b78..24cf4f478b 100644 --- a/configs/mx35pdk_defconfig +++ b/configs/mx35pdk_defconfig @@ -29,6 +29,7 @@ CONFIG_NAND_MXC=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0xB6000000 +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index 7d92b4cff4..4cf0202932 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_DATE=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index c52c3923b4..b0b1d9ef61 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -40,6 +40,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index 215700bc3f..54f7138231 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -43,6 +43,7 @@ CONFIG_DFU_SF=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 891c7111c5..48cc26bbd7 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -52,6 +52,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_PCI=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig index 2d43eccdb0..670f1e8e84 100644 --- a/configs/mx6slevk_defconfig +++ b/configs/mx6slevk_defconfig @@ -41,6 +41,7 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y +CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig index 0b1ce5e72c..acd1b4ed91 100644 --- a/configs/mx6slevk_spinor_defconfig +++ b/configs/mx6slevk_spinor_defconfig @@ -41,6 +41,7 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y +CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig index 41c57bd92e..3a35d378b8 100644 --- a/configs/mx6slevk_spl_defconfig +++ b/configs/mx6slevk_spl_defconfig @@ -49,6 +49,7 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y +CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_DM_USB=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index c9a6ebb11c..27adc281d9 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -37,6 +37,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index 749a386cac..5e67157153 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -37,6 +37,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index d0153d4df6..45647fcfc9 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -39,6 +39,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index bf12cbde80..21839039d2 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -39,6 +39,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index aad2b21cf7..d3353b4153 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -37,6 +37,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 0f618fbb2a..6c27741678 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -37,6 +37,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig index 0c3258ff1b..3616b6a9b6 100644 --- a/configs/ot1200_defconfig +++ b/configs/ot1200_defconfig @@ -32,6 +32,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y +CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig index ac96221ebf..a91df739f0 100644 --- a/configs/ot1200_spl_defconfig +++ b/configs/ot1200_spl_defconfig @@ -40,6 +40,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y +CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig index 99713c26b2..0db7876716 100644 --- a/configs/pcm058_defconfig +++ b/configs/pcm058_defconfig @@ -54,5 +54,6 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_OF_LIBFDT=y diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig index 029c9de2ce..7971e7acce 100644 --- a/configs/pfla02_defconfig +++ b/configs/pfla02_defconfig @@ -52,5 +52,6 @@ CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y CONFIG_FEC_MXC=y +CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_OF_LIBFDT=y diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig index 7908414680..6fb9298b84 100644 --- a/configs/riotboard_defconfig +++ b/configs/riotboard_defconfig @@ -21,6 +21,7 @@ CONFIG_DM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SST=y CONFIG_PHYLIB=y +CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/tqma6dl_mba6_mmc_defconfig b/configs/tqma6dl_mba6_mmc_defconfig index 936a8ac346..260776ecc3 100644 --- a/configs/tqma6dl_mba6_mmc_defconfig +++ b/configs/tqma6dl_mba6_mmc_defconfig @@ -34,6 +34,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/tqma6dl_mba6_spi_defconfig b/configs/tqma6dl_mba6_spi_defconfig index 4f3335151b..3cc16dd8e5 100644 --- a/configs/tqma6dl_mba6_spi_defconfig +++ b/configs/tqma6dl_mba6_spi_defconfig @@ -35,6 +35,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig index e134c256de..b45a78668c 100644 --- a/configs/tqma6q_mba6_mmc_defconfig +++ b/configs/tqma6q_mba6_mmc_defconfig @@ -33,6 +33,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig index 2173155739..622a9786b3 100644 --- a/configs/tqma6q_mba6_spi_defconfig +++ b/configs/tqma6q_mba6_spi_defconfig @@ -34,6 +34,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig index 42c004b550..dd588d0aa6 100644 --- a/configs/tqma6s_mba6_mmc_defconfig +++ b/configs/tqma6s_mba6_mmc_defconfig @@ -34,6 +34,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig index 3912ec2730..5e4583e131 100644 --- a/configs/tqma6s_mba6_spi_defconfig +++ b/configs/tqma6s_mba6_spi_defconfig @@ -35,6 +35,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_NETDEVICES=y +CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y diff --git a/configs/ts4800_defconfig b/configs/ts4800_defconfig index 17497ca52f..49ca209d88 100644 --- a/configs/ts4800_defconfig +++ b/configs/ts4800_defconfig @@ -14,4 +14,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_PHYLIB=y +CONFIG_MXC_SPI=y CONFIG_OF_LIBFDT=y diff --git a/configs/woodburn_defconfig b/configs/woodburn_defconfig index 4d50d4e2f7..7816959903 100644 --- a/configs/woodburn_defconfig +++ b/configs/woodburn_defconfig @@ -29,3 +29,4 @@ CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_MXC_SPI=y diff --git a/configs/woodburn_sd_defconfig b/configs/woodburn_sd_defconfig index 4fe5f2f1bf..11b5a84d57 100644 --- a/configs/woodburn_sd_defconfig +++ b/configs/woodburn_sd_defconfig @@ -40,3 +40,4 @@ CONFIG_NAND=y CONFIG_NAND_MXC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_MXC_SPI=y diff --git a/configs/zc5202_defconfig b/configs/zc5202_defconfig index 244c22b5a5..50dc046261 100644 --- a/configs/zc5202_defconfig +++ b/configs/zc5202_defconfig @@ -30,4 +30,5 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PCI=y +CONFIG_MXC_SPI=y CONFIG_OF_LIBFDT=y diff --git a/configs/zc5601_defconfig b/configs/zc5601_defconfig index d4845ac00d..42786a08ec 100644 --- a/configs/zc5601_defconfig +++ b/configs/zc5601_defconfig @@ -29,4 +29,5 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y +CONFIG_MXC_SPI=y CONFIG_OF_LIBFDT=y diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 686105c0e2..e7e1ccd73a 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -263,6 +263,12 @@ config MPC8XX_SPI help Enable support for SPI on MPC8XX +config MXC_SPI + bool "MXC SPI Driver" + help + Enable the MXC SPI controller driver. This driver can be used + on various i.MX SoCs such as i.MX31/35/51/6/7. + config MXS_SPI bool "MXS SPI Driver" help diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 1c2dee7ee2..835d6de491 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -69,7 +69,6 @@ /* Serial Flash */ #ifdef CONFIG_CMD_SF -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 20000000 diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 397afbb408..4d3326ed4c 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -33,7 +33,6 @@ #define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_SPI_FLASH_MTD -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_SPEED 20000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index f49302603c..afc0bae167 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -38,7 +38,6 @@ #define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_SST -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_SPEED 20000000 #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h index 14c471228f..7d6f39f4da 100644 --- a/include/configs/cl-som-imx7.h +++ b/include/configs/cl-som-imx7.h @@ -148,7 +148,6 @@ /* SPI Flash support */ #define CONFIG_SPI -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 20000000 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index da870b9baa..713d493e7b 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -175,7 +175,6 @@ /* SPI */ #define CONFIG_SPI -#define CONFIG_MXC_SPI /* NAND */ #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 1f26ef4f8f..61673ad2c8 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -92,7 +92,6 @@ /* SPI Flash Configs */ #ifdef CONFIG_CMD_SF -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 25000000 diff --git a/include/configs/display5.h b/include/configs/display5.h index c41ab8b5e2..9c8a836bc5 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -65,7 +65,6 @@ /* SPI NOR Flash */ #ifdef CONFIG_CMD_SF -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 1 #define CONFIG_SF_DEFAULT_CS (0 | (IMX_GPIO_NR(5, 29) << 8)) #define CONFIG_SF_DEFAULT_SPEED 50000000 diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index 909981cf10..89d3dffc97 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -46,7 +46,6 @@ #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 /* Commands */ -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 3 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 20000000 diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 08a29223b2..1d9e33a8c9 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -52,7 +52,6 @@ #define CONFIG_PHY_ATHEROS #ifdef CONFIG_CMD_SF -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 20000000 diff --git a/include/configs/flea3.h b/include/configs/flea3.h index e4d5f91b7a..a14bb96861 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -47,7 +47,6 @@ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_SPD_BUS_NUM 2 /* I2C3 */ #define CONFIG_SYS_MXC_I2C3_SLAVE 0xfe -#define CONFIG_MXC_SPI #define CONFIG_MXC_GPIO /* diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 45a4700ff4..f328b3aae3 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -93,7 +93,6 @@ /* Serial Flash */ #ifdef CONFIG_CMD_SF -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 20000000 diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index d2944b5db2..9b64ff42a7 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -54,7 +54,6 @@ /* SPI */ #ifdef CONFIG_CMD_SF - #define CONFIG_MXC_SPI #define CONFIG_SPI_FLASH_MTD #define CONFIG_SPI_FLASH_BAR #define CONFIG_SF_DEFAULT_BUS 0 diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index c2d416031b..81287638af 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -150,7 +150,6 @@ #define CONFIG_MXC_GPIO #define CONFIG_HARD_SPI -#define CONFIG_MXC_SPI #define CONFIG_S6E63D6 diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 0cb8b17fa3..ed5f53f597 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -45,7 +45,6 @@ #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 2 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 25000000 diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index 18ee355e2e..6516432a45 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -35,7 +35,6 @@ #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_HARD_SPI 1 -#define CONFIG_MXC_SPI 1 #define CONFIG_DEFAULT_SPI_BUS 1 #define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH) #define CONFIG_MXC_GPIO diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 3259e82761..3e72290ad0 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -49,7 +49,6 @@ #define CONFIG_MXC_GPIO #define CONFIG_HARD_SPI -#define CONFIG_MXC_SPI #define CONFIG_DEFAULT_SPI_BUS 1 #define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH) diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 6a334cb730..e10ec23bba 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -41,7 +41,6 @@ #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ -#define CONFIG_MXC_SPI #define CONFIG_MXC_GPIO /* diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 3ecb92c27d..9d7fcce393 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -38,12 +38,6 @@ #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_MXC_GPIO -/* - * SPI Configs - * */ - -#define CONFIG_MXC_SPI - /* PMIC Controller */ #define CONFIG_POWER #define CONFIG_POWER_SPI diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 8b37404beb..d976e77aef 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -31,7 +31,6 @@ #define CONFIG_PHY_ATHEROS #ifdef CONFIG_CMD_SF -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 20000000 diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 9ddb1433ac..aa2952084a 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -148,7 +148,6 @@ #endif #ifdef CONFIG_CMD_SF -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 20000000 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 57cdfd4e2b..c73cfb7f7e 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -25,7 +25,6 @@ #define CONFIG_MXC_UART_BASE UART2_BASE #ifdef CONFIG_CMD_SF -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 25000000 diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 051416eab8..b2cbf91ddf 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -21,7 +21,6 @@ /* SF Configs */ #define CONFIG_SPI -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 2 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 25000000 diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h index 3067fc63ef..6de78317c4 100644 --- a/include/configs/pcm058.h +++ b/include/configs/pcm058.h @@ -44,7 +44,6 @@ #define CONFIG_FEC_MXC_PHYADDR 3 /* SPI Flash */ -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 20000000 diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h index ae03310040..982d239d1e 100644 --- a/include/configs/pfla02.h +++ b/include/configs/pfla02.h @@ -41,7 +41,6 @@ #define CONFIG_FEC_MXC_PHYADDR 3 /* SPI Flash */ -#define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 2 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 20000000 diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 073f3962b7..84a143163b 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -36,9 +36,6 @@ #define CONFIG_MXC_UART -/* SPI */ -#define CONFIG_MXC_SPI - /* SPI Flash */ #define TQMA6_SPI_FLASH_SECTOR_SIZE SZ_64K diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index 4e99cdbb59..cb0b9ee489 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -38,10 +38,4 @@ #define CONFIG_SYS_BOOTCOUNT_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_BOOTCOUNT_BE -/* - * Remove all unused interfaces / commands that are defined in - * the common header tqms6.h - */ -#undef CONFIG_MXC_SPI - #endif /* __CONFIG_TQMA6_WRU4_H */ diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index ebfbb66bab..d0c7b8e214 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -49,7 +49,6 @@ * SPI Configs * */ #define CONFIG_HARD_SPI /* puts SPI: ready */ -#define CONFIG_MXC_SPI /* driver for the SPI controllers*/ /* * MMC Configs diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 7ab60fd7ce..62d2c3f772 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -43,7 +43,6 @@ #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_SPD_BUS_NUM 0 -#define CONFIG_MXC_SPI #define CONFIG_MXC_GPIO /* PMIC Controller */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 1b43512bc8..125634e245 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1434,7 +1434,6 @@ CONFIG_MXC_MCI_REGS_BASE CONFIG_MXC_NAND_HWECC CONFIG_MXC_NAND_IP_REGS_BASE CONFIG_MXC_NAND_REGS_BASE -CONFIG_MXC_SPI CONFIG_MXC_UART_BASE CONFIG_MXC_USB_FLAGS CONFIG_MXC_USB_PORT From patchwork Wed Feb 7 00:42:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tuomas Tynkkynen X-Patchwork-Id: 870164 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zbjMB2fRDz9ryk for ; Wed, 7 Feb 2018 11:46:46 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BF2F1C21E35; Wed, 7 Feb 2018 00:43:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 29874C21E48; Wed, 7 Feb 2018 00:42:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1EBAFC21C29; Wed, 7 Feb 2018 00:42:38 +0000 (UTC) Received: from mx1.mpynet.fi (mx1.mpynet.fi [82.197.21.84]) by lists.denx.de (Postfix) with ESMTPS id D6F2EC21C29 for ; Wed, 7 Feb 2018 00:42:37 +0000 (UTC) From: Tuomas Tynkkynen To: Date: Wed, 7 Feb 2018 02:42:20 +0200 Message-ID: <20180207004223.10932-6-tuomas@tuxera.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180207004223.10932-1-tuomas@tuxera.com> References: <20180207004223.10932-1-tuomas@tuxera.com> MIME-Version: 1.0 X-ClientProxiedBy: tuxera-exch.ad.tuxera.com (10.20.48.11) To tuxera-exch.ad.tuxera.com (10.20.48.11) Received-SPF: none Cc: Tom Rini , Jagan Teki Subject: [U-Boot] [PATCH 5/8] spi: Migrate CONFIG_MPC8XXX_SPI to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Tuomas Tynkkynen --- configs/MPC8349EMDS_defconfig | 1 + configs/ids8313_defconfig | 1 + drivers/spi/Kconfig | 5 +++++ include/configs/MPC8349EMDS.h | 1 - include/configs/ids8313.h | 1 - scripts/config_whitelist.txt | 1 - 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configs/MPC8349EMDS_defconfig b/configs/MPC8349EMDS_defconfig index 49542ca59c..9404d41552 100644 --- a/configs/MPC8349EMDS_defconfig +++ b/configs/MPC8349EMDS_defconfig @@ -16,4 +16,5 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y # CONFIG_PCI is not set CONFIG_SYS_NS16550=y +CONFIG_MPC8XXX_SPI=y CONFIG_OF_LIBFDT=y diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig index 839dfbac8f..362aee2e80 100644 --- a/configs/ids8313_defconfig +++ b/configs/ids8313_defconfig @@ -34,4 +34,5 @@ CONFIG_MTD_NOR_FLASH=y CONFIG_PHYLIB=y # CONFIG_PCI is not set CONFIG_SYS_NS16550=y +CONFIG_MPC8XXX_SPI=y CONFIG_OF_LIBFDT=y diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index e7e1ccd73a..a16faa6dfb 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -263,6 +263,11 @@ config MPC8XX_SPI help Enable support for SPI on MPC8XX +config MPC8XXX_SPI + bool "MPC8XXX SPI Driver" + help + Enable support for SPI on the MPC8XXX PowerPC SoCs. + config MXC_SPI bool "MXC SPI Driver" help diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index c7a5ee0aaf..411fdcc19d 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -332,7 +332,6 @@ #define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} } /* SPI */ -#define CONFIG_MPC8XXX_SPI #undef CONFIG_SOFT_SPI /* SPI bit-banged */ /* GPIOs. Used as SPI chip selects */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 12eb07d1f7..0b5b4a5c75 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -285,7 +285,6 @@ * SPI setup */ #ifdef CONFIG_HARD_SPI -#define CONFIG_MPC8XXX_SPI #define CONFIG_SYS_GPIO1_PRELIM #define CONFIG_SYS_GPIO1_DIR 0x00000001 #define CONFIG_SYS_GPIO1_DAT 0x00000001 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 125634e245..daff47b92b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1372,7 +1372,6 @@ CONFIG_MPC83XX_PCI2 CONFIG_MPC85XX_FEC CONFIG_MPC85XX_FEC_NAME CONFIG_MPC85XX_PCI2 -CONFIG_MPC8XXX_SPI CONFIG_MPC8xxx_DISABLE_BPTR CONFIG_MPLL_FREQ CONFIG_MP_CLK_FREQ From patchwork Wed Feb 7 00:42:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tuomas Tynkkynen X-Patchwork-Id: 870166 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zbjNS3vxvz9ryk for ; Wed, 7 Feb 2018 11:47:52 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 43B2AC21DA3; Wed, 7 Feb 2018 00:45:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E5008C21E52; Wed, 7 Feb 2018 00:42:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 69027C21C50; Wed, 7 Feb 2018 00:42:38 +0000 (UTC) Received: from mx1.mpynet.fi (mx1.mpynet.fi [82.197.21.84]) by lists.denx.de (Postfix) with ESMTPS id 0C6BDC21D6A for ; Wed, 7 Feb 2018 00:42:38 +0000 (UTC) From: Tuomas Tynkkynen To: Date: Wed, 7 Feb 2018 02:42:21 +0200 Message-ID: <20180207004223.10932-7-tuomas@tuxera.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180207004223.10932-1-tuomas@tuxera.com> References: <20180207004223.10932-1-tuomas@tuxera.com> MIME-Version: 1.0 X-ClientProxiedBy: tuxera-exch.ad.tuxera.com (10.20.48.11) To tuxera-exch.ad.tuxera.com (10.20.48.11) Received-SPF: none Cc: Tom Rini , Jagan Teki Subject: [U-Boot] [PATCH 6/8] spi: Migrate CONFIG_LPC32XX_SSP to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Tuomas Tynkkynen --- configs/devkit3250_defconfig | 1 + configs/work_92105_defconfig | 1 + drivers/spi/Kconfig | 5 +++++ include/configs/devkit3250.h | 1 - include/configs/work_92105.h | 1 - scripts/config_whitelist.txt | 1 - 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig index 854ea32105..99e7cb1409 100644 --- a/configs/devkit3250_defconfig +++ b/configs/devkit3250_defconfig @@ -37,6 +37,7 @@ CONFIG_SPL_NAND_SIMPLE=y CONFIG_PHYLIB=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y +CONFIG_LPC32XX_SSP=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig index 1fccaacd82..e4d0fd017f 100644 --- a/configs/work_92105_defconfig +++ b/configs/work_92105_defconfig @@ -36,3 +36,4 @@ CONFIG_DM_GPIO=y CONFIG_PHYLIB=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y +CONFIG_LPC32XX_SSP=y diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index a16faa6dfb..79cd54e10c 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -257,6 +257,11 @@ config TI_QSPI Enable the TI Quad-SPI (QSPI) driver for DRA7xx and AM43xx evms. This driver support spi flash single, quad and memory reads. +config LPC32XX_SSP + bool "LPC32XX SPI Driver" + help + Enable support for SPI on LPC32xx + config MPC8XX_SPI bool "MPC8XX SPI Driver" depends on 8xx diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 526a81a382..af16cbd7a5 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -64,7 +64,6 @@ /* * SSP/SPI */ -#define CONFIG_LPC32XX_SSP #define CONFIG_LPC32XX_SSP_TIMEOUT 100000 /* diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 7faab4e073..2e407cc2b6 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -125,7 +125,6 @@ * SSP/SPI/DISPLAY */ -#define CONFIG_LPC32XX_SSP #define CONFIG_LPC32XX_SSP_TIMEOUT 100000 /* * Environment diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index daff47b92b..2fa4cf13e4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1253,7 +1253,6 @@ CONFIG_LPC32XX_NAND_SLC_WSETUP CONFIG_LPC32XX_NAND_SLC_WWIDTH CONFIG_LPC32XX_SDRAM_ CONFIG_LPC32XX_SPL -CONFIG_LPC32XX_SSP CONFIG_LPC32XX_SSP_TIMEOUT CONFIG_LPC_BASE CONFIG_LPC_IO_BASE From patchwork Wed Feb 7 00:42:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tuomas Tynkkynen X-Patchwork-Id: 870167 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zbjPR1xkLz9ryk for ; Wed, 7 Feb 2018 11:48:43 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 02A29C21E4C; Wed, 7 Feb 2018 00:45:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 92F61C21E85; Wed, 7 Feb 2018 00:42:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B24F2C21D6A; Wed, 7 Feb 2018 00:42:38 +0000 (UTC) Received: from mx1.mpynet.fi (mx1.mpynet.fi [82.197.21.84]) by lists.denx.de (Postfix) with ESMTPS id 50472C21C29 for ; Wed, 7 Feb 2018 00:42:38 +0000 (UTC) From: Tuomas Tynkkynen To: Date: Wed, 7 Feb 2018 02:42:22 +0200 Message-ID: <20180207004223.10932-8-tuomas@tuxera.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180207004223.10932-1-tuomas@tuxera.com> References: <20180207004223.10932-1-tuomas@tuxera.com> MIME-Version: 1.0 X-ClientProxiedBy: tuxera-exch.ad.tuxera.com (10.20.48.11) To tuxera-exch.ad.tuxera.com (10.20.48.11) Received-SPF: none Cc: Tom Rini , Jagan Teki Subject: [U-Boot] [PATCH 7/8] spi: Migrate CONFIG_KIRKWOOD_SPI to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Tuomas Tynkkynen --- arch/arm/mach-kirkwood/include/mach/config.h | 1 - arch/arm/mach-mvebu/include/mach/config.h | 1 - configs/clearfog_defconfig | 1 + configs/controlcenterdc_defconfig | 1 + configs/d2net_v2_defconfig | 1 + configs/db-88f6720_defconfig | 1 + configs/db-88f6820-amc_defconfig | 1 + configs/db-88f6820-gp_defconfig | 1 + configs/db-mv784mp-gp_defconfig | 1 + configs/dreamplug_defconfig | 1 + configs/ds109_defconfig | 1 + configs/ds414_defconfig | 1 + configs/inetspace_v2_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/kmcoge5un_defconfig | 1 + configs/kmnusa_defconfig | 1 + configs/kmsugp1_defconfig | 1 + configs/kmsuv31_defconfig | 1 + configs/lschlv2_defconfig | 1 + configs/lsxhl_defconfig | 1 + configs/maxbcm_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/mvebu_db_armada8k_defconfig | 1 + configs/mvebu_mcbin-88f8040_defconfig | 1 + configs/net2big_v2_defconfig | 1 + configs/netspace_lite_v2_defconfig | 1 + configs/netspace_max_v2_defconfig | 1 + configs/netspace_mini_v2_defconfig | 1 + configs/netspace_v2_defconfig | 1 + configs/portl2_defconfig | 1 + configs/theadorable_debug_defconfig | 1 + configs/turris_omnia_defconfig | 1 + drivers/spi/Kconfig | 6 ++++++ include/configs/dreamplug.h | 1 - include/configs/ds109.h | 1 - include/configs/mvebu_armada-8k.h | 1 - scripts/config_whitelist.txt | 1 - 39 files changed, 38 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h index efa4e7b6e2..9d6ad5387c 100644 --- a/arch/arm/mach-kirkwood/include/mach/config.h +++ b/arch/arm/mach-kirkwood/include/mach/config.h @@ -61,7 +61,6 @@ */ #ifdef CONFIG_CMD_SF #define CONFIG_HARD_SPI 1 -#define CONFIG_KIRKWOOD_SPI 1 #ifndef CONFIG_ENV_SPI_BUS # define CONFIG_ENV_SPI_BUS 0 #endif diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h index cfd0952470..a3b12eaa00 100644 --- a/arch/arm/mach-mvebu/include/mach/config.h +++ b/arch/arm/mach-mvebu/include/mach/config.h @@ -56,7 +56,6 @@ * SPI Flash configuration */ #ifdef CONFIG_CMD_SF -#define CONFIG_KIRKWOOD_SPI #ifndef CONFIG_ENV_SPI_BUS # define CONFIG_ENV_SPI_BUS 0 #endif diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index 7161518715..6fb4d07935 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -44,6 +44,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig index 856591e2c8..786f1a21eb 100644 --- a/configs/controlcenterdc_defconfig +++ b/configs/controlcenterdc_defconfig @@ -53,6 +53,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_TPM_ATMEL_TWI=y CONFIG_TPM_AUTH_SESSIONS=y CONFIG_TPM_FLUSH_RESOURCES=y diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig index 61fd892005..ca377cf631 100644 --- a/configs/d2net_v2_defconfig +++ b/configs/d2net_v2_defconfig @@ -31,6 +31,7 @@ CONFIG_MVSATA_IDE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/db-88f6720_defconfig b/configs/db-88f6720_defconfig index 0dbbe77aed..8a0c0ec25d 100644 --- a/configs/db-88f6720_defconfig +++ b/configs/db-88f6720_defconfig @@ -46,6 +46,7 @@ CONFIG_DEBUG_UART_BASE=0xf1012000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig index abd793c2c1..e361cebd1e 100644 --- a/configs/db-88f6820-amc_defconfig +++ b/configs/db-88f6820-amc_defconfig @@ -53,6 +53,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=200000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig index 5cc27813b0..b2e25ff4a3 100644 --- a/configs/db-88f6820-gp_defconfig +++ b/configs/db-88f6820-gp_defconfig @@ -53,6 +53,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig index 6724af04bc..3249b6c5bd 100644 --- a/configs/db-mv784mp-gp_defconfig +++ b/configs/db-mv784mp-gp_defconfig @@ -51,6 +51,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index 9d24f9c16b..34a38381f4 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -24,6 +24,7 @@ CONFIG_MVSATA_IDE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig index 428ac8ce64..6135f0f6f9 100644 --- a/configs/ds109_defconfig +++ b/configs/ds109_defconfig @@ -20,6 +20,7 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_FS_EXT4=y diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index eb3fe759e8..04ed9fa68e 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -44,6 +44,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig index d222c335fe..5dd1b67367 100644 --- a/configs/inetspace_v2_defconfig +++ b/configs/inetspace_v2_defconfig @@ -31,6 +31,7 @@ CONFIG_MVSATA_IDE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig index aeb55c12c0..2c2b2ce0e1 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -29,5 +29,6 @@ CONFIG_ENV_IS_IN_EEPROM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y CONFIG_OF_LIBFDT=y diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig index 9eed13197e..de363e3de7 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -29,5 +29,6 @@ CONFIG_ENV_IS_IN_EEPROM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y CONFIG_OF_LIBFDT=y diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig index b24c68513c..7a9c48a8ad 100644 --- a/configs/km_kirkwood_pci_defconfig +++ b/configs/km_kirkwood_pci_defconfig @@ -29,5 +29,6 @@ CONFIG_ENV_IS_IN_EEPROM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y CONFIG_OF_LIBFDT=y diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index 6eb4781a0c..f10b9d7087 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -29,5 +29,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y CONFIG_OF_LIBFDT=y diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig index 22b8b4d238..952b676197 100644 --- a/configs/kmnusa_defconfig +++ b/configs/kmnusa_defconfig @@ -29,5 +29,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y CONFIG_OF_LIBFDT=y diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig index a105b8a81a..99d62bc7aa 100644 --- a/configs/kmsugp1_defconfig +++ b/configs/kmsugp1_defconfig @@ -29,5 +29,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y CONFIG_OF_LIBFDT=y diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig index 59d10668a2..db7af87ac4 100644 --- a/configs/kmsuv31_defconfig +++ b/configs/kmsuv31_defconfig @@ -29,5 +29,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y CONFIG_OF_LIBFDT=y diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig index 077df1a5bf..fa993540bc 100644 --- a/configs/lschlv2_defconfig +++ b/configs/lschlv2_defconfig @@ -33,6 +33,7 @@ CONFIG_MVSATA_IDE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig index 3627eb998b..495e283d58 100644 --- a/configs/lsxhl_defconfig +++ b/configs/lsxhl_defconfig @@ -25,6 +25,7 @@ CONFIG_MVSATA_IDE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig index febcee0260..f073739f0b 100644 --- a/configs/maxbcm_defconfig +++ b/configs/maxbcm_defconfig @@ -37,3 +37,4 @@ CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig index 27f399582c..60540506c2 100644 --- a/configs/mgcoge3un_defconfig +++ b/configs/mgcoge3un_defconfig @@ -29,5 +29,6 @@ CONFIG_ENV_IS_IN_EEPROM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y CONFIG_OF_LIBFDT=y diff --git a/configs/mvebu_db_armada8k_defconfig b/configs/mvebu_db_armada8k_defconfig index 253be256b7..7a479c16c6 100644 --- a/configs/mvebu_db_armada8k_defconfig +++ b/configs/mvebu_db_armada8k_defconfig @@ -55,6 +55,7 @@ CONFIG_DEBUG_UART_CLOCK=200000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/mvebu_mcbin-88f8040_defconfig b/configs/mvebu_mcbin-88f8040_defconfig index 91f141ef23..9ce911ae16 100644 --- a/configs/mvebu_mcbin-88f8040_defconfig +++ b/configs/mvebu_mcbin-88f8040_defconfig @@ -59,6 +59,7 @@ CONFIG_DEBUG_UART_CLOCK=200000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig index 76b1f90354..4fa87ad38c 100644 --- a/configs/net2big_v2_defconfig +++ b/configs/net2big_v2_defconfig @@ -31,6 +31,7 @@ CONFIG_MVSATA_IDE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig index 67cb4dd2e9..9f5a2fc729 100644 --- a/configs/netspace_lite_v2_defconfig +++ b/configs/netspace_lite_v2_defconfig @@ -31,6 +31,7 @@ CONFIG_MVSATA_IDE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig index dc72128275..398915fc58 100644 --- a/configs/netspace_max_v2_defconfig +++ b/configs/netspace_max_v2_defconfig @@ -31,6 +31,7 @@ CONFIG_MVSATA_IDE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig index f2dec062e7..4a7c68276a 100644 --- a/configs/netspace_mini_v2_defconfig +++ b/configs/netspace_mini_v2_defconfig @@ -29,4 +29,5 @@ CONFIG_MVSATA_IDE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_OF_LIBFDT=y diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig index c898150d9e..e0dddfbc0e 100644 --- a/configs/netspace_v2_defconfig +++ b/configs/netspace_v2_defconfig @@ -31,6 +31,7 @@ CONFIG_MVSATA_IDE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig index 7db41108b8..f17841b536 100644 --- a/configs/portl2_defconfig +++ b/configs/portl2_defconfig @@ -29,5 +29,6 @@ CONFIG_ENV_IS_IN_EEPROM=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_BCH=y CONFIG_OF_LIBFDT=y diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig index f602c839c3..266bcb375e 100644 --- a/configs/theadorable_debug_defconfig +++ b/configs/theadorable_debug_defconfig @@ -56,6 +56,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig index ffb26cdac3..fe44ef3f80 100644 --- a/configs/turris_omnia_defconfig +++ b/configs/turris_omnia_defconfig @@ -40,6 +40,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000 CONFIG_DEBUG_UART_CLOCK=250000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y +CONFIG_KIRKWOOD_SPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 79cd54e10c..21dd6e0969 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -257,6 +257,12 @@ config TI_QSPI Enable the TI Quad-SPI (QSPI) driver for DRA7xx and AM43xx evms. This driver support spi flash single, quad and memory reads. +config KIRKWOOD_SPI + bool "Marvell Kirkwood SPI Driver" + help + Enable support for SPI on various Marvell SoCs, such as + Kirkwood and Armada 375. + config LPC32XX_SSP bool "LPC32XX SPI Driver" help diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 7a739e39d7..c0f5b31550 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -37,7 +37,6 @@ #ifdef CONFIG_CMD_SF #define CONFIG_HARD_SPI 1 -#define CONFIG_KIRKWOOD_SPI 1 #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 50000000 /* 50 MHz */ diff --git a/include/configs/ds109.h b/include/configs/ds109.h index a2c6837348..0040fbb427 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -40,7 +40,6 @@ #ifdef CONFIG_CMD_SF #define CONFIG_HARD_SPI 1 -#define CONFIG_KIRKWOOD_SPI 1 #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 50000000 /* 50 MHz */ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 86e0d43821..6433550dbb 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -64,7 +64,6 @@ /* * SPI Flash configuration */ -#define CONFIG_KIRKWOOD_SPI #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2fa4cf13e4..7e515db154 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1092,7 +1092,6 @@ CONFIG_KIRKWOOD_EGIGA_INIT CONFIG_KIRKWOOD_GPIO CONFIG_KIRKWOOD_PCIE_INIT CONFIG_KIRKWOOD_RGMII_PAD_1V8 -CONFIG_KIRKWOOD_SPI CONFIG_KIRQ_EN CONFIG_KM8321 CONFIG_KMCOGE4 From patchwork Wed Feb 7 00:42:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tuomas Tynkkynen X-Patchwork-Id: 870165 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zbjNQ1L06z9ryk for ; Wed, 7 Feb 2018 11:47:50 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CBA31C21E1D; Wed, 7 Feb 2018 00:46:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8AFEEC21EAE; Wed, 7 Feb 2018 00:42:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 03EF6C21D6A; Wed, 7 Feb 2018 00:42:38 +0000 (UTC) Received: from mx1.mpynet.fi (mx1.mpynet.fi [82.197.21.84]) by lists.denx.de (Postfix) with ESMTPS id 9F98DC21C50 for ; Wed, 7 Feb 2018 00:42:38 +0000 (UTC) From: Tuomas Tynkkynen To: Date: Wed, 7 Feb 2018 02:42:23 +0200 Message-ID: <20180207004223.10932-9-tuomas@tuxera.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180207004223.10932-1-tuomas@tuxera.com> References: <20180207004223.10932-1-tuomas@tuxera.com> MIME-Version: 1.0 X-ClientProxiedBy: tuxera-exch.ad.tuxera.com (10.20.48.11) To tuxera-exch.ad.tuxera.com (10.20.48.11) Received-SPF: none Cc: Tom Rini , Jagan Teki Subject: [U-Boot] [PATCH 8/8] spi: Migrate CONFIG_CF_SPI to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Tuomas Tynkkynen --- configs/M52277EVB_defconfig | 1 + configs/M52277EVB_stmicro_defconfig | 1 + configs/M54418TWR_defconfig | 1 + configs/M54418TWR_nand_mii_defconfig | 1 + configs/M54418TWR_nand_rmii_defconfig | 1 + configs/M54418TWR_nand_rmii_lowfreq_defconfig | 1 + configs/M54418TWR_serial_mii_defconfig | 1 + configs/M54418TWR_serial_rmii_defconfig | 1 + configs/M54451EVB_defconfig | 1 + configs/M54451EVB_stmicro_defconfig | 1 + configs/M54455EVB_a66_defconfig | 1 + configs/M54455EVB_defconfig | 1 + configs/M54455EVB_i66_defconfig | 1 + configs/M54455EVB_intel_defconfig | 1 + configs/M54455EVB_stm33_defconfig | 1 + configs/stmark2_defconfig | 1 + drivers/spi/Kconfig | 6 ++++++ include/configs/M52277EVB.h | 1 - include/configs/M54418TWR.h | 1 - include/configs/M54451EVB.h | 1 - include/configs/M54455EVB.h | 1 - include/configs/stmark2.h | 1 - scripts/config_whitelist.txt | 1 - 23 files changed, 22 insertions(+), 6 deletions(-) diff --git a/configs/M52277EVB_defconfig b/configs/M52277EVB_defconfig index 74ea619008..2c08494e85 100644 --- a/configs/M52277EVB_defconfig +++ b/configs/M52277EVB_defconfig @@ -19,3 +19,4 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_CF_SPI=y diff --git a/configs/M52277EVB_stmicro_defconfig b/configs/M52277EVB_stmicro_defconfig index 13055c52f5..497902ae3c 100644 --- a/configs/M52277EVB_stmicro_defconfig +++ b/configs/M52277EVB_stmicro_defconfig @@ -18,3 +18,4 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_CF_SPI=y diff --git a/configs/M54418TWR_defconfig b/configs/M54418TWR_defconfig index b26c94e060..eaea5d6656 100644 --- a/configs/M54418TWR_defconfig +++ b/configs/M54418TWR_defconfig @@ -20,3 +20,4 @@ CONFIG_CMD_CACHE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y +CONFIG_CF_SPI=y diff --git a/configs/M54418TWR_nand_mii_defconfig b/configs/M54418TWR_nand_mii_defconfig index cf015333cd..5b54de34a4 100644 --- a/configs/M54418TWR_nand_mii_defconfig +++ b/configs/M54418TWR_nand_mii_defconfig @@ -19,3 +19,4 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y +CONFIG_CF_SPI=y diff --git a/configs/M54418TWR_nand_rmii_defconfig b/configs/M54418TWR_nand_rmii_defconfig index bd36aaabe3..01c06e4c86 100644 --- a/configs/M54418TWR_nand_rmii_defconfig +++ b/configs/M54418TWR_nand_rmii_defconfig @@ -19,3 +19,4 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y +CONFIG_CF_SPI=y diff --git a/configs/M54418TWR_nand_rmii_lowfreq_defconfig b/configs/M54418TWR_nand_rmii_lowfreq_defconfig index 2b9e539e71..1629f90499 100644 --- a/configs/M54418TWR_nand_rmii_lowfreq_defconfig +++ b/configs/M54418TWR_nand_rmii_lowfreq_defconfig @@ -19,3 +19,4 @@ CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y +CONFIG_CF_SPI=y diff --git a/configs/M54418TWR_serial_mii_defconfig b/configs/M54418TWR_serial_mii_defconfig index aa21072703..ad40f1de32 100644 --- a/configs/M54418TWR_serial_mii_defconfig +++ b/configs/M54418TWR_serial_mii_defconfig @@ -20,3 +20,4 @@ CONFIG_CMD_CACHE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y +CONFIG_CF_SPI=y diff --git a/configs/M54418TWR_serial_rmii_defconfig b/configs/M54418TWR_serial_rmii_defconfig index b26c94e060..eaea5d6656 100644 --- a/configs/M54418TWR_serial_rmii_defconfig +++ b/configs/M54418TWR_serial_rmii_defconfig @@ -20,3 +20,4 @@ CONFIG_CMD_CACHE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_ATMEL=y +CONFIG_CF_SPI=y diff --git a/configs/M54451EVB_defconfig b/configs/M54451EVB_defconfig index d184bca011..00cfecd4e5 100644 --- a/configs/M54451EVB_defconfig +++ b/configs/M54451EVB_defconfig @@ -22,3 +22,4 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_CF_SPI=y diff --git a/configs/M54451EVB_stmicro_defconfig b/configs/M54451EVB_stmicro_defconfig index 715b2c32a2..06a7e6ac08 100644 --- a/configs/M54451EVB_stmicro_defconfig +++ b/configs/M54451EVB_stmicro_defconfig @@ -21,3 +21,4 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_CF_SPI=y diff --git a/configs/M54455EVB_a66_defconfig b/configs/M54455EVB_a66_defconfig index 2027481a2b..06b9e8c56d 100644 --- a/configs/M54455EVB_a66_defconfig +++ b/configs/M54455EVB_a66_defconfig @@ -26,3 +26,4 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_CF_SPI=y diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig index ce7af8a3c8..8299e51ed6 100644 --- a/configs/M54455EVB_defconfig +++ b/configs/M54455EVB_defconfig @@ -27,3 +27,4 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_CF_SPI=y diff --git a/configs/M54455EVB_i66_defconfig b/configs/M54455EVB_i66_defconfig index b0eff24d96..64383e66b3 100644 --- a/configs/M54455EVB_i66_defconfig +++ b/configs/M54455EVB_i66_defconfig @@ -26,3 +26,4 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_CF_SPI=y diff --git a/configs/M54455EVB_intel_defconfig b/configs/M54455EVB_intel_defconfig index 279f716847..30c8783799 100644 --- a/configs/M54455EVB_intel_defconfig +++ b/configs/M54455EVB_intel_defconfig @@ -26,3 +26,4 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_CF_SPI=y diff --git a/configs/M54455EVB_stm33_defconfig b/configs/M54455EVB_stm33_defconfig index fd36f22ab7..32ad61b960 100644 --- a/configs/M54455EVB_stm33_defconfig +++ b/configs/M54455EVB_stm33_defconfig @@ -26,3 +26,4 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y +CONFIG_CF_SPI=y diff --git a/configs/stmark2_defconfig b/configs/stmark2_defconfig index 0bffde0168..f7c6d9261a 100644 --- a/configs/stmark2_defconfig +++ b/configs/stmark2_defconfig @@ -23,4 +23,5 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:1m(u-boot),7m(kernel),-(rootfs)" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MTD=y +CONFIG_CF_SPI=y CONFIG_REGEX=y diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 21dd6e0969..235a8c7d73 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -212,6 +212,12 @@ config SOFT_SPI Enable Soft SPI driver. This driver is to use GPIO simulate the SPI protocol. +config CF_SPI + bool "ColdFire SPI driver" + help + Enable the ColdFire SPI driver. This driver can be used on + some m68k SoCs. + config FSL_ESPI bool "Freescale eSPI driver" help diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 72183f284a..9d6bb5e7e8 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -105,7 +105,6 @@ #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR /* DSPI and Serial Flash */ -#define CONFIG_CF_SPI #define CONFIG_CF_DSPI #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x7 diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index 3e2b6e174e..fbd725839f 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -154,7 +154,6 @@ #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR /* DSPI and Serial Flash */ -#define CONFIG_CF_SPI #define CONFIG_CF_DSPI #define CONFIG_SERIAL_FLASH #define CONFIG_HARD_SPI diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index ebc8277ec4..f2b133cad2 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -119,7 +119,6 @@ #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR /* DSPI and Serial Flash */ -#define CONFIG_CF_SPI #define CONFIG_CF_DSPI #define CONFIG_SERIAL_FLASH #define CONFIG_HARD_SPI diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index c5a0a0371d..ad88c6b904 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -146,7 +146,6 @@ #define CONFIG_SYS_IMMR CONFIG_SYS_MBAR /* DSPI and Serial Flash */ -#define CONFIG_CF_SPI #define CONFIG_CF_DSPI #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x13 diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index cefadc1e81..5d4e7db7bd 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -65,7 +65,6 @@ #undef CONFIG_MCFPIT /* DSPI and Serial Flash */ -#define CONFIG_CF_SPI #define CONFIG_CF_DSPI #define CONFIG_SF_DEFAULT_SPEED 50000000 #define CONFIG_SERIAL_FLASH diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7e515db154..2ace43500b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -229,7 +229,6 @@ CONFIG_CFG_DATA_SECTOR CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS CONFIG_CF_DSPI CONFIG_CF_SBF -CONFIG_CF_SPI CONFIG_CF_V2 CONFIG_CF_V3 CONFIG_CF_V4