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 4F433C433EF for ; Sat, 5 Feb 2022 16:41:39 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 18B0483BAC; Sat, 5 Feb 2022 17:40:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1644079202; bh=SHVYy75XewSnhBLul7v6LUrEjWY6IzEOweo2xLPiWA4=; h=From:To:Subject:In-reply-to:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From; b=kgt1L9lNW7Xg5112o5aJwwrGYjzUJCriGfmqX1ecul5+74u59VzUlvfpIMTalwPxp 46aVT1GEOdDMk1hE6SCeRXcWAmANEyqiqNCC/E0HdETjUwhqUFrA8qzLBhB3vGwA8I Fi6+HvMRmgFF47BFtZAgnzXogl+8SW4yhmdBof8Bpkqlg7SaI3XcaZaxnx8j4bv4wD pnSR1YdlXkFBTYjLaDH7gf5oJf8rEdQSgmg6y8rWP3amK/nf8zRu1oIANc0TtfWc5B Vloc32NjG09BiENKoe7Qahp8fgG7We4C+/c8bTs8+oallmCKr8WwVD/72KQvca4pqJ q9g8aG9FWF56w== Received: by phobos.denx.de (Postfix, from userid 109) id 0E23F83BA8; Sat, 5 Feb 2022 17:40:00 +0100 (CET) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 15F7E83B54 for ; Sat, 5 Feb 2022 17:39:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sbabic@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4JrdRc5P4rz1r3FK; Sat, 5 Feb 2022 17:39:56 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4JrdRc5Gx7z1qqkC; Sat, 5 Feb 2022 17:39:56 +0100 (CET) X-Amavis-Alert: BAD HEADER SECTION, Missing required header field: "Date" Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id kvbIyTDqZ9I7; Sat, 5 Feb 2022 17:39:56 +0100 (CET) Received: from papero (host-88-217-136-221.customer.m-online.net [88.217.136.221]) by mail.mnet-online.de (Postfix) with ESMTP; Sat, 5 Feb 2022 17:39:56 +0100 (CET) From: sbabic@denx.de X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 1583030 X-Patchwork-Delegate: sbabic@denx.de To: Adam Ford ,u-boot@lists.denx.de Subject: [PATCH V2 1/2] arm: dts: imx8mm-beacon: Resync dtsi with Kernel 5.17-rc1 In-reply-to: <20220122182734.25580-1-aford173@gmail.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Message-Id: <20220205164000.0E23F83BA8@phobos.denx.de> Date: Sat, 5 Feb 2022 17:39:57 +0100 (CET) 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 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 > Reviewed-by: Fabio Estevam > diff --git a/arch/arm/dts/imx8mm-beacon-baseboard.dtsi b/arch/arm/dts/imx8m= m-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; > }; > =20 > + reg_usbotg1: regulator-usbotg1 { > + compatible =3D "regulator-fixed"; > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&pinctrl_reg_usb_otg1>; > + regulator-name =3D "usb_otg_vbus"; > + regulator-min-microvolt =3D <5000000>; > + regulator-max-microvolt =3D <5000000>; > + gpio =3D <&gpio4 29 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > + > reg_usdhc2_vmmc: regulator-usdhc2 { > compatible =3D "regulator-fixed"; > regulator-name =3D "VSD_3V3"; > @@ -102,7 +113,6 @@ > compatible =3D "wlf,wm8962"; > reg =3D <0x1a>; > clocks =3D <&clk IMX8MM_CLK_SAI3_ROOT>; > - clock-names =3D "xclk"; > DCVDD-supply =3D <®_audio>; > DBVDD-supply =3D <®_audio>; > AVDD-supply =3D <®_audio>; > @@ -170,6 +180,24 @@ > status =3D "okay"; > }; > =20 > +&usbotg1 { > + vbus-supply =3D <®_usbotg1>; > + disable-over-current; > + dr_mode=3D"otg"; > + status =3D "okay"; > +}; > + > +&usbotg2 { > + pinctrl-names =3D "default"; > + disable-over-current; > + dr_mode=3D"host"; > + status =3D "okay"; > +}; > + > +&usbphynop2 { > + reset-gpios =3D <&pca6416_1 7 GPIO_ACTIVE_HIGH>; > +}; > + > &usdhc2 { > pinctrl-names =3D "default", "state_100mhz", "state_200mhz"; > pinctrl-0 =3D <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>; > @@ -216,6 +244,12 @@ > >; > }; > =20 > + pinctrl_reg_usb_otg1: usbotg1grp { > + fsl,pins =3D < > + MX8MM_IOMUXC_SAI3_RXC_GPIO4_IO29 0x19 > + >; > + }; > + > pinctrl_sai3: sai3grp { > fsl,pins =3D < > MX8MM_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC 0xd6 > diff --git a/arch/arm/dts/imx8mm-beacon-som.dtsi b/arch/arm/dts/imx8mm-beac= on-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 =3D <1>; > compatible =3D "jedec,spi-nor"; > spi-max-frequency =3D <80000000>; > - spi-tx-bus-width =3D <4>; > + spi-tx-bus-width =3D <1>; > spi-rx-bus-width =3D <4>; > }; > }; > @@ -256,12 +256,13 @@ > &usdhc1 { > #address-cells =3D <1>; > #size-cells =3D <0>; > - pinctrl-names =3D "default"; > + pinctrl-names =3D "default", "state_100mhz", "state_200mhz"; > pinctrl-0 =3D <&pinctrl_usdhc1>; > + pinctrl-1 =3D <&pinctrl_usdhc1_100mhz>; > + pinctrl-2 =3D <&pinctrl_usdhc1_200mhz>; > bus-width =3D <4>; > non-removable; > cap-power-off-card; > - pm-ignore-notify; > keep-power-in-suspend; > mmc-pwrseq =3D <&usdhc1_pwrseq>; > status =3D "okay"; Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic --=20 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D