From patchwork Fri Jan 18 17:40:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 156026 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3521659jaa; Fri, 18 Jan 2019 09:41:11 -0800 (PST) X-Google-Smtp-Source: ALg8bN4bcz6wPnfuEIdAWZeYOSsb3uUxy35wilkwmLDlKTwe0HMRMUaX3xHHHZ2jJNsNiMmyGHax X-Received: by 2002:a17:906:d0c6:: with SMTP id bq6-v6mr14472382ejb.99.1547833271034; Fri, 18 Jan 2019 09:41:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547833271; cv=none; d=google.com; s=arc-20160816; b=ONLhPWHtSXnt2jil42ajDqaOEi5ql0/7W+crpUMslhpUogi3Z0NjNl9FDC6hBFrpVB 54wVoHlykjY/sv2D8nmwhAGDQQY5erRqIBXvC1mHD1W+OemBv02e0/694jib/l/MUnUC 3TGBnveZRpXatIZrHglYkgfnyXPlC3G0zQocAL0jjvWepUyPtnjw5gAfIILhUUdJ+zjO sA9PqkV5IRQw4OMwL9m708D/AB7Em25ZgDyGLkWs9aBBL4gfQPlKcYQG136TDDTswuIR Td8RROytkjJDC7RcWnD+NlZQPUeDJbeE/zFcX/q/VDeTs4TbSx+v2a1dXMpxDFd+zsnu 9zfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=4MTMMUaiHdEuM5Egl1MORldCZrDgzwzxG1fPSGAFAxo=; b=XTBWhVujVtV7JUi2mjwc3flol5pm53D38gNUQnN6FFF1Ply7j4KNMZSrBy/oCfKB6i qslLvkGexw8wTnWimqLgMyaKFenGMpwjtNGa5jKyUJj+6OfTHl91/4XExlkg+GHCy+1P ExBtaj5KAuTKZxdnTpQ7CYhbfefylDRMNfyCRQ4FI7vWENyRGtGcFNj4N7um/xvHDXVY G6DkjGwUtNjlQ0uE8Sxne/HdmU7sRYVHbZo8twTy0qzVfEWc76kkv0W5rWCzQgB3qt/t gJJzYqrvYqxgkcGdtYZjQ0tMmMUUgbqgZ5Xr4mTRiiyQeHoEG8N2c3zP9vLDPKgygJuB cBNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NOEXv5VM; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id f23-v6si10709ejw.244.2019.01.18.09.41.10; Fri, 18 Jan 2019 09:41:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NOEXv5VM; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 94D8FC220CA; Fri, 18 Jan 2019 17:40:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 287D7C21F9C; Fri, 18 Jan 2019 17:40:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A5884C21D9A; Fri, 18 Jan 2019 17:40:19 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by lists.denx.de (Postfix) with ESMTPS id 54966C21C6A for ; Fri, 18 Jan 2019 17:40:19 +0000 (UTC) Received: by mail-ed1-f66.google.com with SMTP id h15so11784162edb.4 for ; Fri, 18 Jan 2019 09:40:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A3CFT3SRTKn6TIZ4LQ95o4O72kjTvOqLNOMyAEHSITs=; b=NOEXv5VM3lzaFEXE12eD83s/wvrfBK7Sis7UB0sZ4TWEeZsFZ92U+Vbpg0defE5LSP uQsEvaZj2WZ8kvH88fONgMtCDlyvOEcYqMGjMlkIajB+ynX6i+p3ApocEaVdo16bqS/M rktcS72t1bRbCS7f6xkdHgaNonE62HR+UTw6k= 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=A3CFT3SRTKn6TIZ4LQ95o4O72kjTvOqLNOMyAEHSITs=; b=PcYbd5LxtC1T25sWfhbr3PUY3RZ3y62MsVz+UgrvVD9KF0QqLiXI09HE/689EDjTmm G7Pyr6LfXAlRacFx5glWtDG5Sk2SuktbjGDDsg8oyk0WIOlKF/iQ5f2KTnxtqwfkce61 7G4yiPmm+Mkpcu8dluWLWGtAzcTiJuI7gcpgUs8Y7tVPCknF8tXB7BmIQrqvnOMRXcwW aCQZFCCT7EL3Cnvg+Zo9CMaL9VcGFkWEMg8O3s4NCR4zkTPXcLzaV6x/Uz0V/C5+MA58 kX7Lw8QZ9N+TIFbprFAIszn11X01iAqnpt2BM+Qm11x2B4Pig/slC90iYLjLUxSiIY44 0gxA== X-Gm-Message-State: AJcUuked42NXcVEDYrjIresAkZbYUJdtuh7tUjvrMyVej/H0GL/pugAG wwgRVExnOccpwBQEnqLbhL3cjezb8Xo= X-Received: by 2002:a50:c20a:: with SMTP id n10mr17254456edf.60.1547833218575; Fri, 18 Jan 2019 09:40:18 -0800 (PST) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id l20-v6sm4026339eja.18.2019.01.18.09.40.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 09:40:17 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Fri, 18 Jan 2019 17:40:07 +0000 Message-Id: <20190118174014.17860-2-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118174014.17860-1-bryan.odonoghue@linaro.org> References: <20190118174014.17860-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [RESEND] [PATCH v3 1/8] arm: dts: imx7: Correct spelling mistake in GPIO name X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" As pointed out by Lucas WDOD1_WDOG_ANY should be WDOG1_WDOG_ANY. Once corrected we can import the latest kernel DTS unmodified. Signed-off-by: Bryan O'Donoghue Reported-by: Lukas Auer --- arch/arm/dts/imx7d-pinfunc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/imx7d-pinfunc.h b/arch/arm/dts/imx7d-pinfunc.h index f6f7e78f88..f2493bc63d 100644 --- a/arch/arm/dts/imx7d-pinfunc.h +++ b/arch/arm/dts/imx7d-pinfunc.h @@ -17,9 +17,9 @@ #define MX7D_PAD_LPSR_GPIO1_IO00__GPIO1_IO0 0x0000 0x0030 0x0000 0x0 0x0 #define MX7D_PAD_LPSR_GPIO1_IO00__PWM4_OUT 0x0000 0x0030 0x0000 0x1 0x0 -#define MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_ANY 0x0000 0x0030 0x0000 0x2 0x0 -#define MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B 0x0000 0x0030 0x0000 0x3 0x0 -#define MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG__RST_B_DEB 0x0000 0x0030 0x0000 0x4 0x0 +#define MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_ANY 0x0000 0x0030 0x0000 0x2 0x0 +#define MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x0000 0x0030 0x0000 0x3 0x0 +#define MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG__RST_B_DEB 0x0000 0x0030 0x0000 0x4 0x0 #define MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x0004 0x0034 0x0000 0x0 0x0 #define MX7D_PAD_LPSR_GPIO1_IO01__PWM1_OUT 0x0004 0x0034 0x0000 0x1 0x0 #define MX7D_PAD_LPSR_GPIO1_IO01__CCM_ENET_REF_CLK3 0x0004 0x0034 0x0000 0x2 0x0 From patchwork Fri Jan 18 17:40:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 156029 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3523198jaa; Fri, 18 Jan 2019 09:42:46 -0800 (PST) X-Google-Smtp-Source: ALg8bN7lagsFeY5KqZ5IjbuoeMCeRdJ+pYrGKsWFaUFl1Wp3rbiECK3j9CMQOn0wICK0Hrt83wuI X-Received: by 2002:a50:ad97:: with SMTP id a23mr16005973edd.128.1547833366338; Fri, 18 Jan 2019 09:42:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547833366; cv=none; d=google.com; s=arc-20160816; b=YVKnbx6uvTD02CthFde8myJKnoee43fI4yncanLh/OO1/RBK6oz03bt1FUY1XbLLYC keIi7lDRUBJmSOwhk6JYmX3wloUYJcWLs//FEuzvDx+lRPTBOVT5TbQV2IGaulhQKTj5 0G/yf209fqBG7htIwWBZ7wW+3z/YlwATOsiLoWK+TTVSMhrqjDamcqobk54CphF+Visg 6l46fPF7MLFOWh0voDtIJGr5OPAP9DMN2anbuOJMKa4t8KOJ2QQQ6r0/pFNrfqWr2lkF jhdMma/Jfv4rRQuezNgZLJdMEQH9vz18CSbd4nOiuP5R7YnIPJsPHT7A/1EbyltXeBp+ rDyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=bIYJIVfDSjI7cMn7v29dZi3/b3pRBIXpaHlBV6A75qg=; b=h6UPe5TKwC+wkE0UsVj42LVzAyD1JcOeDeAtSo6FRHLHXpb+SjN+mRYJdc2uXbPGYN e2FwFzLPIXkyR52oXEQ7+/RHO+VaOo0MP60XBPZdYQ805DCLMRY7J7N65SVO4zTZGpAs F3s+HHUOWinY0VYB+/93oKxOi5oFahaT7ppdkmCWiu+57tmFB/YLZUYBIrMFDwXCo83R IdRmudw/fz9NrX/sEyLQ2CpsVw1dt0p/42QaC3z6Fq0b8bxXNDR3KfFmMrUC0rweVooE fg43jPQyDIkBo5CvTIod77jjIXSdJ/x0X5u6n2JKKjBjNoQ0WQJ+mTYNOWaFeF667ncS gvSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ihmdINUw; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id i48si5546665ede.239.2019.01.18.09.42.45; Fri, 18 Jan 2019 09:42:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ihmdINUw; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id AEDB2C21E15; Fri, 18 Jan 2019 17:41:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E35BAC22150; Fri, 18 Jan 2019 17:40:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E2059C21E38; Fri, 18 Jan 2019 17:40:25 +0000 (UTC) Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by lists.denx.de (Postfix) with ESMTPS id AA0D5C21E44 for ; Fri, 18 Jan 2019 17:40:20 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id f9so11745362eds.10 for ; Fri, 18 Jan 2019 09:40:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5HSOrrMCsMMjY7fy31jnTyLcdo3cjBlZOqadX4vWpdQ=; b=ihmdINUwlJOWLunUJ6JunxHxEjFMOCsU1rVPXRaEXkAzrKZpJDYy42wFBqbF88Jn6n fQPTMvOED059Gbj/drFcB7jX682bHoxUt5fOzpUTaFfqngUbn9rKPFZKMhoJN/tSxVKw ikMKxXpmxQDTlJg4/QdiVpoiBHHuz3xtOVACI= 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=5HSOrrMCsMMjY7fy31jnTyLcdo3cjBlZOqadX4vWpdQ=; b=bCi1japC+aQB459oLCsYFJ8LCMHNiFiwvEki2Ujgmp3bJMinicFxuxpdq9WtovGMTR vvLXzJNplVWZ4dM+uKztP7GXTgITSQH64as080zB0B2JVl/8HUVIxwwaJ5ETbZCkzetP DWwBtaf+z4F+XUGj77n8Ot5U0bty86DE7Imji5cF3w/hVvbIUm3N6t7KuSbschpI4lfe t1nd2N61L6ZwqPrfB+tRdXRpZKZPM+pOrTyBCY6aqIAnLTvVX4JpaCkY2TztCf+ihrZs GPt4MUQvu1+hQAkOq70kBY8lVHKEZm3lftZgY7OaZ7hgzj7nZaMa7I0SX3df3TEm5u7d x5EA== X-Gm-Message-State: AJcUukdGCg6zeE3ZUyMGNSnRtImJHYSAttMFYAVZseQcatAaUMDNkKuL Dn/slZWtOopW/3goG/k0Pb1t149VfQE= X-Received: by 2002:a50:fc07:: with SMTP id i7mr16759011edr.153.1547833219774; Fri, 18 Jan 2019 09:40:19 -0800 (PST) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id l20-v6sm4026339eja.18.2019.01.18.09.40.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 09:40:19 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Fri, 18 Jan 2019 17:40:08 +0000 Message-Id: <20190118174014.17860-3-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118174014.17860-1-bryan.odonoghue@linaro.org> References: <20190118174014.17860-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [RESEND] [PATCH v3 2/8] arm: dts: imx7s-warp: Import Linux warp7 dts X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This patch imports the Linux kernel warp7 dts as at upstream kernel commit cf76c364a1e1. Signed-off-by: Bryan O'Donoghue Cc: Albert Aribaud Cc: Peng Fan Cc: Fabio Estevam Cc: Stefano Babic --- arch/arm/dts/imx7s-warp.dts | 438 ++++++++++++++++++++++++++++++++++++ 1 file changed, 438 insertions(+) create mode 100644 arch/arm/dts/imx7s-warp.dts diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts new file mode 100644 index 0000000000..f7ba2c0a24 --- /dev/null +++ b/arch/arm/dts/imx7s-warp.dts @@ -0,0 +1,438 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2016 NXP Semiconductors. + * Author: Fabio Estevam + */ + +/dts-v1/; + +#include +#include "imx7s.dtsi" + +/ { + model = "Warp i.MX7 Board"; + compatible = "warp,imx7s-warp", "fsl,imx7s"; + + memory@80000000 { + reg = <0x80000000 0x20000000>; + }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-0 = <&pinctrl_gpio>; + autorepeat; + + back { + label = "Back"; + gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>; + linux,code = ; + wakeup-source; + }; + }; + + reg_brcm: regulator-brcm { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio5 10 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_brcm_reg>; + regulator-name = "brcm_reg"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + startup-delay-us = <200000>; + }; + + reg_bt: regulator-bt { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_bt_reg>; + enable-active-high; + gpio = <&gpio5 17 GPIO_ACTIVE_HIGH>; + regulator-name = "bt_reg"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "imx7-sgtl5000"; + simple-audio-card,format = "i2s"; + simple-audio-card,bitclock-master = <&dailink_master>; + simple-audio-card,frame-master = <&dailink_master>; + simple-audio-card,cpu { + sound-dai = <&sai1>; + }; + + dailink_master: simple-audio-card,codec { + sound-dai = <&codec>; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + }; + }; +}; + +&clks { + assigned-clocks = <&clks IMX7D_PLL_AUDIO_POST_DIV>; + assigned-clock-rates = <884736000>; +}; + +&i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1>; + status = "okay"; + + pmic: pfuze3000@8 { + compatible = "fsl,pfuze3000"; + reg = <0x08>; + + regulators { + sw1a_reg: sw1a { + regulator-min-microvolt = <700000>; + regulator-max-microvolt = <1475000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + /* use sw1c_reg to align with pfuze100/pfuze200 */ + sw1c_reg: sw1b { + regulator-min-microvolt = <700000>; + regulator-max-microvolt = <1475000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw2_reg: sw2 { + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1850000>; + regulator-boot-on; + regulator-always-on; + }; + + sw3a_reg: sw3 { + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <1650000>; + regulator-boot-on; + regulator-always-on; + }; + + swbst_reg: swbst { + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5150000>; + }; + + snvs_reg: vsnvs { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <3000000>; + regulator-boot-on; + regulator-always-on; + }; + + vref_reg: vrefddr { + regulator-boot-on; + regulator-always-on; + }; + + vgen1_reg: vldo1 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen2_reg: vldo2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen3_reg: vccsd { + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen4_reg: v33 { + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen5_reg: vldo3 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen6_reg: vldo4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; + }; +}; + +&i2c2 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; +}; + +&i2c3 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + status = "okay"; +}; + +&i2c4 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c4>; + status = "okay"; + + codec: sgtl5000@a { + #sound-dai-cells = <0>; + reg = <0x0a>; + compatible = "fsl,sgtl5000"; + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai1_mclk>; + VDDA-supply = <&vgen4_reg>; + VDDIO-supply = <&vgen4_reg>; + VDDD-supply = <&vgen2_reg>; + }; + + mpl3115@60 { + compatible = "fsl,mpl3115"; + reg = <0x60>; + }; +}; + +&sai1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai1>; + assigned-clocks = <&clks IMX7D_SAI1_ROOT_SRC>, + <&clks IMX7D_SAI1_ROOT_CLK>; + assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>; + assigned-clock-rates = <0>, <36864000>; + status = "okay"; +}; + +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; + assigned-clocks = <&clks IMX7D_UART1_ROOT_SRC>; + assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>; + status = "okay"; +}; + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; + assigned-clocks = <&clks IMX7D_UART3_ROOT_SRC>; + assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>; + uart-has-rtscts; + status = "okay"; +}; + +&uart6 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart6>; + assigned-clocks = <&clks IMX7D_UART6_ROOT_SRC>; + assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>; + fsl,dte-mode; + status = "okay"; +}; + +&usbotg1 { + dr_mode = "peripheral"; + status = "okay"; +}; + +&usdhc1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc1>; + bus-width = <4>; + keep-power-in-suspend; + no-1-8-v; + non-removable; + vmmc-supply = <®_brcm>; + status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-0 = <&pinctrl_usdhc3>; + pinctrl-1 = <&pinctrl_usdhc3_100mhz>; + pinctrl-2 = <&pinctrl_usdhc3_200mhz>; + assigned-clocks = <&clks IMX7D_USDHC3_ROOT_CLK>; + assigned-clock-rates = <400000000>; + bus-width = <8>; + no-1-8-v; + fsl,tuning-step = <2>; + non-removable; + status = "okay"; +}; + +&wdog1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wdog>; + fsl,ext-reset-output; + status = "okay"; +}; + +&iomuxc { + pinctrl_brcm_reg: brcmreggrp { + fsl,pins = < + MX7D_PAD_SD2_WP__GPIO5_IO10 0x14 /* WL_REG_ON */ + >; + }; + + pinctrl_bt_reg: btreggrp { + fsl,pins = < + MX7D_PAD_SD2_DATA3__GPIO5_IO17 0x14 /* BT_REG_ON */ + >; + }; + + pinctrl_gpio: gpiogrp { + fsl,pins = < + MX7D_PAD_ENET1_RGMII_RD1__GPIO7_IO1 0x14 + >; + }; + + pinctrl_i2c1: i2c1grp { + fsl,pins = < + MX7D_PAD_I2C1_SDA__I2C1_SDA 0x4000007f + MX7D_PAD_I2C1_SCL__I2C1_SCL 0x4000007f + >; + }; + + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX7D_PAD_I2C2_SDA__I2C2_SDA 0x4000007f + MX7D_PAD_I2C2_SCL__I2C2_SCL 0x4000007f + >; + }; + + pinctrl_i2c3: i2c3grp { + fsl,pins = < + MX7D_PAD_I2C3_SDA__I2C3_SDA 0x4000007f + MX7D_PAD_I2C3_SCL__I2C3_SCL 0x4000007f + >; + }; + + pinctrl_i2c4: i2c4grp { + fsl,pins = < + MX7D_PAD_I2C4_SCL__I2C4_SCL 0x4000007f + MX7D_PAD_I2C4_SDA__I2C4_SDA 0x4000007f + >; + }; + + pinctrl_sai1: sai1grp { + fsl,pins = < + MX7D_PAD_SAI1_RX_DATA__SAI1_RX_DATA0 0x1f + MX7D_PAD_SAI1_TX_BCLK__SAI1_TX_BCLK 0x1f + MX7D_PAD_SAI1_TX_SYNC__SAI1_TX_SYNC 0x1f + MX7D_PAD_SAI1_TX_DATA__SAI1_TX_DATA0 0x30 + >; + }; + + pinctrl_sai1_mclk: sai1mclkgrp { + fsl,pins = < + MX7D_PAD_SAI1_MCLK__SAI1_MCLK 0x1f + >; + }; + + pinctrl_uart1: uart1grp { + fsl,pins = < + MX7D_PAD_UART1_TX_DATA__UART1_DCE_TX 0x79 + MX7D_PAD_UART1_RX_DATA__UART1_DCE_RX 0x79 + >; + }; + + pinctrl_uart3: uart3grp { + fsl,pins = < + MX7D_PAD_UART3_TX_DATA__UART3_DCE_TX 0x79 + MX7D_PAD_UART3_RX_DATA__UART3_DCE_RX 0x79 + MX7D_PAD_UART3_CTS_B__UART3_DCE_CTS 0x79 + MX7D_PAD_UART3_RTS_B__UART3_DCE_RTS 0x79 + >; + }; + + pinctrl_uart6: uart6grp { + fsl,pins = < + MX7D_PAD_ECSPI1_MOSI__UART6_DTE_RX 0x79 + MX7D_PAD_ECSPI1_SCLK__UART6_DTE_TX 0x79 + >; + }; + + pinctrl_usdhc1: usdhc1grp { + fsl,pins = < + MX7D_PAD_SD1_CMD__SD1_CMD 0x59 + MX7D_PAD_SD1_CLK__SD1_CLK 0x19 + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x59 + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x59 + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x59 + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x59 + MX7D_PAD_SD2_RESET_B__GPIO5_IO11 0x14 /* WL_HOST_WAKE */ + >; + }; + + pinctrl_usdhc3: usdhc3grp { + fsl,pins = < + MX7D_PAD_SD3_CMD__SD3_CMD 0x59 + MX7D_PAD_SD3_CLK__SD3_CLK 0x19 + MX7D_PAD_SD3_DATA0__SD3_DATA0 0x59 + MX7D_PAD_SD3_DATA1__SD3_DATA1 0x59 + MX7D_PAD_SD3_DATA2__SD3_DATA2 0x59 + MX7D_PAD_SD3_DATA3__SD3_DATA3 0x59 + MX7D_PAD_SD3_DATA4__SD3_DATA4 0x59 + MX7D_PAD_SD3_DATA5__SD3_DATA5 0x59 + MX7D_PAD_SD3_DATA6__SD3_DATA6 0x59 + MX7D_PAD_SD3_DATA7__SD3_DATA7 0x59 + MX7D_PAD_SD3_RESET_B__SD3_RESET_B 0x19 + >; + }; + + pinctrl_usdhc3_100mhz: usdhc3grp_100mhz { + fsl,pins = < + MX7D_PAD_SD3_CMD__SD3_CMD 0x5a + MX7D_PAD_SD3_CLK__SD3_CLK 0x1a + MX7D_PAD_SD3_DATA0__SD3_DATA0 0x5a + MX7D_PAD_SD3_DATA1__SD3_DATA1 0x5a + MX7D_PAD_SD3_DATA2__SD3_DATA2 0x5a + MX7D_PAD_SD3_DATA3__SD3_DATA3 0x5a + MX7D_PAD_SD3_DATA4__SD3_DATA4 0x5a + MX7D_PAD_SD3_DATA5__SD3_DATA5 0x5a + MX7D_PAD_SD3_DATA6__SD3_DATA6 0x5a + MX7D_PAD_SD3_DATA7__SD3_DATA7 0x5a + MX7D_PAD_SD3_RESET_B__SD3_RESET_B 0x1a + >; + }; + + pinctrl_usdhc3_200mhz: usdhc3grp_200mhz { + fsl,pins = < + MX7D_PAD_SD3_CMD__SD3_CMD 0x5b + MX7D_PAD_SD3_CLK__SD3_CLK 0x1b + MX7D_PAD_SD3_DATA0__SD3_DATA0 0x5b + MX7D_PAD_SD3_DATA1__SD3_DATA1 0x5b + MX7D_PAD_SD3_DATA2__SD3_DATA2 0x5b + MX7D_PAD_SD3_DATA3__SD3_DATA3 0x5b + MX7D_PAD_SD3_DATA4__SD3_DATA4 0x5b + MX7D_PAD_SD3_DATA5__SD3_DATA5 0x5b + MX7D_PAD_SD3_DATA6__SD3_DATA6 0x5b + MX7D_PAD_SD3_DATA7__SD3_DATA7 0x5b + MX7D_PAD_SD3_RESET_B__SD3_RESET_B 0x1b + >; + }; +}; + +&iomuxc_lpsr { + pinctrl_wdog: wdoggrp { + fsl,pins = < + MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x74 + >; + }; +}; From patchwork Fri Jan 18 17:40:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 156027 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3521994jaa; Fri, 18 Jan 2019 09:41:31 -0800 (PST) X-Google-Smtp-Source: ALg8bN6V2MSJDLkNUclrAaZiRkEiE0PCOwRyEgoF0YXRNl4wvqQOZTxzOlp1L8DGenjcngyH7uoR X-Received: by 2002:aa7:d88c:: with SMTP id u12mr15975466edq.237.1547833291064; Fri, 18 Jan 2019 09:41:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547833291; cv=none; d=google.com; s=arc-20160816; b=NoyZaBY56SCgr4vmpiuV/wl/7g6OHuW0fwSBggIS0dWF7rP3qP8zCQO4baZTWAWRlp cLOH0ZdiaAMHpsqC6uV4YTGTzcUYwuu8DvoLy1Waiu9gtM6lpdg1XGkw5ZAgW1vp9/cn uuiKFkufD9TxM7Ce1XLF3yoF2brExyzRqu8BEwuK7PTv81Zc6mO7esfMUwQxfUvOxshW IHchUnAXTo0JAm3S8BZc7XKr04W84raVhmEfA4N79G5y7ONqvvWL/8rx08M0JM1Pa2t4 +tMuLQFDAcZEIK6BWueiQHSH6qWSEsT5ImI8500gdCU+TOazo1Y5cO2kKeQ+wJxM4lSk fnJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=F2i/yFi12UeZ+rccdwWK4rH35ZfNCBqJu0drC1deork=; b=YyjYjckxDxOgPY8UlHz8sGZR9qwKPv+24iKJhzZ+wZDJWnXWoh2+VlCem1ndeRraU0 bu3z5p+WEJG5MKX/jMC7feAQ43zbulyVuVbhlxQQdx4BD/geFlLsP4VUlOQPnvyI3iyh jB6NCvOAk7mqqYrurkyFLK9vNUYViywrIi+RU0Uq1nt0SDUHVevw1VpwD54GYSK5PY3T A2yaYgiVjn2n+RKtGKumK4yQHe6/si0sCXf85V9vLAf4poTPt8mNMqHtZdT7FdX2ecWa lqX7S9pZl3T0HEmeJd/hzdNsU982dC6f8qxLT6WWTI4pc5w4VjrDjmSIimc0GOK5s8UT IdKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YyZhPss7; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id e19-v6si486531ejj.140.2019.01.18.09.41.30; Fri, 18 Jan 2019 09:41:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YyZhPss7; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 7F259C220EA; Fri, 18 Jan 2019 17:41:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1DCB3C2212D; Fri, 18 Jan 2019 17:40:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2F95FC22113; Fri, 18 Jan 2019 17:40:26 +0000 (UTC) Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by lists.denx.de (Postfix) with ESMTPS id BF508C220CC for ; Fri, 18 Jan 2019 17:40:21 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id g22so11764765edr.7 for ; Fri, 18 Jan 2019 09:40:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y4qx9643gwxpY+5UiHWTDDEwaVCJvP94NgF+r8ygYU8=; b=YyZhPss74QroEnVdZLpRfk4/s0OLUt5+Q6Q7KaKVfqCTX5+MJcW3QmhxTpoT0eStLa XSdzrJ9tNezxvzoUuIFi9K5Z4KmF0i80epA7aZZsQ4mLSpkTqcVc/K1b1Ofi2KjQquYf 1lOEN2nbn/6tV7OABOkgjMH4rPzcIhZAlj0G4= 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=Y4qx9643gwxpY+5UiHWTDDEwaVCJvP94NgF+r8ygYU8=; b=Ux8Kv/cL1OCFfuKNzDxIgIOXY2zHn1F7usYSUO+Mem9wkTIvFC16d1gSHg2AGCLoOO +yLaMeBPmuk+5TyefCsunokAJjw9b9VLOxyKgvHQQJnGqd56ubKj8t0IV2cfp2ZGVuzM HNlr59aqhGyEzME9UTzsKLchy6Duo+UgjP5t8BJWx+DiJ1lDy4gC6ywwNZxpAQ1Hnvqh 7WmRJSZFo0Ndjn7YvXucRoLQ0srbgtGTpjE8rd9pBaI5WVD44yY4/57FiA250GnpljsT qg3ShMwCGaTWv9Akm9WReCAgkfHjw9DaiP2PhffooOLviO1GtodDlAGnkK2VzuaCANgZ iraQ== X-Gm-Message-State: AJcUukec/GLc38a3GiUsSMelKOjqAxG+F4ksBOF8OfYBf2yv51fLf4jY 7MkInwDu/5qrrLCnGUyx3jVGzenUkqs= X-Received: by 2002:a50:a642:: with SMTP id d60mr16989514edc.290.1547833221058; Fri, 18 Jan 2019 09:40:21 -0800 (PST) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id l20-v6sm4026339eja.18.2019.01.18.09.40.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 09:40:20 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Fri, 18 Jan 2019 17:40:09 +0000 Message-Id: <20190118174014.17860-4-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118174014.17860-1-bryan.odonoghue@linaro.org> References: <20190118174014.17860-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [RESEND] [PATCH v3 3/8] arm: imx7s-warp: Add DT file hooks X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This patch adds DT file hooks for imx7s-warp.dtb to the warp7 and warp7_bl33 builds. Signed-off-by: Bryan O'Donoghue Reviewed-by: Peng Fan Cc: Albert Aribaud Cc: Peng Fan Cc: Fabio Estevam Cc: Stefano Babic --- arch/arm/dts/Makefile | 3 ++- configs/warp7_bl33_defconfig | 3 ++- configs/warp7_defconfig | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index dda4e59491..4fe7e90902 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -460,7 +460,8 @@ dtb-$(CONFIG_MX6ULL) += imx6ull-14x14-evk.dtb dtb-$(CONFIG_MX7) += imx7-colibri.dtb \ imx7d-sdb.dtb \ - imx7d-sdb-qspi.dtb + imx7d-sdb-qspi.dtb \ + imx7s-warp.dtb dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index a568c6d10e..12141fedd3 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_CMD_FS_GENERIC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DFU_MMC=y @@ -37,5 +38,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" -CONFIG_OF_LIBFDT=y CONFIG_OPTEE_TZDRAM_SIZE=0x2000000 +CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp" diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 4d443295ba..fee98dfbbe 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_CMD_FS_GENERIC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DFU_MMC=y @@ -47,8 +48,8 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" -CONFIG_OF_LIBFDT=y CONFIG_OPTEE_LOAD_ADDR=0x84000000 CONFIG_OPTEE_TZDRAM_SIZE=0x3000000 CONFIG_OPTEE_TZDRAM_BASE=0x9d000000 CONFIG_BOOTM_OPTEE=y +CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp" From patchwork Fri Jan 18 17:40:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 156033 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3524964jaa; Fri, 18 Jan 2019 09:44:42 -0800 (PST) X-Google-Smtp-Source: ALg8bN4CFBildn6jMsAOXiGBEaFUOSMvXb4UBPvSzhqg9d8JOrG19KCHruzC7Xfz2YwQ3p0L/5zK X-Received: by 2002:aa7:c352:: with SMTP id j18mr16520867edr.295.1547833482552; Fri, 18 Jan 2019 09:44:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547833482; cv=none; d=google.com; s=arc-20160816; b=YG+KtiHgwhRIBR7uED0tHsGMoaZWV0eo/yaBMfmQkU0gohkpnboGt34wcIWbDmsFut s7qaM0XVwU4iTHQJBpsB4n6/9XMQv0TFCJ8OeiqcLN7450eFstJXzmcHsEVhp9oGIdT2 kQw4MLCzAn/kIzElJoOQXgp+KUIr5T7LSMP6FjcBB/iGkwzr9X+oNtfe427nm/zryyjd TGB6arSgKPGeRJm0vREpD4Kz34IVyO6D0j2WN0cpqkkj6B4Fh/1GmaJDF/ucUXzqmXsi 3CwcaIh4vI5oLbndY4QqiTu/kq+t9JPAD5DPnJeXhv01+mIWTX4TcHnU7/L0yotgTNWM Aeig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=RPdJV8FrKxMvnWYumvu2iq3gYP1tSbFZfC3M0kCWJOU=; b=06KWVFGUrDJQJx54eka6MKdCQVSgwTNCtCfxnHkbtsTQcyHncefE8x7QNHwzvqCpuw jKFAzzQDN3N4fd6LkLUQCAq8UMpbdAa2/PpiMrjSu2hyoDTS3nzV7t0Djea9UjssLYlY 3Z8fsl1HdseqJmpfUA74wXYgDfjnTrxc9r92E1DIrXXhtHofWWOcs9+JP1DZDXvdqogp OFh5prIaBLy6BOVz6O2FXSdOUJGZbHy3XimhxCJ05alF4rDFNA1IquW4FDCd4vs9snmO kMPyUJ2VYdd2Qzc1GNj6xwAOEWJYisxkUBmDpvO5cRGE815k3QZnUeObryPesJkjDfdf Mlhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=cjABzeyP; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id hk19-v6si738170ejb.253.2019.01.18.09.44.42; Fri, 18 Jan 2019 09:44:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=cjABzeyP; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 0E09AC2210B; Fri, 18 Jan 2019 17:42:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B8CEFC21EB4; Fri, 18 Jan 2019 17:40:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3843EC21DCA; Fri, 18 Jan 2019 17:40:27 +0000 (UTC) Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by lists.denx.de (Postfix) with ESMTPS id 5B4A0C2212E for ; Fri, 18 Jan 2019 17:40:23 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id y20so11746372edw.9 for ; Fri, 18 Jan 2019 09:40:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xuw69l2NZmlhWut3b0kZtSp+D8LO/IdkttK/+BbS7yg=; b=cjABzeyPUs8jGfTI9eKY7MhSzzLbQRBBaxvW3dVgcXb3uP99l0i6Ndpw/RsWkPoRfZ TF4Rgr4gh4w4SkkGJaw7vIJfuLZ0H5c8ZUMCAWjbFbtewGS+eDiYcfbrlBjIC+QmmPme ftManRHeG0t3q25sZbyeE0TEEPJvQ2tZ0leN8= 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=Xuw69l2NZmlhWut3b0kZtSp+D8LO/IdkttK/+BbS7yg=; b=X223VU9cVOEvU6Xzi8hrxYe6Aa5zTyl7HLMXWdDCxxCVBf6aVoN9bEgt5p+J1u5nwV oEpU9wrixkcIqgZYwn/ymU4y7KxBqlPRuLUa7uUFxxj/tUQ6N2jUNVPbLS1MhgoQPI2x 4/YKcSFVcDyYzandLIkXCQveml7gedgGuEBIGq0d+CwKUIUDb6ATtzgvreMv63IuTRR9 WS1Wb9Iach4Wzl8o4w0d0ObeUYqdMg+efjOEyREXVl6tP2KWG6FotEUFoosSo8XhvbdG W7GWSP3uMI2rTqvqurlU1YVd5EWeQZ+veh+0xFWFdmqznor9KEjetGjB5YW0zdSL38cz L9/Q== X-Gm-Message-State: AJcUuketUHN6+pE0VkB96oES3Rny1tz1iVEaaAgbf2nBWHI83Ip8lF+u 9XqTwQCEHUmBW89xNrJYEMoblKCiP64= X-Received: by 2002:a17:906:6011:: with SMTP id o17-v6mr15515436ejj.237.1547833222601; Fri, 18 Jan 2019 09:40:22 -0800 (PST) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id l20-v6sm4026339eja.18.2019.01.18.09.40.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 09:40:21 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Fri, 18 Jan 2019 17:40:10 +0000 Message-Id: <20190118174014.17860-5-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118174014.17860-1-bryan.odonoghue@linaro.org> References: <20190118174014.17860-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [RESEND] [PATCH v3 4/8] arm: imx7s-warp: Convert to DM MMC initialization X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Converts from fixed initialization of MMC to DM initialization of MMC. Signed-off-by: Bryan O'Donoghue Cc: Albert Aribaud Cc: Peng Fan Cc: Fabio Estevam Cc: Stefano Babic --- board/warp7/warp7.c | 34 ---------------------------------- configs/warp7_bl33_defconfig | 1 + configs/warp7_defconfig | 1 + 3 files changed, 2 insertions(+), 34 deletions(-) diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index 3d32b3eb52..146d722b15 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -30,8 +30,6 @@ DECLARE_GLOBAL_DATA_PTR; #define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | PAD_CTL_PUS_PU100KOHM | \ PAD_CTL_HYS) -#define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \ - PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU47KOHM) #define I2C_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \ PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM) @@ -74,43 +72,11 @@ static iomux_v3_cfg_t const uart1_pads[] = { MX7D_PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), }; -static iomux_v3_cfg_t const usdhc3_pads[] = { - MX7D_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX7D_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX7D_PAD_SD3_DATA0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX7D_PAD_SD3_DATA1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX7D_PAD_SD3_DATA2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX7D_PAD_SD3_DATA3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX7D_PAD_SD3_DATA4__SD3_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX7D_PAD_SD3_DATA5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX7D_PAD_SD3_DATA6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX7D_PAD_SD3_DATA7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), - MX7D_PAD_SD3_RESET_B__SD3_RESET_B | MUX_PAD_CTRL(USDHC_PAD_CTRL), -}; - 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] = { - {USDHC3_BASE_ADDR}, -}; - -int board_mmc_getcd(struct mmc *mmc) -{ - /* Assume uSDHC3 emmc is always present */ - return 1; -} - -int board_mmc_init(bd_t *bis) -{ - imx_iomux_v3_setup_multiple_pads(usdhc3_pads, ARRAY_SIZE(usdhc3_pads)); - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); - - return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); -} - int board_early_init_f(void) { setup_iomux_uart(); diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index 12141fedd3..b2f943c775 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -24,6 +24,7 @@ CONFIG_OF_CONTROL=y CONFIG_CMD_FS_GENERIC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DFU_MMC=y +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index fee98dfbbe..65d801ffe2 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -33,6 +33,7 @@ CONFIG_OF_CONTROL=y CONFIG_CMD_FS_GENERIC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DFU_MMC=y +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_OPTEE=y CONFIG_USB=y From patchwork Fri Jan 18 17:40:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 156032 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3524745jaa; Fri, 18 Jan 2019 09:44:29 -0800 (PST) X-Google-Smtp-Source: ALg8bN75jETxasA82WbxF727LPx/H6/FmkRU2UIH3JRjL/OPYpHVVPU0aSda+M2RmiSROSYC1j+K X-Received: by 2002:a50:a395:: with SMTP id s21mr17258461edb.1.1547833469128; Fri, 18 Jan 2019 09:44:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547833469; cv=none; d=google.com; s=arc-20160816; b=r1G69X7iCwp7FabNq74JqMtjY+UJVbaFOrXX3CsrjP6KrzQNkRmoPp8I5r5FIsse9V dhstTNKeMGItBqq3TdSX0TpvNyZs7WCzoOyQAlnJglDribBd+U1A4UDWKJrS3G3TxTi/ vKD2/o7VEBICZ8K286AtRO2Ve5H5H4LsWHbkFuX8q0B51DYUZcv5co0oxtOZHDOr680S 1Ph89wvIMVtL9CHpUTvgWKo+FWXEP38JDt6nSSbpEfCNBcvTDS112w/6rxrqq6XBU/JE vXuXpiw44CFwsihLIEQnqVJkNt3pWjT566ApaFbQttje+6DlUccf2J4xTIDQ/XpCy4GB gbPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=WPYX5bXWvai1PH5uLeACPIPpu37Ss/CZh4PVJ1qAieo=; b=lTbY7iSHr/kFrVmeTuj7DR7B2yFuWQanWCXrzW7OvEKmnAOCgP5UcXDEAJOXmL/S3x l0WmgblkAt23wvPqFClAlnBzYzEXMz6lBeE/0ij1r9/JqyzCn3kQgFzY+B2QTOhoR5RH htCcjTwgRvQhCR0EgmJ+TM/yWzmBMbiFssxbiYudMTZTXxaAU1gruKl1HnFw08gKWAgD 0L1Sq15hYh+zddjnVp1t1Ec7qhS+6eTFE+31QPdGHmFdjANODYiOeB+Md1EqHtrrCvlL l/R63o3lMgv8xb58DqRq9aSjueKhYD4s4vraOTDj16J+0eIx3BJ4CrnnQT6DL6N+omgl SejQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=FZvtAU0P; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id z5si290004edp.248.2019.01.18.09.44.28; Fri, 18 Jan 2019 09:44:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=FZvtAU0P; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 94779C2212D; Fri, 18 Jan 2019 17:42:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D7510C2212F; Fri, 18 Jan 2019 17:40:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1D101C21DCA; Fri, 18 Jan 2019 17:40:27 +0000 (UTC) Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by lists.denx.de (Postfix) with ESMTPS id 6B704C2213D for ; Fri, 18 Jan 2019 17:40:24 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id f9so11745540eds.10 for ; Fri, 18 Jan 2019 09:40:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dCRxIInhwBfp2i0pZ4FyA6NyHfcFkbJmBIY0VgiPRQI=; b=FZvtAU0P7dk/V5yhIYfjE5Dog3RNhwREpP0nXTWMdZlPLIpgMntJbBRWBowNVrzyLp DXHKn3pXDvCqwtD2s9/ObyCfm+oES6hf1oU6vB5Gc3HyTmH7xVTFS/fE2VwSF+ay7Rbs UritsEb4IrzqIkvFD2yxWsxHXFcPlyKquxaK4= 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=dCRxIInhwBfp2i0pZ4FyA6NyHfcFkbJmBIY0VgiPRQI=; b=bgMw2I9chGeoXv8269zTogEqL68EvVAXwIL91yPm+5u0OZ50MntXaS7T2JT6i52ct0 PxtcjaBVvQIAqKH2kPyWJHjQCnn7tyil669CgjAceRH6B8JNa6G2Jr/0Bunyl/Wsk0WI MtiIEWrwDffKGQlp/H+kHwPd9jk7/H83QYXerQNXsdDEhWkhTha5nurU6STwwmjnVrhZ Bv39E+RAmbY+CVBZdfO3SwsL1y7yo3SZ8vFAaNvTpA3DUDivYYIpYcI+gc+rBp4JCG2M ZPNQs0e39AYUWhX6aIM9ACzqPeo0w4kK1zMwa5AlowEa3itKQt0XxRdhQuMY6xS62KT2 a+LQ== X-Gm-Message-State: AJcUukfht8N0FJurhDcqAUmAMkJjwSfnD9BFRLE8fpQD2rqIxb9sR7dG yUTAdf5mTCmDAbLKSbWs2XvgyzG5F+c= X-Received: by 2002:a50:ec19:: with SMTP id g25mr16452720edr.38.1547833223694; Fri, 18 Jan 2019 09:40:23 -0800 (PST) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id l20-v6sm4026339eja.18.2019.01.18.09.40.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 09:40:23 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Fri, 18 Jan 2019 17:40:11 +0000 Message-Id: <20190118174014.17860-6-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118174014.17860-1-bryan.odonoghue@linaro.org> References: <20190118174014.17860-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [RESEND] [PATCH v3 5/8] arm: dts: imx7s-warp: Create alias for mmc0 to &usdhc3 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This patch sets up an alias for mmc0 to usdhc3. Before the DM conversion only usdhc3 was enabled and therefore it appeared as MMC 0 to u-boot. After enabling MMC DM though usdhc3 defaults to MMC 2, which left unattended would drive changes to existing warp7 bootscripts and environment variables that rely on mmc 0. Setup the alias of mmc0 and usdhc3 so that existing warp7 boot code will work unmodified. Signed-off-by: Bryan O'Donoghue Cc: Albert Aribaud Cc: Peng Fan Cc: Fabio Estevam Cc: Stefano Babic --- arch/arm/dts/imx7s-warp.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts index f7ba2c0a24..d28b7ec715 100644 --- a/arch/arm/dts/imx7s-warp.dts +++ b/arch/arm/dts/imx7s-warp.dts @@ -17,6 +17,10 @@ reg = <0x80000000 0x20000000>; }; + aliases { + mmc0 = &usdhc3; + }; + gpio-keys { compatible = "gpio-keys"; pinctrl-0 = <&pinctrl_gpio>; From patchwork Fri Jan 18 17:40:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 156028 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3523095jaa; Fri, 18 Jan 2019 09:42:39 -0800 (PST) X-Google-Smtp-Source: ALg8bN5rcbAvb573EvoHfz6OhKKM78W4pdfePFuO6f5GRNbj39+cdLsGcSZWlNS3ivCxWkfCoOgT X-Received: by 2002:a50:cc04:: with SMTP id m4mr17084010edi.171.1547833358968; Fri, 18 Jan 2019 09:42:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547833358; cv=none; d=google.com; s=arc-20160816; b=Z5ooeimom3enJksK8qk9cOdx4h8CTK0KkQPjStg1WfVV+WEYxTJDQXZr+ezsBu+n5y rIhaEjzeW89bDwUHHMBTsyXku0Lv05NCOXZFTIbl5g0Z5mEilQP8JaPgLis8uczP03/E NMvxavipBWygXUP1d37KUNVeg1eI4kh8hn2O9AeH0xdBrzQODPVtpCCi/qOeYkelpye6 Y1FaTpKa5RahjlOXN2kl3lPNi7Nzle4T6VeKODwJ6zz01AWS3hDkywqu/UKIJ8gZgkIZ A+WBHx8hienozaPPnyNVyd519xC6nr0gogxEYO9YDKXZH+o7/P6gcIMOzaJgjDQ1DCfc afyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=K+KnM2Q2SOpMgnm/rQ8VRDjBZ4A/Q6p1wFROcgtwxn4=; b=Ce4NKvHyioEOH17oKcOs6PvbdxHr5VDRkjGGp88t9n5RPIPaThdSe7U80GPIQvTC/0 L7zZXsI8HtGJncWW2wKkFLgLnkFlT+nFfeOaGgSwsM+uOisOI27uZ0XTnICNjxOebzYj tcFYTcI+sP+PNTTEBCnbBP8qQHUVCXAwLHfdolaD9KFkLlWutFer7Gxk9/rzUS3bAADu UqDmOaeN0v0/RKn0I5dCy614mektVJjTnMwB5u+q5yOuYXB7vcyCd1TD2p+eaxd7Qzr6 xZ3FYMiYnc1uJGj0yvGQ6K+Hg46cGPWlVAOoeoV+fajuLmdJWhkQRoOz4e8rsc7K3KGx AkhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=PIbp7knE; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id q10si7043210edd.257.2019.01.18.09.42.38; Fri, 18 Jan 2019 09:42:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=PIbp7knE; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 71EC0C21E15; Fri, 18 Jan 2019 17:42:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BF67AC22157; Fri, 18 Jan 2019 17:40:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BBC7AC22129; Fri, 18 Jan 2019 17:40:29 +0000 (UTC) Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by lists.denx.de (Postfix) with ESMTPS id 78FBFC2211C for ; Fri, 18 Jan 2019 17:40:25 +0000 (UTC) Received: by mail-ed1-f68.google.com with SMTP id h15so11784426edb.4 for ; Fri, 18 Jan 2019 09:40:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uWa4pt1qGk3GZw2QN3d3PX4Qs1bDC5wFMhBUgJ2mCoE=; b=PIbp7knEEmByjEkRMgqwr+1rePMZUSkbvF7RdGo/bqShkyI4o+AI+MLQfsx+q/jmT+ fPWHsapwOS2p/+yN4eCPzfpNFO95xUwQHohQF4Ty3MP1ar+unLwxN2OKPV49MxQzC/DC CmwtPZVMYenHX8F6eLtYiRAnjgmR+NRhGm7bs= 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=uWa4pt1qGk3GZw2QN3d3PX4Qs1bDC5wFMhBUgJ2mCoE=; b=CMfuKHdxEo7UGLLdXbkyG2Cgp4pQhi3vtKDDAOc2jUKeRxTeWpHe5RxrbfdJZz2RBB 17R7NGsSXTFTNGxsVwGHOTQIrLhqfvgW3mMcHFmynd71mojizbV+gQfYQt6op78lbvpi qMMnRQzqJsXsbcy69km76mKGB/JLABhyewKAJRYFh0h9u0DhAyyjE5EvykBbCPdJDl5G pbc6d4xTqT9d4pKk1PTnYEVOPbAahSBEYzXP4DnzVDPIBI53Wm+IDsweoXRgFSw/jO+z w5AwaMT6+6NXtjAHSHdW56xmxiY8Aw7w/IFpPmuSQ3NmNsi/s0q3ED60A0dGmdOK14+B tKXQ== X-Gm-Message-State: AJcUukcVbg4GMJc3QylK/4QBfqkLd00vPWnkQASbIH3k9DWeAibYzH7c q3ImqVLaicqonyCfGLGGPIBQaR+XTDM= X-Received: by 2002:a50:cdd0:: with SMTP id h16mr17099419edj.151.1547833224847; Fri, 18 Jan 2019 09:40:24 -0800 (PST) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id l20-v6sm4026339eja.18.2019.01.18.09.40.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 09:40:24 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Fri, 18 Jan 2019 17:40:12 +0000 Message-Id: <20190118174014.17860-7-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118174014.17860-1-bryan.odonoghue@linaro.org> References: <20190118174014.17860-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [RESEND] [PATCH v3 6/8] warp7: defconfig: Switch on IMX7 GPIO/pinctrl for both ports X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Switches on the IMX7 pinctrl driver for the warp7 and warp7_bl33 ports, necessary to convert over to DM for this board. It is necessary to switch on pinctrl and GPIO in one go. Signed-off-by: Bryan O'Donoghue Cc: Peng Fan Cc: Fabio Estevam Cc: Stefano Babic --- configs/warp7_bl33_defconfig | 3 +++ configs/warp7_defconfig | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index b2f943c775..7f21bb4f53 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -41,3 +41,6 @@ CONFIG_USB_ETH_CDC=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_OPTEE_TZDRAM_SIZE=0x2000000 CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp" +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX7=y +CONFIG_DM_GPIO=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 65d801ffe2..2d3171e42a 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -54,3 +54,6 @@ CONFIG_OPTEE_TZDRAM_SIZE=0x3000000 CONFIG_OPTEE_TZDRAM_BASE=0x9d000000 CONFIG_BOOTM_OPTEE=y CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp" +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX7=y +CONFIG_DM_GPIO=y From patchwork Fri Jan 18 17:40:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 156030 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3523731jaa; Fri, 18 Jan 2019 09:43:14 -0800 (PST) X-Google-Smtp-Source: ALg8bN5B1eFUeUulU+OXDKEl+GxAUhBCPXCYxFAXbspVd4Ma5wskhON8bNk0rfxRXn3xlSSkc2u+ X-Received: by 2002:a17:906:351a:: with SMTP id r26-v6mr15330223eja.193.1547833394256; Fri, 18 Jan 2019 09:43:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547833394; cv=none; d=google.com; s=arc-20160816; b=XN7blutjguB1ipQyXtDe+LhVeifyj0ZDVFXXn/DTHXw+jDjl6G10AIdacu1Q+w1Y6w atFvq5va1EEL6BqI0xgRcCbFr7ckSJ3kA7ut+G/lP5/8iMuEKHPTe8BnpQENE6g34AAW wWQqO1v7CavluqD5TEjlKOGa/PdzYn75T8IxdQQm/QKgfwHmJMdHz3bV98yKwA0/4Qej Min3wbpxvu4qnYONHCyVDbhPDilsMwG6mAAUQWzO6v7PxLFjBOf5EOEGjuH156P4lLsX rsDxZO2dOpylhew8TCaATiZmwLXFwRO1L214Agnzt7GxaKLfv4YNvI/1JS6SDyA7gnRm 3hNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=5wRWjWV5+ARPMws/eqqA4vjXSnuOTWAlb+NG7mro7pY=; b=EFkAOiAY9GVYTbICIinxgH0jSOT9zC4i2tgxDC4aP7eF2v8tCrt5ZK9V2fbPb3zYqk Tcr/NjwtikKZJpBCO+HUJK1h3SdThSLnBelosHtnQR8ftnWCttkfkVsM88yVwEQOXJVK qpjc/IMKHs2y78/0S+zUXPLMr7IiPr5speZArxuQJUseagmOWHN54n8vdUBwJcMl4rGG 7Hjz9ypyKYXlLTyIPqYklSaeQ+vR9DeLBY+A4X/NAPWRtGXIbGk6OROAjGchUtlu9t+Q BzEcA5aDsx0yaRlH8CXnWXJa4FbWsCaqZomUnPQ3N3qTxwi+x1B/vrd6f/O7EuLNbLTE T4Vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=K2opSLcx; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id g13si892011edk.370.2019.01.18.09.43.13; Fri, 18 Jan 2019 09:43:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=K2opSLcx; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 87AF0C21C6A; Fri, 18 Jan 2019 17:41:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E6AC7C2214C; Fri, 18 Jan 2019 17:40:34 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AD318C22072; Fri, 18 Jan 2019 17:40:30 +0000 (UTC) Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by lists.denx.de (Postfix) with ESMTPS id C4D54C21E44 for ; Fri, 18 Jan 2019 17:40:26 +0000 (UTC) Received: by mail-ed1-f68.google.com with SMTP id o10so11729046edt.13 for ; Fri, 18 Jan 2019 09:40:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pFUoFSMMP0zynGJg+HQl6+cRsZDkQqPSHcp+Nd0D7aU=; b=K2opSLcxaVa+5xG5d+BvRxt7/y5txRfnVx6Gomro/BJqFszmcySoNGc759Z+UQWGDx f1Vf7DlXkESpovzADBCc7GVeqtEH78xIWnqQvH+CLT0OrbHY5DBe1wHjdFGwnXcN0wDz 3uFIg6FjXweha6EkxYfGAybwipONi1QtDVr9A= 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=pFUoFSMMP0zynGJg+HQl6+cRsZDkQqPSHcp+Nd0D7aU=; b=agKW1pR9M41QNCnVA5Ebn6vuYT6+F5hWY47jcr8zyp2gvb5ZnMtm27EnkTUKW7/Yg8 fJ42jQo3NJuAHAdfEhiu6sjiZqCEVbRsYQrsGqc0RZiHfdhCyuv0mixQsX49laaDAEnE 2R3earhVGMhDOm4+UXPkkvYRGEyr56t76Q29WYQiClIoylDsNfbTDcqeGYPIq1j73CeL 1eU0MvqY9LtZeR1fohmisB6R721y8JN2TQtPPEfnZYP3Djy6oIMWo98Nafa3UNm6DNIh gkrWKcBAqgW90WwTNQ230tRQz8hWb5scgJFksZGmwujzUec+2Q1nJfnjPNeXmzP7omFz H+tg== X-Gm-Message-State: AJcUukdm5qurQHuzQYjneidPgVFj3eqDmFWxlw6QJjWvbQ7D/cqpXNqL fpoDeXTEoyVR6FMlHmFevdDJxRrL1hQ= X-Received: by 2002:a50:cdd3:: with SMTP id h19mr5357814edj.45.1547833225983; Fri, 18 Jan 2019 09:40:25 -0800 (PST) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id l20-v6sm4026339eja.18.2019.01.18.09.40.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 09:40:25 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Fri, 18 Jan 2019 17:40:13 +0000 Message-Id: <20190118174014.17860-8-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118174014.17860-1-bryan.odonoghue@linaro.org> References: <20190118174014.17860-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [RESEND] [PATCH v3 7/8] warp7: defconfig: Switch to DM for I2C X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This commit switches to DM I2C for warp7 and warp7_bl33 defconfigs. Signed-off-by: Bryan O'Donoghue Reviewed-by: Peng Fan Cc: Peng Fan Cc: Fabio Estevam Cc: Stefano Babic --- board/warp7/warp7.c | 24 ------------------------ configs/warp7_bl33_defconfig | 1 + configs/warp7_defconfig | 1 + include/configs/warp7.h | 2 -- 4 files changed, 2 insertions(+), 26 deletions(-) diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index 146d722b15..19f0df4d09 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -31,26 +31,6 @@ DECLARE_GLOBAL_DATA_PTR; #define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | PAD_CTL_PUS_PU100KOHM | \ PAD_CTL_HYS) -#define I2C_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \ - PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM) - -#ifdef CONFIG_SYS_I2C_MXC -#define PC MUX_PAD_CTRL(I2C_PAD_CTRL) -/* I2C1 for PMIC */ -static struct i2c_pads_info i2c_pad_info1 = { - .scl = { - .i2c_mode = MX7D_PAD_I2C1_SCL__I2C1_SCL | PC, - .gpio_mode = MX7D_PAD_I2C1_SCL__GPIO4_IO8 | PC, - .gp = IMX_GPIO_NR(4, 8), - }, - .sda = { - .i2c_mode = MX7D_PAD_I2C1_SDA__I2C1_SDA | PC, - .gpio_mode = MX7D_PAD_I2C1_SDA__GPIO4_IO9 | PC, - .gp = IMX_GPIO_NR(4, 9), - }, -}; -#endif - int dram_init(void) { gd->ram_size = PHYS_SDRAM_SIZE; @@ -130,10 +110,6 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; - #ifdef CONFIG_SYS_I2C_MXC - setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); - #endif - return 0; } diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index 7f21bb4f53..2e80011cbc 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -44,3 +44,4 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp" CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_GPIO=y +CONFIG_DM_I2C=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 2d3171e42a..9f7dc73a11 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -57,3 +57,4 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp" CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_GPIO=y +CONFIG_DM_I2C=y diff --git a/include/configs/warp7.h b/include/configs/warp7.h index a391dfb5c1..41eb8d7e1d 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -126,9 +126,7 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* I2C configs */ -#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC -#define CONFIG_SYS_I2C_MXC_I2C1 #define CONFIG_SYS_I2C_SPEED 100000 /* PMIC */ From patchwork Fri Jan 18 17:40:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 156034 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3525575jaa; Fri, 18 Jan 2019 09:45:24 -0800 (PST) X-Google-Smtp-Source: ALg8bN7TXIKj31YK6tEcd1qUViBG+PMHGZHijpIZKQ9jI1C86hu4BGSdtPMM5a5/zCzSMpr3nvBi X-Received: by 2002:a17:906:6085:: with SMTP id t5-v6mr15566096ejj.47.1547833523925; Fri, 18 Jan 2019 09:45:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547833523; cv=none; d=google.com; s=arc-20160816; b=lDsPv/CK1x2D0/WlAJjoEtbg9v0GihaJS7ym5jQMj5n/rHrBfdnjl118Vra/5cscuv RiG/X955lWNmfbgbth4ovT0NtQIZ60bv15Vje8tgYMSp1Ow6WPeKllRCg3KGQrwgTz2k QbbPI9iU3uj6haDYhJuRq56VRp1O1oWwoHzjZXF4vaNwnd7di7h/oRwiSsl2n93TcQY+ sMdncAu3EeaYrN4PegGQ5xDobHDF0i8plJgiw7qBozchUmgssOHQ2LR+FiPl0NGGwlf+ mk3Q1pxHddpzvAd6rp66XxCx1ThG2VqBW5KR5cPwj6WqRPhhgZgipoy20Q+0UbkcDwOC MiXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=daWq9xVXvOvStk4LUNjHMrfM8xtBtAhWN5S6Lsnps0U=; b=a6ZHKEbSoBl3+9ADyeWuoxp7secjjEInYehv7dnX9hY+zcc6wlDCQei/ppUNQ1BCFy pIWReG0A2vIcbxYQeXnTq6REwVwira053frFyGQ0Et5IQF+iCxV7D014yhbQn+Y6FFER AK/moTUqLDLki3KAOkRKpE7c8nMCMkgbeOY8pTLpcof8Jpr/k0Gnh3fEBoj4c+zmzGpx 1MjxDDQlzXF9icjTU3mEa06H1PbGuB6y/MSCEZiDLD7bCmtyY1MxzbwlJuMjJF6AeJzp nVjsgunQwgI8VA4DZv1Y8Nu9MOHT/08QwQWmUcwgXxC+c4m3uAYYqE5rpoLRcYF0GRCv mzQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bRec+KNB; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id q19-v6si1887329ejk.294.2019.01.18.09.45.23; Fri, 18 Jan 2019 09:45:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bRec+KNB; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 777BEC2213D; Fri, 18 Jan 2019 17:43:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A0419C22135; Fri, 18 Jan 2019 17:40:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E82CBC21EA1; Fri, 18 Jan 2019 17:40:31 +0000 (UTC) Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by lists.denx.de (Postfix) with ESMTPS id F1EF4C22129 for ; Fri, 18 Jan 2019 17:40:27 +0000 (UTC) Received: by mail-ed1-f66.google.com with SMTP id y20so11746587edw.9 for ; Fri, 18 Jan 2019 09:40:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GdiSyuEjim5+vzDESRUhTEZSwbHbH+4ac/+7RxnoLhE=; b=bRec+KNBFI1L34J6hTNWCNUfgkIpFu/wzFPOY5RDcdB+ihLLtITf9RI6vBr23w6Xps +SZI1WKZXdvf7Kq09gXSlvVze3nGw57k5URAjq2w3YJiR8vdS2B5EDpaHRDvoTUnfd7i hVxSPwinDJ89PSkd9tO24etC115VvFInLxASE= 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=GdiSyuEjim5+vzDESRUhTEZSwbHbH+4ac/+7RxnoLhE=; b=aojYNwEyO7c3pX8UpDjtmPb4qDCvBN2nAnl97ZX8e2ESaKgpU3+UzXPlShcZrkgFJg V6V8Tka57a+7//TmvIfGphfA5GM9LIMhMW8YJRiASelmRdyuoBJT1l0XsuenoQfpadvd 4YmRbgzWIjEcFVq6DD/9Uz2NUGdhIckG4xMacT6Y2X8cyKZxKc8RRPaNiEzbUfmE5ROT V9u/snxOphoLidhikfb8TnqU1z6Sna2JYw7R+uM3uG7gq8eqNfK5ui0Ne0W79a3/+M+q SPgvyVZzaVx99R7nR0qLWkMlom0Dn15LTswJAbR9vPsM7aKXTaeIUJOWe0Qd9cDibSbl Co8Q== X-Gm-Message-State: AJcUuketgkmODvHHGokKg1IwpW1hWGPZwtaISClODigVW08oqSoXHjlb +Jc/bK8op812YkhD7vHNaIIOt2Fjmt8= X-Received: by 2002:a50:8fe4:: with SMTP id y91mr16488899edy.231.1547833227345; Fri, 18 Jan 2019 09:40:27 -0800 (PST) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id l20-v6sm4026339eja.18.2019.01.18.09.40.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 09:40:26 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Fri, 18 Jan 2019 17:40:14 +0000 Message-Id: <20190118174014.17860-9-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118174014.17860-1-bryan.odonoghue@linaro.org> References: <20190118174014.17860-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [RESEND] [PATCH v3 8/8] arm: imx7s-warp: Convert to DM PMIC X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This patch converts the warp7 and warp7_bl33 board ports over to using the DM PMIC model. Signed-off-by: Bryan O'Donoghue Reviewed-by: Peng Fan Cc: Peng Fan Cc: Fabio Estevam Cc: Stefano Babic --- board/warp7/warp7.c | 27 +++++++++++---------------- configs/warp7_bl33_defconfig | 6 ++++++ configs/warp7_defconfig | 6 ++++++ include/configs/warp7.h | 6 ------ 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index 19f0df4d09..6ebeb08e33 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -64,29 +64,24 @@ int board_early_init_f(void) return 0; } -#ifdef CONFIG_POWER -#define I2C_PMIC 0 -static struct pmic *pfuze; +#ifdef CONFIG_DM_PMIC int power_init_board(void) { - int ret; - unsigned int reg, rev_id; + struct udevice *dev; + int ret, dev_id, rev_id; - ret = power_pfuze3000_init(I2C_PMIC); - if (ret) + ret = pmic_get("pfuze3000", &dev); + if (ret == -ENODEV) + return 0; + if (ret != 0) return ret; - pfuze = pmic_get("PFUZE3000"); - ret = pmic_probe(pfuze); - if (ret) - return ret; - - pmic_reg_read(pfuze, PFUZE3000_DEVICEID, ®); - pmic_reg_read(pfuze, PFUZE3000_REVID, &rev_id); - printf("PMIC: PFUZE3000 DEV_ID=0x%x REV_ID=0x%x\n", reg, rev_id); + dev_id = pmic_reg_read(dev, PFUZE3000_DEVICEID); + rev_id = pmic_reg_read(dev, PFUZE3000_REVID); + printf("PMIC: PFUZE3000 DEV_ID=0x%x REV_ID=0x%x\n", dev_id, rev_id); /* disable Low Power Mode during standby mode */ - pmic_reg_write(pfuze, PFUZE3000_LDOGCTL, 0x1); + pmic_clrsetbits(dev, PFUZE3000_LDOGCTL, 0, 1); return 0; } diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index 2e80011cbc..7b40bfbd6d 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -45,3 +45,9 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y +CONFIG_DM_PMIC=y +CONFIG_DM_PMIC_PFUZE100=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_PFUZE100=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 9f7dc73a11..d1c8e403a7 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -58,3 +58,9 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y +CONFIG_DM_PMIC=y +CONFIG_DM_PMIC_PFUZE100=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_PFUZE100=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 41eb8d7e1d..043f2861b6 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -129,12 +129,6 @@ #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_SPEED 100000 -/* PMIC */ -#define CONFIG_POWER -#define CONFIG_POWER_I2C -#define CONFIG_POWER_PFUZE3000 -#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 - /* environment organization */ #define CONFIG_ENV_SIZE SZ_8K