From patchwork Sun Jan 17 23:53:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 8051171 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0322C9F744 for ; Sun, 17 Jan 2016 23:54:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 93DBC2022A for ; Sun, 17 Jan 2016 23:54:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C41220221 for ; Sun, 17 Jan 2016 23:54:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752806AbcAQXx6 (ORCPT ); Sun, 17 Jan 2016 18:53:58 -0500 Received: from mail-ig0-f176.google.com ([209.85.213.176]:38321 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751243AbcAQXx5 (ORCPT ); Sun, 17 Jan 2016 18:53:57 -0500 Received: by mail-ig0-f176.google.com with SMTP id mw1so39105824igb.1 for ; Sun, 17 Jan 2016 15:53:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=fIDQmlg1Y2misilSO8kEqUktcXiFLneMkofM/ggiWsQ=; b=Mort+IjaWAITJAebkKBZyneHQQGlPNQx0KZT38Q7e9m02ICMUdakGmo/U8FF/KH/ie SCgnmOPnBsTKdNqNRrvn+AkMMuoGD+KAjZVvCayWUheAcKx1zA7I4AXBsJcYlW926sak wDTKBzhOMsuxBtuWRxkFW71wiFo75+n91HxSJQwuyJKQwEiPAORQrMoaVhhzLmJl3am2 vxcXo4zEwggrGTSdvpH0AC6+cAzVWlbwQSOkKVscoSAhnXGTnjFAseCk5AJ6vtkIbS0T N5F4UBg+NnRiyh6FBUQkj9JncAwaZuW1wr3SdgyJa+P2OHMLSRGSb6Wl6ZiuRimoyqVj vfDA== 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; bh=fIDQmlg1Y2misilSO8kEqUktcXiFLneMkofM/ggiWsQ=; b=W8z9nZ3ZYHfRetEUAURohVTWIxygYJMUNFtJXiApW2ilAyZOP1wYwdyS4deShN8nS6 xtVlpAyxmkdhSuCMqV8inJTUkyHS4rnbbP/ptRgCvgRtqEHRxdwzM4gDbF+56bYYnwxw CboNfKhi+v3K/3/cXQg6IZsjR6yiC5/GWEiaJEqgesCvvDgPvq9oxHhnduvhAOIZADS/ cjhGNkfX7NsjTT35VTdaDHoLcLrr/CbaWnCcvs8kOZEf7m4Rr4iT8VJAwy2qGLqDWVJi 5AB1ckHAkhDyGdVZK32cMTn0J9E626/BKT01opHzfCxtWacXsiqX9JpHEKiqNjJDkVPP CI5w== X-Gm-Message-State: AG10YOQn2Hrcpr6/OrRpz6V1RlWpKwTXa7RGZsBJzQooVlwiLshU0moIrzMyiZHjir/GFA== X-Received: by 10.50.142.40 with SMTP id rt8mr8146542igb.28.1453074836631; Sun, 17 Jan 2016 15:53:56 -0800 (PST) Received: from localhost.localdomain (c-76-113-128-183.hsd1.mn.comcast.net. [76.113.128.183]) by smtp.gmail.com with ESMTPSA id i73sm8161715ioi.6.2016.01.17.15.53.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 17 Jan 2016 15:53:55 -0800 (PST) From: Adam Ford To: linux-omap@vger.kernel.org Cc: tony@atomide.com, adam.ford@logicpd.com, Adam Ford Subject: [PATCH] ARM: OMAP2+: LogicPD Torpedo: Set HSUSB0 Pin Mux Date: Sun, 17 Jan 2016 17:53:48 -0600 Message-Id: <1453074828-25212-1-git-send-email-aford173@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch defines the pin muxing to configure the hsusb0 through the twl4030 PMIC, because we can't always assume the bootloader will do it correctly. Signed-off-by: Adam Ford --- arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 2 ++ arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts index 703ced2..874ce46 100644 --- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts +++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts @@ -378,6 +378,8 @@ /* Wired to the tps65950 on the SOM, only the USB connector is on the devkit */ &usb_otg_hs { + pinctrl-names = "default"; + pinctrl-0 = <&hsusb_otg_pins>; interface-type = <0>; usb-phy = <&usb2_phy>; phys = <&usb2_phy>; diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi index 1876e7d..5816335 100644 --- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi +++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi @@ -179,7 +179,23 @@ OMAP3_CORE1_IOPAD(0x21ce, PIN_OUTPUT | MUX_MODE0) /* mcspi1_cs0.mcspi1_cs0 */ >; }; - + hsusb_otg_pins: pinmux_hsusb_otg_pins { + pinctrl-single,pins = < + OMAP3_CORE1_IOPAD(0x21a2, PIN_INPUT | MUX_MODE0) /* hsusb0_clk.hsusb0_clk */ + OMAP3_CORE1_IOPAD(0x21a4, PIN_OUTPUT | MUX_MODE0) /* hsusb0_stp.hsusb0_stp */ + OMAP3_CORE1_IOPAD(0x21a6, PIN_INPUT | MUX_MODE0) /* hsusb0_dir.hsusb0_dir */ + OMAP3_CORE1_IOPAD(0x21a8, PIN_INPUT | MUX_MODE0) /* hsusb0_nxt.hsusb0_nxt */ + + OMAP3_CORE1_IOPAD(0x21aa, PIN_INPUT | MUX_MODE0) /* hsusb0_data0.hsusb0_data0 */ + OMAP3_CORE1_IOPAD(0x21ac, PIN_INPUT | MUX_MODE0) /* hsusb0_data1.hsusb0_data1 */ + OMAP3_CORE1_IOPAD(0x21ae, PIN_INPUT | MUX_MODE0) /* hsusb0_data2.hsusb0_data2 */ + OMAP3_CORE1_IOPAD(0x21b0, PIN_INPUT | MUX_MODE0) /* hsusb0_data3.hsusb0_data3 */ + OMAP3_CORE1_IOPAD(0x21b2, PIN_INPUT | MUX_MODE0) /* hsusb0_data4.hsusb0_data4 */ + OMAP3_CORE1_IOPAD(0x21b4, PIN_INPUT | MUX_MODE0) /* hsusb0_data5.hsusb0_data5 */ + OMAP3_CORE1_IOPAD(0x21b6, PIN_INPUT | MUX_MODE0) /* hsusb0_data6.hsusb0_data6 */ + OMAP3_CORE1_IOPAD(0x21b8, PIN_INPUT | MUX_MODE0) /* hsusb0_data7.hsusb0_data7 */ + >; + }; }; &uart2 {