From patchwork Fri Jan 29 04:28:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiang Zhao X-Patchwork-Id: 575436 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: 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]) by ozlabs.org (Postfix) with ESMTP id 7E9BA140C2C for ; Fri, 29 Jan 2016 15:37:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E3027A75AB; Fri, 29 Jan 2016 05:37:15 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bSQjWisI3XP4; Fri, 29 Jan 2016 05:37:15 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6B25AA75CB; Fri, 29 Jan 2016 05:37:06 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 207A0A75C0 for ; Fri, 29 Jan 2016 05:37:00 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0XydO-xV8mam for ; Fri, 29 Jan 2016 05:37:00 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0085.outbound.protection.outlook.com [157.56.111.85]) by theia.denx.de (Postfix) with ESMTPS id 2C377A759A for ; Fri, 29 Jan 2016 05:36:53 +0100 (CET) Received: from BLUPR0301CA0016.namprd03.prod.outlook.com (10.162.113.154) by BY2PR0301MB0696.namprd03.prod.outlook.com (10.160.63.150) with Microsoft SMTP Server (TLS) id 15.1.390.13; Fri, 29 Jan 2016 04:36:51 +0000 Received: from BL2FFO11FD015.protection.gbl (2a01:111:f400:7c09::144) by BLUPR0301CA0016.outlook.office365.com (2a01:111:e400:5259::26) with Microsoft SMTP Server (TLS) id 15.1.396.15 via Frontend Transport; Fri, 29 Jan 2016 04:36:51 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD015.mail.protection.outlook.com (10.173.160.223) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Fri, 29 Jan 2016 04:36:50 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u0T4aZLX004687; Thu, 28 Jan 2016 21:36:48 -0700 From: Zhao Qiang To: Date: Fri, 29 Jan 2016 12:28:17 +0800 Message-ID: <1454041697-20944-5-git-send-email-qiang.zhao@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1454041697-20944-1-git-send-email-qiang.zhao@nxp.com> References: <1454041697-20944-1-git-send-email-qiang.zhao@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 130985158112080826; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD015; 1:6bVHDXduZoaFk0wXu8UKZv5OA4FSRPtxt9lg1Hg1HejNwk43rR3Zm8+5OYwwvEfnBJPEBMn8FvURN75OUXcydJJF4q4Bh3sA8Kx/x7/clSIL/TMoGrWGN/hxsc/cdsySk6J0bQf+Qp5tVXpkihGGzBdQbm4igqyRMPOqEUDFr/qbUcGCMn8snZ/Fu8QlbEmxT1/X1fak3aPbVxAVIscBR3c/Fguz+j13rKZnUoOWoifeHKVuKFn7KE8FOZZCxtRdzDERlxWA4WNOOUhPHDPU4UmEGhBJp69In6+l1/Fpi6jL/0tPESMX+dhixfe8EzZK1mGGYwk7HfyR70Mj3G/45sjMVFX+IU33j83TxF96F1L7abut2gHYggdHdlxvZB6h/kyt5yvMnAlcpx4pibipe+JA3Nrzpf05FDetfEXtqyV5lPjxDAiaU3dYG9EWOEnIlSaabXr03MZM2g/hXKqJXiCrfzsdH8L9Lh126bcJmGEiSMAE072CM7sTRvSSqM3ah6+KOAffKCeAhR+BUqt9pHmIg2to55pvJu0fh2i152Y= X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(77096005)(229853001)(48376002)(586003)(47776003)(33646002)(4326007)(5003940100001)(36756003)(2906002)(19580395003)(5008740100001)(19580405001)(87936001)(92566002)(2950100001)(104016004)(6806005)(50986999)(76176999)(105606002)(106466001)(85426001)(189998001)(50466002)(3470700001)(11100500001)(2351001)(110136002)(50226001)(1220700001)(1096002)(5001960100002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0696; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 11292efc-33e5-4d6c-68b2-08d32865ce82 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0696; 2:fC73HUJWD2Nf0ExVwKXoY3cxhGBzbhXzD9Z15nGYLrTUMDEmDgNlbXvtMne+LGCG/gej+VZdjcEsQb9ADJXLZYO5Alb8wXKKTa2aongL3z0Ary1LyxZefiDLEUI6M9c7EbJtv2bD0yxKBLhJWinLhJk8Ce7L2AkYBk6d2sUE3azFLE7EX1bruNt+SBtvO3OA; 3:+rhovtWigCUKjCiLHAeJdsHAIPk+aUxpr9cagZkm8M1xwUYd4KXjBuSSa86j/y5jXPTT6W/ai87IwX1JQmBaQW/mdYeJbFTWCP0IBvMn0kSNJAB/1Nd+0ZiJfFO2sYrDC9ihcwhSKtWePFPewDUFjkgNKa0whER3mc4M0XJX52VBszrXvRTIA4W4qu88ydy3TncmDcQTanfqjf7Oa/Ks2dWZfGr+78ujLGGDmOOmkoc=; 25:ZZNEKSTLNN7+ARZevf2ZkD0iqyK71JIWaG5dW/g1nKla/IVSyshD4YFjJq7t2w5L1Hx+5i4QCOwvZ04q4qrNCTPzUgzLIUp9sMTnbRME5rOIZWatrSv18S9mY0NX98Df5Npww/3woSEpxU7eu4/fSR8ajw9nwQDNCmaOagdIr9uN80P2jTFggd8K9EAqIhm88k25pMyXBLT0jgeWPc/OmQt798YroevgGkXCnqmSWksRvmF9rt006V9FX1yJBurJ X-Exchange-Antispam-Report-Test: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB0696; UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13023025)(13017025)(8121501046)(5005006)(13015025)(13024025)(13018025)(3002001)(10201501046); SRVR:BY2PR0301MB0696; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0696; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0696; 4:oWmC/Lhl7PwqRTLJEzEH6xAcwALETVtlnbISRlDIDAvQjSk4ZjQCkT6D1VR5h2O1zPQErDE3klNd8G/eI1MY9aXRg2kQzkxiMB6DFuoWuOlA8v8RNzz+XdaDHaX0e2LbyEMcJ2VOrN5lQxmk2SpgSZOaAy1JzdJaVvtu2bzR8YDKU534j0uLrzRggQCsrW1w7iQiSzFwPHwJN5ZtRqyEAEZKv1J0kELRTOkiooqQ8mmgVsTR3BdvfQdonN4t845rf2BInIj4PwSNWejlFuKUk8f8CLi0S0mf2PFMD/JWNEhEK9++epFvqoPp4y/LoFo8embyN7nWTZ685CHveS2NXRRObU/v/URrY0qNLz7WgOCyNiuj1wT1AxDoJSbBH5TAJspnWmOty3gTdo2ChOzo0Esp4ExbSpNzA+6iCKyWHHezks7Cu7OgdoOEl69Nj93UBSluaL6PpTBD37qzv54felyGEBg66b0DrjO3OcuMHVA6M1GpRhHIgeh7cv6QDZuT X-Forefront-PRVS: 083691450C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0696; 23:JzfbvBLfIWBYWMKPZGMUgglU3XpZ2+HuQDoG3dm?= =?us-ascii?Q?DZOIRHpOjiOOSlujtedYcReFV+oDvukIvQt5pHkUtQjR9h2xgl9zP/jwSwIL?= =?us-ascii?Q?kz83qSL5+cPPBPbUsF4xSILshzpWMcYEUVaErtAmNS/Bousj4KQ9B5XYawXe?= =?us-ascii?Q?UUgQD+rv1gcmPVUNdHtpp/0Ugh5JjHKFRwklxoTeIyq1lpn0ET626u1xwOsR?= =?us-ascii?Q?vb8PqYo4pm5wzyy9LD6gi8GLHUkmAOKC1KapK4EMv+zYVZdwd0JaR02Ju+b4?= =?us-ascii?Q?f2K1xEMlhxde3W9uCRYVJWGZQjBYWTvV5MxITjEJat8CGsi60LLQlyCCAeq7?= =?us-ascii?Q?QXbOAiP2i4GTxl7Rbj1WuOecchd52nxCUsookU7zrpRbhOnNDx+M1OPAaDDh?= =?us-ascii?Q?abDNJgEdcuUkPeblc8HsxCcWEZUbyDEmvYkfHXBzRkn1QIAxinoRx8wXvbSs?= =?us-ascii?Q?SNQhK/O9xhP6fr2lVMjMnc8d+mEDXzXiKPIjPZKmV1f/yUeGLfawpwPDiAA5?= =?us-ascii?Q?bC+JlqO8WSn+g0K44M1jYi2yRx7nmWopZtOREL3xcZptVuR33GIe/lsE9U3o?= =?us-ascii?Q?lYUuzVqxMQLjDDnm4c6SXuQzA6ZXrpi67Qupdcwj8YV3j4IdHtUiTLgxVjTU?= =?us-ascii?Q?P5zYmmWiQVewo3A6EifqVkqNcnn7fVYAfRThiTu0+Y3YAuVR9nORsoUJujjB?= =?us-ascii?Q?v2uNIdUSskSHqcy18x+xJUm6JHYukBz03kdLRQHK9E2pA8LNEMTZcLjQp/7W?= =?us-ascii?Q?jqFBF9zoOMaK/A1yRirtxNtjUQDlhPDwamQHcbnqsmmrrNZZyhfhkuba2Xe8?= =?us-ascii?Q?Yo41RVc5/iRNglWyox0XYr1+8AH/gEwqhEtQum/z4LXt1izLfLGZfxmGilZa?= =?us-ascii?Q?ivYH1VU9os9NXQnEdPQYzp5TTEGMbmQzk3Qgf1Nlvqz6OU72/Irk+jxc18St?= =?us-ascii?Q?f/jvJUwv+0UuOXXGoDkIQU74SJiK4e66Guxq5oCup0w4AmVc82oQFIvdVU/j?= =?us-ascii?Q?VhpSScPT8ERFnhFTAKCmEkTVH2F5VeWb54kaTShQR/c8Jclru889AqDEwYs1?= =?us-ascii?Q?sl9H5B+kdpnKnfx7zdtYCzYrykBQM?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0696; 5:U463+UEMmiwtRrbCYQH1xOSY8r1ZeGHuB6P9GegIAVO6H81diaeUyxGsKSdgio90R0FMR/Z4FS30JMzpsccV4WH1gEoeUlIovj06WpPMQkhs5opcmsM8PieY2WdrB/h1UWm3gKZfYRp46o0Dj4ZRPLGjdoJE5n1RJsrBkt1TQQA=; 24:xFsXbPgwLau6tscR6fa8dCXD58OwUhRJSywy/hl2JQBohukxjGs7KZJ9LcxOUnIASV5xZ4DlSMAwy8bWrTgqkp0XDLQTMv8l+l3icSu+R6Y= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2016 04:36:50.9116 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB0696 Cc: trini@konsulko.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH v4 4/4] qe: assgin pins to qe-hdlc X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" qe-hdlc and usb multi-use the pins, when set hwconfig=qe-hdlc, assign the pins to qe-hdlc, if not, assgin it to usb Signed-off-by: Zhao Qiang Reviewed-by: Mingkai Hu --- board/freescale/ls1043ardb/ls1043ardb.c | 53 ++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index c2d4887..7ba72f8 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -114,18 +114,24 @@ int config_board_mux(void) struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR; u32 usb_pwrfault; + if (hwconfig("qe-hdlc")) { + out_be32(&scfg->rcwpmuxcr0, + (in_be32(&scfg->rcwpmuxcr0) & ~0xff00) | 0x6600); + printf("Assign to qe-hdlc clk, rcwpmuxcr0=%x\n", + in_be32(&scfg->rcwpmuxcr0)); + } else { #ifdef CONFIG_HAS_FSL_XHCI_USB - out_be32(&scfg->rcwpmuxcr0, 0x3333); - out_be32(&scfg->usbdrvvbus_selcr, SCFG_USBDRVVBUS_SELCR_USB1); - usb_pwrfault = (SCFG_USBPWRFAULT_DEDICATED << - SCFG_USBPWRFAULT_USB3_SHIFT) | - (SCFG_USBPWRFAULT_DEDICATED << - SCFG_USBPWRFAULT_USB2_SHIFT) | - (SCFG_USBPWRFAULT_SHARED << - SCFG_USBPWRFAULT_USB1_SHIFT); - out_be32(&scfg->usbpwrfault_selcr, usb_pwrfault); + out_be32(&scfg->rcwpmuxcr0, 0x3333); + out_be32(&scfg->usbdrvvbus_selcr, SCFG_USBDRVVBUS_SELCR_USB1); + usb_pwrfault = (SCFG_USBPWRFAULT_DEDICATED << + SCFG_USBPWRFAULT_USB3_SHIFT) | + (SCFG_USBPWRFAULT_DEDICATED << + SCFG_USBPWRFAULT_USB2_SHIFT) | + (SCFG_USBPWRFAULT_SHARED << + SCFG_USBPWRFAULT_USB1_SHIFT); + out_be32(&scfg->usbpwrfault_selcr, usb_pwrfault); #endif - + } return 0; } @@ -152,6 +158,16 @@ int misc_init_r(void) } #endif +void fdt_del_qe(void *blob) +{ + int nodeoff = 0; + + while ((nodeoff = fdt_node_offset_by_compatible(blob, 0, + "fsl,qe")) >= 0) { + fdt_del_node(blob, nodeoff); + } +} + int ft_board_setup(void *blob, bd_t *bd) { u64 base[CONFIG_NR_DRAM_BANKS]; @@ -169,6 +185,23 @@ int ft_board_setup(void *blob, bd_t *bd) #ifdef CONFIG_SYS_DPAA_FMAN fdt_fixup_fman_ethernet(blob); #endif + + /* + * qe-hdlc and usb multi-use the pins, + * when set hwconfig to qe-hdlc, delete usb node. + */ + if (hwconfig("qe-hdlc")) +#ifdef CONFIG_HAS_FSL_XHCI_USB + fdt_del_node_and_alias(blob, "usb1"); +#endif + /* + * qe just support qe-uart and qe-hdlc, + * if qe-uart and qe-hdlc are not set in hwconfig, + * delete qe node. + */ + if (!hwconfig("qe-uart") && !hwconfig("qe-hdlc")) + fdt_del_qe(blob); + return 0; }