From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Chen Subject: [PATCH v11 7/8] ARM: dts: imx6qdl-udoo.dtsi: fix onboard USB HUB property Date: Thu, 5 Jan 2017 14:01:58 +0800 Message-ID: <1483596119-27508-8-git-send-email-peter.chen@nxp.com> References: <1483596119-27508-1-git-send-email-peter.chen@nxp.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1483596119-27508-1-git-send-email-peter.chen@nxp.com> Sender: linux-kernel-owner@vger.kernel.org To: gregkh@linuxfoundation.org, stern@rowland.harvard.edu, ulf.hansson@linaro.org, broonie@kernel.org, sre@kernel.org, robh+dt@kernel.org, shawnguo@kernel.org, rjw@rjwysocki.net, dbaryshkov@gmail.com Cc: heiko@sntech.de, linux-arm-kernel@lists.infradead.org, p.zabel@pengutronix.de, devicetree@vger.kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, linux-usb@vger.kernel.org, arnd@arndb.de, s.hauer@pengutronix.de, mail@maciej.szmigiero.name, troy.kisky@boundarydevices.com, festevam@gmail.com, oscar@naiandei.net, stephen.boyd@linaro.org, linux-pm@vger.kernel.org, stillcompiling@gmail.com, linux-kernel@vger.kernel.org, mka@chromium.org, vaibhav.hiremath@linaro.org, gary.bisson@boundarydevices.com, hverkuil@xs4all.nl, krzk@kernel.org, Peter Chen List-Id: linux-pm@vger.kernel.org The current dts describes USB HUB's property at USB controller's entry, it is improper. The USB HUB should be the child node under USB controller, and power sequence properties are under it. Besides, using gpio pinctrl setting for USB2415's reset pin. Signed-off-by: Peter Chen Signed-off-by: Joshua Clayton Tested-by: Maciej S. Szmigiero --- arch/arm/boot/dts/imx6qdl-udoo.dtsi | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi index c96c91d..a173de2 100644 --- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi +++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi @@ -9,6 +9,8 @@ * */ +#include + / { aliases { backlight = &backlight; @@ -58,17 +60,6 @@ #address-cells = <1>; #size-cells = <0>; - reg_usb_h1_vbus: regulator@0 { - compatible = "regulator-fixed"; - reg = <0>; - regulator-name = "usb_h1_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - startup-delay-us = <2>; /* USB2415 requires a POR of 1 us minimum */ - gpio = <&gpio7 12 0>; - }; - reg_panel: regulator@1 { compatible = "regulator-fixed"; reg = <1>; @@ -188,7 +179,7 @@ pinctrl_usbh: usbhgrp { fsl,pins = < - MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x1b0b0 MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x130b0 >; }; @@ -259,9 +250,16 @@ &usbh1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usbh>; - vbus-supply = <®_usb_h1_vbus>; - clocks = <&clks IMX6QDL_CLK_CKO>; status = "okay"; + + usb2415: hub@1 { + compatible = "usb424,2514"; + reg = <1>; + + clocks = <&clks IMX6QDL_CLK_CKO>; + reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>; + reset-duration-us = <3000>; + }; }; &usdhc3 { -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: peter.chen@nxp.com (Peter Chen) Date: Thu, 5 Jan 2017 14:01:58 +0800 Subject: [PATCH v11 7/8] ARM: dts: imx6qdl-udoo.dtsi: fix onboard USB HUB property In-Reply-To: <1483596119-27508-1-git-send-email-peter.chen@nxp.com> References: <1483596119-27508-1-git-send-email-peter.chen@nxp.com> Message-ID: <1483596119-27508-8-git-send-email-peter.chen@nxp.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org The current dts describes USB HUB's property at USB controller's entry, it is improper. The USB HUB should be the child node under USB controller, and power sequence properties are under it. Besides, using gpio pinctrl setting for USB2415's reset pin. Signed-off-by: Peter Chen Signed-off-by: Joshua Clayton Tested-by: Maciej S. Szmigiero --- arch/arm/boot/dts/imx6qdl-udoo.dtsi | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi index c96c91d..a173de2 100644 --- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi +++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi @@ -9,6 +9,8 @@ * */ +#include + / { aliases { backlight = &backlight; @@ -58,17 +60,6 @@ #address-cells = <1>; #size-cells = <0>; - reg_usb_h1_vbus: regulator at 0 { - compatible = "regulator-fixed"; - reg = <0>; - regulator-name = "usb_h1_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - startup-delay-us = <2>; /* USB2415 requires a POR of 1 us minimum */ - gpio = <&gpio7 12 0>; - }; - reg_panel: regulator at 1 { compatible = "regulator-fixed"; reg = <1>; @@ -188,7 +179,7 @@ pinctrl_usbh: usbhgrp { fsl,pins = < - MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x1b0b0 MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x130b0 >; }; @@ -259,9 +250,16 @@ &usbh1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usbh>; - vbus-supply = <®_usb_h1_vbus>; - clocks = <&clks IMX6QDL_CLK_CKO>; status = "okay"; + + usb2415: hub at 1 { + compatible = "usb424,2514"; + reg = <1>; + + clocks = <&clks IMX6QDL_CLK_CKO>; + reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>; + reset-duration-us = <3000>; + }; }; &usdhc3 { -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031142AbdAEGER (ORCPT ); Thu, 5 Jan 2017 01:04:17 -0500 Received: from mail-cys01nam02on0062.outbound.protection.outlook.com ([104.47.37.62]:56135 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1030652AbdAEGCm (ORCPT ); Thu, 5 Jan 2017 01:02:42 -0500 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=fail action=none header.from=nxp.com;nxp.com; dkim=none (message not signed) header.d=none; From: Peter Chen To: , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , Peter Chen Subject: [PATCH v11 7/8] ARM: dts: imx6qdl-udoo.dtsi: fix onboard USB HUB property Date: Thu, 5 Jan 2017 14:01:58 +0800 Message-ID: <1483596119-27508-8-git-send-email-peter.chen@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483596119-27508-1-git-send-email-peter.chen@nxp.com> References: <1483596119-27508-1-git-send-email-peter.chen@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131280697403722515;(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)(7916002)(336005)(39860400002)(39380400002)(39850400002)(39400400002)(39410400002)(39840400002)(39450400003)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(8936002)(6666003)(76176999)(33646002)(189998001)(626004)(54906002)(105606002)(92566002)(7416002)(85426001)(305945005)(47776003)(2171001)(2950100002)(575784001)(8676002)(81166006)(39060400001)(8656002)(5003940100001)(2906002)(81156014)(50466002)(5001770100001)(7406005)(50986999)(97736004)(5660300001)(77096006)(86362001)(36756003)(356003)(38730400001)(4326007)(2201001)(68736007)(106466001)(104016004)(48376002)(50226002)(32563001)(217873001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR03MB2474;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD055;1:LR1XaUtjRmz9iYDRKRHP0rpLDzSsXUd0ILEbyYUuiZHruD0oexjt2F+42txyvHCufQ5H+lNPOXu9ylHZGa+RMje5eivJz0dkvBloXaAUqp/7HFqKLOrWBWdo/DEV+K25Hyiwgh/c+RTAhK0TqfrtFEHqAAg3W/tQLnuOox+hmRFIaA52+8Cz4HVoT3DpF07G6KZnFNVhF3z4UwKKXxU2DpDhKzGvorEUnTyGXy6kKO+bO/+u3AR94g9wdVvQ3ZKcJ00of4vHE+9A54T9v914VnQwB8v8XXyHBvctKb14ffkhLlC192zJzSbLk0fjky7Idgr/UYcnEWDw2xX8/fAHonHVaXfpXVPDZsdO02ZPTIhxxTKiVc0JUiWKCiY0pYw6kARr7QjnO1c/bE3r9Gpz7hbUtxnvhZp1aGRw7aorHAxZw0gYu49bQqAN5w5DL9EQeNzK/ID4vaAEuU6pvImmQEXx54y7gXQdswvln3OnwrWzGimyyM7rk9FED+E512kb3RHWBKJF2GvQ+9xJ3oEx/gAuSoPuDUHny9kXPoWK4Mtsa4QvKQLLNrL3eeITDB0Ft/DA7ZkPysVvEIp8MTW/TBOk4fvNgzAHrKVkgGG3vJ7+7ckV24RxbtlM5r/xkSY2i4bYJQ5ihjOsoDj3UZ/8jPNLhE1eUO0BjJuXvS+l4qMZveG+Si/Gfo2Tf04I9wgaxzO2wE2GFg2iXCic/TCyFe7PHNoaFrLr7N4F9eSUWuqCA7cCrD51xsz9mfv2yPhU MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 07b49517-42b2-4cd3-e9b7-08d435306911 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DM5PR03MB2474; X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2474;3:7hpMPYk9tKWN3f4Ra26HSMRZbBTumkrAEMuUOyxwpV30R2SUA59n2Zz7b6ksJhPPD2L2sIw8Pj6/dJKKWJFY/7wc6Jy34X5eek54Yg+DWnB8fB3zIXGC1o4z0MI316KCt6855ptr32MIWs+VuqzsBVplwI3p5RuSGxzYKsA69bkOcnlK6psyliht6SUkMAFjH/abFh9cRTTp475SnaplscD66LHOucUFlxBX72LGLT4/DDFyL9OsvkAyWewLoZxA3vcwLZt5P0jNdIzVJ0mMqpTmYjRrxEU/sfg+0L0m7vamKnfUpLhOzrNg0MHb8lRCM3B3DacvDoBTzbeLJgJmJwKcXF7cQnvbmtICq41qk721vj69ippl3OJRtCoD+rvA;25:DiUct5eIgpfARMayRm+J25/vedIyNsdZyNKqi1Fne/BxorH9MiB0JHXjLz0DGnWR4fW4JDR1OreTTgnqVU+mPjzLhlNN9wLvIeVFZSQLcqlYwDi9w6P3donovQNdSgOCxqImzpCqL1Y/jJk4hdXmU5MNXx3iY0HPxfD02vGcSNSdwQHbwNOwn/cuTXfbwb1m9651SHb2G2xhqL5HL6z/9SqBpPzWePr4wbAzV9BE+IFG67ipqXD9b6v7I/90rbu2EhFDwC+mO0vvT4DlhPe+0qOusA3RUfs3k7uEtdTrG/rEiIY4YHeU+fkSh0lZP3uX8SUbBKgTJ6ntMgyvjVDzTUBtWc1tT1bZl8+Fs50IoJCMJqexs0bYzKLEkgGyVfjiuvvDVBJPZ7jqQ+jN3ApmXiRMshJBauasY2tRYuf/QysOwul1j1fkd9DL08ParyAo X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2474;31:ScNnNcHW/q7e0GF4o9eIm6RNEVIcVv3ZAuYa/OTKcCv1x8TMrmFf592TKJz8mO8u7z2ONQnCDVC/bwRAgSpk0PKWdvDC+nk+6eKY7CbpbbyJFuhV1jol4q28k2pymitE4+RZJ8MGQfwFQtykKYTVNkfAS9dyfCyijLF03lJ/FrSY2W3q9LXEguwfNiHjYReoCVeiZ21g/yMKH0QK9YohGa+nzwrjjv8YeGXthOSyZ3V3VBy3+xElD/GaoJAe6zO4HGGwTpuIoQq3fIG74b7EGP27ECKjQS7ygzMYyTasDmM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6095060)(601004)(2401047)(5005006)(8121501046)(13024025)(13023025)(13015025)(13017025)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123563025)(20161123556025)(20161123559025)(20161123561025)(20161123565025);SRVR:DM5PR03MB2474;BCL:0;PCL:0;RULEID:(400006);SRVR:DM5PR03MB2474; X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2474;4:wuiuSHmUZKD7eXixxVStbbjkBDtvCHeNv5OJjmvD74SolLDtA+kp53RGX44OxpcPi08F9O9qxDDZQooQLoi8ZEFg7fRJcxIacNzcBoTy6mOfMrYVbaAjmkLBqzqvqzGxiIDhTT/GW8dmREd0zFyj/Oc5BPKyMb2HZtkC60JziCVaVdntFS1v32pkbb7gd3W51AtQ+BHWzoxDw9EyqKeAQhJnxZSURqEAf7JYULNXxwinOJa/DqOklP9aYdzikx5Lpj3eAfhe7yltNU220Io5AQL6chgui7qTURD5xuYvk4SRHTqprnDwOKdApSdlamwB1NlDRj55MF0qsyWcx9epPJ92gVGcz9S1ssANU8sQNGBbXEyBW+FoF3jSlvipVAKqUBzMv+sDnZEw7LHRKmQNwMUvuYp3J5ADAKw7A/RkAP1havhfxVLzhcFPXgrGzOKT3F8EafinEnlEkWNweMyd3dnD5fdLtc1+JVHoWUxzDT8blj9R7Q9o1mplsBBRsAtTYY2R/IrlGSi2pvCBZ/pT0VSXTtYptp8cr6lrDTz7FmrX7d3sx7/uRDoPOg6w8BodoKhZHfMK0xWy+zmwtf8sXThzytZ078j2trsFqxF+LrDnRx/gG59Xvvr2/XzifoVS8Uhj7MMtvZZX2v7I6UT5hxh9BCfyUT0vj8edjAHP9UBqd9UTIsbRd46vqT+0FGsHTNAmtk4smujjV3LZ+q1RxPl0PJu/aHRcrQglaL0Q7S8w9zDHFBxgaHojifIjATss X-Forefront-PRVS: 0178184651 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM5PR03MB2474;23:TIybkkpHUo7jP6ykyNCBJN2Kto5ebd3nijRCFFwf0?= =?us-ascii?Q?W0X4w7uDGAm/MLcaJqWQblpwtPIA8Ga2yjKI+fSEErkNsZYESovh0A/lkYpC?= =?us-ascii?Q?DdgJdMQPMCQLHhnaEAc8JH5EVYcpfyKv55EmBS9G+wn1Wq+RgMZpA8jPG8fc?= =?us-ascii?Q?PAtlrbisxzbGN2tNPdfc+2/3eI7Y+7oE6Ioj/Low3+N6CM8ZTkm171mwSECf?= =?us-ascii?Q?Jg7XwuE/PXJwlHxY2LZdFQia4dGHSLZ5bVb7Mfrm0TlufgHEIxWcs59IdxJR?= =?us-ascii?Q?hC8RBwvsgv/ycR02xbPeXrd8UseKmMFLxlYpP8rxssvl/dZ9IDzp40++trxH?= =?us-ascii?Q?4MH1Wc4y/9oLkyIygE90Y+faLIELGLzfUQ9xmb38ddXQpllEOb8mYMu91b8N?= =?us-ascii?Q?VY6fBD2WhIe3E/jol3QxcLHodUH/EVYM0egOqFlSMvuu1jha5VDGKlGVlgO7?= =?us-ascii?Q?hq83U0V1lQA0SuxS1Am5Vub7vMtcM8qy1TNldNPp+jXmQBD6R2J/sZfDB8Pv?= =?us-ascii?Q?X9nLQ7Idb1KarDIt4XzOlw64h91dwXANS327SOjBWzBzaRW3GrDDOBql+bPr?= =?us-ascii?Q?NYMMk9G6Eq/lMgOPPJ/CUKGUwJB3RJyKbp6iITjz+ydqUWG/nP1i6vVjM1dG?= =?us-ascii?Q?ZQg9/ilcwg3aP5WCy/8hHhoyDSoj9Jk6/qcgrgF4Rsgu+UK7Zc/OuCzTGGU0?= =?us-ascii?Q?KSamUEVW3WTNnOeCwb1mSZlRUOcp3pLRReaCkSGheXPlmeq9rdvXg0mSEP3k?= =?us-ascii?Q?yNw7svttG5SZ0jM47+Kr/bzmG9miRss70ehAaDO+1tEpS0Z2ICcUnyZo6O+P?= =?us-ascii?Q?u8MNQfoEz61MHkrpP+mJKKBCi4eJsz3MbhvJd8L/3vc5dBJdRFsWDPxwqIeb?= =?us-ascii?Q?8VgXusoMHECiri6I8NzVDWhfGU0PfQI16EP3ZBfF2yfwZWJf63Gg/J+150C1?= =?us-ascii?Q?o6CY6uBm2i3xMvCpGVcH/TXgyM9PmXPLbLL9Z9rQiI7dNzMixZiGOpnhAWqh?= =?us-ascii?Q?g+v0dCUiROoEKCQEZwp3r+BUON0+S3gEDNz9H6McVlbFd+rRPsVTH8oSKhaM?= =?us-ascii?Q?ASJIT94tDcBNNIYsIQvBmQZWw+PSfCwTtoq+9AcN1Xvwg3Xgu4fuPTMsVDxB?= =?us-ascii?Q?ApqewcV4IGIjsTr88/hg7flcPSjSqfXUphawqvwnqavrUkh5IMhvWyDZcOp4?= =?us-ascii?Q?urLJ+G2jzym5nI8ltO1IBAG88j0nvhiUH5FcQwBGk51CxfoRXaSzXm6q1p+f?= =?us-ascii?Q?ZOYq1z1Sy/qKg0Q8C9CUvp/GBiZtD67plD1GuNbsUwq9Iq1UkC+YWR6b++Ve?= =?us-ascii?Q?eJH7q898gx+vuOLNmt+NsAAQ98DnEVFNe3eW4eRuADBoFIN9TMsDhPoPugHM?= =?us-ascii?Q?NOmGJGWNciB7lTO967FL3Pk3R7CykAFnh0+MumaIh6nfIGdkebEoYv90+DZ/?= =?us-ascii?Q?PLiVbGhHA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2474;6:+mxNvSW0m0AkUsnu6hKgln6VsZ0LKByTw2Xto8uoAYT7oID5R7EQF2vdAvXSsHoKrjujOctlGvJBHFBexM1mDmjEPtMOfEg9fSSi4ZewAEqm36apQfegOkyDOdf7U9ShIHHaADV9yo9OQODxaBDzJqODwYm0+CKnTEfemFr6LusMpW0NmJm8mZOUYK3LAvIGILjpV8cTgt6TLWJ5ca9yGl10/l9nTf+XqnEja5dfmi5q3B3eRwimpXkFoDefKPr5g0stR+kGOkkZig7XQrMA6f+8iiPTYaZzNRKgodfc4N2Xko0HxvWGBjh46K1zt/0OG7MGEnMPbVvhctkaauRFsfBj4ESVH6lFuq7mP5s/6xsaopAHRNOuoNK/bppExsGMcth8XkY2GAEVpVquLxy4UICGvDeRg7SMCtonDGiJNXJcutqpD4cBgdZbUzNVYzyH;5:A/1Sj11IKgXrxBhRFjoH8d+vQzrBOyvHl24RFRCKyewo3gj3On1OUydwDP7BUPVv1H5Uee6u7xFjHnhHv2gWU2f26H3/grb1n2oOo7mMdKqS+tEQqyaDzoMEuQcZYjzS4Fi/omrGuL6v+cfp51GXc0FR31R1lv9rEpWckfIBauAdtZ238TY6P7zUh6o+3rMB;24:IczMHtAR9JclgCoEMvvPwJFVKeJUEs9Hi2Dp1NeAhB8uwL9AL12/xstAsPphxuNK6qniI1DMpq/7u9vAAlkHjEhoTtsjbgt1gnT0NkV6rRU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB2474;7:yvkjKT5rBe3DomOZH2wrChE9F1UYtTmS+jw0BIK43FIwV/j+wzFCSWbbBw1gC4iYjRbQht3d9hJWZU5Q7LYUn3Dj7zb+KNByONdlyLQvUMTgGVvkSStOQSa5LjpBbwenoOZn4td6ON7qQVZt/IiGd7SFVrzDAyVfDjCxd38+luwsr7elQN2x+SRoHK282rNvrYBiDGHHy9htnL8G/8mKMAKHzVdnmJmE6lAb7d9ovk+QQAevEkodWVgKp1DQsckecXkwCcpV1rgaESQBpvdU5L9o9FEPgqEGHwvb4M8Db9awnNIMZO77GYhMzr7BbbT5gb8zNlfWrjIjRBiCUcWbiR6166potYRW3f6sUiSPyn9cKApmOog816ngO+5UK/JT6QjIdRLJN5dszkXrOQsO4XuwPpGrzsXJFZJVx2YBdeLQOVi7AVgcSeZz9a9KJis100DYHu2hgbWWcE7ED0+PQQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2017 06:02:20.1070 (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: DM5PR03MB2474 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current dts describes USB HUB's property at USB controller's entry, it is improper. The USB HUB should be the child node under USB controller, and power sequence properties are under it. Besides, using gpio pinctrl setting for USB2415's reset pin. Signed-off-by: Peter Chen Signed-off-by: Joshua Clayton Tested-by: Maciej S. Szmigiero --- arch/arm/boot/dts/imx6qdl-udoo.dtsi | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi index c96c91d..a173de2 100644 --- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi +++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi @@ -9,6 +9,8 @@ * */ +#include + / { aliases { backlight = &backlight; @@ -58,17 +60,6 @@ #address-cells = <1>; #size-cells = <0>; - reg_usb_h1_vbus: regulator@0 { - compatible = "regulator-fixed"; - reg = <0>; - regulator-name = "usb_h1_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - startup-delay-us = <2>; /* USB2415 requires a POR of 1 us minimum */ - gpio = <&gpio7 12 0>; - }; - reg_panel: regulator@1 { compatible = "regulator-fixed"; reg = <1>; @@ -188,7 +179,7 @@ pinctrl_usbh: usbhgrp { fsl,pins = < - MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x1b0b0 MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x130b0 >; }; @@ -259,9 +250,16 @@ &usbh1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usbh>; - vbus-supply = <®_usb_h1_vbus>; - clocks = <&clks IMX6QDL_CLK_CKO>; status = "okay"; + + usb2415: hub@1 { + compatible = "usb424,2514"; + reg = <1>; + + clocks = <&clks IMX6QDL_CLK_CKO>; + reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>; + reset-duration-us = <3000>; + }; }; &usdhc3 { -- 2.7.4