Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/414983/?format=api
{ "id": 414983, "url": "http://patchwork.ozlabs.org/api/patches/414983/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/1416973224-16794-2-git-send-email-yao.yuan@freescale.com/", "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": "<1416973224-16794-2-git-send-email-yao.yuan@freescale.com>", "list_archive_url": null, "date": "2014-11-26T03:40:24", "name": "[U-Boot,v2] ls1021aqds: add hwconfig setting to do pin mux", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "7f025e51f643fd2a705b233e439c818a2ae026a7", "submitter": { "id": 53507, "url": "http://patchwork.ozlabs.org/api/people/53507/?format=api", "name": "Yao Yuan", "email": "yao.yuan@freescale.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/1416973224-16794-2-git-send-email-yao.yuan@freescale.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/414983/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/414983/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", "Received": [ "from theia.denx.de (theia.denx.de [85.214.87.163])\n\tby ozlabs.org (Postfix) with ESMTP id 801F714019C\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 26 Nov 2014 15:15:33 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id D96404B604;\n\tWed, 26 Nov 2014 05:15:30 +0100 (CET)", "from theia.denx.de ([127.0.0.1])\n\tby localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 0iZNLrreXoYy; Wed, 26 Nov 2014 05:15:30 +0100 (CET)", "from theia.denx.de (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id 57E3C4B5FB;\n\tWed, 26 Nov 2014 05:15:30 +0100 (CET)", "from localhost (localhost [127.0.0.1])\n\tby theia.denx.de (Postfix) with ESMTP id BD4784B5FB\n\tfor <u-boot@lists.denx.de>; Wed, 26 Nov 2014 05:15:23 +0100 (CET)", "from theia.denx.de ([127.0.0.1])\n\tby localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 5rifwuVaUIYV for <u-boot@lists.denx.de>;\n\tWed, 26 Nov 2014 05:15:23 +0100 (CET)", "from na01-bn1-obe.outbound.protection.outlook.com\n\t(mail-bn1on0143.outbound.protection.outlook.com [157.56.110.143])\n\tby theia.denx.de (Postfix) with ESMTPS id 3CA6D4B5FA\n\tfor <u-boot@lists.denx.de>; Wed, 26 Nov 2014 05:15:18 +0100 (CET)", "from BL2PR03MB148.namprd03.prod.outlook.com (10.255.230.27) by\n\tBL2PR03MB291.namprd03.prod.outlook.com (10.141.68.25) with Microsoft\n\tSMTP Server (TLS) id 15.1.31.16; Wed, 26 Nov 2014 03:41:49 +0000", "from CH1PR03CA008.namprd03.prod.outlook.com (10.255.156.153) by\n\tBL2PR03MB148.namprd03.prod.outlook.com (10.255.230.27) with Microsoft\n\tSMTP Server (TLS) id 15.1.26.15; Wed, 26 Nov 2014 03:41:47 +0000", "from BY2FFO11FD005.protection.gbl (10.255.156.132) by\n\tCH1PR03CA008.outlook.office365.com (10.255.156.153) with Microsoft\n\tSMTP Server (TLS) id 15.1.26.15 via Frontend Transport;\n\tWed, 26 Nov 2014 03:41:47 +0000", "from tx30smr01.am.freescale.net (192.88.168.50) by\n\tBY2FFO11FD005.mail.protection.outlook.com (10.1.14.126) with\n\tMicrosoft SMTP Server (TLS) id 15.1.6.13 via Frontend Transport;\n\tWed, 26 Nov 2014 03:41:47 +0000", "from titan.ap.freescale.net ([10.192.208.233])\n\tby tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id\n\tsAQ3fgvB001552; Tue, 25 Nov 2014 20:41:45 -0700" ], "X-policyd-weight": "NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5\n\tNOT_IN_BL_NJABL=-1.5 (only DNSBL check requested)", "From": "Yuan Yao <yao.yuan@freescale.com>", "To": "<yorksun@freescale.com>", "Date": "Wed, 26 Nov 2014 11:40:24 +0800", "Message-ID": "<1416973224-16794-2-git-send-email-yao.yuan@freescale.com>", "X-Mailer": "git-send-email 2.1.0.27.g96db324", "In-Reply-To": "<1416973224-16794-1-git-send-email-yao.yuan@freescale.com>", "References": "<1416973224-16794-1-git-send-email-yao.yuan@freescale.com>", "X-EOPAttributedMessage": "0", "X-Forefront-Antispam-Report": "CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI;\n\tSFV:NSPM;\n\tSFS:(10019020)(6009001)(199003)(189002)(31966008)(36756003)(229853001)(2351001)(107046002)(95666004)(46102003)(104016003)(33646002)(21056001)(110136001)(102836001)(104166001)(575784001)(97736003)(86362001)(93916002)(105606002)(106466001)(120916001)(2371004)(62966003)(450100001)(77156002)(99396003)(88136002)(76176999)(50986999)(87286001)(87936001)(50466002)(64706001)(20776003)(47776003)(48376002)(89996001)(84676001)(19580405001)(19580395003)(92566001)(92726001)(68736004)(44976005)(6806004)(50226001)(4396001);\n\tDIR:OUT; SFP:1102; SCL:1; SRVR:BL2PR03MB148;\n\tH:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv;\n\tPTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; ", "MIME-Version": "1.0", "X-Microsoft-Antispam": [ "UriScan:;UriScan:;", "BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB148;", "BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB291;" ], "X-Exchange-Antispam-Report-Test": "UriScan:;", "X-Exchange-Antispam-Report-CFA-Test": [ "BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB148;", "BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB148;" ], "X-Forefront-PRVS": "04073E895A", "Received-SPF": "Fail (protection.outlook.com: domain of freescale.com does not\n\tdesignate 192.88.168.50 as permitted sender)\n\treceiver=protection.outlook.com; \n\tclient-ip=192.88.168.50; helo=tx30smr01.am.freescale.net;", "Authentication-Results": "spf=fail (sender IP is 192.88.168.50)\n\tsmtp.mailfrom=yao.yuan@freescale.com; ", "X-OriginatorOrg": "freescale.com", "Cc": "u-boot@lists.denx.de", "Subject": "[U-Boot] [PATCH v2] ls1021aqds: add hwconfig setting to do pin mux", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.13", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<http://lists.denx.de/mailman/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": "<http://lists.denx.de/mailman/listinfo/u-boot>,\n\t<mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "u-boot-bounces@lists.denx.de", "Errors-To": "u-boot-bounces@lists.denx.de" }, "content": "The Freescale LS1021AQDS share some pins, so Add the hwconfig option\nthat allows the user to choose which the function he wants.\n\nThe main pin mux IP is:\neSDHC, SAI, IIC2, RGMII, CAN, SAI.\n\nSigned-off-by: Yuan Yao <yao.yuan@freescale.com>\n---\n board/freescale/ls1021aqds/ls1021aqds.c | 65 +++++++++++++++++++++++++++++++--\n include/configs/ls1021aqds.h | 1 +\n 2 files changed, 63 insertions(+), 3 deletions(-)", "diff": "diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c\nindex 5fafc85..b5b8956 100644\n--- a/board/freescale/ls1021aqds/ls1021aqds.c\n+++ b/board/freescale/ls1021aqds/ls1021aqds.c\n@@ -10,6 +10,7 @@\n #include <asm/arch/immap_ls102xa.h>\n #include <asm/arch/clock.h>\n #include <asm/arch/fsl_serdes.h>\n+#include <hwconfig.h>\n #include <mmc.h>\n #include <fsl_esdhc.h>\n #include <fsl_ifc.h>\n@@ -21,6 +22,11 @@\n DECLARE_GLOBAL_DATA_PTR;\n \n enum {\n+\tMUX_TYPE_CAN,\n+\tMUX_TYPE_IIC2,\n+\tMUX_TYPE_RGMII,\n+\tMUX_TYPE_SAI,\n+\tMUX_TYPE_SDHC,\n \tMUX_TYPE_SD_PCI4,\n \tMUX_TYPE_SD_PC_SA_SG_SG,\n \tMUX_TYPE_SD_PC_SA_PC_SG,\n@@ -158,11 +164,27 @@ int board_early_init_f(void)\n \n int config_board_mux(int ctrl_type)\n {\n-\tu8 reg12;\n+\tu8 reg12, reg14;\n \n \treg12 = QIXIS_READ(brdcfg[12]);\n+\treg14 = QIXIS_READ(brdcfg[14]);\n \n \tswitch (ctrl_type) {\n+\tcase MUX_TYPE_CAN:\n+\t\treg14 = (reg14 & 0xf0) | 0x03;\n+\t\tbreak;\n+\tcase MUX_TYPE_IIC2:\n+\t\treg14 = (reg14 & 0x0f) | 0xa0;\n+\t\tbreak;\n+\tcase MUX_TYPE_RGMII:\n+\t\treg14 = (reg14 & 0xf0) | 0x0;\n+\t\tbreak;\n+\tcase MUX_TYPE_SAI:\n+\t\treg14 = (reg14 & 0xf0) | 0x0c;\n+\t\tbreak;\n+\tcase MUX_TYPE_SDHC:\n+\t\treg14 = (reg14 & 0x0f) | 0x0;\n+\t\tbreak;\n \tcase MUX_TYPE_SD_PCI4:\n \t\treg12 = 0x38;\n \t\tbreak;\n@@ -181,6 +203,7 @@ int config_board_mux(int ctrl_type)\n \t}\n \n \tQIXIS_WRITE(brdcfg[12], reg12);\n+\tQIXIS_WRITE(brdcfg[14], reg14);\n \n \treturn 0;\n }\n@@ -214,14 +237,50 @@ int config_serdes_mux(void)\n \treturn 0;\n }\n \n-#if defined(CONFIG_MISC_INIT_R)\n int misc_init_r(void)\n {\n+\tint conflict_flag;\n+\n+\t/* some signals can not enable simultaneous*/\n+\tconflict_flag = 0;\n+\tif (hwconfig(\"sdhc\"))\n+\t\tconflict_flag++;\n+\tif (hwconfig(\"iic2\"))\n+\t\tconflict_flag++;\n+\tif (conflict_flag > 1) {\n+\t\tprintf(\"WARNING: pin conflict !\\n\");\n+\t\treturn 0;\n+\t}\n+\n+\tconflict_flag = 0;\n+\tif (hwconfig(\"rgmii\"))\n+\t\tconflict_flag++;\n+\tif (hwconfig(\"can\"))\n+\t\tconflict_flag++;\n+\tif (hwconfig(\"sai\"))\n+\t\tconflict_flag++;\n+\tif (conflict_flag > 1) {\n+\t\tprintf(\"WARNING: pin conflict !\\n\");\n+\t\treturn 0;\n+\t}\n+\n+\tif (hwconfig(\"can\"))\n+\t\tconfig_board_mux(MUX_TYPE_CAN);\n+\telse if (hwconfig(\"rgmii\"))\n+\t\tconfig_board_mux(MUX_TYPE_RGMII);\n+\telse if (hwconfig(\"sai\"))\n+\t\tconfig_board_mux(MUX_TYPE_SAI);\n+\n+\tif (hwconfig(\"iic2\"))\n+\t\tconfig_board_mux(MUX_TYPE_IIC2);\n+\telse if (hwconfig(\"sdhc\"))\n+\t\tconfig_board_mux(MUX_TYPE_SDHC);\n+\n #ifdef CONFIG_FSL_CAAM\n \treturn sec_init();\n #endif\n+\treturn 0;\n }\n-#endif\n \n int board_init(void)\n {\ndiff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h\nindex b19a60f..0f5f988 100644\n--- a/include/configs/ls1021aqds.h\n+++ b/include/configs/ls1021aqds.h\n@@ -327,6 +327,7 @@ unsigned long get_board_ddr_clk(void);\n #define CONFIG_CMDLINE_EDITING\n #define CONFIG_CMD_IMLS\n \n+#define CONFIG_MISC_INIT_R\n #define CONFIG_HWCONFIG\n #define HWCONFIG_BUFFER_SIZE\t\t128\n \n", "prefixes": [ "U-Boot", "v2" ] }