From patchwork Thu Aug 11 16:40:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Clayton X-Patchwork-Id: 9275639 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7B2E660780 for ; Thu, 11 Aug 2016 16:43:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D75A28732 for ; Thu, 11 Aug 2016 16:43:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 619452874B; Thu, 11 Aug 2016 16:43:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD7AC28732 for ; Thu, 11 Aug 2016 16:43:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bXt3s-00024Q-RS; Thu, 11 Aug 2016 16:42:28 +0000 Received: from mail-pa0-x244.google.com ([2607:f8b0:400e:c03::244]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bXt2c-00016V-TG for linux-arm-kernel@lists.infradead.org; Thu, 11 Aug 2016 16:41:18 +0000 Received: by mail-pa0-x244.google.com with SMTP id cf3so39258pad.2 for ; Thu, 11 Aug 2016 09:40:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wkYze3lVeZpTgrcaYGfaTS3YMbQb0+qi+en0M/jZ8Zc=; b=gvZu0WabbNeTc89Q0SmCGBZFG5daEB7AjBTNnlZigHkZyvEs3X0c4rIalrOdH0h1JC K1HEwB+o76OfoZIvDsojwLNLfeeQfgut4x9EYIHRXcNZl8pxKj5WTZjPWDKx8+0MwYIH bvAs05+ug5nnWqYTvgjuTRehhM3UCPziWQ8za4C32Ka/lPQ08fLKHGvoSFAJ39ZsJD/v oKfyw7K4IAX8cy5ey++ABS3NbQuKAXbSJDuY6g5xBE/oDCdATRDD8UATiGQ/naYLWFSU E5c2GLuEEHGozz0o7f2vHYnNK/zi7FkumUqiLwQzLUCp+KveJTJyPXtV09+2Xl2u6gey kjfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wkYze3lVeZpTgrcaYGfaTS3YMbQb0+qi+en0M/jZ8Zc=; b=Zd7s/Kh/mHYFDf5KkG8WCXPJD5DL+8p0riliOjrQKwSEunQwGzOOhZ0AgZb60pAtTX x0Vi3Q6KaMOd6cumMMVhQbZxyI8OcpbOjtoYFqUOEvWIe4fQm0ewD03Z/xkMWdAAM7tn KibDVQ9dB/u2vVA16mxBuF/TSQ8lumXBhkVAvFcHITzm1ogXvj296NH8Y+jTzv+p0guK bP9i4cVu4QVmpWmtfau2+La+mckk/Uwb8g7sbcRNLcHiYNekGlQdz2xzvO19clgfnsh/ hD2WmzogNkC2++io6QGXYgX7Mk5I3DJiB5s7ZFEYmneedinsClsDQZmYHTpWiflxlAIl DT2Q== X-Gm-Message-State: AEkooutqke17g2sVVSBV8/x9XvgX62ruawZObXIFUbUMgvvBVe9mASOYNuNidMKsGrLU/Q== X-Received: by 10.66.236.201 with SMTP id uw9mr13653942pac.111.1470933649727; Thu, 11 Aug 2016 09:40:49 -0700 (PDT) Received: from jclayton-pc.columbia.uniwest.com (68-185-59-186.static.knwc.wa.charter.com. [68.185.59.186]) by smtp.gmail.com with ESMTPSA id sy7sm6551643pac.42.2016.08.11.09.40.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Aug 2016 09:40:48 -0700 (PDT) From: Joshua Clayton To: Peter Chen , Shawn Guo Subject: [PATCH 3/3] ARM: dts: imx6q-evi: Fix onboard hub reset line Date: Thu, 11 Aug 2016 09:40:32 -0700 Message-Id: <1470933632-22133-4-git-send-email-stillcompiling@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470933632-22133-1-git-send-email-stillcompiling@gmail.com> References: <20160810030254.GD1879@shlinux2> <1470933632-22133-1-git-send-email-stillcompiling@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160811_094111_220214_D69299C5 X-CRM114-Status: GOOD ( 10.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, ulf.hansson@linaro.org, stephen.boyd@linaro.org, k.kozlowski@samsung.com, linux-kernel@vger.kernel.org, festevam@gmail.com, Joshua Clayton , pawel.moll@arm.com, dbaryshkov@gmail.com, mka@chromium.org, stern@rowland.harvard.edu, dwmw3@infradead.org, devicetree@vger.kernel.org, mail@maciej.szmigiero.name, arnd@arndb.de, linux-pm@vger.kernel.org, s.hauer@pengutronix.de, troy.kisky@boundarydevices.com, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org, oscar@naiandei.net, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, sre@kernel.org, broonie@kernel.org, p.zabel@pengutronix.de MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Previously the onboard hub was made to work by treating its reset gpio as a regulator enable. Get rid of that kludge now that pwseq has added reset gpio support Move pin muxing the hub reset pin into the usbh1 group Signed-off-by: Joshua Clayton --- arch/arm/boot/dts/imx6q-evi.dts | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-evi.dts b/arch/arm/boot/dts/imx6q-evi.dts index 4fa5601..49c6f61 100644 --- a/arch/arm/boot/dts/imx6q-evi.dts +++ b/arch/arm/boot/dts/imx6q-evi.dts @@ -54,18 +54,6 @@ reg = <0x10000000 0x40000000>; }; - reg_usbh1_vbus: regulator-usbhubreset { - compatible = "regulator-fixed"; - regulator-name = "usbh1_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - startup-delay-us = <2>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbh1_hubreset>; - gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>; - }; - reg_usb_otg_vbus: regulator-usbotgvbus { compatible = "regulator-fixed"; regulator-name = "usb_otg_vbus"; @@ -204,12 +192,18 @@ }; &usbh1 { - vbus-supply = <®_usbh1_vbus>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usbh1>; dr_mode = "host"; disable-over-current; status = "okay"; + + usb2415host: hub@1 { + compatible = "usb424,2513"; + reg = <1>; + reset-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>; + reset-duration-us = <3000>; + }; }; &usbotg { @@ -467,11 +461,6 @@ MX6QDL_PAD_GPIO_3__USB_H1_OC 0x1b0b0 /* usbh1_b OC */ MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0 - >; - }; - - pinctrl_usbh1_hubreset: usbh1hubresetgrp { - fsl,pins = < MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x1b0b0 >; };