From patchwork Sat Sep 29 19:10:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 976674 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YyjxZ9o5"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42Myn356qMz9s3x for ; Sun, 30 Sep 2018 05:10:42 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id CE39CC21F0B; Sat, 29 Sep 2018 19:10:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 30BF2C21E0B; Sat, 29 Sep 2018 19:10:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 69C43C21DCA; Sat, 29 Sep 2018 19:10:31 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id C61D2C21CB6 for ; Sat, 29 Sep 2018 19:10:29 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id n18-v6so6531319ioa.9 for ; Sat, 29 Sep 2018 12:10:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=5SOCUJ9YHmiJo3RweyyC12W6ZEoZs+7EoGTFHvV7I7g=; b=YyjxZ9o5SBVd3k43IXuGZIF5CxUWNOTieJpwZz1KbqhhxI+qAi/moUCcicSi5raZ7G gVB05sxdq6EqWmHpO3s8uKBgZu9wbpvRYZMnvgmbvjUNTabRPnMEc7rOy2TY+MwQWU2Q 75TdUiL5sv7uMo5BchXSrd0bHNWZ/0jKilXwoN6E+EjhJPRjlWvPzr4TiqBFCNw7eESX Bn5zZCYXR8uop0BTuqMSNmfA5zH/MABZAjBtI6E4yexYm0DS152B+VZhol6sWQ8/2U41 lsWRxPazWVbwjN08AdG165mWNhej4KMP1Yx9c2p9EaXZE1xibKJicbAaMPpHQRaMME8H 86Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=5SOCUJ9YHmiJo3RweyyC12W6ZEoZs+7EoGTFHvV7I7g=; b=IsYojlQ50d9IbUGHoZWu0wUvkFNcbsZoJCPvwszYv8//0YREQWu4ag+7bySmI/QXes jcGkuHuqT/Uhc3ExSxL8BDCOkEHzu/1SFQHmXeGRvmBuIKoaGHjtLbzhi9UPUcwBKJg3 FRa2zuFGr0McCG57lOKWIAWhxA98p7I/kDhuHKADA7Xit6IvjrUaUMfDYXmDwQ9Ovio/ apVZTqXevY3ZsSnM/dvTSaRx/FNkz20KAEzt00q5UEWfBK0Ph+YpKOO8Gh6WStcVoE6a Ka+rbVO+VvMo3GgVyOthqdvunq8gf3Lk/5Dlby0Njoh/oAz7o/zrpX4j8Y0OgI7Vsktd R+jA== X-Gm-Message-State: ABuFfogRhbSD1zcepPJjadNQLdgFwsXFIk7xXeYyXKTYXQRhZxN8RLUk 6JCQsbq4NF5TUcH/EA16PJg5NHA6+GQ= X-Google-Smtp-Source: ACcGV630f9b/BEjsVxW1OBWVzZvZEHHcjomHzTrOCG90fLDJvl8Cn3XVYvB7+44lN6kJWzlryYlSGQ== X-Received: by 2002:a6b:410f:: with SMTP id n15-v6mr2566764ioa.3.1538248227719; Sat, 29 Sep 2018 12:10:27 -0700 (PDT) Received: from localhost.localdomain (c-75-73-34-135.hsd1.mn.comcast.net. [75.73.34.135]) by smtp.gmail.com with ESMTPSA id w196-v6sm2636838itb.9.2018.09.29.12.10.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Sep 2018 12:10:26 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Date: Sat, 29 Sep 2018 14:10:15 -0500 Message-Id: <20180929191019.12614-1-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: adam.ford@logicpd.com Subject: [U-Boot] [PATCH 1/5] ARM: DTS: LogicPD-SOM-LV & Torpedo: Resync DTS with Kernel X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The device tree entries are from linux-omap's for-next branch destined to me put into 4.20 (or whatever the version is after 4.19) Signed-off-by: Adam Ford diff --git a/arch/arm/dts/logicpd-som-lv-37xx-devkit.dts b/arch/arm/dts/logicpd-som-lv-37xx-devkit.dts index 2428373952..2aca9111c6 100644 --- a/arch/arm/dts/logicpd-som-lv-37xx-devkit.dts +++ b/arch/arm/dts/logicpd-som-lv-37xx-devkit.dts @@ -15,3 +15,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/dts/logicpd-som-lv.dtsi b/arch/arm/dts/logicpd-som-lv.dtsi index 3bb28c03ca..03485509c8 100644 --- a/arch/arm/dts/logicpd-som-lv.dtsi +++ b/arch/arm/dts/logicpd-som-lv.dtsi @@ -129,7 +129,7 @@ }; &mmc3 { - interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>; + interrupts-extended = <&intc 94>; pinctrl-0 = <&mmc3_pins &wl127x_gpio>; pinctrl-names = "default"; vmmc-supply = <&wl12xx_vmmc>; @@ -142,7 +142,7 @@ compatible = "ti,wl1273"; reg = <2>; interrupt-parent = <&gpio1>; - interrupts = <2 IRQ_TYPE_LEVEL_HIGH>; /* gpio 2 */ + interrupts = <2 IRQ_TYPE_EDGE_RISING>; /* gpio 2 */ ref-clock-frequency = <26000000>; }; }; @@ -232,6 +232,20 @@ >; }; + i2c2_pins: pinmux_i2c2_pins { + pinctrl-single,pins = < + OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0) /* i2c2_scl */ + OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0) /* i2c2_sda */ + >; + }; + + i2c3_pins: pinmux_i2c3_pins { + pinctrl-single,pins = < + OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0) /* i2c3_scl */ + OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0) /* i2c3_sda */ + >; + }; + tsc2004_pins: pinmux_tsc2004_pins { pinctrl-single,pins = < OMAP3_CORE1_IOPAD(0x2186, PIN_INPUT | MUX_MODE4) /* mcbsp4_dr.gpio_153 */ @@ -253,33 +267,6 @@ OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */ >; }; - i2c2_pins: pinmux_i2c2_pins { - pinctrl-single,pins = < - OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0) /* i2c2_scl */ - OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0) /* i2c2_sda */ - >; - }; - i2c3_pins: pinmux_i2c3_pins { - pinctrl-single,pins = < - OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0) /* i2c3_scl */ - OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0) /* i2c3_sda */ - >; - }; -}; - -&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 { diff --git a/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts index 234afd6d60..9d5d53fbe9 100644 --- a/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts +++ b/arch/arm/dts/logicpd-torpedo-37xx-devkit.dts @@ -48,7 +48,7 @@ compatible = "ti,wl1283"; reg = <2>; interrupt-parent = <&gpio5>; - interrupts = <24 IRQ_TYPE_LEVEL_HIGH>; /* gpio 152 */ + interrupts = <24 IRQ_TYPE_EDGE_RISING>; /* gpio 152 */ ref-clock-frequency = <26000000>; tcxo-clock-frequency = <26000000>; }; From patchwork Sat Sep 29 19:10:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 976675 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tIFooIxP"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42Myp95ZMSz9s3x for ; Sun, 30 Sep 2018 05:11:45 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6A35DC21E9F; Sat, 29 Sep 2018 19:10:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C6AD9C21EFC; Sat, 29 Sep 2018 19:10:34 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1CDFCC21E9F; Sat, 29 Sep 2018 19:10:32 +0000 (UTC) Received: from mail-it1-f196.google.com (mail-it1-f196.google.com [209.85.166.196]) by lists.denx.de (Postfix) with ESMTPS id 82987C21CB6 for ; Sat, 29 Sep 2018 19:10:31 +0000 (UTC) Received: by mail-it1-f196.google.com with SMTP id 139-v6so6732502itf.0 for ; Sat, 29 Sep 2018 12:10:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0BtItE7fVn96xHpHJ+hYE14C+Atrnd/hKinhutPktVs=; b=tIFooIxPRiv2y1GtpSrfDrs+LzmXPizXPYFfhEM19Ll22jXoyRoXJZv75y933/54n+ Zzq+tLjXvr2l9iT62OtO1tleGEVPtDLUNd9uiNtYTdu/CyCOkbbtu2h+yHqgIKlOm4Fj EzMiLp/pGWmo9+IVwk6/j5jDibVmjGbBsB0XswlfdipHHHQ3GVITQU0zGHQsCLArUYsg oHIXCAJ/8oejL5b3+MP9RgVJAD1VZfJvzr4k/2uyGBRka3+k4syUHIkMQxYWGrVC3uba F/gJrWD1VjsyVmNDDSEYMOXCDaN3tknjjxUSAI94PIc/9vGV6ieaVjPZ+CsrQiA8EPA9 zEcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0BtItE7fVn96xHpHJ+hYE14C+Atrnd/hKinhutPktVs=; b=H6AGoyesQa8GwQOVj5pCuSWiHkZ5soxrDa1jCCo3EJGLXfAvFsmSBDFDSLgnd3naSS bAYc8ldI6HOdHrV6fAz20T/umwBVQCsUieDX+i/nbtASXBWZgQzVc06yJaGP30EebhMf /Y+cRQsJpFl1ok1+AUQ3STzweiKsTMMKOzhke5y/Txo3yrSewdtdS10sfS8D3aQF+2go MXyS8ajSbbss9FjsTNUQE2+iIHvuQF0r6XIITEospVDMgufzsHyUEw0JlthZxPK028sA h26ELndE2rNYtKdHrXE5LSOZD0CpygZPIbwXQVdLKAy8vTRiFmPLsB9+sTo8W3hiUunq ikbA== X-Gm-Message-State: ABuFfogsvM3jaMmefiK3oMYnyuAl3BpA6u4z8L8wzY9iUj1VpAW72vui wWN+Iqu6+2x9hlg2KlBFuG370uNbq1w= X-Google-Smtp-Source: ACcGV62U47HqtyVjR+HvcRddG1XHglBuGcTfn54mmnO7lqcRm30WuPYIVUievIPrkFk0EgPMIfazTw== X-Received: by 2002:a24:46cd:: with SMTP id j196-v6mr5444323itb.0.1538248229551; Sat, 29 Sep 2018 12:10:29 -0700 (PDT) Received: from localhost.localdomain (c-75-73-34-135.hsd1.mn.comcast.net. [75.73.34.135]) by smtp.gmail.com with ESMTPSA id w196-v6sm2636838itb.9.2018.09.29.12.10.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Sep 2018 12:10:28 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Date: Sat, 29 Sep 2018 14:10:16 -0500 Message-Id: <20180929191019.12614-2-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180929191019.12614-1-aford173@gmail.com> References: <20180929191019.12614-1-aford173@gmail.com> Cc: adam.ford@logicpd.com Subject: [U-Boot] [PATCH 2/5] ARM: DTS: Remove unnecessary u-boot.dtsi options from omap3/36xx X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" With the introduction of the omap serial driver, the need for some of these U-Boot specific modifications is gone. This cleans up this unnneeded stuff. Signed-off-by: Adam Ford diff --git a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi index d584b4a9ab..41ed5d7e17 100644 --- a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi +++ b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi @@ -4,14 +4,6 @@ * Logic PD - http://www.logicpd.com */ -/ { - model = "LogicPD Zoom OMAP3 Development Kit"; - - chosen { - stdout-path = &uart1; - }; -}; - &i2c1 { clock-frequency = <400000>; }; @@ -28,15 +20,3 @@ status = "disabled"; }; -&uart1 { - reg-shift = <2>; -}; - -&uart2 { - reg-shift = <2>; -}; - -&uart3 { - reg-shift = <2>; -}; - diff --git a/arch/arm/dts/omap3-u-boot.dtsi b/arch/arm/dts/omap3-u-boot.dtsi deleted file mode 100644 index 633153a41e..0000000000 --- a/arch/arm/dts/omap3-u-boot.dtsi +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017 - * Logic PD - http://www.logicpd.com - */ - -&uart1 { - reg-shift = <2>; -}; - -&uart2 { - reg-shift = <2>; -}; - -&uart3 { - reg-shift = <2>; -}; - diff --git a/arch/arm/dts/omap36xx-u-boot.dtsi b/arch/arm/dts/omap36xx-u-boot.dtsi deleted file mode 100644 index 374499dcb2..0000000000 --- a/arch/arm/dts/omap36xx-u-boot.dtsi +++ /dev/null @@ -1,9 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2017 - * Logic PD - http://www.logicpd.com - */ - -&uart4 { - reg-shift = <2>; -}; From patchwork Sat Sep 29 19:10:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 976676 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TwnXC+Jo"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42MypJ4s1yz9s3x for ; Sun, 30 Sep 2018 05:11:52 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 38B76C21CB6; Sat, 29 Sep 2018 19:11:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B0358C21F1F; Sat, 29 Sep 2018 19:10:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C61D3C21EE3; Sat, 29 Sep 2018 19:10:36 +0000 (UTC) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by lists.denx.de (Postfix) with ESMTPS id B33E4C21E85 for ; Sat, 29 Sep 2018 19:10:32 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id v14-v6so6550388iob.4 for ; Sat, 29 Sep 2018 12:10:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Vieai8eJg4+Sfhb85uR7zobhHb17NFPMEPNGvPtepdM=; b=TwnXC+JoBlCvcbWEPesSj4weP0JAJV7FXm1i1uB4mSqhlC/CfE5a/3Jibwv7xymMmK /KxaBhKd+a8OrbGuXm54DaRHX+OFZZeYlGSN86oRDsjEwwWO/hnTQ7a38TS05prc3zvP PaxwP/Vks/Tix5mzY3fXWQye+6GMsmdacNFmoBZlZ3Sd+d53LLrEddDDL9GComHcdqs3 LlDJqMF/NQhYj356ss7YbDRMIgpoNara7j8Rh8HVhmcEu6LUeK/MrFnpnOJo9GqN05Yc cwUC7QAIQ1KeMps3hLPil3vuJt0YkRjt5AExv8dDA4oueFi9tHgL0o1eTaIhQbWz40mO Km6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Vieai8eJg4+Sfhb85uR7zobhHb17NFPMEPNGvPtepdM=; b=cHKj55r9dNjBvWMX7+KTJWRKcEN2heITwFtY0NeHOyCP77MO2TtDRcyELA2SdwyRjH YG7UrTw8lEwWB87Sb90oMBrNCxg8cnrClfDAn8Lm2OlITXWm5ChJLEN1nVFXWCUFOrQ3 MN+3E3DKmICd831+6cNL/TulhnEnUgfWkaDjQxhmGxS+4Ax6yKMReYG0dm7fupugVacp xNI4cH71AmkG62m4q/1FOgSxnxs4480gN0fQdT6HW85aAlapsKJiJ0h0JHsm/FtnljCK S/gOVxY8PoCx0XuPPW2vOjWFpAYvANNSOAb2QZnMtZWeKeDexX4twSEF1UJ+3I7vqd1K ZLDA== X-Gm-Message-State: ABuFfogdFvkLwq8hjDm7XRr5qdD8Cwhe3+36vm/1BHJ5y+GOF380hg6e ePqxshkkrvLYHoF6ABoBL14eQcvRa74= X-Google-Smtp-Source: ACcGV61423N0b43J+3JSDCqz6Nbg0ujCYmcyMX6vBq/rp2uRIsULJF+aIUd9JGN1ApWT5MEW7GihWA== X-Received: by 2002:a5e:8a43:: with SMTP id o3-v6mr1238140iom.110.1538248230967; Sat, 29 Sep 2018 12:10:30 -0700 (PDT) Received: from localhost.localdomain (c-75-73-34-135.hsd1.mn.comcast.net. [75.73.34.135]) by smtp.gmail.com with ESMTPSA id w196-v6sm2636838itb.9.2018.09.29.12.10.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Sep 2018 12:10:29 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Date: Sat, 29 Sep 2018 14:10:17 -0500 Message-Id: <20180929191019.12614-3-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180929191019.12614-1-aford173@gmail.com> References: <20180929191019.12614-1-aford173@gmail.com> Cc: adam.ford@logicpd.com Subject: [U-Boot] [PATCH 3/5] ARM: DTS: Add support for Logic PD OMAP35 Torpedo & SOM-LV X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The baseboards and SOM's are virtually identical to their DM37 counterparts, but OMAP36/37 and OMAP3 have some minor register differences. With the boards being mostly driven by device trees now, this synchronizes their respective device trees with linux-omap for-next branch destined for 4.20 (or whatever the version after 4.19 will be called) Signed-off-by: Adam Ford diff --git a/arch/arm/dts/logicpd-som-lv-35xx-devkit.dts b/arch/arm/dts/logicpd-som-lv-35xx-devkit.dts new file mode 100644 index 0000000000..4cd72b5e61 --- /dev/null +++ b/arch/arm/dts/logicpd-som-lv-35xx-devkit.dts @@ -0,0 +1,32 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/dts-v1/; + +#include "omap34xx.dtsi" +#include "logicpd-som-lv.dtsi" +#include "logicpd-som-lv-baseboard.dtsi" +#include "omap-gpmc-smsc9221.dtsi" + +/ { + model = "LogicPD Zoom OMAP35xx SOM-LV Development Kit"; + compatible = "logicpd,dm3730-som-lv-devkit", "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/dts/logicpd-torpedo-35xx-devkit.dts b/arch/arm/dts/logicpd-torpedo-35xx-devkit.dts new file mode 100644 index 0000000000..d7cb659656 --- /dev/null +++ b/arch/arm/dts/logicpd-torpedo-35xx-devkit.dts @@ -0,0 +1,17 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/dts-v1/; + +#include "omap34xx.dtsi" +#include "logicpd-torpedo-som.dtsi" +#include "logicpd-torpedo-baseboard.dtsi" +#include "omap-gpmc-smsc9221.dtsi" + +/ { + model = "LogicPD Zoom OMAP35xx Torpedo Development Kit"; + compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3"; +}; From patchwork Sat Sep 29 19:10:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 976678 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="i/pUej3L"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42Myr03Gn2z9s3x for ; Sun, 30 Sep 2018 05:13:20 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 162C0C21CB6; Sat, 29 Sep 2018 19:11:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2,T_DKIM_INVALID,UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 5A4FCC21F00; Sat, 29 Sep 2018 19:10:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F2226C21F00; Sat, 29 Sep 2018 19:10:38 +0000 (UTC) Received: from mail-it1-f196.google.com (mail-it1-f196.google.com [209.85.166.196]) by lists.denx.de (Postfix) with ESMTPS id 9E5FAC21EEF for ; Sat, 29 Sep 2018 19:10:34 +0000 (UTC) Received: by mail-it1-f196.google.com with SMTP id 134-v6so6575147itz.2 for ; Sat, 29 Sep 2018 12:10:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u/cVcuSlx1jZPxtuyYcn5WWga6EcnUP6WxLlrtwceT8=; b=i/pUej3LtqUbhgVTFKXaTIac1LqVDqCluxDpMarINAyTFe8kHvX4wz3QwI1KaN8i3M H8uhT4Uu0AeGuzt+7t5TmA2TvJB7bE08rMmj/5B3eDkFWlqAk5/GIoneDbg7erI4/sxb HM7aV1QBtbjJ3mUTQmtt3bdPoYu18FrVke1MHJBvd6L34+yq6Yo92syTytquDHnpMFyH UdE4Gg00zLcQlGrkc1S8E7Vjlny8jli21t4S9TRaop9tAyTGlBNkIssL778V4KokyHuj Dd5jiVYd3M0QIn7btdGdTvJY3rp/HLhtR1gdyDUqpudLhksrjher5yGtMgdaz+uySlrV hjmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=u/cVcuSlx1jZPxtuyYcn5WWga6EcnUP6WxLlrtwceT8=; b=sSLXl+TN80m0bWH42poCNtQSoz7jaeoxbemVjYkhIj2UexNG1SDSxCmn07ajDs/9Jz mJuKbeo7gTEz9a0OxpYxlMxuyQvG3q/SABo8dth7wid4ukB20ayDCS+3Y1AWFLyglbz8 Hjq1/bxUmeo3Wa6TZ0XvIyPWW1KBqpZkpmo8beAAFIiJsHvQjC0CkQiPv4+oYG5FjqGJ GtqYXPzGvGv18eHrNxWkJvM25pYTiWkt8pRBtuwprmxfgRMRW2um7Z/K1yebbmGSoMBz KfhWGGnyUPr1ISqmx1DUgynerwC51f08pXwn4WTzAn8+PjuxcbTpbvaI3S9pGMZQovng xZ8Q== X-Gm-Message-State: ABuFfog/zgDEhqK4cE6+ml8qP7DnO3v4LTTWZMrY0a4RY22IyiYd163L drQhd2kf1PgNhWeeRVfRADnFS2Vrlvw= X-Google-Smtp-Source: ACcGV60GguJfw9urzgTidiev3H5Wp2RVUHGgN/kHoggoMlqnMMAg53nb1xpnzqxbLJIa7ngvrkx6mg== X-Received: by 2002:a02:5f5a:: with SMTP id r87-v6mr3046186jab.22.1538248232703; Sat, 29 Sep 2018 12:10:32 -0700 (PDT) Received: from localhost.localdomain (c-75-73-34-135.hsd1.mn.comcast.net. [75.73.34.135]) by smtp.gmail.com with ESMTPSA id w196-v6sm2636838itb.9.2018.09.29.12.10.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Sep 2018 12:10:32 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Date: Sat, 29 Sep 2018 14:10:18 -0500 Message-Id: <20180929191019.12614-4-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180929191019.12614-1-aford173@gmail.com> References: <20180929191019.12614-1-aford173@gmail.com> Cc: adam.ford@logicpd.com Subject: [U-Boot] [PATCH 4/5] ARM: DTS: Add Logic PD OMAP35/DM37 SOM-LV and OMAP35 Torpedo X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" With the device trees doing most of the work of pin-muxing and DM doing much of the peripheral initialization, this creates new defconfig files for each of the Logic PD variants with proper register settings/pin-muxing. Signed-off-by: Adam Ford diff --git a/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi new file mode 100644 index 0000000000..6445048fe0 --- /dev/null +++ b/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2017 + * Logic PD - http://www.logicpd.com + */ + +/ { + chosen { + stdout-path = &uart1; + }; +}; + +&i2c1 { + clock-frequency = <400000>; +}; + +&i2c2 { + clock-frequency = <400000>; +}; + +&mmc1 { + cd-gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; /* gpio_110 */ +}; + +&mmc2 { + status = "disabled"; +}; + +&mmc3 { + status = "disabled"; +}; + diff --git a/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi new file mode 100644 index 0000000000..6445048fe0 --- /dev/null +++ b/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2017 + * Logic PD - http://www.logicpd.com + */ + +/ { + chosen { + stdout-path = &uart1; + }; +}; + +&i2c1 { + clock-frequency = <400000>; +}; + +&i2c2 { + clock-frequency = <400000>; +}; + +&mmc1 { + cd-gpios = <&gpio4 14 GPIO_ACTIVE_LOW>; /* gpio_110 */ +}; + +&mmc2 { + status = "disabled"; +}; + +&mmc3 { + status = "disabled"; +}; + diff --git a/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi new file mode 100644 index 0000000000..41ed5d7e17 --- /dev/null +++ b/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2017 + * Logic PD - http://www.logicpd.com + */ + +&i2c1 { + clock-frequency = <400000>; +}; + +&i2c2 { + clock-frequency = <400000>; +}; + +&mmc2 { + status = "disabled"; +}; + +&mmc3 { + status = "disabled"; +}; + diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig new file mode 100644 index 0000000000..54c40d8c42 --- /dev/null +++ b/configs/omap35_logic_defconfig @@ -0,0 +1,72 @@ +CONFIG_ARM=y +CONFIG_ARCH_OMAP2PLUS=y +CONFIG_TI_COMMON_CMD_OPTIONS=y +# CONFIG_SPL_GPIO_SUPPORT is not set +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_OMAP3_LOGIC=y +# CONFIG_SPL_OMAP3_ID_NAND is not set +CONFIG_SPL=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=2 +# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_VERSION_VARIABLE=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_OS_BOOT=y +CONFIG_SYS_PROMPT="OMAP Logic # " +# CONFIG_CMD_IMI is not set +CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x240000 +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 +# CONFIG_CMD_EEPROM is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_NAND=y +CONFIG_CMD_NAND_LOCK_UNLOCK=y +CONFIG_CMD_CACHE=y +CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" +CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)" +CONFIG_CMD_UBI=y +CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="logicpd-torpedo-35xx-devkit" +CONFIG_SPL_OF_PLATDATA=y +# CONFIG_ENV_IS_IN_FAT is not set +CONFIG_ENV_IS_IN_NAND=y +CONFIG_SPL_DM=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x82000000 +CONFIG_DM_I2C=y +CONFIG_DM_MMC=y +CONFIG_MMC_OMAP_HS=y +CONFIG_NAND=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 +CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SMC911X=y +CONFIG_SMC911X_BASE=0x08000000 +CONFIG_SMC911X_32_BIT=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_SINGLE=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_PMIC_CHILDREN is not set +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_SPECIFY_CONSOLE_INDEX=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_OMAP3_SPI=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_MUSB_GADGET=y +CONFIG_USB_MUSB_OMAP2PLUS=y +CONFIG_TWL4030_USB=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="TI" +CONFIG_USB_GADGET_VENDOR_NUM=0x0451 +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 +CONFIG_USB_ETHER=y +CONFIG_BCH=y +# CONFIG_SPL_OF_LIBFDT is not set diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig new file mode 100644 index 0000000000..4521aedb2a --- /dev/null +++ b/configs/omap35_logic_somlv_defconfig @@ -0,0 +1,72 @@ +CONFIG_ARM=y +CONFIG_ARCH_OMAP2PLUS=y +CONFIG_TI_COMMON_CMD_OPTIONS=y +# CONFIG_SPL_GPIO_SUPPORT is not set +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_OMAP3_LOGIC=y +# CONFIG_SPL_OMAP3_ID_NAND is not set +CONFIG_SPL=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=2 +# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_VERSION_VARIABLE=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_OS_BOOT=y +CONFIG_SYS_PROMPT="OMAP Logic # " +# CONFIG_CMD_IMI is not set +CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x240000 +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 +# CONFIG_CMD_EEPROM is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_NAND=y +CONFIG_CMD_NAND_LOCK_UNLOCK=y +CONFIG_CMD_CACHE=y +CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" +CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)" +CONFIG_CMD_UBI=y +CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="logicpd-som-lv-35xx-devkit" +CONFIG_SPL_OF_PLATDATA=y +# CONFIG_ENV_IS_IN_FAT is not set +CONFIG_ENV_IS_IN_NAND=y +CONFIG_SPL_DM=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x82000000 +CONFIG_DM_I2C=y +CONFIG_DM_MMC=y +CONFIG_MMC_OMAP_HS=y +CONFIG_NAND=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 +CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SMC911X=y +CONFIG_SMC911X_BASE=0x08000000 +CONFIG_SMC911X_32_BIT=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_SINGLE=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_PMIC_CHILDREN is not set +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_SPECIFY_CONSOLE_INDEX=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_OMAP3_SPI=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_MUSB_GADGET=y +CONFIG_USB_MUSB_OMAP2PLUS=y +CONFIG_TWL4030_USB=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="TI" +CONFIG_USB_GADGET_VENDOR_NUM=0x0451 +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 +CONFIG_USB_ETHER=y +CONFIG_BCH=y +# CONFIG_SPL_OF_LIBFDT is not set diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig new file mode 100644 index 0000000000..d29621d8ce --- /dev/null +++ b/configs/omap3_logic_somlv_defconfig @@ -0,0 +1,73 @@ +CONFIG_ARM=y +CONFIG_ARCH_OMAP2PLUS=y +CONFIG_TI_COMMON_CMD_OPTIONS=y +# CONFIG_SPL_GPIO_SUPPORT is not set +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_OMAP3_LOGIC=y +# CONFIG_SPL_OMAP3_ID_NAND is not set +CONFIG_SPL=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=2 +# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_VERSION_VARIABLE=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_OS_BOOT=y +CONFIG_SYS_PROMPT="OMAP Logic # " +# CONFIG_CMD_IMI is not set +CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x240000 +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 +# CONFIG_CMD_EEPROM is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_NAND=y +CONFIG_CMD_NAND_LOCK_UNLOCK=y +CONFIG_CMD_CACHE=y +CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" +CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)" +CONFIG_CMD_UBI=y +CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="logicpd-som-lv-37xx-devkit" +CONFIG_SPL_OF_PLATDATA=y +# CONFIG_ENV_IS_IN_FAT is not set +CONFIG_ENV_IS_IN_NAND=y +CONFIG_SPL_DM=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x82000000 +CONFIG_DM_I2C=y +CONFIG_DM_MMC=y +CONFIG_MMC_OMAP_HS=y +CONFIG_MMC_OMAP36XX_PINS=y +CONFIG_NAND=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 +CONFIG_SPL_NAND_SIMPLE=y +CONFIG_SMC911X=y +CONFIG_SMC911X_BASE=0x08000000 +CONFIG_SMC911X_32_BIT=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_SINGLE=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_PMIC_CHILDREN is not set +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_SPECIFY_CONSOLE_INDEX=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_OMAP3_SPI=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_MUSB_GADGET=y +CONFIG_USB_MUSB_OMAP2PLUS=y +CONFIG_TWL4030_USB=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="TI" +CONFIG_USB_GADGET_VENDOR_NUM=0x0451 +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 +CONFIG_USB_ETHER=y +CONFIG_BCH=y +# CONFIG_SPL_OF_LIBFDT is not set From patchwork Sat Sep 29 19:10:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 976677 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ObBOYrh8"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42Myq00WCjz9s3x for ; Sun, 30 Sep 2018 05:12:27 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B62D8C21EE8; Sat, 29 Sep 2018 19:11:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 769BEC21F24; Sat, 29 Sep 2018 19:10:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B5B72C21F1C; Sat, 29 Sep 2018 19:10:38 +0000 (UTC) Received: from mail-it1-f195.google.com (mail-it1-f195.google.com [209.85.166.195]) by lists.denx.de (Postfix) with ESMTPS id 4A3AEC21CB6 for ; Sat, 29 Sep 2018 19:10:35 +0000 (UTC) Received: by mail-it1-f195.google.com with SMTP id i76-v6so1130557ita.3 for ; Sat, 29 Sep 2018 12:10:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0O2BJ3tKeHPL5De5qwpUdQCIlzlOauMJlMwr3gevpFw=; b=ObBOYrh8tkz/qZUPwqxV5uvJRgQYaWqRounWRtDbiwZRLo4lA5NtiJZ4KefswcwNgm +FNyi51nLNZITupuGFJMhTZ0Dxb8kCZBKj2r+cQMTVtcoE0izJShC7PRbbBsQfGCKG99 KJDuljecz2NBqV8HkZ+n8cYmD8fWewv02EKzZzbqhCbr4WK8oKv7YRPPFnWlDXgBYdMZ u2Nx8kW85RlJPijvjDHQPMKB9KRRy2s5ScFgZgclTWuZEbbp3TR19iXJz233wagN22Y1 Oc3sBqtmpKOcQTJ9/xxLz3rjk+oBMYAka9xvHzkipFYeN50HEESQ5LzgSZqMFj26rePf y4Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0O2BJ3tKeHPL5De5qwpUdQCIlzlOauMJlMwr3gevpFw=; b=ME2x+qau1QPdiuH+odr0d7N5hA0fT1bToh1F/BpEq8g97SLMHBJZ5JdLiv0Qygue7A HSSZf1pZjIbirF+/7B6G2XJ+rdt5LSYAbQryqziTB3e8Ivd+IJAQU+JdrgT1VO14GgjR 7hNxWtnJGN3AEdmAVFPI4iLcEkqzPK6UrO5S6E3RwNxuB5VeYms/7l3WdnhkpkfIwOse NRCQDvn4S0HcskOrOKI1Yvwc26lOY/dc3sQDVhz2SQ+5WhOJkt1H6lV/NOV30yuq3NhT Vj24deODw5jjU2+Hva60TpMJgmA6x3yyBZZVjzSaLMOH36VcRx2u/b0tjc7rS8fwHEHB GIWA== X-Gm-Message-State: ABuFfoi3cInz+BsqtwpHZwaBvns25Bh1zeAUNQLH6gFJ7cXxpHrxMlPt kAR+8FAdKshg7fWE+SVpVoddyHsHb/U= X-Google-Smtp-Source: ACcGV6032AK3m/FVjCctyNmvuULbPyb+c0h5DTAjTPdvqSVG1YG6ATkIfQmeDjJaxd+3TiVNeE/jhw== X-Received: by 2002:a02:aa99:: with SMTP id u25-v6mr2988131jai.73.1538248233615; Sat, 29 Sep 2018 12:10:33 -0700 (PDT) Received: from localhost.localdomain (c-75-73-34-135.hsd1.mn.comcast.net. [75.73.34.135]) by smtp.gmail.com with ESMTPSA id w196-v6sm2636838itb.9.2018.09.29.12.10.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Sep 2018 12:10:32 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Date: Sat, 29 Sep 2018 14:10:19 -0500 Message-Id: <20180929191019.12614-5-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180929191019.12614-1-aford173@gmail.com> References: <20180929191019.12614-1-aford173@gmail.com> Cc: adam.ford@logicpd.com Subject: [U-Boot] [PATCH 5/5] ARM: LogicPD: omap3logic: Remove Torpedo/SOM-LV autodection X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" With there now being four device tree files, and 4 separate defconfig files, the code necessary to determine which board is being used is no longer necessary as the corresponding pin-muxing and board names are determined by the device tree. Signed-off-by: Adam Ford diff --git a/board/logicpd/omap3som/README b/board/logicpd/omap3som/README index b77b3d63db..5aaf58f0a6 100644 --- a/board/logicpd/omap3som/README +++ b/board/logicpd/omap3som/README @@ -1,21 +1,15 @@ Summary ======= -The source for omap3som encompases the DM3730 SOM-LV and DM3730 Torpedo platforms. +The source for omap3logic.c encompases the OMAP35 and DM3730 SOM-LV and DM3730 Torpedo platforms, but there are device trees custom taylored to each board. -By default, the Torpedo Device Tree is integrated into U-Boot,but the MMC controller, GPIO and I2C controllers are the same, so for the purposes of loading U-Boot, it should be sufficient. However this will display the Model as "LogicPD Zoom DM3730 Torpedo + Wireless Development Kit" upon boot. +omap3_logic_defconfig = DM37 Torpedo / Torpedo + Wireless +omap35_logic_defconfig = OMAP35 Torpedo +omap3_logic_somlv_defconfig = DM37 SOM-LV +omap35_logic_somlv_defconfig = OMAP35 SOM-LV -The actual board remains autodetected and the Board will read "DM37xx SOM LV" when used on the DM37 SOM-LV. The device tree loaded with Linux is also correct. - -Integrating the SOM-LV Device Tree into U-Boot -============================================== - -This step is optional, but should you want to change the default to the SOM-LV, locate the configs/omap3_logic_defconfig file and make the following change. - - CONFIG_DEFAULT_DEVICE_TREE="logicpd-som-lv-37xx-devkit" - - make distclean - make omap3_logic_defconfig +The device tree included with each of the defconfig files will also direct the board as to which dtb file to load when loading the kernel, so it is not +recomended to mix and match the defconfig files. Falcon Mode: FAT SD cards ========================= diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 48d886930f..4507b1ed99 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -70,40 +70,6 @@ U_BOOT_DEVICE(am335x_mmc0) = { #endif -/* - * two dimensional array of strucures containining board name and Linux - * machine IDs; row it selected based on CPU column is slected based - * on hsusb0_data5 pin having a pulldown resistor - */ -static struct board_id { - char *name; - int machine_id; - char *fdtfile; -} boards[2][2] = { - { - { - .name = "OMAP35xx SOM LV", - .machine_id = MACH_TYPE_OMAP3530_LV_SOM, - .fdtfile = "logicpd-som-lv-35xx-devkit.dtb", - }, - { - .name = "OMAP35xx Torpedo", - .machine_id = MACH_TYPE_OMAP3_TORPEDO, - .fdtfile = "logicpd-torpedo-35xx-devkit.dtb", - }, - }, - { - { - .name = "DM37xx SOM LV", - .fdtfile = "logicpd-som-lv-37xx-devkit.dtb", - }, - { - .name = "DM37xx Torpedo", - .fdtfile = "logicpd-torpedo-37xx-devkit.dtb", - }, - }, -}; - #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { @@ -226,7 +192,6 @@ int ehci_hcd_stop(int index) #endif /* CONFIG_USB_EHCI_HCD */ - /* * Routine: misc_init_r * Description: Configure board specific parts @@ -243,11 +208,6 @@ int misc_init_r(void) return 0; } -/* - * BOARD_ID_GPIO - GPIO of pin with optional pulldown resistor on SOM LV - */ -#define BOARD_ID_GPIO 189 /* hsusb0_data5 pin */ - /* * Routine: board_init * Description: Early hardware init. @@ -275,54 +235,6 @@ static void unlock_nand(void) int board_late_init(void) { - struct board_id *board; - unsigned int val; - - /* - * To identify between a SOM LV and Torpedo module, - * a pulldown resistor is on hsusb0_data5 for the SOM LV module. - * Drive the pin (and let it soak), then read it back. - * If the pin is still high its a Torpedo. If low its a SOM LV - */ - - /* Mux hsusb0_data5 as a GPIO */ - MUX_VAL(CP(HSUSB0_DATA5), (IEN | PTD | DIS | M4)); - - if (gpio_request(BOARD_ID_GPIO, "husb0_data5.gpio_189") == 0) { - - /* - * Drive BOARD_ID_GPIO - the pulldown resistor on the SOM LV - * will drain the voltage. - */ - gpio_direction_output(BOARD_ID_GPIO, 0); - gpio_set_value(BOARD_ID_GPIO, 1); - - /* Let it soak for a bit */ - sdelay(0x100); - - /* - * Read state of BOARD_ID_GPIO as an input and if its set. - * If so the board is a Torpedo - */ - gpio_direction_input(BOARD_ID_GPIO); - val = gpio_get_value(BOARD_ID_GPIO); - gpio_free(BOARD_ID_GPIO); - - board = &boards[!!(get_cpu_family() == CPU_OMAP36XX)][!!val]; - printf("Board: %s\n", board->name); - - /* Set the machine_id passed to Linux */ - if (board->machine_id) - gd->bd->bi_arch_number = board->machine_id; - - /* If the user has not set fdtimage, set the default */ - if (!env_get("fdtimage")) - env_set("fdtimage", board->fdtfile); - } - - /* restore hsusb0_data5 pin as hsusb0_data5 */ - MUX_VAL(CP(HSUSB0_DATA5), (IEN | PTD | DIS | M0)); - #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK unlock_nand(); #endif @@ -356,5 +268,3 @@ int board_eth_init(bd_t *bis) return smc911x_initialize(0, CONFIG_SMC911X_BASE); } #endif - - diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 2cbdbebb26..8644e16830 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -116,6 +116,7 @@ "ip=${ipaddr}:${tftpserver}:${gatewayip}:${netmask}::eth0:off\0" \ "nfsrootpath=/opt/nfs-exports/omap\0" \ "autoload=no\0" \ + "fdtimage=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "loadfdt=mmc rescan; " \ "load mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \ "mmcbootcommon=echo Booting with DT from mmc${mmcdev} ...; " \