From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753628AbdBKBvF (ORCPT ); Fri, 10 Feb 2017 20:51:05 -0500 Received: from mail-by2nam01on0061.outbound.protection.outlook.com ([104.47.34.61]:17664 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751961AbdBKBt2 (ORCPT ); Fri, 10 Feb 2017 20:49:28 -0500 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; linux.intel.com; dkim=none (message not signed) header.d=none;linux.intel.com; dmarc=fail action=none header.from=nxp.com; From: Peter Chen To: , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , Sriram Dash , Mathias Nyman Subject: [PATCH v13 04/12] usb: chipidea: use bus->sysdev for DMA configuration Date: Sat, 11 Feb 2017 09:27:15 +0800 Message-ID: <1486776443-2280-5-git-send-email-peter.chen@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1486776443-2280-1-git-send-email-peter.chen@nxp.com> References: <1486776443-2280-1-git-send-email-peter.chen@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131312512458569390;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(336005)(7916002)(39450400003)(39860400002)(39380400002)(39850400002)(39400400002)(39410400002)(39840400002)(2980300002)(1110001)(1109001)(3190300001)(339900001)(189002)(199003)(2171002)(50986999)(356003)(50466002)(76176999)(48376002)(305945005)(189998001)(105606002)(92566002)(53936002)(50226002)(8936002)(104016004)(2906002)(4326007)(33646002)(106466001)(81156014)(8676002)(81166006)(47776003)(97736004)(54906002)(86362001)(8656002)(2950100002)(36756003)(5660300001)(38730400002)(7416002)(7406005)(5003940100001)(39060400001)(68736007)(85426001)(77096006)(626004)(2201001);DIR:OUT;SFP:1101;SCL:1;SRVR:BL2PR03MB1939;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11OLC001;1:MCKSItgY9vhqIaPk5n6TM0pcJAp/K9iiFHJCGSRIhwB2iNlqgeg6RJFaBVlPedIuHojoHQ6p1e1CjbyCqqNQImO4jzO1ufFZJUGbiLLh+3d5RIiJ+cRyuZU/jLjjZYvy5jLjrP8itPrOLtDJ9n5xUtCXP0JqvfKcXQATidhyxufxHyNafBnMMO9zOwSyYhFHcmE64t2AjwbPFiIDAtBqMFJ4kcirpKBX2LZmil1gx6WOSrKM0SO+E89zweAnQ8gfNlG34TXVY6bfIbrWs12g6oyboGO8s5RIhVhvVabmpEWdyvzIIJXm0HstbebUkaF6xwiXvJgQjHrje/dR8OPEIqgCUTUGyPxx/VxfSIWTRIcG6C7klp176z5EeZz1o9IROATqpploDHVonQhqBXaMCjjmOneVMejqKqTazIdTj9ibPm5pb62J7xEzXod3wKJ79R9XYamDy9BBLs4NdboLSQNyctmtHlGDXQ4PqaR0sot4No9mrfylEhXzY5zEJOqBG/21PhC75pj1MsfttNpSRyVn41y0izoph3FyZ8YmqYw9S306eQMXTpwAepHWpvaiSvC3tRShGTQslKKsmx7j1hVJN2Eemzv0eILFAADjsK80LKprYnchF9rPDif2O064AOmVMWWMpn/wYVPUgfZu4I5VvNR6McLCOxN6pwcpsDQ= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: a6e4dd0d-5fc2-4942-ca69-08d4521fee09 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BL2PR03MB1939; X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB1939;3:EADzSi91WxP4pnjrParYnNqoDw0BDEP5fgiImT6dIIKVTYIP7pHXVx5NuW1d7Aftapjkipw3yaahhbdwibU2Fk6tYwzK51cOeluyVy70HZ29r7phyIjbUQJLp14bSXbuye7kk++EYDqnr5dFVRXuI587IrMXSZNnIxIi8En3SmpEQOlRX1pH92LG7uxkB78/+MPjyMveYDWAzmhW54ixC0Cup3Q72IqM+JqzrsDC+IgDrVQhWoTMU787ye+u+9kJpc2/GdJsBkeM7kynG9ePKSQ9AOk1MAXsQVpbNv6oIFuJ+Q70KqqcH83WLtNZH9CfGC3CBmiQmjYVh+2D0+aBxt09iKYTCkqOJjUnrtjT8FlMoU7iwLRTssXt4yftPocI;25:uniWI0kruEpkUfGagrrxi7XVlBFG5UNxJS02dvP6yXyVGvNwn4zV9WsKQ9iP5wLYSBun/IupsOAufZ84LaD5O3pGQoIqOol4pgYZNN1lzSksVp1miXMIYGa1T3In8tEeOKTVpjXkf3pJ7AuUdNGrKXSz07zGifOjTw+1L+ImMk0lo8Ys1IiNhlFkoP61mLAWEvJ2TLYS+UFvvtqz4vnLNiexG4gs/i68l+Y4+slDvn7WeJpnJzQrFkBkZT3N7tttSLkQHShF4/ocFhitymBHwL83Dhu1RyawbQx30C568y3ttpGxx94+ecVLihmHOHk71FncfxuUFzBCdLWwTo3i51wBnI2Zma3MU37blJjanEuLf5CnH6zD6nv4wM6TeNk9d8+W7bw7zY/3v/LEGNzlBb5QQ/RRrn6/hkVB/At7LdxLFEhmcdcWNRolFoXTJVvSsUSRheguLwI5A3RNfA3g+A== X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB1939;31:ZcKN3xwvTRPaIEm5C8DOaVatG0zLbEazcl1j+UuA/xYFRu5GUIzFniOBdVAsZ0x/zbgVCL9rBRbaG4Y9kVOZNeY5BsXeHwA1WxjDmgYS7sooF3wdycHK8ZCfLeBIz7kmN4oVEcsGTVbQD5Ak86bhwf8YQtxOd/+/wKEfA9P6CBAZ6xtUduYoWrbXsI3tt+jF31bcviX4j6xFJvV7IZYhYmC/x5J3XVbKJw3Cqc1d3m0bUAQ0Mg5e7b4HgFlYiIeiOjll3GgdwfuPoLeFKtvOipGgd/fZ8Aq3Gy/qRdCjujY= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6095060)(601004)(2401047)(13015025)(13023025)(8121501046)(5005006)(13017025)(13024025)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123556025)(20161123559025)(20161123563025)(20161123565025)(20161123561025);SRVR:BL2PR03MB1939;BCL:0;PCL:0;RULEID:(400006);SRVR:BL2PR03MB1939; X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB1939;4:bmfYK9Mbck73s3NUhr/6UoP+KQ+CYryxLskYguqkiKgwujdLg0y9VkxwQbrxSjnkusD09kgvgB1RUhicAEe4cwcohREj6UxXZkGAi3jksxa0obV0eTP6QJAY8IenyGEJSsw6qEOJAz5xy9HtDI2/EjC774xng1Es7RD+MtVscvg5BHkncX0ii8wlglHe6giwsyo/KVCyXQ4/+PdO0Mjiyev9hSY47YRo4JxaWqtY7QjKk01dfCXMsa/BZSTklvHHeSfGTd4zRi6EEs8ntRRYkqNUcc83DkWs4IEhkIIhJ6bOi/0wGxJPmNOFyvxBS77uwIt9NPM+DfInlXmlKKX0WelEIJARbK8zn3AcK7Dww+wlk8IDXM8QYBBTls16NNBhviyQQxXneGNLqPXDgTaV1A67nEETH5mMa5YVCNusZw2GdLWv6xs/L4A4wAghpqMFeChjDXqhUOYmAT1p0/IOIWzBm1hbrw5cELO0TzFb4ym6Q3LPv0WKVpWc6ibvqLcGCg6n70n9zCL8+BP3WHce3ABwHqb3qkzHqFKXm1VJZXVh2ie//ECJe3Oyox9gLV0mIS74hyHq4sf0uvoZBM1/qWvbrQiKgz/s7lMGLTngAqPYq5orGnuvVLz5DVz0BlY5yKa9aMxQP+ez1EyD/LqSuhXlZgwU3pyH4GpUW3TAghyni6qAxCfjUlCxyVEMgkPAyJYMd6Uxc4vWBp0eycLDxGRtMT9inea85lONv4LrOUSDERgTEcH3lYnNXz9Wr+2sZWq3EwxJmgnxpctY1XLMkQ== X-Forefront-PRVS: 0215D7173F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR03MB1939;23:9+/gdIwj8hWAPJ1joR54Rd40b6hKW6Wu+Qnvq7bI3?= =?us-ascii?Q?oAb6NbfV0Eb3G/nIMKaMVtsjiQ7ZHDsESxms7p5nZOAn9/eTM+oCf+l105Ux?= =?us-ascii?Q?edZWtKpeB9N1e2gwPFaqzoJhiFinsqEdc0Su2D9dtqkZ3GpQhVNNf4mJcaCb?= =?us-ascii?Q?qd3WJ1u6hrqhzHn6QFSFaRzgEpiVWfBQO6fQZddKnM8jblMCv6SbObnzwPQS?= =?us-ascii?Q?dsXRinKYf9kk3Kaq7viGB0x1TcAQ9w8tPe9BHQaKvA/WvOKdO6TV3XBkst9v?= =?us-ascii?Q?YrKYV/BNO6bgphH9BkgAYbYvTBEuJY4EuDSqOIrzLMGJVXhMb2Hp8SfZS4lj?= =?us-ascii?Q?jHZuSIisj9/cn87OJq1BAXx7IX/FaxNsCpZVIS918m5k5/SUGCLn1XVlxd1E?= =?us-ascii?Q?a/K4PzMjpoP5XH7VvwMyTrbD2Rx8CDpGr9Eitgb0wI2A1DW51qzbfRzhBYlk?= =?us-ascii?Q?8SnQTaDEQiGb/Cpwdkn+K2GwyHpKR8P+oWxfpehHUg1PMJaAtVEfrQeRUfqN?= =?us-ascii?Q?YUXfaET0VMWsHFttKWG6QV2Eg+cxuvpIE4Jj6Nu1OPCCNBwbg09GraWtr6p3?= =?us-ascii?Q?10OvTNYYAg/ZYNIUakO6WK/D5zcs++0QhuvgLmKRuMlQyPn+A3mpp72I5rrW?= =?us-ascii?Q?4mAuS5WVcpeYPtj+i4aTXiqgj637d9gtWMWQd56R/z3xoEvMShxuUCJwTOlw?= =?us-ascii?Q?BwM2iqts+2LH8vIHdWgUMpolnaIuY1PUb3llYsiZfhbcY3i2nLq5JpODpe72?= =?us-ascii?Q?OqOhoT0Nc8PSi0CahdhaW6mQsZgxcQO2adoxQBU+0QusRP77NW2sBSJCJERE?= =?us-ascii?Q?3+cPbuR4l12Xbro4KjeBFRFcDUMgKBAcIdgQmIgVltiFQ8d4IpcgyrWn5KJf?= =?us-ascii?Q?E3K3kz8iBf3HU1iucjtLIw3DilAf4T+dxyv9pcDuIUNsxuSBPDL+wQdtPvKb?= =?us-ascii?Q?5XBOak/mAi8/AKZGC5t4hTP1V5SbY+cRDMr5NPDm0CuilZ4cVXp7P+Vw6Pzh?= =?us-ascii?Q?eUXVWUmptBm08gehQem/bmxOP9V/oCMtthQEhVVl+i6JlamiqzBOrm4TYOJh?= =?us-ascii?Q?E00iMdPFtSTo6BRJE8l0w7c8+EHx+IQFVH/kXNmWazCC9f7bGE6NuG/8rrG7?= =?us-ascii?Q?YRbNILB3AiQzUfp7fbzaVC7enduBM18gymIf1IdywWZUFbmtmFtNAEpTQuir?= =?us-ascii?Q?+F2uU+6HJqedaJl7tpOMydgWI+6MhypoJFmdlaX+TVhAP1XSduRrxYfqcJHF?= =?us-ascii?Q?CBkJCj+OXGsqK+1C6vlthHswvU0yaRbRiZF7fnRjnCVUNnqknfOwvLZ5t80+?= =?us-ascii?Q?rDPyWYMJ7YVHYYLnQUWVDfvf2pXM+hEz4mJ/8KNtMbsM3tZiaQLoRHRdBjYs?= =?us-ascii?Q?dt2hg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB1939;6:/pMg62vcy1RqqjYHtUxSmFl1iSx2PJVo76fXBd2oEWmneWLyhFpdAxG+zzZ2GquLe/EtelI6j43NMX3M36V3i6WFFvpcq+Sk0yYvDW7UNRlcPWJMAseK5TmpmdJc+t1ZHjUSqAXE0OBY3fOhhLVDP0qoLdGnQASZH/S0BNKK0PHBCRvl0rcYmnWuWQweoLbnLxaPXbuU5GK8CLypxvfjuTtZLE3AugVWwNm9qpvlHiBU4P5CaCDTRLANJp6lchoEiJ+wGzSpeMgG7nj1MclmvhoaUH3D0Cl7D7Vat7pd2fmwpVAX4EqEA8bHC5tMV6nbYGv6QsLVOJhrb9xvDzE6SPM5dlyeBW4U6X+a3IEhTp3ByNTTnAljtCYWBB8pP7dj1i/sGY6SyJTBYcIGJJyBM9en4hHtz1MgO56FfNQ92BA=;5:b48/4UfES76yvmvNnKg+21+z2VtLoS+0xeEy5l8uSMZ7AT9ss5mV3cm6mUqnDo63EqVHLZoLLZk79giNaADdJP0vlekQ7jm78fgOM79xg+KfHVGKfJsTEJ8a3F/pd8jiy+pE/MTql4EZxrL4OJbDeub0A56ul9MZmV6jx6sHyp7zFELjq1+C+ysJuMyvIAlB;24:9NUV7e+HfWwcSMVoaYuvbDFbsc+CzB5BGELA0jF3gRlAUZPIdRRClPKh5pcAtBw2aplBqjOWIx8N6F+GkwyNKb5114IDFuPvvnxG83k27/o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB1939;7:jHUv2ohkSnYfQnK0wvcC6/uU49+Sq2eEjEpJBDEVwCenyDWFOKRbahL0pPe6XUTHzIKyUUzV0HPuxEcrhEuAWOFqyv6MkoejBSZgQXn6RFGB09jyDyZ90GO4BPlQvDWLOlYJiVYjbPDwhlFmUAynWIgde5yQRzGX/M2kFdDvJaVDnxVho0IY4qVRtTRl1MsBf8FGgjkQf+/iXLugbFTybcCaneWAwEhGyRSHlDZU2BCkqF4o8TtWX9ugg7qaYCDCw82mqU2OkdDJoAeDhEL0NmurrLx5tD5EdNApKo3Han51lK5u1xwFmoPWsD5TPa9pXmV73tdLZqBuGHr/7gWWNJft0KruJObiKgaHU241KcpOiRq0ExvLHZ5Hl7XIhpglPgW4aUFTquKl0dYK41+PPLtZLWYFMbJ9XMfK6sN651Lbp29Ck+MQsm25t/lRAXnLpb0W+eyxzhSywPcpsF51UxBihHc7VvFANxYZ3SvA+jyY4g1RpylUM6vHasfwMAdgwJbiR49c6HsIjDTHydE3Lg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2017 01:47:25.4201 (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: BL2PR03MB1939 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann Set the dma for chipidea from sysdev. This is inherited from its parent node. Also, do not set dma mask for child as it is not required now. Signed-off-by: Arnd Bergmann Signed-off-by: Sriram Dash Acked-by: Peter Chen Signed-off-by: Mathias Nyman --- drivers/usb/chipidea/core.c | 3 --- drivers/usb/chipidea/host.c | 3 ++- drivers/usb/chipidea/udc.c | 10 ++++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index 79ad8e9..b4a78b2 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c @@ -783,9 +783,6 @@ struct platform_device *ci_hdrc_add_device(struct device *dev, } pdev->dev.parent = dev; - pdev->dev.dma_mask = dev->dma_mask; - pdev->dev.dma_parms = dev->dma_parms; - dma_set_coherent_mask(&pdev->dev, dev->coherent_dma_mask); ret = platform_device_add_resources(pdev, res, nres); if (ret) diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c index 915f3e9..18cb8e4 100644 --- a/drivers/usb/chipidea/host.c +++ b/drivers/usb/chipidea/host.c @@ -123,7 +123,8 @@ static int host_start(struct ci_hdrc *ci) if (usb_disabled()) return -ENODEV; - hcd = usb_create_hcd(&ci_ehci_hc_driver, ci->dev, dev_name(ci->dev)); + hcd = __usb_create_hcd(&ci_ehci_hc_driver, ci->dev->parent, + ci->dev, dev_name(ci->dev), NULL); if (!hcd) return -ENOMEM; diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c index f88e915..1fb5235 100644 --- a/drivers/usb/chipidea/udc.c +++ b/drivers/usb/chipidea/udc.c @@ -423,7 +423,8 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq) hwreq->req.status = -EALREADY; - ret = usb_gadget_map_request(&ci->gadget, &hwreq->req, hwep->dir); + ret = usb_gadget_map_request_by_dev(ci->dev->parent, + &hwreq->req, hwep->dir); if (ret) return ret; @@ -603,7 +604,8 @@ static int _hardware_dequeue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq) list_del_init(&node->td); } - usb_gadget_unmap_request(&hwep->ci->gadget, &hwreq->req, hwep->dir); + usb_gadget_unmap_request_by_dev(hwep->ci->dev->parent, + &hwreq->req, hwep->dir); hwreq->req.actual += actual; @@ -1899,13 +1901,13 @@ static int udc_start(struct ci_hdrc *ci) INIT_LIST_HEAD(&ci->gadget.ep_list); /* alloc resources */ - ci->qh_pool = dma_pool_create("ci_hw_qh", dev, + ci->qh_pool = dma_pool_create("ci_hw_qh", dev->parent, sizeof(struct ci_hw_qh), 64, CI_HDRC_PAGE_SIZE); if (ci->qh_pool == NULL) return -ENOMEM; - ci->td_pool = dma_pool_create("ci_hw_td", dev, + ci->td_pool = dma_pool_create("ci_hw_td", dev->parent, sizeof(struct ci_hw_td), 64, CI_HDRC_PAGE_SIZE); if (ci->td_pool == NULL) { -- 2.7.4