From mboxrd@z Thu Jan 1 00:00:00 1970 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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 763E0C433EF for ; Sat, 22 Jan 2022 19:48:49 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B1C31837C1; Sat, 22 Jan 2022 20:48:47 +0100 (CET) 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="YhdoDTHm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 10A5B837C1; Sat, 22 Jan 2022 20:48:47 +0100 (CET) Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) (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 87E3582C6D for ; Sat, 22 Jan 2022 20:48:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aford173@gmail.com Received: by mail-io1-xd29.google.com with SMTP id a12so14818502iod.9 for ; Sat, 22 Jan 2022 11:48:44 -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:mime-version :content-transfer-encoding; bh=x9JOxYwT7hu3vlJ1BwNlP5jk861zOQ4AXUZKmlzh/ko=; b=YhdoDTHmZBOvBsXqCgu4Gls45P2qxYxuH0ZBg81IOIc59fkGLCQ7wmLP0/udgrR84d HTpk26M/jkaSPytFrHJ7d0qOi7QVMs2JRVFJIO9qqgvCn53j2JKBgYBtGxc/bZbS7lAO 2llKiyVfKJwMFXbafvZqkiuI8dF22CLJO1l+FVcKlKzEc+MnTa2iix3FEHeiajV+rR2v bPmVVK5w8pgRj2T5DKlAO1uyRuz6629/D9Uk+c1kgIhQS+GG6t9KLjNZ6tXqtR31oY4H BR9mPIO3RQt5UzXqffYLVVhN1Ly8NZd48PRvP+M8E6npnHybOGv2NTyrqV/R8oDRdfYs 1AfA== 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:mime-version :content-transfer-encoding; bh=x9JOxYwT7hu3vlJ1BwNlP5jk861zOQ4AXUZKmlzh/ko=; b=wbx2br2uKRDbYvJSWW/CUATIcZMtyPXiii9DwUCtDkDui1bcIF3PedsDyC2TtyRF8O lYuKjBro/mRLC47D7M98htKFEGXeNLTCdg6dWyBsbND0vQ8rKouzUFOlaEEhpSJrpVAs QDbhB/XnKgsBuho5mqFRv3zD4DeQpuzwsCt+OideqzHOcichAZSpin198RmJaLw6hVqh tVE0PQe1yCCrhXdjnDzAElQbHyJgbFtkgaKpsIpLIROXuxQQPb24q76aNG0xCLEn8y5p mYj8zmEw+/+z15RRedA4g7JUIEhNc2MUfPQ+g98avL4C4CJvLGl60xLkfyJhB6ObbccX LKyA== X-Gm-Message-State: AOAM5316Q3GI5jy6sYy1y8hqnmGurMZCDg4kSthbD6p6S+D1g+QsZQvD fq1OmOyul9JXy/pk/xPh8UTFGlbgNsk= X-Google-Smtp-Source: ABdhPJxvUFQ1MwVejNLFngu2OSzOI9GbIKSwWZC4HZpoJFrteq3ewhVDHNjMH2DtRbRJ0xLYkWtZOQ== X-Received: by 2002:a6b:156:: with SMTP id 83mr4712366iob.76.1642880922837; Sat, 22 Jan 2022 11:48:42 -0800 (PST) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:6f25:fae8:96cf:3bfc]) by smtp.gmail.com with ESMTPSA id x1sm4760318ilv.30.2022.01.22.11.48.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jan 2022 11:48:42 -0800 (PST) From: Adam Ford To: u-boot@lists.denx.de Cc: sbabic@denx.de, trini@konsulko.com, festevam@gmail.com, uboot-imx@nxp.com, aford@beaconembedded.com, Adam Ford Subject: [PATCH 1/3] arm: dts: imx8mn-beacon: Resync dtsi with Kernel 5.17-rc1 Date: Sat, 22 Jan 2022 13:48:34 -0600 Message-Id: <20220122194836.64044-1-aford173@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.5 at phobos.denx.de X-Virus-Status: Clean Resync the SOM and baseboard files with the device trees that will be included in 5.17-RC1 when it's cut. This will improve pinmuxing for USDHC1 and add USB functionality. Add edits to imx8mn-beacon-kit-u-boot for enabling USB. Signed-off-by: Adam Ford diff --git a/arch/arm/dts/imx8mn-beacon-baseboard.dtsi b/arch/arm/dts/imx8mn-beacon-baseboard.dtsi index 376ca8ff72..0f40b43ac0 100644 --- a/arch/arm/dts/imx8mn-beacon-baseboard.dtsi +++ b/arch/arm/dts/imx8mn-beacon-baseboard.dtsi @@ -126,7 +126,6 @@ compatible = "wlf,wm8962"; reg = <0x1a>; clocks = <&clk IMX8MN_CLK_SAI3_ROOT>; - clock-names = "xclk"; DCVDD-supply = <®_audio>; DBVDD-supply = <®_audio>; AVDD-supply = <®_audio>; diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi index 69fd69c8d0..a06b271787 100644 --- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi @@ -110,6 +110,10 @@ u-boot,dm-spl; }; +&usbotg1 { + dr_mode="host"; +}; + &usdhc1 { u-boot,dm-spl; sd-uhs-sdr104; diff --git a/arch/arm/dts/imx8mn-beacon-som.dtsi b/arch/arm/dts/imx8mn-beacon-som.dtsi index de2cd0e320..1133cded9b 100644 --- a/arch/arm/dts/imx8mn-beacon-som.dtsi +++ b/arch/arm/dts/imx8mn-beacon-som.dtsi @@ -101,7 +101,7 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; spi-max-frequency = <80000000>; - spi-tx-bus-width = <4>; + spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; }; }; @@ -120,6 +120,9 @@ interrupt-parent = <&gpio1>; interrupts = <3 IRQ_TYPE_LEVEL_LOW>; rohm,reset-snvs-powered; + #clock-cells = <0>; + clocks = <&osc_32k 0>; + clock-output-names = "clk-32k-out"; regulators { buck1_reg: BUCK1 { @@ -262,12 +265,15 @@ &usdhc1 { #address-cells = <1>; #size-cells = <0>; - pinctrl-names = "default"; + pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc1>; + pinctrl-1 = <&pinctrl_usdhc1_100mhz>; + pinctrl-2 = <&pinctrl_usdhc1_200mhz>; + vmmc-supply = <&buck4_reg>; + vqmmc-supply = <&buck5_reg>; bus-width = <4>; non-removable; cap-power-off-card; - pm-ignore-notify; keep-power-in-suspend; mmc-pwrseq = <&usdhc1_pwrseq>; status = "okay"; -- 2.32.0