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 5E270C433EF for ; Fri, 14 Jan 2022 00:57:39 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0C3B0830EA; Fri, 14 Jan 2022 01:57:37 +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="lVQrJb+y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 54D01830EA; Fri, 14 Jan 2022 01:57:35 +0100 (CET) Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 4B01D832E9 for ; Fri, 14 Jan 2022 01:57:32 +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-xd34.google.com with SMTP id i82so10675372ioa.8 for ; Thu, 13 Jan 2022 16:57:32 -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=ns/kK5aehVFJv1U0sjk1iwr3JtNUztKeQEtJLl5GOAE=; b=lVQrJb+yo6KsWZe95r2CWMzymVqAWHbMbf/0Pc1lWt2Ci179fWWJ6UywZ2XfP+1IDB SksuH3TuqPh7+ZETL4tiLq6fCaTq+KliRb3B6WEnjbc6fhgBaowWVFExgmo3NHE0yFz7 BT3Rczn95sufgL4o6C3eI76NvouNy1sn22D7e3tLXXyNqXa8vigZzCiLGWdqnOmIXtrz k2DbbhDwqTL5PDyQ+66cQbPd3zLdOBK+DulMnXH8pkvLTjWwJS+vNHLdUitDRD2MpCUG DAJnFgfYpQ+7dZWhMmKaVaY31OCCqwl4PTSu4YM85JBVI17fx3LS9PL/YDuVmVL6y/7Y ko4Q== 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=ns/kK5aehVFJv1U0sjk1iwr3JtNUztKeQEtJLl5GOAE=; b=yXnClqswfn69LlKNdVLKnHTqBNIYSAxp0B1hv/ni6oLtVkTsHTpeSV5shKEigEnv3J X5aPbIyQdsDNRR+oEkkaXbW5QF2TWybZ/zmVos4/HykSSUMgSaG0UlU7JGa3zW2fXphm FnFik+51+pfqoScnQgSF6zStCVcrcIlLQMrdYy6swMgL2uuasylHiVh7sEaewWlmtD8G 9yCZfyXpnUGtD+fx8PvitIBogYX04TpC2iUDUw651ple7sRB5Febxe/C8zmCJG/SQFAH Dgg4N8BbB1VlvZ3r8SA8MLeNMBB5LNA8wFbf8BPNC2ORUQNMK+P3PI7BwiFMcO1bKWDs s5jQ== X-Gm-Message-State: AOAM533hPjFcZ1lGNu1WxGJ+D1MYtSayV2bB5Wpd1X+f4qnfW1fWWlEo BcAOitRzyhMyTTzRFsGRguW7TDyRyag= X-Google-Smtp-Source: ABdhPJwTE3ERVnmsP0iEbTK7gAfsgGbkzTzElX6zXD5Ww3AwNEgNvGiwGlN1zEfnpefu9xVBDvhcFA== X-Received: by 2002:a05:6638:3049:: with SMTP id u9mr3166621jak.132.1642121850239; Thu, 13 Jan 2022 16:57:30 -0800 (PST) Received: from aford-IdeaCentre-A730.lan (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id u2sm917849iob.38.2022.01.13.16.57.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jan 2022 16:57:29 -0800 (PST) From: Adam Ford To: u-boot@lists.denx.de Cc: sbabic@denx.de, festevam@gmail.com, uboot-imx@nxp.com, aford@beaconembedded.com, Adam Ford Subject: [PATCH 1/2] arm: dts: imx8mm-beacon: Resync dtsi with Kernel 5.17-rc1 Date: Thu, 13 Jan 2022 18:57:18 -0600 Message-Id: <20220114005719.471860-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.2 at phobos.denx.de X-Virus-Status: Clean Resync the SOM and baseboar 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. Signed-off-by: Adam Ford diff --git a/arch/arm/dts/imx8mm-beacon-baseboard.dtsi b/arch/arm/dts/imx8mm-beacon-baseboard.dtsi index d6b9dedd16..4097a66163 100644 --- a/arch/arm/dts/imx8mm-beacon-baseboard.dtsi +++ b/arch/arm/dts/imx8mm-beacon-baseboard.dtsi @@ -43,6 +43,17 @@ enable-active-high; }; + reg_usbotg1: regulator-usbotg1 { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_reg_usb_otg1>; + regulator-name = "usb_otg_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio4 29 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + reg_usdhc2_vmmc: regulator-usdhc2 { compatible = "regulator-fixed"; regulator-name = "VSD_3V3"; @@ -102,7 +113,6 @@ compatible = "wlf,wm8962"; reg = <0x1a>; clocks = <&clk IMX8MM_CLK_SAI3_ROOT>; - clock-names = "xclk"; DCVDD-supply = <®_audio>; DBVDD-supply = <®_audio>; AVDD-supply = <®_audio>; @@ -170,6 +180,24 @@ status = "okay"; }; +&usbotg1 { + vbus-supply = <®_usbotg1>; + disable-over-current; + dr_mode="otg"; + status = "okay"; +}; + +&usbotg2 { + pinctrl-names = "default"; + disable-over-current; + dr_mode="host"; + status = "okay"; +}; + +&usbphynop2 { + reset-gpios = <&pca6416_1 7 GPIO_ACTIVE_HIGH>; +}; + &usdhc2 { pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>; @@ -216,6 +244,12 @@ >; }; + pinctrl_reg_usb_otg1: usbotg1grp { + fsl,pins = < + MX8MM_IOMUXC_SAI3_RXC_GPIO4_IO29 0x19 + >; + }; + pinctrl_sai3: sai3grp { fsl,pins = < MX8MM_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC 0xd6 diff --git a/arch/arm/dts/imx8mm-beacon-som.dtsi b/arch/arm/dts/imx8mm-beacon-som.dtsi index d897913537..cf07987ccc 100644 --- a/arch/arm/dts/imx8mm-beacon-som.dtsi +++ b/arch/arm/dts/imx8mm-beacon-som.dtsi @@ -91,7 +91,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>; }; }; @@ -256,12 +256,13 @@ &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>; 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