From patchwork Thu Mar 3 17:18:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 12767801 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBC8AC433FE for ; Thu, 3 Mar 2022 17:18:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235271AbiCCRTT (ORCPT ); Thu, 3 Mar 2022 12:19:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233121AbiCCRTS (ORCPT ); Thu, 3 Mar 2022 12:19:18 -0500 Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 949B7DF495; Thu, 3 Mar 2022 09:18:30 -0800 (PST) Received: by mail-io1-xd2f.google.com with SMTP id q8so6622814iod.2; Thu, 03 Mar 2022 09:18:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=Piv/cwjRM38ctXaerZYeTWxIVh1IQ5zV9gRucqSt5Ow=; b=cMp0QepwF0b2BjbjvXzC51xZri/it7a7dc6vo6hmUJswJbmpu+3Jf45b1/r4+wWg1I AoFqnZeWVaXGz8MNSE9A9edYSC3s1ySmJpfah7zmprgz4mlvia9acs8l/lxWpQVEyQ2n 5dAd9JC9m9kEkKfebe9oT+HPjHZOjO9Nczg2TN+U1YFbaQpfxV985vp/KTsa6W59D6Qm s9BGpI9yMuFlmgAP1a7A24Xg5i1QcJdggMuaulJnPWF021g23LoJVrgxp0e86jksNXgd Emn6tMKRyYhG1j85bZxiD9NHVYdd0MYrQTW17piCR6yiPHnce1uQWesrk7ejIvNBQhso kEFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Piv/cwjRM38ctXaerZYeTWxIVh1IQ5zV9gRucqSt5Ow=; b=jAzDWFuc+Hk3KcmmE6nlsB8HwrAkF9QzCegfq9FaRCCnZd+bKkA69AXC7+861WIbEW zoGb+Tbuff1hZej180AA45BL4vVhWmaSz8eHUYW1qqPkHI+aJBlwkSAWZ09La74xh8EL kPX/Ng2YXwGEY3u/SduuOjv7eXwe+McqjLSNWmYFP1mpzeCKjhK9OtC0Pr0QSCq7pKMc I39wU9Sd2Ki6Hr7Rks/T+PHEzho+UbwZt15swTxvZpIb+Rr/16mNLBjzut9YshB7erlM LyAGgYyRri3Vv+z+5XucUc2OfjtPco7RhM5HyAxsPk256T42vftyT+F3wfTL1/OkYd4c jJ3g== X-Gm-Message-State: AOAM530ZIdIEnvuhwdHCkQf4j1hNiJg2/MupRr/WfJ6Hrql8nR09frzY eVNZxEgsfQA3yWuvPx+fA2+uDXqSzecMcA== X-Google-Smtp-Source: ABdhPJySCXHAFG/fVPd8LxSkhMoMH6R6svTkOcUbDAYgbbRNVTTk8ONZtwcFqggyW74gHFRY7gNjJA== X-Received: by 2002:a6b:8e17:0:b0:60d:c43a:6992 with SMTP id q23-20020a6b8e17000000b0060dc43a6992mr28061136iod.24.1646327909291; Thu, 03 Mar 2022 09:18:29 -0800 (PST) Received: from aford-OptiPlex-7050.logicpd.com ([174.46.170.158]) by smtp.gmail.com with ESMTPSA id b11-20020a92c56b000000b002c5ff65adffsm3016655ilj.31.2022.03.03.09.18.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Mar 2022 09:18:28 -0800 (PST) From: Adam Ford To: linux-omap@vger.kernel.org Cc: aford@beaconembedded.com, Adam Ford , =?utf-8?q?Beno?= =?utf-8?q?=C3=AEt_Cousson?= , Tony Lindgren , Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] ARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP35 Date: Thu, 3 Mar 2022 11:18:17 -0600 Message-Id: <20220303171818.11060-1-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The pinout of the OMAP35 and DM37 variants of the SOM-LV are the same, but the macros which define the pinmuxing are different between OMAP3530 and DM3730. The pinmuxing was correct for for the DM3730, but wrong for the OMAP3530. Since the boot loader was correctly pin-muxing the pins, this was not obvious. As the bootloader not guaranteed to pinmux all the pins any more, this causes an issue, so the pinmux needs to be moved from a common file to their respective board files. Fixes: f8a2e3ff7103 ("ARM: dts: Add minimal support for LogicPD OMAP35xx SOM-LV devkit") Signed-off-by: Adam Ford diff --git a/arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts b/arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts index 2a0a98fe67f0..3240c67e0c39 100644 --- a/arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts +++ b/arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts @@ -11,3 +11,18 @@ model = "LogicPD Zoom OMAP35xx SOM-LV Development Kit"; compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3430", "ti,omap3"; }; + +&omap3_pmx_core2 { + pinctrl-names = "default"; + pinctrl-0 = <&hsusb2_2_pins>; + hsusb2_2_pins: pinmux_hsusb2_2_pins { + pinctrl-single,pins = < + OMAP3430_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3) /* etk_d10.hsusb2_clk */ + OMAP3430_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3) /* etk_d11.hsusb2_stp */ + OMAP3430_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d12.hsusb2_dir */ + OMAP3430_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d13.hsusb2_nxt */ + OMAP3430_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d14.hsusb2_data0 */ + OMAP3430_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d15.hsusb2_data1 */ + >; + }; +}; diff --git a/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts index a604d92221a4..c757f0d7781c 100644 --- a/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts +++ b/arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts @@ -11,3 +11,18 @@ model = "LogicPD Zoom DM3730 SOM-LV Development Kit"; compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3630", "ti,omap3"; }; + +&omap3_pmx_core2 { + pinctrl-names = "default"; + pinctrl-0 = <&hsusb2_2_pins>; + hsusb2_2_pins: pinmux_hsusb2_2_pins { + pinctrl-single,pins = < + OMAP3630_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3) /* etk_d10.hsusb2_clk */ + OMAP3630_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3) /* etk_d11.hsusb2_stp */ + OMAP3630_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d12.hsusb2_dir */ + OMAP3630_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d13.hsusb2_nxt */ + OMAP3630_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d14.hsusb2_data0 */ + OMAP3630_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d15.hsusb2_data1 */ + >; + }; +}; diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi index b56524cc7fe2..55b619c99e24 100644 --- a/arch/arm/boot/dts/logicpd-som-lv.dtsi +++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi @@ -265,21 +265,6 @@ }; }; -&omap3_pmx_core2 { - pinctrl-names = "default"; - pinctrl-0 = <&hsusb2_2_pins>; - hsusb2_2_pins: pinmux_hsusb2_2_pins { - pinctrl-single,pins = < - OMAP3630_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3) /* etk_d10.hsusb2_clk */ - OMAP3630_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3) /* etk_d11.hsusb2_stp */ - OMAP3630_CORE2_IOPAD(0x25f4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d12.hsusb2_dir */ - OMAP3630_CORE2_IOPAD(0x25f6, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d13.hsusb2_nxt */ - OMAP3630_CORE2_IOPAD(0x25f8, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d14.hsusb2_data0 */ - OMAP3630_CORE2_IOPAD(0x25fa, PIN_INPUT_PULLDOWN | MUX_MODE3) /* etk_d15.hsusb2_data1 */ - >; - }; -}; - &uart2 { interrupts-extended = <&intc 73 &omap3_pmx_core OMAP3_UART2_RX>; pinctrl-names = "default"; From patchwork Thu Mar 3 17:18:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 12767802 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 217AFC433F5 for ; Thu, 3 Mar 2022 17:18:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233121AbiCCRTX (ORCPT ); Thu, 3 Mar 2022 12:19:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235284AbiCCRTW (ORCPT ); Thu, 3 Mar 2022 12:19:22 -0500 Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD3DD1768EA; Thu, 3 Mar 2022 09:18:36 -0800 (PST) Received: by mail-io1-xd30.google.com with SMTP id t11so6595060ioi.7; Thu, 03 Mar 2022 09:18:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0WF3B5MhmM4VMTKxqIPbUl7+aYszdv2qaJTWGu36x48=; b=njhaYPGdjPvmw5QM90U49Q4Ymshn7zeqlSQBGMVtO8tQUksrPUiBsclxp8+rFi9ejq sK1nbemdUcaiqMXQFYMBUwIdBdznC7wjzlJ9M6b7OhlpjEyBVitzBw63TroEw8CDOuhK VWtY4HTnBwfeY4Wy9e1px7iFzt/SC4fxE9D8R9QPF6l78P5XqwFXbsaL8MV8ld073yOR oy4dhyXK+Hsg3NA4RH3uEtni1/kSzGIKbexmIAJ1W/U/9eilRNpDgcpJWllPJ3kC6XVP 6S10wA+gDKgHCYi+eMf97q7iBP+u/CS5Qp6zhqercoCtowW9znXpTgF2tHVhjptmy3ZZ +Wrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0WF3B5MhmM4VMTKxqIPbUl7+aYszdv2qaJTWGu36x48=; b=pKaVR1+lMotTK+Uta4xLqJBFwuvcrSNjYZra4BneIXv5B0/twxEMqzZAH6nGFGVB3A OqK9y+ZuAonDljHA2n8CaMx1tnI9rNpdn6PvVKJGD8zBTC3d97GdBFSCLl/uyzKnCAZy T5Ydm9bnSPtQ6UUTaV3B1xuJj5g7wk6X5i9IYSNXVPzbJsKUAk0ON04Ev89HYHk+9bwh NQDyPEOhrafLHlhyeY97CHRC3yoicREx01bDePmxduduAZsjEXzSMuBN2fGRBovJe+hC FaP5cCnEx0lTZGJywFldyNS4FHvt7UWdMXu0LLWC+oFHUGm1aKdytsZTusfSQ9KPMMLh xTwQ== X-Gm-Message-State: AOAM530ohHMc++tPUk6BG7+Qk8wBAcalMiKG6QvBT3pRgAVGv1DM7ajZ U98LhBMqOjT5NsbTg44XPM2uAamknowQZA== X-Google-Smtp-Source: ABdhPJwwZbYuhjgp3vYy95ehiMEQUCMr4P3uLS4JxL0pUCEASWodXfSIWznGeLwWsW6fTXDebSdzig== X-Received: by 2002:a02:1183:0:b0:314:4120:1fbe with SMTP id 125-20020a021183000000b0031441201fbemr30693303jaf.129.1646327915784; Thu, 03 Mar 2022 09:18:35 -0800 (PST) Received: from aford-OptiPlex-7050.logicpd.com ([174.46.170.158]) by smtp.gmail.com with ESMTPSA id b11-20020a92c56b000000b002c5ff65adffsm3016655ilj.31.2022.03.03.09.18.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Mar 2022 09:18:35 -0800 (PST) From: Adam Ford To: linux-omap@vger.kernel.org Cc: aford@beaconembedded.com, Adam Ford , =?utf-8?q?Beno?= =?utf-8?q?=C3=AEt_Cousson?= , Tony Lindgren , Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ARM: dts: logicpd-som-lv: Move pinmuxing to peripheral nodes Date: Thu, 3 Mar 2022 11:18:18 -0600 Message-Id: <20220303171818.11060-2-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220303171818.11060-1-aford173@gmail.com> References: <20220303171818.11060-1-aford173@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Move some pinmux references to their respective peripherals. This keeps the pins in safe-mode until they are requested. Signed-off-by: Adam Ford diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi index 55b619c99e24..9ba0ea4eb48a 100644 --- a/arch/arm/boot/dts/logicpd-som-lv.dtsi +++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi @@ -27,6 +27,8 @@ /* HS USB Host PHY on PORT 1 */ hsusb2_phy: hsusb2_phy { + pinctrl-names = "default"; + pinctrl-0 = <&hsusb2_reset_pin>; compatible = "usb-nop-xceiv"; reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; /* gpio_4 */ #phy-cells = <0>; @@ -144,6 +146,8 @@ }; &usbhshost { + pinctrl-names = "default"; + pinctrl-0 = <&hsusb2_pins>; port2-mode = "ehci-phy"; }; @@ -151,10 +155,7 @@ phys = <0 &hsusb2_phy>; }; - &omap3_pmx_core { - pinctrl-names = "default"; - pinctrl-0 = <&hsusb2_pins>; mmc3_pins: pinmux_mm3_pins { pinctrl-single,pins = < @@ -250,8 +251,7 @@ }; &omap3_pmx_wkup { - pinctrl-names = "default"; - pinctrl-0 = <&hsusb2_reset_pin>; + hsusb2_reset_pin: pinmux_hsusb1_reset_pin { pinctrl-single,pins = < OMAP3_WKUP_IOPAD(0x2a0e, PIN_OUTPUT | MUX_MODE4) /* sys_boot2.gpio_4 */