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 58EF9C433F5 for ; Sat, 22 Jan 2022 18:27:57 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C204982EBB; Sat, 22 Jan 2022 19:27:54 +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="qHP2Ll9k"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 83BC281974; Sat, 22 Jan 2022 19:27:52 +0100 (CET) Received: from mail-il1-x12a.google.com (mail-il1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) (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 CACD481F7E for ; Sat, 22 Jan 2022 19:27:49 +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-il1-x12a.google.com with SMTP id i14so10354796ila.11 for ; Sat, 22 Jan 2022 10:27:49 -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=qHP2Ll9k1IRffqAyBxUTtLZYh8arc92f0jJ+Cg60ayo6FqcdOLuWyS/dfLbDuC7QNy 5o5AV4Sb9nAwV056RBgkJJ5ZH5ZafZb19vTh7pjhYxtgJBQ5mZpA8zHP8i93NVETCclj xkiHnWqOuNrTKhjEbZAtJmnVDmZfY2mVcDTwb1HEe7EPVG8z22iDf0hR/C7KP/0hkyvH faN99TXRgMHg/I6yzj4tc7CIiJIPGRCH3Of7jmEgbEsaetxwV5I4u40qpLduVlbvdLuY C7HQS+LJtScszyd/WTUlv0eX28bQYWj6lTHFy/DuzJez0Xeen5+sfSa5OCjSq4ecC3pT s+Bw== 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=wbwBfcCqqAa1s3GgeT8+GySA6Y7/ve4ufTmSk/heI4gon84kC2GV8m1gRs2yAt6ciV J8DPLQdnfS/WyRVdXXhr29/5XRQvmF/MuAkUyQNomWFZ/66LAczexd5KtrIJhImYm7q5 3hFSdx/bSOxcmz+qgOO03hxTGyBmCB5xkLQdNFh+iHt6s70Vcva0GShtUZrzb7EpfspY /4ppNYlU2iFb9SjsUqpYGrqqeQUZfCThzeISv5FdXNb0qkkg/wK64LaNa+Xu0KMx9FWN TiMARgWjfUZAJLfbOqj/0sxyO6BZan9/S7gzAjeB7Arg/d0HKsMxZ+W+Q2xTr9/fIStx eiUA== X-Gm-Message-State: AOAM530vbKu4QuUwoHSv0pnA9rrVgcsZFQRooZ8WFvDnpPthCSKcs1p2 zlz/9flAk79KsdFcT18kldQA1n6O2hA= X-Google-Smtp-Source: ABdhPJxa5MxYOhazGb8RuXTmVu4zSPmmj3JP5OCdfgcTBVOmAi2yDrA6OSeKcx39lRszWV5c/3PRLg== X-Received: by 2002:a05:6e02:16cb:: with SMTP id 11mr4797479ilx.225.1642876067938; Sat, 22 Jan 2022 10:27:47 -0800 (PST) Received: from aford-IdeaCentre-A730.lan ([2601:448:8400:9e8:6f25:fae8:96cf:3bfc]) by smtp.gmail.com with ESMTPSA id u8sm4752046ilb.39.2022.01.22.10.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jan 2022 10:27:47 -0800 (PST) From: Adam Ford To: u-boot@lists.denx.de Cc: sbabic@denx.de, festevam@gmail.com, uboot-imx@nxp.com, trini@konsulko.com, Adam Ford Subject: [PATCH V2 1/2] arm: dts: imx8mm-beacon: Resync dtsi with Kernel 5.17-rc1 Date: Sat, 22 Jan 2022 12:27:33 -0600 Message-Id: <20220122182734.25580-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 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