{"id":1157051,"url":"http://patchwork.ozlabs.org/api/patches/1157051/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20190903143850.9824-8-lukma@denx.de/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20190903143850.9824-8-lukma@denx.de>","list_archive_url":null,"date":"2019-09-03T14:38:43","name":"[U-Boot,v2,07/14] DM: SPI: Convert display5 to use SPI with DM/DTS (but no in SPL)","commit_ref":"e95b4bdd8dcadeecd516406387604aa56b76804c","pull_url":null,"state":"accepted","archived":false,"hash":"1667737ebb27f923b10d2da379735aad4b68818c","submitter":{"id":70701,"url":"http://patchwork.ozlabs.org/api/people/70701/?format=json","name":"Lukasz Majewski","email":"lukma@denx.de"},"delegate":{"id":1693,"url":"http://patchwork.ozlabs.org/api/users/1693/?format=json","username":"sbabic","first_name":"Stefano","last_name":"Babic","email":"sbabic@denx.de"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20190903143850.9824-8-lukma@denx.de/mbox/","series":[{"id":128783,"url":"http://patchwork.ozlabs.org/api/series/128783/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=128783","date":"2019-09-03T14:38:36","name":"DM: display5: Convert display5 board to DM/DTS (including 'factory' setup)","version":2,"mbox":"http://patchwork.ozlabs.org/series/128783/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1157051/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1157051/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=denx.de"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 46N8pP1Vv5z9sDB\n\tfor ;\n\tWed, 4 Sep 2019 00:43:41 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid D21F2C21E1B; Tue, 3 Sep 2019 14:41:35 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 27BCEC21E26;\n\tTue, 3 Sep 2019 14:41:33 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 40436C21DFA; Tue, 3 Sep 2019 14:39:24 +0000 (UTC)","from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9])\n\tby lists.denx.de (Postfix) with ESMTPS id AD54BC21E0F\n\tfor ; Tue, 3 Sep 2019 14:39:21 +0000 (UTC)","from frontend01.mail.m-online.net (unknown [192.168.8.182])\n\tby mail-out.m-online.net (Postfix) with ESMTP id 46N8jP3d2Mz1rLlZ;\n\tTue, 3 Sep 2019 16:39:21 +0200 (CEST)","from localhost (dynscan1.mnet-online.de [192.168.6.70])\n\tby mail.m-online.net (Postfix) with ESMTP id 46N8jP2LPrz1qqkP;\n\tTue, 3 Sep 2019 16:39:21 +0200 (CEST)","from mail.mnet-online.de ([192.168.8.182])\n\tby localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new,\n\tport 10024)\n\twith ESMTP id QIumt9X8Cwwq; Tue, 3 Sep 2019 16:39:19 +0200 (CEST)","from localhost.localdomain (85-222-111-42.dynamic.chello.pl\n\t[85.222.111.42])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby mail.mnet-online.de (Postfix) with ESMTPSA;\n\tTue, 3 Sep 2019 16:39:19 +0200 (CEST)"],"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=none autolearn=unavailable\n\tautolearn_force=no version=3.4.0","X-Virus-Scanned":"amavisd-new at mnet-online.de","X-Auth-Info":"sHjmr9R74cAExGJPZHdbHKolyCynETLjEP1YPxUA6b4=","From":"Lukasz Majewski ","To":"u-boot@lists.denx.de,\n\tStefano Babic ","Date":"Tue, 3 Sep 2019 16:38:43 +0200","Message-Id":"<20190903143850.9824-8-lukma@denx.de>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20190903143850.9824-1-lukma@denx.de>","References":"<20190903143850.9824-1-lukma@denx.de>","Cc":"Marek Vasut , Fabio Berton ,\n\tParthiban Nallathambi ,\n\tOtavio Salvador ,\n\tMartyn Welch , \n\t\"NXP i.MX U-Boot Team\" ","Subject":"[U-Boot] [PATCH v2 07/14] DM: SPI: Convert display5 to use SPI with\n\tDM/DTS (but no in SPL)","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"The DM/DTS support for SPI is disabled on purpose for SPL, as it is not\nsupported as of time of this conversion.\n\nSigned-off-by: Lukasz Majewski \n\n---\n\nChanges in v2:\n- Use dm_gpio_* instead of legacy gpio_* functions\n\n arch/arm/mach-imx/mx6/Kconfig | 1 +\n board/liebherr/display5/common.c | 18 ------------------\n board/liebherr/display5/common.h | 1 -\n board/liebherr/display5/display5.c | 37 ++++++++++++-------------------------\n configs/display5_defconfig | 3 +++\n include/configs/display5.h | 7 +++++--\n 6 files changed, 21 insertions(+), 46 deletions(-)","diff":"diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig\nindex aef18726702b..f0786b5ffb40 100644\n--- a/arch/arm/mach-imx/mx6/Kconfig\n+++ b/arch/arm/mach-imx/mx6/Kconfig\n@@ -190,6 +190,7 @@ config TARGET_DISPLAY5\n \tselect DM_ETH\n \tselect DM_I2C\n \tselect DM_MMC\n+\tselect DM_SPI\n \tselect DM_GPIO\n \tselect DM_SERIAL\n \tselect SUPPORT_SPL\ndiff --git a/board/liebherr/display5/common.c b/board/liebherr/display5/common.c\nindex 754c442427f8..d2d174beaa0d 100644\n--- a/board/liebherr/display5/common.c\n+++ b/board/liebherr/display5/common.c\n@@ -45,18 +45,6 @@ void displ5_set_iomux_misc_spl(void)\n }\n \n #ifdef CONFIG_MXC_SPI\n-iomux_v3_cfg_t const ecspi_pads[] = {\n-\t/* SPI3 */\n-\tMX6_PAD_DISP0_DAT2__ECSPI3_MISO\t| MUX_PAD_CTRL(SPI_PAD_CTRL),\n-\tMX6_PAD_DISP0_DAT1__ECSPI3_MOSI\t| MUX_PAD_CTRL(SPI_PAD_CTRL),\n-\tMX6_PAD_DISP0_DAT0__ECSPI3_SCLK\t| MUX_PAD_CTRL(SPI_PAD_CTRL),\n-\tMX6_PAD_DISP0_DAT3__ECSPI3_SS0\t| MUX_PAD_CTRL(NO_PAD_CTRL),\n-\tMX6_PAD_DISP0_DAT4__ECSPI3_SS1\t| MUX_PAD_CTRL(NO_PAD_CTRL),\n-\tMX6_PAD_DISP0_DAT5__ECSPI3_SS2\t| MUX_PAD_CTRL(NO_PAD_CTRL),\n-\tMX6_PAD_DISP0_DAT6__ECSPI3_SS3\t| MUX_PAD_CTRL(NO_PAD_CTRL),\n-\tMX6_PAD_DISP0_DAT7__ECSPI3_RDY\t| MUX_PAD_CTRL(NO_PAD_CTRL),\n-};\n-\n iomux_v3_cfg_t const ecspi2_pads[] = {\n \t/* SPI2, NOR Flash nWP, CS0 */\n \tMX6_PAD_CSI0_DAT10__ECSPI2_MISO\t| MUX_PAD_CTRL(SPI_PAD_CTRL),\n@@ -79,14 +67,8 @@ void displ5_set_iomux_ecspi_spl(void)\n \tSETUP_IOMUX_PADS(ecspi2_pads);\n }\n \n-void displ5_set_iomux_ecspi(void)\n-{\n-\tSETUP_IOMUX_PADS(ecspi_pads);\n-}\n-\n #else\n void displ5_set_iomux_ecspi_spl(void) {}\n-void displ5_set_iomux_ecspi(void) {}\n #endif\n \n #ifdef CONFIG_FSL_ESDHC_IMX\ndiff --git a/board/liebherr/display5/common.h b/board/liebherr/display5/common.h\nindex 231cefc96009..2bbd934e7a70 100644\n--- a/board/liebherr/display5/common.h\n+++ b/board/liebherr/display5/common.h\n@@ -34,7 +34,6 @@\n void displ5_set_iomux_uart_spl(void);\n void displ5_set_iomux_uart(void);\n void displ5_set_iomux_ecspi_spl(void);\n-void displ5_set_iomux_ecspi(void);\n void displ5_set_iomux_usdhc_spl(void);\n void displ5_set_iomux_misc_spl(void);\n \ndiff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c\nindex e008ea9a3fb8..541e3e94a5eb 100644\n--- a/board/liebherr/display5/display5.c\n+++ b/board/liebherr/display5/display5.c\n@@ -19,7 +19,6 @@\n #include \n #include \n #include \n-#include \n #include \n #include \n #include \n@@ -28,11 +27,6 @@\n #include \n #include \n \n-#ifndef CONFIG_MXC_SPI\n-#error \"CONFIG_SPI must be set for this board\"\n-#error \"Please check your config file\"\n-#endif\n-\n #include \"common.h\"\n \n DECLARE_GLOBAL_DATA_PTR;\n@@ -140,21 +134,6 @@ iomux_v3_cfg_t const misc_pads[] = {\n \tMX6_PAD_EIM_D29__GPIO3_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL),\n };\n \n-static void displ5_setup_ecspi(void)\n-{\n-\tint ret;\n-\n-\tdispl5_set_iomux_ecspi();\n-\n-\tret = gpio_request(IMX_GPIO_NR(5, 29), \"spi2_cs0\");\n-\tif (!ret)\n-\t\tgpio_direction_output(IMX_GPIO_NR(5, 29), 1);\n-\n-\tret = gpio_request(IMX_GPIO_NR(7, 0), \"spi2_#wp\");\n-\tif (!ret)\n-\t\tgpio_direction_output(IMX_GPIO_NR(7, 0), 1);\n-}\n-\n /*\n * Do not overwrite the console\n * Always use serial for U-Boot console\n@@ -188,7 +167,7 @@ int board_phy_config(struct phy_device *phydev)\n \n int board_init(void)\n {\n-\tstruct gpio_desc phy_int_gbe;\n+\tstruct gpio_desc phy_int_gbe, spi2_wp;\n \tint ret;\n \n \tdebug(\"board init\\n\");\n@@ -197,9 +176,6 @@ int board_init(void)\n \n \t/* Setup iomux for non console UARTS */\n \tdispl5_set_iomux_uart();\n-\n-\tdispl5_setup_ecspi();\n-\n \t/* Setup misc (application specific) stuff */\n \tSETUP_IOMUX_PADS(misc_pads);\n \n@@ -229,6 +205,17 @@ int board_init(void)\n \tiomuxc_set_rgmii_io_voltage(DDR_SEL_1P5V_IO);\n \tenable_fec_anatop_clock(0, ENET_125MHZ);\n \n+\t/* Setup #WP for SPI-NOR memory */\n+\tret = dm_gpio_lookup_name(\"GPIO7_0\", &spi2_wp);\n+\tif (ret) {\n+\t\tprintf(\"Cannot get GPIO7_0\\n\");\n+\t} else {\n+\t\tret = dm_gpio_request(&spi2_wp, \"spi2_#wp\");\n+\t\tif (!ret)\n+\t\t\tdm_gpio_set_dir_flags(&spi2_wp, GPIOD_IS_OUT |\n+\t\t\t\t\t GPIOD_IS_OUT_ACTIVE);\n+\t}\n+\n \treturn 0;\n }\n \ndiff --git a/configs/display5_defconfig b/configs/display5_defconfig\nindex 6c80a4d46678..3719eb40d5ea 100644\n--- a/configs/display5_defconfig\n+++ b/configs/display5_defconfig\n@@ -85,12 +85,15 @@ CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2\n CONFIG_SUPPORT_EMMC_BOOT=y\n CONFIG_FSL_USDHC=y\n CONFIG_MTD_DEVICE=y\n+CONFIG_DM_SPI_FLASH=y\n CONFIG_SPI_FLASH=y\n CONFIG_SF_DEFAULT_BUS=1\n CONFIG_SF_DEFAULT_MODE=0\n CONFIG_SF_DEFAULT_SPEED=50000000\n+CONFIG_SPI_FLASH_SFDP_SUPPORT=y\n CONFIG_SPI_FLASH_SPANSION=y\n CONFIG_SPI_FLASH_STMICRO=y\n+CONFIG_SPI_FLASH_MTD=y\n CONFIG_PHYLIB=y\n CONFIG_PHY_MARVELL=y\n CONFIG_FEC_MXC=y\ndiff --git a/include/configs/display5.h b/include/configs/display5.h\nindex 15027f153341..a3cb62367c4c 100644\n--- a/include/configs/display5.h\n+++ b/include/configs/display5.h\n@@ -35,8 +35,11 @@\n * 0x1540000 - 0x1640000 : SPI.factory (1MiB)\n */\n \n-#ifndef CONFIG_SPL_BUILD\n-#define CONFIG_SPI_FLASH_MTD\n+/* SPI Flash Configs */\n+#if defined(CONFIG_SPL_BUILD)\n+#undef CONFIG_DM_SPI\n+#undef CONFIG_DM_SPI_FLASH\n+#undef CONFIG_SPI_FLASH_MTD\n #endif\n \n /* Below values are \"dummy\" - only to avoid build break */\n","prefixes":["U-Boot","v2","07/14"]}