From patchwork Tue Jun 7 13:29:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajesh Bhagat X-Patchwork-Id: 631595 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 3rPC9T3WQ7z9s9Y for ; Tue, 7 Jun 2016 23:30:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 13D3EA74DA; Tue, 7 Jun 2016 15:30:03 +0200 (CEST) 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 C3YioYAxWkNT; Tue, 7 Jun 2016 15:30:02 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6D0004BED0; Tue, 7 Jun 2016 15:30:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E61B34BED0 for ; Tue, 7 Jun 2016 15:29:58 +0200 (CEST) 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 RaV6onPXZn5x for ; Tue, 7 Jun 2016 15:29:58 +0200 (CEST) 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-bn1on0060.outbound.protection.outlook.com [157.56.110.60]) by theia.denx.de (Postfix) with ESMTPS id 3FCF44BA67 for ; Tue, 7 Jun 2016 15:29:55 +0200 (CEST) Received: from BN3PR0301CA0041.namprd03.prod.outlook.com (10.160.180.179) by BLUPR0301MB1620.namprd03.prod.outlook.com (10.162.214.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.511.8; Tue, 7 Jun 2016 13:29:52 +0000 Received: from BY2FFO11FD042.protection.gbl (2a01:111:f400:7c0c::199) by BN3PR0301CA0041.outlook.office365.com (2a01:111:e400:4000::51) with Microsoft SMTP Server (TLS) id 15.1.497.12 via Frontend Transport; Tue, 7 Jun 2016 13:29:52 +0000 Authentication-Results: spf=none (sender IP is 192.88.158.2) smtp.mailfrom=lvd4224.freescale.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=none action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: None (protection.outlook.com: lvd4224.freescale.com does not designate permitted sender hosts) Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD042.mail.protection.outlook.com (10.1.14.227) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Tue, 7 Jun 2016 13:29:51 +0000 Received: from lvd4224.freescale.com (lvd4224.ap.freescale.net [10.232.52.224]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u57DTbRp005614; Tue, 7 Jun 2016 06:29:38 -0700 Received: by lvd4224.freescale.com (Postfix, from userid 65022248) id B92D368085; Tue, 7 Jun 2016 18:59:36 +0530 (IST) From: Rajesh Bhagat To: Date: Tue, 7 Jun 2016 18:59:34 +0530 Message-ID: <1465306174-25746-1-git-send-email-rajesh.bhagat@nxp.com> X-Mailer: git-send-email 1.7.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131097797923987145; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(6039001)(2980300002)(428002)(189002)(199003)(8676002)(97736004)(81156014)(19580405001)(69596002)(52956003)(19580395003)(103686003)(5003940100001)(16796002)(42186005)(189998001)(4326007)(86372001)(36756003)(8666004)(87936001)(110136002)(11100500001)(2351001)(5008740100001)(50226002)(45336002)(229853001)(50466002)(6806005)(48376002)(586003)(8936002)(106466001)(81166006)(2906002)(105586002)(46386002)(68736007)(960300001)(33646002)(92566002)(47776003)(50986999)(90966002)(101416001)(7059030)(42882005)(4720700001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0301MB1620; H:az84smr01.freescale.net; FPR:; SPF:None; PTR:InfoDomainNonexistent; MX:1; A:0; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD042; 1:18q+dZaY9kejhdDTeU9MSSGptOIzzqqxxnPOj1W0no3Hs1cUqH2pX20xUL3UgUFBUD6emc7KGGtq6RiJ9lNwRnceHeUemYSMq2hT2cqMNPuTdX/Flgb8s9I8S3mBqHqFuBH1+tqHhitnaP9h+iOhjw4XbapmlIt1ojqi6IQ3x8yst33dzP1DTSG6itbojyo8yGmIC9eDC2xyL+242CHW8NbTsD8xIWIIy3+Er+nOpxa3g9IeJ2ZDf5VF2EGD9PcRSEr2HIES//KyUE5lVqoiq8mycU2det3tLuIG9icXDJCBV2kF8DZ8pyCgvy+qsKFTDqtW0ztD0Mvpz4+ZBO59qYZ+IN8QyYxkySEJu93Slvp7PllCavtiWXMr568d1rpjWLa5XLU6rJ/DPNDT2cai08fj4ZAXGCEFIYyOlja+rqfUxyfTqW93QgP7sCkeyb/Gt/tKVs46sTM5uv1uVlqXSt0Gv8cElq34bUnWBphuX//0+DUi32KtjDTaYXcbXHeYkEfvIPHvRo/YegPEgzRPPivyx9iCXr6FvS6Q8H4z0IgYNpKq/ReyX5DFuyIsNYc7wiWY+l1M8/lEyUCJTAfjrbXNwroqfKp2zMCKf3iYWu2WzJd3h51hoCBj12+Jeh20cuKabhYzUMqXgC/xAclmA+rtZ1CqNFJTMmoovMZRai/oKPRyGiqC2U5TuGEver0eGxZNaLcK4fs0O8jD0jOpGd+rl37QFOnwO6pO8Mxv+ifGPhqSMRcCzVFzt9FnC5ww MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 9c8f50f9-6cd2-49e0-0b7b-08d38ed7ce6e X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB1620; 2:Xioi67d+HGZH8+ahGLoh2buJvcjq+YR0+g9Qg7KUX735baQ09BJHN2Ag0LAKhq0EOHnKtF5zp3KAlp1dcQVWHnRDNnMujqPoCqFnzkmAbcHpAjbaA5CMnzOHPBV+4QBMDmzKc9D4g1wswR4nPNVub6pC+uUrPbhzltyG+JI9WO7V8pCVdLn72gL9MwB86JvC; 3:/9tS++70ls/wRZ8GqSdcE2Xy46bYWVjY3pA7+enkNLVBDAwivf8CUcOV1LtjBA9EQ3dzLGNw7Lg1DMRVbakVwJfT63jcdoqiGNiBnTdZkgEILrDnGwHX7UM6LJwrOZG4STq9KUklEV01QIGQQ6CtonH/DBaTfoeJYiGSKZT54oVbmTxvzf94z6lHebuN00YeppZ4vNRyGk/HulVyMBPr4WTw7pD830BYF5MJmQ03FEc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0301MB1620; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB1620; 25:ni3WUNwkh+UR3s1xPUZsauI52106tDh2CmNBWAFnJUWPtn2ZeHQZqrZfyW8/6bA47qQ3mYi8kCCntu+7xaoPlnM/qYPcFSbcMPB1pKihPjz8Z9fBWBhwLgYhDowp5TUIczavxmu1pDBxI23A9325z10trxkPhcq2Oy50diYZFzz3sQ7vVAHj3dh5IzudGBUHedF3Vhh1FqgZqio9usG77dsjZ6vFMmrAtWLiiK0N0qsXEqYZ8wc+8XKly4NMjtSle2AE1urlO/Hdn538piK1d5wc1mDqRn8Slaffo3A974VPvDQmMlRoG7Jg0QkjLfM2ubUn3+IQ1WqIlRfwuHs8ejcs6BzQpQSKQhY2qpcHW+vwvEZwbgTeelFwbfch5df03W8D/UPGTrh78+OVcq4OUzhmJZsvVp9kquTGwbPZ3ar+u29pdmVajW5vPfNhMGTjwt9jzaS5JCniWkBH6egY4eNUL/vLs6YQsE+IPhuTgfwKap4XOnH5wAFXOpjmkeOb531NYLQatu48SJglLUTRMqv/iTLG5daABpCR0sXIx668Td58aEnvL690+OhzR/baHzIPnj5o0xYQQ5CbGcyOpN81hMF2BiZlt8U6sGX0mHRbDzINNkeMPsfqcboLqVutlEG7pCKHqJCwsIQE22qa10R8jSFa67KzIMBafn8O0eQvrXUWqswbHLYKDnWW4OMTOVOY+RBFkGqCTOG1CwYEp8C5DfvGpLCQj6HJ318tBtI= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13024025)(13023025)(13017025)(8121501046)(13015025)(13018025)(5005006)(10201501046)(3002001)(6055026); SRVR:BLUPR0301MB1620; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR0301MB1620; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB1620; 4:2/3xNn++0v0jzn9pjEf77fK+vygKO7isEMl8dUd3X1Tmt/BLseo7aR9RbJH198M8F9g14AoAW9zICGIb7d93cJgaQGW0K3GGOrXLNLM1lkgcG/h1DCcexTUNqO+kRUyC4lSQyidb4xIfmkYcWD+UgZNqKv4Vx8NP0u6PCYKRyt0KZlyoZ3PdVqrx0vYkkPL5lU8ktYEfME2v6KtoZGwk+B7KTISQNXgWXaDCzZelN4RuneJ2+r3s1Y26Nktw/th6ACVubNPC/Jki1RvRv+Czkc+FW3pMRh0OIUpBFzv8bnTltNmH7sop+//EFnY7B3RoLrCDIRork2omsdlTHuaP4Cznc3WqqK617igpi0HldWJalar0zRL2ULYhJ6fswBYH5DFVNKH5KsuG5/c6xzPNFy9RpOb0XTXArKTzwHT2Z863Dlvpbq0JR2kCeJFfL/NiKH+75oDN+Ptc0LPA9YRbtMspDd0oWRsuMaBUSRVEH5S1teRrhXdlmr5bJ0HgzWdyYp5v2not/ct2rSRAB3wRMg== X-Forefront-PRVS: 09669DB681 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0301MB1620; 23:zs/5urjIHnDe/u6Ou5ANh5391MLafV1oqUdy4Hj?= =?us-ascii?Q?nqDXe1SrX29Xu/jjPzBa32ocG3CjyqL9tu+W5oIaFvcILK+CVYlaSNy+L89Q?= =?us-ascii?Q?BcaLhrSXTTX19vmo1ONjVkBMH2uOMEqhjDLcow5jaoOIvpOwC8XiDiOBPwRP?= =?us-ascii?Q?P1foCWX2b1JO77gs5AD7gOy6YwWYhS3khbk6bLLRs0utKuuhBio/6bHZhX3+?= =?us-ascii?Q?AtMSoIf+rGSuNYaf+QPXREd0RgpqUjrFOUsCnf8dNelkqkHvIg2GsQhjCaEf?= =?us-ascii?Q?Nu6mBi1ZHNzvrWmBW50DCRndlrifUnN39fhWSpbslptb1HTOzi3a3/BkXSkJ?= =?us-ascii?Q?txLX7I90KwLC/ZSw+mmWT1q1bf0domG6D5ijs6dGjLTO2PIfeUlJTA9r9Yi3?= =?us-ascii?Q?LmCgw5VNtQQ8Hcdtr45kGH7hW2EC/h2lSZNkXqHTMkreAtmKyZnY9d17agH+?= =?us-ascii?Q?Xtv5FfMwThC84ikLChM39raKAYLisYKMDD8mhOUD47L6H30YmY75bmVyEget?= =?us-ascii?Q?zdvZQhxd90Zk2ItMvnrs8udc1w5hzzu1H1ZGloNNjOx6JyvVZn8fLxoxXL5b?= =?us-ascii?Q?+dbvV3GDbj191bZYAYPTIBvV7ZayzYRC7scOrn1sc9Y7829b7Yhe/p8ERbim?= =?us-ascii?Q?aqK0zf0KBK3Viwe13X4RQWJ07d/Es7wjw2E98+c5BMP2VqqXBcn3xgo0lnRI?= =?us-ascii?Q?6tyG0ZFY0yLKQ3vb2CL8Jx/k5VOS0J00IfnL7YuDTKG/x5nhS/0EwN7lPu3G?= =?us-ascii?Q?b4l9WTVGt4IyGwREADiM/UkmoQjowPVsQRDDMy0ivTtEs0J2YQjrwld3Cd8V?= =?us-ascii?Q?2xok1a7c6ZwqBSTb98bk9xVMRAcQdvHq0c1CN/PlUZX0XQ94mo4+z+5Rgghl?= =?us-ascii?Q?27IOijpg5K7MWFqaEjJ73DeWc9ndFDDqZnS8OLpVnhBDK/vw3CJlY8CULUlj?= =?us-ascii?Q?Lyzkdh8tTRm9rJ2z4ARjYIAfnzNCvw0woAb1T8qcyujeKVtyN/pC5el0xHcu?= =?us-ascii?Q?Hudad7TQQCoTJatAn5w+1AI4Eqv9tSacuCXPhYfnpxZo1BsR3VPS/BbVGUcw?= =?us-ascii?Q?6iDvYPaBBNAqkew/DRLolniy1ayVMgCN3fGYdp/PMy0mJOzktFqUfsjQK+fE?= =?us-ascii?Q?k/7Huui7E2Ch0MeTSNQGDSuNxbermtVVhKMwa6LqGQv9zTu/e9PEwAVq2Cyr?= =?us-ascii?Q?V+mdh7rWg9ToafkEY2WA6e7kU5wv6coX2Ct0Ht4T73zKFd+CWVqT1EAzmtst?= =?us-ascii?Q?XyYzkW+xCuOw+kKJH4P1q7x7F4BTSEXtrJ8f/CQEi?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB1620; 5:MGrLxBXUOgRvnmNsd2B1b6TiKpnez4G5CVVgGRJMxa2a/fIqTJh5GP81Rb3P7m1bQkoQDm9lkpSYDg2VIC1Iq7FEfakpyjmnQKku7z5ZDcr2hhY7mdXUOoMDjFJk/bObFlX68m/nF1bUIAF7GX4VSdvd1WK+UaexkfqXxWXL+tI=; 24:/F3qMGDjbr/e9PiBlrNJ4yHW9cIs5MiMXF9eKl46SZM94ylhB3fKEenAeJtOfZ73eERL9SbCBvLZCySvsrC4Qo6zhfTskloDV8piQdhiDYI=; 7:UIXoGZyEDU8dCpINKmQBp8MhU/LuIIyNK88ZEBu5P6Y0rijknAcfeq+RVKsK4bYNamPGEL57ZWHBkWZSc3hLGuZZSIVM/NdB7LjB3WMsFPm2Y0Aux/TCF+gfNjrArcduxeo2x22Mpw8FwIYU+eBunZt0txgEsw/5JJlczh9btUBnpI+Tb6YUH5zfGY7tjYjEMA0e1kSQfhytEvXKRkqF0fyK7fyFijN+RpZNfwO0mT4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2016 13:29:51.0571 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0301MB1620 Cc: Qianyu.Gong@freescale.com, prabhakar@freescale.com Subject: [U-Boot] [PATCH v2] include: usb: Rename USB controller base address mapping 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" Remove Soc specific defines and use generic chasis specific defines for USB controller base address mapping. Signed-off-by: Rajesh Bhagat --- Changes in v2: - Rebased patch for latest u-boot .../include/asm/arch-fsl-layerscape/immap_lsch2.h | 6 +++--- .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 4 ++-- arch/arm/include/asm/arch-ls102xa/config.h | 6 ++---- include/linux/usb/xhci-fsl.h | 20 ++++++++------------ include/usb/ehci-ci.h | 2 +- 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h index e98e055..0c87c2f 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h @@ -31,9 +31,9 @@ #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x011c0600) #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_IMMR + 0x011d0500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_IMMR + 0x011d0600) -#define CONFIG_SYS_LS1043A_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x01f00000) -#define CONFIG_SYS_LS1043A_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02000000) -#define CONFIG_SYS_LS1043A_XHCI_USB3_ADDR (CONFIG_SYS_IMMR + 0x02100000) +#define CONFIG_SYS_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x01f00000) +#define CONFIG_SYS_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02000000) +#define CONFIG_SYS_XHCI_USB3_ADDR (CONFIG_SYS_IMMR + 0x02100000) #define CONFIG_SYS_PCIE1_ADDR (CONFIG_SYS_IMMR + 0x2400000) #define CONFIG_SYS_PCIE2_ADDR (CONFIG_SYS_IMMR + 0x2500000) #define CONFIG_SYS_PCIE3_ADDR (CONFIG_SYS_IMMR + 0x2600000) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h index 65b3357..2dc9e5c 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h @@ -51,8 +51,8 @@ #define I2C3_BASE_ADDR (CONFIG_SYS_IMMR + 0x01020000) #define I2C4_BASE_ADDR (CONFIG_SYS_IMMR + 0x01030000) -#define CONFIG_SYS_LS2080A_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x02100000) -#define CONFIG_SYS_LS2080A_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02110000) +#define CONFIG_SYS_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x02100000) +#define CONFIG_SYS_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02110000) /* TZ Address Space Controller Definitions */ #define TZASC1_BASE 0x01100000 /* as per CCSR map. */ diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h index 04abec4..67a4311 100644 --- a/arch/arm/include/asm/arch-ls102xa/config.h +++ b/arch/arm/include/asm/arch-ls102xa/config.h @@ -35,13 +35,11 @@ #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x011c0500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x011d0500) #define CONFIG_SYS_DCU_ADDR (CONFIG_SYS_IMMR + 0x01ce0000) -#define CONFIG_SYS_LS102XA_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x02100000) -#define CONFIG_SYS_LS102XA_USB1_ADDR \ - (CONFIG_SYS_IMMR + CONFIG_SYS_LS102XA_USB1_OFFSET) +#define CONFIG_SYS_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x02100000) +#define CONFIG_SYS_EHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x07600000) #define CONFIG_SYS_FSL_SEC_OFFSET 0x00700000 #define CONFIG_SYS_FSL_JR0_OFFSET 0x00710000 -#define CONFIG_SYS_LS102XA_USB1_OFFSET 0x07600000 #define CONFIG_SYS_TSEC1_OFFSET 0x01d10000 #define CONFIG_SYS_TSEC2_OFFSET 0x01d50000 #define CONFIG_SYS_TSEC3_OFFSET 0x01d90000 diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h index 253eddf..199f366 100644 --- a/include/linux/usb/xhci-fsl.h +++ b/include/linux/usb/xhci-fsl.h @@ -51,22 +51,18 @@ struct fsl_xhci { struct dwc3 *dwc3_reg; }; -#if defined(CONFIG_LS102XA) -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS102XA_XHCI_USB1_ADDR +#if defined(CONFIG_LS102XA) || defined(CONFIG_LS1012A) +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR #define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 #elif defined(CONFIG_LS2080A) -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS2080A_XHCI_USB1_ADDR -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_LS2080A_XHCI_USB2_ADDR -#define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 -#elif defined(CONFIG_LS1043A) || defined(CONFIG_LS1012A) -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS1043A_XHCI_USB1_ADDR -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_LS1043A_XHCI_USB2_ADDR -#define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_LS1043A_XHCI_USB3_ADDR -#elif defined(CONFIG_LS1012A) -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS1043A_XHCI_USB1_ADDR -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 +#elif defined(CONFIG_LS1043A) +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_XHCI_USB2_ADDR +#define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_XHCI_USB3_ADDR #endif #define FSL_USB_XHCI_ADDR {CONFIG_SYS_FSL_XHCI_USB1_ADDR, \ diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h index 586d32a..882aed4 100644 --- a/include/usb/ehci-ci.h +++ b/include/usb/ehci-ci.h @@ -160,7 +160,7 @@ #define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_MPC512x_USB1_ADDR #define CONFIG_SYS_FSL_USB2_ADDR 0 #elif defined(CONFIG_LS102XA) -#define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_LS102XA_USB1_ADDR +#define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_EHCI_USB1_ADDR #define CONFIG_SYS_FSL_USB2_ADDR 0 #endif