Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1157057/?format=api
{ "id": 1157057, "url": "http://patchwork.ozlabs.org/api/patches/1157057/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20190903143850.9824-11-lukma@denx.de/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "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-11-lukma@denx.de>", "list_archive_url": null, "date": "2019-09-03T14:38:46", "name": "[U-Boot,v2,10/14] ARM: display5: Remove common.c file (after DM/DTS U-Boot proper conversion)", "commit_ref": "21c7d34279a4f4247e1f20492b87828187a090df", "pull_url": null, "state": "accepted", "archived": false, "hash": "c4c16f64d47053c471d463efe075e47add974be5", "submitter": { "id": 70701, "url": "http://patchwork.ozlabs.org/api/people/70701/?format=api", "name": "Lukasz Majewski", "email": "lukma@denx.de" }, "delegate": { "id": 1693, "url": "http://patchwork.ozlabs.org/api/users/1693/?format=api", "username": "sbabic", "first_name": "Stefano", "last_name": "Babic", "email": "sbabic@denx.de" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20190903143850.9824-11-lukma@denx.de/mbox/", "series": [ { "id": 128783, "url": "http://patchwork.ozlabs.org/api/series/128783/?format=api", "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/1157057/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1157057/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "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=<UNKNOWN>)", "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 46N8rQ0Qxmz9sDB\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 4 Sep 2019 00:45:26 +1000 (AEST)", "by lists.denx.de (Postfix, from userid 105)\n\tid B134EC21DC1; Tue, 3 Sep 2019 14:41:10 +0000 (UTC)", "from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 9921EC21D74;\n\tTue, 3 Sep 2019 14:41:08 +0000 (UTC)", "by lists.denx.de (Postfix, from userid 105)\n\tid C1050C21DA1; Tue, 3 Sep 2019 14:39:28 +0000 (UTC)", "from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10])\n\tby lists.denx.de (Postfix) with ESMTPS id 00122C21E02\n\tfor <u-boot@lists.denx.de>; Tue, 3 Sep 2019 14:39:25 +0000 (UTC)", "from frontend01.mail.m-online.net (unknown [192.168.8.182])\n\tby mail-out.m-online.net (Postfix) with ESMTP id 46N8jT5jxZz1rWT6;\n\tTue, 3 Sep 2019 16:39:25 +0200 (CEST)", "from localhost (dynscan1.mnet-online.de [192.168.6.70])\n\tby mail.m-online.net (Postfix) with ESMTP id 46N8jT5FTXz1qqkP;\n\tTue, 3 Sep 2019 16:39:25 +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 YX6ynzXx312v; Tue, 3 Sep 2019 16:39:24 +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:24 +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": "zFjDWpQ9soRNhSXXHSiuFU5+s7DjuRmrpggB7BMe9X0=", "From": "Lukasz Majewski <lukma@denx.de>", "To": "u-boot@lists.denx.de,\n\tStefano Babic <sbabic@denx.de>", "Date": "Tue, 3 Sep 2019 16:38:46 +0200", "Message-Id": "<20190903143850.9824-11-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": "Tom Rini <trini@konsulko.com>", "Subject": "[U-Boot] [PATCH v2 10/14] ARM: display5: Remove common.c file\n\t(after DM/DTS U-Boot proper conversion)", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.18", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<http://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>", "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\" <u-boot-bounces@lists.denx.de>" }, "content": "The common.c file content can be safely moved to spl.c file after\nperforming the DM/DTS conversion for the U-Boot proper.\n\nIt contains the non DM/DTS setup code, which now is only used by SPL.\n\nSigned-off-by: Lukasz Majewski <lukma@denx.de>\n---\n\nChanges in v2: None\n\n board/liebherr/display5/Makefile | 4 +-\n board/liebherr/display5/common.c | 83 ----------------------------------------\n board/liebherr/display5/common.h | 5 ---\n board/liebherr/display5/spl.c | 74 +++++++++++++++++++++++++++++++++++\n 4 files changed, 76 insertions(+), 90 deletions(-)\n delete mode 100644 board/liebherr/display5/common.c", "diff": "diff --git a/board/liebherr/display5/Makefile b/board/liebherr/display5/Makefile\nindex f934672428ab..ee503add75d3 100644\n--- a/board/liebherr/display5/Makefile\n+++ b/board/liebherr/display5/Makefile\n@@ -5,7 +5,7 @@\n # SPDX-License-Identifier: GPL-2.0+\n #\n ifdef CONFIG_SPL_BUILD\n-obj-y = common.o spl.o\n+obj-y = spl.o\n else\n-obj-y := common.o display5.o\n+obj-y := display5.o\n endif\ndiff --git a/board/liebherr/display5/common.c b/board/liebherr/display5/common.c\ndeleted file mode 100644\nindex 5e714076a49c..000000000000\n--- a/board/liebherr/display5/common.c\n+++ /dev/null\n@@ -1,83 +0,0 @@\n-// SPDX-License-Identifier: GPL-2.0+\n-/*\n- * Copyright (C) 2017 DENX Software Engineering\n- * Lukasz Majewski, DENX Software Engineering, lukma@denx.de\n- */\n-\n-#include <asm/mach-imx/iomux-v3.h>\n-#include <asm/arch/mx6-pins.h>\n-#include \"common.h\"\n-\n-iomux_v3_cfg_t const uart_console_pads[] = {\n-\t/* UART5 */\n-\tMX6_PAD_CSI0_DAT14__UART5_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),\n-\tMX6_PAD_CSI0_DAT15__UART5_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),\n-\tMX6_PAD_CSI0_DAT18__UART5_RTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),\n-\tMX6_PAD_CSI0_DAT19__UART5_CTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),\n-};\n-\n-void displ5_set_iomux_uart_spl(void)\n-{\n-\tSETUP_IOMUX_PADS(uart_console_pads);\n-}\n-\n-iomux_v3_cfg_t const misc_pads_spl[] = {\n-\t/* Emergency recovery pin */\n-\tMX6_PAD_EIM_D29__GPIO3_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL),\n-};\n-\n-void displ5_set_iomux_misc_spl(void)\n-{\n-\tSETUP_IOMUX_PADS(misc_pads_spl);\n-}\n-\n-#ifdef CONFIG_MXC_SPI\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-\tMX6_PAD_CSI0_DAT9__ECSPI2_MOSI\t| MUX_PAD_CTRL(SPI_PAD_CTRL),\n-\tMX6_PAD_CSI0_DAT8__ECSPI2_SCLK\t| MUX_PAD_CTRL(SPI_PAD_CTRL),\n-\tMX6_PAD_CSI0_DAT11__GPIO5_IO29\t| MUX_PAD_CTRL(NO_PAD_CTRL),\n-\tMX6_PAD_SD3_DAT5__GPIO7_IO00\t| MUX_PAD_CTRL(NO_PAD_CTRL),\n-};\n-\n-int board_spi_cs_gpio(unsigned int bus, unsigned int cs)\n-{\n-\tif (bus != 1 || cs != 0)\n-\t\treturn -EINVAL;\n-\n-\treturn IMX_GPIO_NR(5, 29);\n-}\n-\n-void displ5_set_iomux_ecspi_spl(void)\n-{\n-\tSETUP_IOMUX_PADS(ecspi2_pads);\n-}\n-\n-#else\n-void displ5_set_iomux_ecspi_spl(void) {}\n-#endif\n-\n-#ifdef CONFIG_FSL_ESDHC_IMX\n-iomux_v3_cfg_t const usdhc4_pads[] = {\n-\tMX6_PAD_SD4_CLK__SD4_CLK\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n-\tMX6_PAD_SD4_CMD__SD4_CMD\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n-\tMX6_PAD_SD4_DAT0__SD4_DATA0\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n-\tMX6_PAD_SD4_DAT1__SD4_DATA1\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n-\tMX6_PAD_SD4_DAT2__SD4_DATA2\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n-\tMX6_PAD_SD4_DAT3__SD4_DATA3\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n-\tMX6_PAD_SD4_DAT4__SD4_DATA4\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n-\tMX6_PAD_SD4_DAT5__SD4_DATA5\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n-\tMX6_PAD_SD4_DAT6__SD4_DATA6\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n-\tMX6_PAD_SD4_DAT7__SD4_DATA7\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n-\tMX6_PAD_NANDF_ALE__SD4_RESET\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n-};\n-\n-void displ5_set_iomux_usdhc_spl(void)\n-{\n-\tSETUP_IOMUX_PADS(usdhc4_pads);\n-}\n-\n-#else\n-void displ5_set_iomux_usdhc_spl(void) {}\n-#endif\ndiff --git a/board/liebherr/display5/common.h b/board/liebherr/display5/common.h\nindex 4eb70dc42fb6..44c7470074ce 100644\n--- a/board/liebherr/display5/common.h\n+++ b/board/liebherr/display5/common.h\n@@ -31,9 +31,4 @@\n #define ENET_PAD_CTRL_CLK ((PAD_CTL_PUS_100K_UP & ~PAD_CTL_PKE) | \\\n \tPAD_CTL_SPEED_HIGH | PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)\n \n-void displ5_set_iomux_uart_spl(void);\n-void displ5_set_iomux_ecspi_spl(void);\n-void displ5_set_iomux_usdhc_spl(void);\n-void displ5_set_iomux_misc_spl(void);\n-\n #endif /* __DISPL5_COMMON_H_ */\ndiff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c\nindex 354b63e431f6..311edaf939cc 100644\n--- a/board/liebherr/display5/spl.c\n+++ b/board/liebherr/display5/spl.c\n@@ -104,6 +104,80 @@ static const struct mx6_ddr3_cfg mt41k128m16jt_125 = {\n \t.trasmin = 3500,\n };\n \n+iomux_v3_cfg_t const uart_console_pads[] = {\n+\t/* UART5 */\n+\tMX6_PAD_CSI0_DAT14__UART5_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),\n+\tMX6_PAD_CSI0_DAT15__UART5_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),\n+\tMX6_PAD_CSI0_DAT18__UART5_RTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),\n+\tMX6_PAD_CSI0_DAT19__UART5_CTS_B | MUX_PAD_CTRL(UART_PAD_CTRL),\n+};\n+\n+void displ5_set_iomux_uart_spl(void)\n+{\n+\tSETUP_IOMUX_PADS(uart_console_pads);\n+}\n+\n+iomux_v3_cfg_t const misc_pads_spl[] = {\n+\t/* Emergency recovery pin */\n+\tMX6_PAD_EIM_D29__GPIO3_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL),\n+};\n+\n+void displ5_set_iomux_misc_spl(void)\n+{\n+\tSETUP_IOMUX_PADS(misc_pads_spl);\n+}\n+\n+#ifdef CONFIG_MXC_SPI\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+\tMX6_PAD_CSI0_DAT9__ECSPI2_MOSI\t| MUX_PAD_CTRL(SPI_PAD_CTRL),\n+\tMX6_PAD_CSI0_DAT8__ECSPI2_SCLK\t| MUX_PAD_CTRL(SPI_PAD_CTRL),\n+\tMX6_PAD_CSI0_DAT11__GPIO5_IO29\t| MUX_PAD_CTRL(NO_PAD_CTRL),\n+\tMX6_PAD_SD3_DAT5__GPIO7_IO00\t| MUX_PAD_CTRL(NO_PAD_CTRL),\n+};\n+\n+int board_spi_cs_gpio(unsigned int bus, unsigned int cs)\n+{\n+\tif (bus != 1 || cs != 0)\n+\t\treturn -EINVAL;\n+\n+\treturn IMX_GPIO_NR(5, 29);\n+}\n+\n+void displ5_set_iomux_ecspi_spl(void)\n+{\n+\tSETUP_IOMUX_PADS(ecspi2_pads);\n+}\n+\n+#else\n+void displ5_set_iomux_ecspi_spl(void) {}\n+#endif\n+\n+#ifdef CONFIG_FSL_ESDHC_IMX\n+iomux_v3_cfg_t const usdhc4_pads[] = {\n+\tMX6_PAD_SD4_CLK__SD4_CLK\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n+\tMX6_PAD_SD4_CMD__SD4_CMD\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n+\tMX6_PAD_SD4_DAT0__SD4_DATA0\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n+\tMX6_PAD_SD4_DAT1__SD4_DATA1\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n+\tMX6_PAD_SD4_DAT2__SD4_DATA2\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n+\tMX6_PAD_SD4_DAT3__SD4_DATA3\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n+\tMX6_PAD_SD4_DAT4__SD4_DATA4\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n+\tMX6_PAD_SD4_DAT5__SD4_DATA5\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n+\tMX6_PAD_SD4_DAT6__SD4_DATA6\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n+\tMX6_PAD_SD4_DAT7__SD4_DATA7\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n+\tMX6_PAD_NANDF_ALE__SD4_RESET\t| MUX_PAD_CTRL(USDHC_PAD_CTRL),\n+};\n+\n+void displ5_set_iomux_usdhc_spl(void)\n+{\n+\tSETUP_IOMUX_PADS(usdhc4_pads);\n+}\n+\n+#else\n+void displ5_set_iomux_usdhc_spl(void) {}\n+#endif\n+\n static void ccgr_init(void)\n {\n \tstruct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;\n", "prefixes": [ "U-Boot", "v2", "10/14" ] }