From patchwork Fri Apr 2 18:05:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 1461835 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=gljw4Hgj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FBnzm2Y4gz9sV5 for ; Sat, 3 Apr 2021 05:06:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 661B780C76; Fri, 2 Apr 2021 20:05:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gljw4Hgj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5CCE380C73; Fri, 2 Apr 2021 20:05:58 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 61D9080C73 for ; Fri, 2 Apr 2021 20:05:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pbrobinson@gmail.com Received: by mail-wr1-x42f.google.com with SMTP id j9so5349763wrx.12 for ; Fri, 02 Apr 2021 11:05:55 -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:mime-version :content-transfer-encoding; bh=WCraKbTry5B4ZHvAzViq55xLBiTbNmU5vJQxoUTr8AE=; b=gljw4HgjN+eAOvuHHsMkscMflXbKlfheAGbcmDfa0uVztfBHJlAlakXcCOX7fXZWWi jxB6q0VNaeoMGhGF0+VuzwDq2LQ5D+MSipFZcHw9uWBJp5+LY/coA2F+QatQUb0R5KeG rosEsYbKB+qLbxAOOp2zUXwZ0huq/i1bz+GbQNfPJ9gjMIOdQzvvj/LwVSP5uj2Ohlri UvuH0RqPiEABeEE3pq45mGJHuwo0t2Ow0XbSr0c5Hx58AduVQoY5+zkF7EXzyg0olE6p izmW8UclqLqcUWMApK0EzFVrhWKeBPYLhSbP5yk9aP4er0vqhSZXn+OI1HT3OZ9kQF3D 6kqA== 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:mime-version :content-transfer-encoding; bh=WCraKbTry5B4ZHvAzViq55xLBiTbNmU5vJQxoUTr8AE=; b=sMBiojOBon2VCBRzmMtMFCPq2+UfJFy5MD0RFc5gXY8474d456lYnzWrhxoOOqAAu0 6o0fqaNYpBbx4325/BYKdkqEBWFAPA5OUg4fo69k1rlApYc/Dl9SbCDozqUyrh7BP43+ ovpKc3sEVKIoMuEAA8TCBlbumEd9dPB4lNv/u3+UARUCu3pzRml7wItPf+qr/wMeRANT 4fySIyNosITNPp2zoom5kR2QtQyGOxgnD7nM1MWMaAjV5SNpQWymHeKhrdpkYKe3AZrB NPb0/oy4S9DyQYud3FaP6EWP9aQ7W1++sTUJnZSy0eHgqCW3bgPmmvCiIJ3Qkoj9EFej FpBA== X-Gm-Message-State: AOAM533Bm+zCEJyI3YMilHr0SJL/OJWwS9c0GDXzaSoMtycoI51GsIlV /OlDfDhe4OavQfN+Ul3pce1vq7xF3CY= X-Google-Smtp-Source: ABdhPJwKH75wBzWWmiFiUK5p+Q2vB9SB5yqRGHzsIcdRQ3ZAzS8Vllap2U84SHjEQEJIWz22JyC3Vw== X-Received: by 2002:adf:ec46:: with SMTP id w6mr16217962wrn.213.1617386754871; Fri, 02 Apr 2021 11:05:54 -0700 (PDT) Received: from morpheus.home.roving-it.com (2.e.6.5.c.a.a.1.a.8.0.3.1.e.3.c.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:c3e1:308a:1aac:56e2]) by smtp.googlemail.com with ESMTPSA id f2sm13753832wmp.20.2021.04.02.11.05.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 11:05:54 -0700 (PDT) From: Peter Robinson To: u-boot@lists.denx.de Cc: Peter Robinson , Fabio Estevam , Stefano Babic Subject: [PATCH 1/5] ARM: board: warp: Import dts files Date: Fri, 2 Apr 2021 19:05:48 +0100 Message-Id: <20210402180552.1075997-1-pbrobinson@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Import the i.MX6 based Warp dts files from Linux 5.12-rc1. Signed-off-by: Peter Robinson Cc: Fabio Estevam Cc: Stefano Babic Reviewed-by: Fabio Estevam --- arch/arm/dts/Makefile | 4 +- arch/arm/dts/imx6sl-warp.dts | 234 +++++++++++++++++++++++++++++++++++ 2 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/imx6sl-warp.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 116f75192f..1481a6ec46 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -734,7 +734,9 @@ dtb-y += \ endif -dtb-$(CONFIG_MX6SL) += imx6sl-evk.dtb +dtb-$(CONFIG_MX6SL) += \ + imx6sl-evk.dtb \ + imx6sl-warp.dtb dtb-$(CONFIG_MX6SLL) += imx6sll-evk.dtb diff --git a/arch/arm/dts/imx6sl-warp.dts b/arch/arm/dts/imx6sl-warp.dts new file mode 100644 index 0000000000..9d7c888489 --- /dev/null +++ b/arch/arm/dts/imx6sl-warp.dts @@ -0,0 +1,234 @@ +/* + * Copyright 2014, 2015 O.S. Systems Software LTDA. + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this file; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; + +#include +#include "imx6sl.dtsi" + +/ { + model = "Revotics WaRP Board"; + compatible = "revotics,imx6sl-warp", "fsl,imx6sl"; + + memory@80000000 { + device_type = "memory"; + reg = <0x80000000 0x20000000>; + }; + + usdhc3_pwrseq: usdhc3_pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&gpio4 5 GPIO_ACTIVE_LOW>, /* WL_REG_ON */ + <&gpio4 7 GPIO_ACTIVE_LOW>, /* WL_HOSTWAKE */ + <&gpio3 25 GPIO_ACTIVE_LOW>, /* BT_REG_ON */ + <&gpio3 27 GPIO_ACTIVE_LOW>, /* BT_HOSTWAKE */ + <&gpio4 4 GPIO_ACTIVE_LOW>, /* BT_WAKE */ + <&gpio4 6 GPIO_ACTIVE_LOW>; /* BT_RST_N */ + }; +}; + +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; + status = "okay"; +}; + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; + status = "okay"; +}; + +&uart5 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart5>; + uart-has-rtscts; + status = "okay"; +}; + +&usbotg1 { + dr_mode = "peripheral"; + disable-over-current; + status = "okay"; +}; + +&usbotg2 { + dr_mode = "host"; + disable-over-current; + status = "okay"; +}; + +&usdhc2 { + pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-0 = <&pinctrl_usdhc2>; + pinctrl-1 = <&pinctrl_usdhc2_100mhz>; + pinctrl-2 = <&pinctrl_usdhc2_200mhz>; + bus-width = <8>; + non-removable; + status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-0 = <&pinctrl_usdhc3>; + pinctrl-1 = <&pinctrl_usdhc3_100mhz>; + pinctrl-2 = <&pinctrl_usdhc3_200mhz>; + bus-width = <4>; + non-removable; + keep-power-in-suspend; + wakeup-source; + mmc-pwrseq = <&usdhc3_pwrseq>; + status = "okay"; +}; + +&iomuxc { + imx6sl-warp { + pinctrl_uart1: uart1grp { + fsl,pins = < + MX6SL_PAD_UART1_RXD__UART1_RX_DATA 0x41b0b1 + MX6SL_PAD_UART1_TXD__UART1_TX_DATA 0x41b0b1 + >; + }; + + + pinctrl_uart3: uart3grp { + fsl,pins = < + MX6SL_PAD_AUD_RXC__UART3_RX_DATA 0x41b0b1 + MX6SL_PAD_AUD_RXC__UART3_TX_DATA 0x41b0b1 + >; + }; + + pinctrl_uart5: uart5grp { + fsl,pins = < + MX6SL_PAD_ECSPI1_SCLK__UART5_RX_DATA 0x41b0b1 + MX6SL_PAD_ECSPI1_MOSI__UART5_TX_DATA 0x41b0b1 + MX6SL_PAD_ECSPI1_MISO__UART5_RTS_B 0x4130b1 + MX6SL_PAD_ECSPI1_SS0__UART5_CTS_B 0x4130b1 + >; + }; + + pinctrl_usdhc2: usdhc2grp { + fsl,pins = < + MX6SL_PAD_SD2_CMD__SD2_CMD 0x417059 + MX6SL_PAD_SD2_CLK__SD2_CLK 0x410059 + MX6SL_PAD_SD2_DAT0__SD2_DATA0 0x417059 + MX6SL_PAD_SD2_DAT1__SD2_DATA1 0x417059 + MX6SL_PAD_SD2_DAT2__SD2_DATA2 0x417059 + MX6SL_PAD_SD2_DAT3__SD2_DATA3 0x417059 + MX6SL_PAD_SD2_DAT4__SD2_DATA4 0x417059 + MX6SL_PAD_SD2_DAT5__SD2_DATA5 0x417059 + MX6SL_PAD_SD2_DAT6__SD2_DATA6 0x417059 + MX6SL_PAD_SD2_DAT7__SD2_DATA7 0x417059 + MX6SL_PAD_SD2_RST__SD2_RESET 0x417059 + >; + }; + + pinctrl_usdhc2_100mhz: usdhc2grp100mhz { + fsl,pins = < + MX6SL_PAD_SD2_CMD__SD2_CMD 0x4170b9 + MX6SL_PAD_SD2_CLK__SD2_CLK 0x4100b9 + MX6SL_PAD_SD2_DAT0__SD2_DATA0 0x4170b9 + MX6SL_PAD_SD2_DAT1__SD2_DATA1 0x4170b9 + MX6SL_PAD_SD2_DAT2__SD2_DATA2 0x4170b9 + MX6SL_PAD_SD2_DAT3__SD2_DATA3 0x4170b9 + MX6SL_PAD_SD2_DAT4__SD2_DATA4 0x4170b9 + MX6SL_PAD_SD2_DAT5__SD2_DATA5 0x4170b9 + MX6SL_PAD_SD2_DAT6__SD2_DATA6 0x4170b9 + MX6SL_PAD_SD2_DAT7__SD2_DATA7 0x4170b9 + MX6SL_PAD_SD2_RST__SD2_RESET 0x4170b9 + >; + }; + + pinctrl_usdhc2_200mhz: usdhc2grp200mhz { + fsl,pins = < + MX6SL_PAD_SD2_CMD__SD2_CMD 0x4170f9 + MX6SL_PAD_SD2_CLK__SD2_CLK 0x4100f9 + MX6SL_PAD_SD2_DAT0__SD2_DATA0 0x4170f9 + MX6SL_PAD_SD2_DAT1__SD2_DATA1 0x4170f9 + MX6SL_PAD_SD2_DAT2__SD2_DATA2 0x4170f9 + MX6SL_PAD_SD2_DAT3__SD2_DATA3 0x4170f9 + MX6SL_PAD_SD2_DAT4__SD2_DATA4 0x4170f9 + MX6SL_PAD_SD2_DAT5__SD2_DATA5 0x4170f9 + MX6SL_PAD_SD2_DAT6__SD2_DATA6 0x4170f9 + MX6SL_PAD_SD2_DAT7__SD2_DATA7 0x4170f9 + MX6SL_PAD_SD2_RST__SD2_RESET 0x4170f9 + >; + }; + + pinctrl_usdhc3: usdhc3grp { + fsl,pins = < + MX6SL_PAD_SD3_CMD__SD3_CMD 0x417059 + MX6SL_PAD_SD3_CLK__SD3_CLK 0x410059 + MX6SL_PAD_SD3_DAT0__SD3_DATA0 0x417059 + MX6SL_PAD_SD3_DAT1__SD3_DATA1 0x417059 + MX6SL_PAD_SD3_DAT2__SD3_DATA2 0x417059 + MX6SL_PAD_SD3_DAT3__SD3_DATA3 0x417059 + >; + }; + + pinctrl_usdhc3_100mhz: usdhc3grp100mhz { + fsl,pins = < + MX6SL_PAD_SD3_CMD__SD3_CMD 0x4170b9 + MX6SL_PAD_SD3_CLK__SD3_CLK 0x4100b9 + MX6SL_PAD_SD3_DAT0__SD3_DATA0 0x4170b9 + MX6SL_PAD_SD3_DAT1__SD3_DATA1 0x4170b9 + MX6SL_PAD_SD3_DAT2__SD3_DATA2 0x4170b9 + MX6SL_PAD_SD3_DAT3__SD3_DATA3 0x4170b9 + >; + }; + + pinctrl_usdhc3_200mhz: usdhc3grp200mhz { + fsl,pins = < + MX6SL_PAD_SD3_CMD__SD3_CMD 0x4170f9 + MX6SL_PAD_SD3_CLK__SD3_CLK 0x4100f9 + MX6SL_PAD_SD3_DAT0__SD3_DATA0 0x4170f9 + MX6SL_PAD_SD3_DAT1__SD3_DATA1 0x4170f9 + MX6SL_PAD_SD3_DAT2__SD3_DATA2 0x4170f9 + MX6SL_PAD_SD3_DAT3__SD3_DATA3 0x4170f9 + >; + }; + }; +}; From patchwork Fri Apr 2 18:05:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 1461836 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=u+UzPYcn; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FBnzt3Q2Cz9sW0 for ; Sat, 3 Apr 2021 05:06:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 58086815A4; Fri, 2 Apr 2021 20:06:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u+UzPYcn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0210380C7F; Fri, 2 Apr 2021 20:05:59 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.2 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 76A1780C76 for ; Fri, 2 Apr 2021 20:05:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pbrobinson@gmail.com Received: by mail-wm1-x32f.google.com with SMTP id g20so2841556wmk.3 for ; Fri, 02 Apr 2021 11:05:56 -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 :mime-version:content-transfer-encoding; bh=wW1DlCZSHNsWHYhYcL/ZuCMJ8IFiEsU/rcJ2xEsyJlQ=; b=u+UzPYcnyryv+O1UTx1YGYQAeuXl98uu3J1v4MCzqbbwXFjHXzLhmEqSYXaI+nsQXa PXnK0HROpTWZvc21fdPf0BL9nO7kvB7iHU+ElwXsyPkaUzqVizKa6RQCSX9XVUARLA9n I02eWwtX7ETxtw2kbTJrQFu73e1dHORSTdzfRPhH0mZVnyTfTU/d0aMn+cnN4YOCLPon bellzYEb07PBJgIsLUBXcgHg3VRfBPdBgbLwkvz1I+P7N8/rzliktkqp0z5OnPcfZo6N +RI4SxYJFz4jXJCr38s8csn/4V06WgoYPGheLNfmU8kpZ+wL9FPxPbourXE+/ilzgs8W ooAQ== 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:mime-version:content-transfer-encoding; bh=wW1DlCZSHNsWHYhYcL/ZuCMJ8IFiEsU/rcJ2xEsyJlQ=; b=Nhz6FHn+nMDkVolTZRm7ena1FzYa0cst0sYReUgVVd2/yHZrpjAGYKlmH5ozuvoJRm ukYlV8PUcFwuUh3eFOFTLU9+/zVKGV2nclbV49PNHv4i1Qf483UlM53hhonBcC8TQUiR 906DKau8th1zwGF2WiV04sN4nEzZxZ7aOOTV86aNK83Kb2gU2xp49ERXHEH0NDEok640 yGS9R/CPGUUDrSgF0syFY4UYDoWVhQk/XPQ7JRuiFdlavj+PISgSmRVfH7z593o+dS8y lgAfWksLGfTeZQtkuBvWfTNW5VQskDIPuD7CQk9g6iguzkeONWArw/JGHFM8BbywIiZp 4wew== X-Gm-Message-State: AOAM530VcrU4nm4QXrEZ2EZmMW+wBz/5/Kw1yUIfIbByo4TbEN2dCnbo fvcXQRTTax05VaxlrnJ/O8jBr6EgGiQ= X-Google-Smtp-Source: ABdhPJxAFWn/q8ihukThPRA1Tt9tmIPn2ZNvXPx8iAaWRnRKqWGDNZr2GrGjmxUSg4qMslJ4cvqV2w== X-Received: by 2002:a1c:a5d8:: with SMTP id o207mr13847642wme.150.1617386756069; Fri, 02 Apr 2021 11:05:56 -0700 (PDT) Received: from morpheus.home.roving-it.com (2.e.6.5.c.a.a.1.a.8.0.3.1.e.3.c.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:c3e1:308a:1aac:56e2]) by smtp.googlemail.com with ESMTPSA id f2sm13753832wmp.20.2021.04.02.11.05.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 11:05:55 -0700 (PDT) From: Peter Robinson To: u-boot@lists.denx.de Cc: Peter Robinson , Otavio Salvador , Fabio Estevam , Stefano Babic Subject: [PATCH 2/5] ARM: board: warp: Enable OF_CONTROL and DM gpio/pin control Date: Fri, 2 Apr 2021 19:05:49 +0100 Message-Id: <20210402180552.1075997-2-pbrobinson@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210402180552.1075997-1-pbrobinson@gmail.com> References: <20210402180552.1075997-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Enable OF_CONTROL and DM for gpio and pin control support on the i.MX6SL based Warp. Signed-off-by: Peter Robinson Cc: Otavio Salvador Cc: Fabio Estevam Cc: Stefano Babic --- configs/warp_defconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configs/warp_defconfig b/configs/warp_defconfig index 34acc9e6c8..68ad71c27c 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -2,10 +2,12 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_NR_DRAM_BANKS=1 +CONFIG_DEFAULT_DEVICE_TREE="imx6sl-warp" CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x60000 CONFIG_MX6SL=y CONFIG_TARGET_WARP=y +CONFIG_OF_CONTROL=y # CONFIG_CMD_BMODE is not set CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp/imximage.cfg" @@ -18,6 +20,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y +# CONFIG_CMD_PINMUX is not set CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set @@ -32,9 +35,13 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set CONFIG_BOUNCE_BUFFER=y +CONFIG_DM=y +CONFIG_DM_GPIO=y CONFIG_DFU_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y CONFIG_USB=y CONFIG_USB_STORAGE=y From patchwork Fri Apr 2 18:05:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 1461839 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=u6+Rf4c6; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FBp0W55gPz9sV5 for ; Sat, 3 Apr 2021 05:06:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7023981691; Fri, 2 Apr 2021 20:06:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u6+Rf4c6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3F738812B3; Fri, 2 Apr 2021 20:06:03 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2819B80C7A for ; Fri, 2 Apr 2021 20:05:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pbrobinson@gmail.com Received: by mail-wr1-x434.google.com with SMTP id x16so5366371wrn.4 for ; Fri, 02 Apr 2021 11:05:57 -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 :mime-version:content-transfer-encoding; bh=zsY3XV6AZSEMgmUi2XEP3SIyBDIN/+pR44weFpQq9W0=; b=u6+Rf4c6tBgEbwvGxwKHi8L22ZP/9PGAoKo5QTP6Z/SiCm5OAfRY0avxMdP4EoOhaA 9aU/ecGJV0Qd7c1cydJRSdOEV9W/GttkFtdwcE/Kke2r3q6IzFuimQ7enjOGyP1vCnIR goFyFCCpCt2s8KLnTVvmnu/UggygdPsD0ecaPHwWMc8CY6BzjZr9dGa+Bc7ui6f16P28 4VlZYxiY8PpyHLeUurBf6uCFSjXQ8N2k1ZoJ4JbL4zCTDbrqnaA8jodlcQfhpbdLZ8+V sfBE4HglhuCF1nwl+RY6BrMD7uzB/B63c/wlo34Dq3bIClh1ToDmG8gL3esW4QqixMb+ odxw== 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:mime-version:content-transfer-encoding; bh=zsY3XV6AZSEMgmUi2XEP3SIyBDIN/+pR44weFpQq9W0=; b=Ivp8rCedR1/7RLLn1ShZDaaqafsomH8IWOocLnkTTncXi7ZWAdcAhrNR2KJcvYnFYT VCnX5xOu68ynIfSrvrXQkYJ6uuy7upbRrwUqrWu5auM+ZQPeT1Hi66gdQlT3282THc4s HIp/qs/2WaJlIQoo3ett8eqChaO807XCqlQbBeJ1JUeMfyWXfJ/mvCTYSBJsYfSXjHS9 2/zyKyixkw5ya0ynr7cLeC/nZVBZMrgJNYSN/rtNlPx1sYaClU5hlv7o12RZhutYzfFb mmbiiHGnhnBgQ3Q4zCg0D970Mt6ddyeNUqXYr34LXvVpChT9y4vo5ZdSwyJ7IZJI2//Y m5dQ== X-Gm-Message-State: AOAM533IaPBjtpimDBWK0q/uSHnQqD4cwHorgpqZplAc+MnuYTA61/1A ZHb7lDlLF6WL+0Yujc+RguzudojCRtc= X-Google-Smtp-Source: ABdhPJwNWCa5sfAPI6Bz69rOt8aKaf0BcMexIQnzyaYOj7DyCFwCH12Ngh3lbYjtMnteQsUTVgJ+yg== X-Received: by 2002:a5d:65d2:: with SMTP id e18mr16151601wrw.256.1617386756777; Fri, 02 Apr 2021 11:05:56 -0700 (PDT) Received: from morpheus.home.roving-it.com (2.e.6.5.c.a.a.1.a.8.0.3.1.e.3.c.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:c3e1:308a:1aac:56e2]) by smtp.googlemail.com with ESMTPSA id f2sm13753832wmp.20.2021.04.02.11.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 11:05:56 -0700 (PDT) From: Peter Robinson To: u-boot@lists.denx.de Cc: Peter Robinson , Otavio Salvador , Fabio Estevam , Stefano Babic Subject: [PATCH 3/5] ARM: board: warp: convert to DM_MMC Date: Fri, 2 Apr 2021 19:05:50 +0100 Message-Id: <20210402180552.1075997-3-pbrobinson@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210402180552.1075997-1-pbrobinson@gmail.com> References: <20210402180552.1075997-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Convert Warp to use DM MMC. Signed-off-by: Peter Robinson Cc: Otavio Salvador Cc: Fabio Estevam Cc: Stefano Babic Reviewed-by: Jaehoon Chung --- arch/arm/dts/imx6sl-warp-u-boot.dtsi | 7 ++++++ board/warp/warp.c | 33 ---------------------------- configs/warp_defconfig | 1 + 3 files changed, 8 insertions(+), 33 deletions(-) create mode 100644 arch/arm/dts/imx6sl-warp-u-boot.dtsi diff --git a/arch/arm/dts/imx6sl-warp-u-boot.dtsi b/arch/arm/dts/imx6sl-warp-u-boot.dtsi new file mode 100644 index 0000000000..daf2489cfd --- /dev/null +++ b/arch/arm/dts/imx6sl-warp-u-boot.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/ { + aliases { + mmc0 = &usdhc2; + }; +}; diff --git a/board/warp/warp.c b/board/warp/warp.c index 0f1d038fab..417f0e7507 100644 --- a/board/warp/warp.c +++ b/board/warp/warp.c @@ -21,9 +21,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -62,37 +60,6 @@ static void setup_iomux_uart(void) imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); } -static struct fsl_esdhc_cfg usdhc_cfg[1] = { - {USDHC2_BASE_ADDR, 0, 0, 0, 1}, -}; - -int board_mmc_getcd(struct mmc *mmc) -{ - return 1; /* Assume boot SD always present */ -} - -int board_mmc_init(struct bd_info *bis) -{ - static iomux_v3_cfg_t const usdhc2_pads[] = { - MX6_PAD_SD2_CLK__USDHC2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_CMD__USDHC2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_RST__USDHC2_RST | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT0__USDHC2_DAT0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT1__USDHC2_DAT1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT2__USDHC2_DAT2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT3__USDHC2_DAT3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT4__USDHC2_DAT4 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT5__USDHC2_DAT5 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT6__USDHC2_DAT6 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX6_PAD_SD2_DAT7__USDHC2_DAT7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - }; - - imx_iomux_v3_setup_multiple_pads(usdhc2_pads, ARRAY_SIZE(usdhc2_pads)); - - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); - return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); -} - int board_usb_phy_mode(int port) { return USB_INIT_DEVICE; diff --git a/configs/warp_defconfig b/configs/warp_defconfig index 68ad71c27c..6efe400dd1 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -39,6 +39,7 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DFU_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_DM_MMC=y CONFIG_FSL_USDHC=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y From patchwork Fri Apr 2 18:05:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 1461838 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=IKOp+l77; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FBp0J53Lzz9sV5 for ; Sat, 3 Apr 2021 05:06:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8AFDC8164D; Fri, 2 Apr 2021 20:06:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IKOp+l77"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 72C1780C81; Fri, 2 Apr 2021 20:06:03 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C0C4A80C7E for ; Fri, 2 Apr 2021 20:05:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pbrobinson@gmail.com Received: by mail-wr1-x42c.google.com with SMTP id v4so5340620wrp.13 for ; Fri, 02 Apr 2021 11:05:57 -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 :mime-version:content-transfer-encoding; bh=MN7Q9PYE0f3Fku4+xJZRulAkRu4cQd6/wBM/QGl0cwc=; b=IKOp+l77Hj+kYaRLOJsnT+hAr6nsDGFfYRZ4Z/hxx/9NGBnt41YFGTib3zGqe1LU4K q1kdjqpvhnFzLqxjlR13+1pCR8MoRHdDDAXh2251szXG0D3VN3XFPyG6yZXD2Jumo4U2 SBg2/aObm/TqwU2IzJluLC0N+Euc1yM+R0H2E2u40w5q55zeqC/Vkah29OZ/fy7gByph qJ2vi8nrCU6uTs9FhvapA2pTk4Y0agZgDq5QBMg78F0ogmJXq7E446YhJRx4UShS2Jvc 4PwE02Dy+sqnyzxNmhLrDTtNosMTCiQdtXbpBWCe8EPaWxy8C9fvkunsqEjOuGnROddt oh8g== 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:mime-version:content-transfer-encoding; bh=MN7Q9PYE0f3Fku4+xJZRulAkRu4cQd6/wBM/QGl0cwc=; b=AvdszN/Gne42ERIdSWi3W4fxa22xpKGDiPkA3vxVFNIrkI0p8cvO2aRJxV8SxyOdn5 9eRW4SSZ5bIZ/P+VLC3iqem5SdWo/aRqlG0Wz8naYT77sD5Gz0EpNpw6NBTKlXsEkA+S TG3S370LHFZ5MgP0SOnvmzF7DUfadvFpRTTcqr2McO/jQsn2cfeBY6mZ2mmAzkXVfcm0 JAmPan8o7xWvwfxFbMmCVHlghjLrasfhAowJ+cI6knrKS+Pp6SsnoCF1ndEEn/q7F9Qd LJysSpoZk7gUUJDYVBmgez+nSVw7oqTc6uYyKKqblEWwRb+5hLL9tkdhHx/42B5PpE9h vH5A== X-Gm-Message-State: AOAM5331ds7bJps9OhlflO65AMIQCWo3cy8TBgDszJdWkVCHwIFFeWri xZpk9pkLj1PL8B+DA1B8SEik3ACssBQ= X-Google-Smtp-Source: ABdhPJyOn4ENI9Q0FUHyS91oOzRjdkKoL3GW/vS6i2TVsqA+8xfCOQ6DF0B70uzN41luWqkToYDQ5g== X-Received: by 2002:a5d:58e8:: with SMTP id f8mr16558925wrd.102.1617386757384; Fri, 02 Apr 2021 11:05:57 -0700 (PDT) Received: from morpheus.home.roving-it.com (2.e.6.5.c.a.a.1.a.8.0.3.1.e.3.c.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:c3e1:308a:1aac:56e2]) by smtp.googlemail.com with ESMTPSA id f2sm13753832wmp.20.2021.04.02.11.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 11:05:57 -0700 (PDT) From: Peter Robinson To: u-boot@lists.denx.de Cc: Peter Robinson , Otavio Salvador , Fabio Estevam , Stefano Babic Subject: [PATCH 4/5] ARM: board: warp: convert to DM_USB Date: Fri, 2 Apr 2021 19:05:51 +0100 Message-Id: <20210402180552.1075997-4-pbrobinson@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210402180552.1075997-1-pbrobinson@gmail.com> References: <20210402180552.1075997-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Convert Warp to use DM USB. Signed-off-by: Peter Robinson Cc: Otavio Salvador Cc: Fabio Estevam Cc: Stefano Babic --- configs/warp_defconfig | 1 + include/configs/warp.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/warp_defconfig b/configs/warp_defconfig index 6efe400dd1..223436c86e 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -45,6 +45,7 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" diff --git a/include/configs/warp.h b/include/configs/warp.h index f17eea117f..8cde52f634 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -45,7 +45,6 @@ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Only OTG2 port enabled */ #endif #define CONFIG_USBD_HS From patchwork Fri Apr 2 18:05:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 1461837 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=dhlzyGsq; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FBp0D1g05z9sV5 for ; Sat, 3 Apr 2021 05:06:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7DC8E80C81; Fri, 2 Apr 2021 20:06:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dhlzyGsq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8010C814E1; Fri, 2 Apr 2021 20:06:01 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 527BB80C81 for ; Fri, 2 Apr 2021 20:05:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pbrobinson@gmail.com Received: by mail-wr1-x42c.google.com with SMTP id x16so5366406wrn.4 for ; Fri, 02 Apr 2021 11:05:58 -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 :mime-version:content-transfer-encoding; bh=nFFwdDliCD6XL3n32GkcYT9O87hAsSL1D+JcHQ5sxAw=; b=dhlzyGsqHxN3Ib0sHkSwtLJD6coEVot3gEniKWuUxYSRHNM2m8kHeAdoPA400S76n4 KOQL9lNj72yNgTFHymq+B083/PCG8qlmPf/Tz4Y2p74GJclp8tr1N7WOaJg/eX6WGP+o ppYrFtcU4hO5jJpBTWpirbf4OVwTlFTe2uBUBhdNuf8S+BgRNEz1ZRdHa4kO0llH/y6O Am7T+R9A1k5XY/ywlZYwXPF35Nfca10MyTrbm1bQ0EgEsLsabERL8GwV/tlAo0unI8Tt SGofzbOTlneUeZXkm4X90qyOrPl5iz33vgrk3TTe+B9yOcT8GEnlnBFoZ+B2xyf1twfN h8yA== 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:mime-version:content-transfer-encoding; bh=nFFwdDliCD6XL3n32GkcYT9O87hAsSL1D+JcHQ5sxAw=; b=eS7RPV+r7dNBpLYW7eUrHXtMqC9s2i7gyhyB54fApK3dZ3LdYFeU5UHSoLidWQMyz6 Txs7r7oA836YFlNhqnAdI4R23zolSdIiPHOIEf9CQhzsWZSUyCzoiw8YYKN8tXIiQc39 Ynm2PRWg+sWSSkLWI2uQh9xBSPUfP9OQNQ0tlH7qvirRE7qYPdOSAb88gvokzKjFew4N V2hy2p7RcK920OlUwRQLA5z4ZwpIR5EEnkP3D5RobDSKGXasfKC29JVUrGyaEwqBKan1 hjBOWRCQu0mcVjFFcKZgVnTrTUpEvL+alJ5tqKWrtUT6gxAXYZWOGqeUMC0sW1k29Oy9 fnMA== X-Gm-Message-State: AOAM530zgVFNSA2fSlxo85Ib2FMn9HSJX33vDdBAgvHUV0qaLc7SXsoa SDmxozAIZK5fP8zaD7x8URol+4fi4V0= X-Google-Smtp-Source: ABdhPJwqN8wqs/Knoa4PuVz0np3pgESQvQRY4xEiNpxZ9qFSXfAWyTgqkOk3/yC020Mfx6+2T9V0Ug== X-Received: by 2002:a05:6000:362:: with SMTP id f2mr16591226wrf.141.1617386757983; Fri, 02 Apr 2021 11:05:57 -0700 (PDT) Received: from morpheus.home.roving-it.com (2.e.6.5.c.a.a.1.a.8.0.3.1.e.3.c.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:c3e1:308a:1aac:56e2]) by smtp.googlemail.com with ESMTPSA id f2sm13753832wmp.20.2021.04.02.11.05.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Apr 2021 11:05:57 -0700 (PDT) From: Peter Robinson To: u-boot@lists.denx.de Cc: Peter Robinson , Fabio Estevam , Stefano Babic Subject: [PATCH 5/5] ARM: board: warp7: Minor cleanups and DM_ETH Date: Fri, 2 Apr 2021 19:05:52 +0100 Message-Id: <20210402180552.1075997-5-pbrobinson@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210402180552.1075997-1-pbrobinson@gmail.com> References: <20210402180552.1075997-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean We don't need a random MAC as the only network that's supported is over USB and that has a hardcoded MAC, enable DM_ETH for the USB, and the device doesn't have MTD storage so drop that. Signed-off-by: Peter Robinson Cc: Fabio Estevam Cc: Stefano Babic --- configs/warp7_bl33_defconfig | 3 +-- configs/warp7_defconfig | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index 4b45fcd50a..98d370754a 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -32,14 +32,13 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_NET_RANDOM_ETHADDR=y CONFIG_BOUNCE_BUFFER=y CONFIG_DFU_MMC=y +CONFIG_DM_ETH=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y -CONFIG_MTD=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_PMIC=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 3d11196080..8fa1981207 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -38,14 +38,13 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_NET_RANDOM_ETHADDR=y CONFIG_BOUNCE_BUFFER=y CONFIG_DFU_MMC=y +CONFIG_DM_ETH=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y -CONFIG_MTD=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_PMIC=y