From patchwork Tue Jan 29 11:30:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032676 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="ei+Ssj5+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pkpS2N05z9sMr for ; Tue, 29 Jan 2019 22:31:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CC44AC21D8E; Tue, 29 Jan 2019 11:30:59 +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=SPF_HELO_PASS, 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 A962FC21E13; Tue, 29 Jan 2019 11:30:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0A20CC21C2F; Tue, 29 Jan 2019 11:30:41 +0000 (UTC) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50080.outbound.protection.outlook.com [40.107.5.80]) by lists.denx.de (Postfix) with ESMTPS id E36B4C21C27 for ; Tue, 29 Jan 2019 11:30:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ucMS9HTSp5Ma1bQtwKYeLJDEQhlML+udViTvVzFcTDI=; b=ei+Ssj5+UjoXRbWPB/VFfk++brYUjISk0UGod8+EPMMvNcJ0AKlkB9jWq0sWoMvc1XIKHkBgww6smGj/HlkarZQHEap7ce16Ek8ahvnzzb4trJ1GoRc3LaGtHW1HzDkGFvBH/uRR8IzGoqr7WukuuwZnENmjqkkswd6UGvstzRw= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB4735.eurprd04.prod.outlook.com (20.177.48.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:30:39 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:30:39 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 01/22] usb: Rename SPL_USB_SUPPORT to SPL_USB_STORAGE Thread-Index: AQHUt8YPP5IVlZanmkWySEQxzLNukg== Date: Tue, 29 Jan 2019 11:30:39 +0000 Message-ID: <1548761421-8267-2-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0029.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::42) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB4735; 6:/4ZSsvUWANyD21x0HP4D8OP3U/53xOPpcREvT8tvZ1ASF3oq8P3VsSOeFhejsyPUURBDm0L5LUh8FSPm0oGNypo6f6SQo6vj1VF0v+C9PVvhOgt+3PVVhrZsRD7XWsQCD+5209tScnojY3OgKqGtfpbTStrovKLbS7FqSCTcZjtvmDqLc8HReQS3dHb+Q5mGaItL24yTHJ1RFAlcfuu1i3iinWVnApY+5ZykK0bNIApmchbG1d/OLi954/Snadbsie5DTOjREZyZBKv1IGOaRo4U8JhmKJxvgwvAEBTXK2m2RbMEj9RaroWoUOxc1tavufLvVufAS8WkmnwHk7Zr/jH3FxFGBkMumsAsID7300q+7gG4zjYZPRf1qxUCkCv5zraIKG6NvdB8fJS/YENxDDjfddi37CLDN+iACpX4UizQKnuc7UtsDW5g92M3y37vUp7S7spafVi9Wx9o5xFMCQ==; 5:NujnYL7afhqGCKe5xl4p1MWnHS3IH6IcNxUZHv2cocksQuVaO7vITog6IqtVcXtAHw0AK4MwA52M5y1p0q3KWBhHrfR75/OUTUCVH10AT4BCsastNCujTWmNrYY6AsCzyUUXyZIpQCM8WTClDQ8uMMiUKl9Iwp+NMAkLzY1A7kWqAAYkZOwOv1m1YSlikmDjaC7Cl4PuJpL9Lk3jJB+Flg==; 7:ffAjXozSR97zs9IJ4DWrysKsSxRsFNpzhjyci47CivgY0QbnjIRtBM0PDwxSdb8TUotNPZu3HzMioXxuDAV/HM+aazTiU+7rXoVWvCyzVcV0vQ1DYtYCd8TatLTx4P1zL4PXHsb+yuKCgNiNinDMlQ== x-ms-office365-filtering-correlation-id: 0642665c-eded-4b00-bbe2-08d685dd31d3 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB4735; x-ms-traffictypediagnostic: VI1PR04MB4735: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(346002)(376002)(136003)(366004)(396003)(189003)(199004)(54906003)(110136005)(26005)(81156014)(86362001)(97736004)(2906002)(105586002)(106356001)(316002)(5024004)(4326008)(446003)(6512007)(256004)(8676002)(36756003)(14444005)(2616005)(44832011)(186003)(81166006)(53936002)(11346002)(476003)(478600001)(68736007)(386003)(6506007)(102836004)(14454004)(71200400001)(6636002)(2501003)(7736002)(305945005)(66066001)(3846002)(99286004)(52116002)(76176011)(50226002)(6486002)(486006)(71190400001)(6116002)(6436002)(25786009)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB4735; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: F8FiHvzxHIKv2C/qOpNTi3MbJl3Ij9qPbxVxfMOH7zovWKWw5dpxdFvrVCFQKQe1XFulFv2HUI07/mJbIi80lvPABJKs74qFzqaVdtnpoL0fH2FCFrPGo7zSLR6T1Rn5Zue8cupl7GlevBpapC1o8aS5HEYZJ3szyGdcsu7GkMC4Tv86baKTlUocaOGV4CCI4Zfln+9qMWAcqWCiih05u8G9qaxYk3RBQRShvrf+cJHpG6FOKw7J3eBez2Sd9BOOEGzeIjsttGz/UHk8AAK9bfRceeLtIMGQ+so0WA1aqONVCFPer5JqaO7prD2WbczqB+QL8pTegt0/U6nxE+MGmwRZGLrrQEfFsFRJvyLtQrfZeg1Qo3q8wygBO3jRTo6m2rt88MVqntMv5UgB5tUgXIKUIqnREVQ6siZHLfZIiRA= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0642665c-eded-4b00-bbe2-08d685dd31d3 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:30:38.4261 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4735 Subject: [U-Boot] [PATCH v2 01/22] usb: Rename SPL_USB_SUPPORT to SPL_USB_STORAGE 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" Since there is the SPL_USB_HOST_SUPPORT for enabling USB support in SPL, makes more sense to rename the SPL_USB_SUPPORT as SPL_USB_STORAGE. Everything that is not part of the usb storage support in SPL is now build under SPL_USB_HOST_SUPPORT. Signed-off-by: Abel Vesa Reviewed-by: Tom Rini --- arch/arm/include/asm/arch-am33xx/spl.h | 2 +- arch/arm/mach-omap2/boot-common.c | 2 +- common/Makefile | 5 +++-- common/spl/Kconfig | 4 ++-- common/spl/Makefile | 2 +- common/spl/spl_usb.c | 4 ---- configs/am43xx_evm_usbhost_boot_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- 8 files changed, 10 insertions(+), 13 deletions(-) diff --git a/arch/arm/include/asm/arch-am33xx/spl.h b/arch/arm/include/asm/arch-am33xx/spl.h index 0bf8c17..f3910c2 100644 --- a/arch/arm/include/asm/arch-am33xx/spl.h +++ b/arch/arm/include/asm/arch-am33xx/spl.h @@ -62,7 +62,7 @@ #define BOOT_DEVICE_CPGMAC 0x47 #define MMC_BOOT_DEVICES_START BOOT_DEVICE_MMC1 -#ifdef CONFIG_SPL_USB_SUPPORT +#ifdef CONFIG_SPL_USB_STORAGE #define MMC_BOOT_DEVICES_END BOOT_DEVICE_USB #else #define MMC_BOOT_DEVICES_END BOOT_DEVICE_MMC2 diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index 2db1922..c8b8ac6 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -93,7 +93,7 @@ void save_omap_boot_params(void) sys_boot_device = 1; break; #endif -#if defined(BOOT_DEVICE_USB) && !defined(CONFIG_SPL_USB_SUPPORT) +#if defined(BOOT_DEVICE_USB) && !defined(CONFIG_SPL_USB_STORAGE) case BOOT_DEVICE_USB: sys_boot_device = 1; break; diff --git a/common/Makefile b/common/Makefile index ad390d0..8c92feb 100644 --- a/common/Makefile +++ b/common/Makefile @@ -75,8 +75,9 @@ obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o ifdef CONFIG_SPL_USB_HOST_SUPPORT -obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o -obj-$(CONFIG_USB_STORAGE) += usb_storage.o +obj-y += usb.o +obj-y += usb_hub.o +obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o else obj-$(CONFIG_USB_MUSB_HOST) += usb.o endif diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 54b0dc3..8b0627e 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -766,9 +766,9 @@ config SPL_USB_HOST_SUPPORT device can be attached. This option enables the drivers in drivers/usb/host as part of an SPL build. -config SPL_USB_SUPPORT +config SPL_USB_STORAGE bool "Support loading from USB" - depends on SPL_USB_HOST_SUPPORT + depends on SPL_USB_HOST_SUPPORT && !(BLK && !DM_USB) help Enable support for USB devices in SPL. This allows use of USB devices such as hard drives and flash drivers for loading U-Boot. diff --git a/common/spl/Makefile b/common/spl/Makefile index 6f8d759..a3980ce 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -22,7 +22,7 @@ obj-$(CONFIG_$(SPL_TPL_)NET_SUPPORT) += spl_net.o obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += spl_mmc.o obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o obj-$(CONFIG_$(SPL_TPL_)OPTEE) += spl_optee.o -obj-$(CONFIG_$(SPL_TPL_)USB_SUPPORT) += spl_usb.o +obj-$(CONFIG_$(SPL_TPL_)USB_STORAGE) += spl_usb.o obj-$(CONFIG_$(SPL_TPL_)FAT_SUPPORT) += spl_fat.o obj-$(CONFIG_$(SPL_TPL_)EXT_SUPPORT) += spl_ext.o obj-$(CONFIG_$(SPL_TPL_)SATA_SUPPORT) += spl_sata.o diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c index c8d8231..e29d579 100644 --- a/common/spl/spl_usb.c +++ b/common/spl/spl_usb.c @@ -15,9 +15,7 @@ #include #include -#ifdef CONFIG_USB_STORAGE static int usb_stor_curr_dev = -1; /* current device */ -#endif static int spl_usb_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) @@ -34,13 +32,11 @@ static int spl_usb_load_image(struct spl_image_info *spl_image, return err; } -#ifdef CONFIG_USB_STORAGE /* try to recognize storage devices immediately */ usb_stor_curr_dev = usb_stor_scan(1); stor_dev = blk_get_devnum_by_type(IF_TYPE_USB, usb_stor_curr_dev); if (!stor_dev) return -ENODEV; -#endif debug("boot mode - FAT\n"); diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 5131f19..5bd919b 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -14,7 +14,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_SUPPORT=y +CONFIG_SPL_USB_STORAGE=y CONFIG_CMD_SPL=y CONFIG_CMD_SPL_NAND_OFS=0x00100000 CONFIG_CMD_SPL_WRITE_SIZE=0x40000 diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 99e4ccb..c01fda9 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -24,7 +24,7 @@ CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_USB_HOST_SUPPORT=y -CONFIG_SPL_USB_SUPPORT=y +CONFIG_SPL_USB_STORAGE=y CONFIG_SPL_USB_GADGET=y CONFIG_SPL_USB_ETHER=y # CONFIG_CMD_FLASH is not set From patchwork Tue Jan 29 11:30:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032678 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Xva6Qst9"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pkrC0f2Nz9sMr for ; Tue, 29 Jan 2019 22:32:43 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CC8D9C21DEC; Tue, 29 Jan 2019 11:31:15 +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=SPF_HELO_PASS, 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 2CA43C21DFF; Tue, 29 Jan 2019 11:30:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8033AC21C2C; Tue, 29 Jan 2019 11:30:42 +0000 (UTC) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50071.outbound.protection.outlook.com [40.107.5.71]) by lists.denx.de (Postfix) with ESMTPS id 5563DC21C2C for ; Tue, 29 Jan 2019 11:30:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GFYdfcKCZnwMxUXahRFGRxR/sHSg3kAgqO5220//CeY=; b=Xva6Qst9Ntss88FrPhkcnys+yKMIoLsqw/kZzOsKSvPOA8ECQ9vIrbBC4xDgJ5Z5K+tJORPK8v+MEABT7DCr6ojGcmqWekpQPP8m8yHyHZeimB+7LqAm0wW/IKPZLunmFX05KTuZxFcxsuApkajBR7FEisypCajijpRUj5+Etz0= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB4735.eurprd04.prod.outlook.com (20.177.48.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:30:40 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:30:40 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 02/22] usb: ehci-mx6: Make regulator DM_REGULATOR dependent Thread-Index: AQHUt8YQby3mBOkEhkCE81GucdPDAQ== Date: Tue, 29 Jan 2019 11:30:40 +0000 Message-ID: <1548761421-8267-3-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0029.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::42) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB4735; 6:G9PWpMXHciSO3ny/ji+cPftZ3tauI2ruk4RiUUl/eVWl8vMQeeLL5O4JvD2N4TRAiFUAJAN4oPmnVbbmUlad85uCccQOlppA530YH4D2wmaKbYZW7zr5CSGqtG0heJjoyewZSyrVRVpacr77fTdwm/SHotdIycfYzvgBJyRDw9mRVT9O29C7gkBPmWWPmeffU7phW9F/USY+CAeT+MGkaIIYdJ4zaSWSIAKLJWyeAFWB8GZsE7iHg3cGG84rfZ1ft/r9SG0CImlOxYnXmNGw1EekXyQ2V/cQsoIwzY8BRmstgCDhHHbdkKub6ROkkTD8fIih9WTMQftrBRlBFfQvzO2P56NWhUigPYuLgt0QpVJ93FPPpZMZjz3wFjsNAq5aLIiDoZyzYeaZWe9QQqzhg6py6oxzDlIQO6I97d6BLL1ILwZ23FgztR6cb7i+cC/ZIwtrbPfsTVgiQFKUfnIdvQ==; 5:8mfINB+7oEfTP6VqgVGcOpT4sOLOm1+cMZ41fZq1KBi7y950xMciDcsT5nE2jnvBZvEW12GSO3Ft6eZm4JHD6W5WV6CCbW2bdsFUU8uY8sytPN2YYp65h62+ZOnquAtEDQMWHF1iXPYmkLgkfv1bRTsh0k+RbzbK2+806qggcyThky/64kjccK6LKZ60OJ0pN4rRoFAJJXMKdC6gm98cpA==; 7:0cJnzpis0CCE6zpvsIzVdyDta0kStHDRqvBX0QHzI3NHFMSOWf3iHeeEvvwTIoD5CwGv5Dl0Muqqvf/+JHQT6ECqIzvVbLFielcW48LESov+W6ioBNkzcY4QNOtAS4ACFgcFep88FAqw0EMjULO0zA== x-ms-office365-filtering-correlation-id: d5bf8674-5a81-418d-049f-08d685dd325e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB4735; x-ms-traffictypediagnostic: VI1PR04MB4735: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(346002)(376002)(136003)(366004)(396003)(189003)(199004)(54906003)(110136005)(26005)(81156014)(86362001)(97736004)(2906002)(105586002)(106356001)(316002)(4326008)(446003)(6512007)(256004)(8676002)(36756003)(14444005)(2616005)(44832011)(186003)(81166006)(53936002)(11346002)(476003)(478600001)(68736007)(386003)(6506007)(102836004)(14454004)(71200400001)(6636002)(2501003)(7736002)(305945005)(66066001)(3846002)(99286004)(52116002)(76176011)(50226002)(6486002)(486006)(71190400001)(6116002)(6436002)(25786009)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB4735; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: vywPNvEGlVhmVCJpUzPqmjwy/XTyrogh5uLLBUccj1rSYaa5Wn0u7QYZixYDslGBcC+gp/SfHM6qkQYVorqbS/b1kR9668evR4cisb32VQP/WLr+v7nlX+0767IHOp7Ypy0jd49ERmByiLUBdMMtXhndqpmaBFT930AE7mlaccql1S4L2sWUzi23ErBdLZD0TH/ue2NMzdGgvzEqQ4Romw0DfXXrxsvsMP7P76BlcXWCr8Anb2QAZCSxvF3OQTBv8H3cxrLH84z4s5Y4wvFzYJ4bkMYNHDhna28S03EqADp488c6imH28Tag9lakkm44UMH2jcMyyZXod1M/eeiLU+hrewsEqJ1/YGy/mf6TRDcV6tT23w1byuAcHrB4cOm40SEeg48COrVCI9pBlHR8QPlew3MxAZ5rb4ga871VnOg= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d5bf8674-5a81-418d-049f-08d685dd325e X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:30:39.3480 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4735 Subject: [U-Boot] [PATCH v2 02/22] usb: ehci-mx6: Make regulator DM_REGULATOR dependent 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" Do the regulator related work only if the build has the DM_REGULATOR. Signed-off-by: Abel Vesa Reviewed-by: Peng Fan --- drivers/usb/host/ehci-mx6.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 1acf08d..9483947 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -404,6 +404,7 @@ static int mx6_init_after_reset(struct ehci_ctrl *dev) if (ret) return ret; +#if CONFIG_IS_ENABLED(DM_REGULATOR) if (priv->vbus_supply) { ret = regulator_set_enable(priv->vbus_supply, (type == USB_INIT_DEVICE) ? @@ -413,6 +414,7 @@ static int mx6_init_after_reset(struct ehci_ctrl *dev) return ret; } } +#endif if (type == USB_INIT_DEVICE) return 0; @@ -514,15 +516,17 @@ static int ehci_usb_probe(struct udevice *dev) priv->portnr = dev->seq; priv->init_type = type; +#if CONFIG_IS_ENABLED(DM_REGULATOR) ret = device_get_supply_regulator(dev, "vbus-supply", &priv->vbus_supply); if (ret) debug("%s: No vbus supply\n", dev->name); - +#endif ret = ehci_mx6_common_init(ehci, priv->portnr); if (ret) return ret; +#if CONFIG_IS_ENABLED(DM_REGULATOR) if (priv->vbus_supply) { ret = regulator_set_enable(priv->vbus_supply, (type == USB_INIT_DEVICE) ? @@ -532,6 +536,7 @@ static int ehci_usb_probe(struct udevice *dev) return ret; } } +#endif if (priv->init_type == USB_INIT_HOST) { setbits_le32(&ehci->usbmode, CM_HOST); From patchwork Tue Jan 29 11:30:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032677 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="NWp6lF/R"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pkqN1LqQz9sMr for ; Tue, 29 Jan 2019 22:32:00 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C27AAC21DC1; Tue, 29 Jan 2019 11:31:31 +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=SPF_HELO_PASS, 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 A74E5C21C3F; Tue, 29 Jan 2019 11:30:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 471F1C21C2C; Tue, 29 Jan 2019 11:30:46 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80077.outbound.protection.outlook.com [40.107.8.77]) by lists.denx.de (Postfix) with ESMTPS id B4E5CC21C27 for ; Tue, 29 Jan 2019 11:30:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ky5vhqb/uABl+iBqtK+EwzJu6Ww+j8MncvrfMxrw2kk=; b=NWp6lF/Rsnmlq4iss2bm2aCQ5yD1/c1xDSXaJtAb1mo0PJCbOKA/wOdpM5sDvB+i3RyR4scDieNTOcq4RpadCt8atEVEFfg3hImj2UMumJ+0elvW/hJVuC1CwsSWwXOttK/8FutvbLq2g0lnFIH9c1tA6pfnxx7cXI0fIYh0G2E= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB3070.eurprd04.prod.outlook.com (10.170.228.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.19; Tue, 29 Jan 2019 11:30:41 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:30:41 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 03/22] configs: imx6sabreauto: Add DM_MMC support Thread-Index: AQHUt8YQnRHBludvKkOPj/AZBGy0vA== Date: Tue, 29 Jan 2019 11:30:41 +0000 Message-ID: <1548761421-8267-4-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0029.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::42) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB3070; 6:EMbH9+qGdAlJ0nw5NO4ZDnnJwALJ2yXrVY8Q/f/Vd4JdjNy4EIGbKmXwUuRES871QGDtf37riWXS4urhMV+gYmcRe3ne19HAxW1LJDQ0HR4BEpfqkAVAVrjaVcdg7dMSzrJgrdyu8TbI4k3y6l5awaFCVrzecqaJ7hPel1sSU29md7fehkz0usytnPU6JccxCDwcb6tX0eW/mEw9uG6qJL47aO2uIxuJFOEuxuS7KTbM+vc4sF3WfXsxAe71LKOs+5ImQLwQkW+gQ3D5gLdnrcT7wWKvBRzhEAnxLvFWofi4Q/G1L+f3Gix2oh9Al9UWMtdpVMp2TGhtQScW9kqBWwWsnNy5QCMoGOsb3iYfpM8S2klYquQBakIdf7Jqh/KuQ7RIYYmx2TbFz+uOJlU69Xk1v0P6qhNBRBdT4I5YujnWDc8lS3m9Bfbzzes2wRas/vqaSp3+quqgxrjI2ZS54A==; 5:RlDW2iDtft+b0SwbHlc/XGgS2k1rPyCCu89B/bNaMCOnuXqevvCgytCGSj9hcTFkkzl+NnPophFGC6V47InNUteHrIAa/CKGIewhuDZeDFG0IwNI3UrHUIh9XVJWKYDBdfoW1mp/awtgE5OSDVS9H2hqcJSp/5FdUormtTl+aUogMZDw7zwZ91Bv0RktWxTJkDuugKZ7V9kZA8MI0dX/6w==; 7:mVKVq1CVhmFeXvGcMKwoJy2Ri1NisJrTzjbaJwsDbQQ792LtSX15eQtBbIFfemd64PyYG4sTqmZsAMKLp72gEPlqj8U0lJf6iZSJHfRVCtnBou3Hgkl/UOWqLPmMbGdp9wbprMxE3KcPOK6zeWzGPA== x-ms-office365-filtering-correlation-id: 7fabd33f-13f2-4a91-10d6-08d685dd330c x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB3070; x-ms-traffictypediagnostic: VI1PR04MB3070: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(376002)(396003)(39860400002)(346002)(189003)(199004)(81166006)(6116002)(71190400001)(53936002)(25786009)(99286004)(36756003)(478600001)(316002)(52116002)(3846002)(54906003)(8936002)(76176011)(110136005)(81156014)(4326008)(8676002)(256004)(2906002)(6436002)(71200400001)(66066001)(486006)(102836004)(26005)(6512007)(2616005)(476003)(50226002)(6486002)(446003)(186003)(11346002)(105586002)(4744005)(44832011)(6506007)(106356001)(386003)(7736002)(14454004)(68736007)(97736004)(305945005)(86362001)(2501003)(6636002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB3070; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: FB2Cx58H0c0FvDpg9pWXmrTHs4KHzgHOwyRIVe1do/H+bXOKzmFsTefwSRagLxAOmu1OsY7WYndYym78BO1KU6BdLjomE+BVLSGNwZ5Cr38p6vEbABwpW0HDXPVCGWKC/gir2vYTfbLQmexqhTb6rimYizfmMI2eeY8UsMD7eBsrBXeJB9+s0PXP9mBFQnhwAfqoHpjv8sXNw+99pOPPUUeoOqgyN2xkM44/EEHHB+uf7pH6pu0MJ1QLdjIF4hMNhR3oqh/lQvVjw/PeYdQFcALEQd3jTcxZJ8NKp6SjbBk/yfFVlh4DZ5YuaXlYXcKhMZtfDL2lK4zmm3nF2WkISr8R1wj4EF4dEc/G7V22vZ16200BF8gAksTmF/HdTWi2Q73MZwB0Ga2yKAd5G2KeAEehF9UXGNW5CbsKeITa7+8= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fabd33f-13f2-4a91-10d6-08d685dd330c X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:30:40.3636 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3070 Subject: [U-Boot] [PATCH v2 03/22] configs: imx6sabreauto: Add DM_MMC support 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" Add DM_MMC config to imx6sabreauto defconfig. Signed-off-by: Abel Vesa --- configs/mx6sabreauto_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index 40386c2..a3d63a2 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -44,6 +44,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_NAND=y CONFIG_NAND_MXS=y From patchwork Tue Jan 29 11:30:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032683 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="pYpOxx1b"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pktx5KGvz9sNN for ; Tue, 29 Jan 2019 22:35:05 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 54030C21DA6; Tue, 29 Jan 2019 11:31: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=SPF_HELO_PASS, 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 2D21BC21DF8; Tue, 29 Jan 2019 11:30:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1C563C21DFD; Tue, 29 Jan 2019 11:30:47 +0000 (UTC) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50047.outbound.protection.outlook.com [40.107.5.47]) by lists.denx.de (Postfix) with ESMTPS id 79467C21DC1 for ; Tue, 29 Jan 2019 11:30:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TFLi9/HIvUbX37XA5+wFC5A+JVuUuq4D8W16Rtz2SYo=; b=pYpOxx1b9pRwdTEAOrQaEgdCYf1RsXSyaQzUKYhc8letWFge0LlUm4LGH2CedwkLlAqmafbtBdPCaxbhPRjY3+tvx9TeOeXslqjCbc5GGrgyhG31DWV3AfKBVPb/aKGxnMfWplCEGZA328eJ1g5uHBLnDUWvYXgWqvUfMsJp4Fo= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB4735.eurprd04.prod.outlook.com (20.177.48.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:30:42 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:30:42 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 04/22] configs: imx6sabreauto: Add DM_USB support Thread-Index: AQHUt8YRsRGXJa7W6U6OKCFJneokmg== Date: Tue, 29 Jan 2019 11:30:42 +0000 Message-ID: <1548761421-8267-5-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0029.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::42) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB4735; 6:ONzt31VgQV7owqky/HC8Q7UIY07HxjMpZXLsKi5yMDRVsUB38HKCG9b6Uc7q6yhERcomyScXP+TbkEoGcDeaD5kEO7yF32TZ4x6d78LBDuRi/zAp8E3i0npzqK+B69sCuRRKiDPck5BfuXojudj2+yEIdykfOGuwDfjMHL8KWLB1SxggOV0P7IbsjGoSMReiQClaRPxQwVSsTT0Rgvfqa1r7MVDRUGgEzpBc0XLaDo213IPdr7QxP6gIRdXo6bp9jd9DjRUy0+ZnWTzlJZXOpz7x2wzdjIqTP7zBNwxIImlPB+vkT95fCxIY/3WSoWyBWKYW2nLOAq3ezS+RGFZ3CBFkTEMM3VEnphxZGG+rzjJYX4pNIft+N/xKTi1wJrOb0D7JFzvTnd1KrVxaAw3S5WQQXRvbavBDrnBjCz4NmKMYvS6ca2eHOJezsPrcpmfx+k+QH+YoD/hvZBXP72nK6g==; 5:juy1YWaeTxxWx4q3Kaokx3qeSLhownn1ruBJrOIr8Y3R/rfVMzG0liv/3kKsmpkv8mG/0MRz6owK02vTm6FshWEiiedPCeERgjxDNalWivpCMpLL9CRE+9cygQlBSmQlSjby6x7ZS71xqzaVQdrzAST/vndgSKmqvo2XViD1Wcrdt+pns8GQRDolBa7e79T8QTptLvokWVyGiNUDFHHKAQ==; 7:IZRm2h2cEaHsfFBaBTgdUu6yXuxoBzVSkOLAZtVoOePkXx/siRmasURpU1R6ou1kaBr/hyhQUyufDw1h06rNpOur2orWm+1faiueGW3Ic5JHg7DpsWlVpparQw6kddLPJerUYxo/15BlCPoGD6Lktg== x-ms-office365-filtering-correlation-id: 293c351e-9eb7-4545-0a6b-08d685dd33a7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB4735; x-ms-traffictypediagnostic: VI1PR04MB4735: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(346002)(376002)(136003)(366004)(396003)(189003)(199004)(54906003)(110136005)(26005)(81156014)(86362001)(97736004)(2906002)(105586002)(106356001)(316002)(4326008)(446003)(6512007)(256004)(8676002)(36756003)(14444005)(2616005)(44832011)(186003)(81166006)(53936002)(11346002)(476003)(478600001)(68736007)(386003)(6506007)(102836004)(14454004)(4744005)(71200400001)(6636002)(2501003)(7736002)(305945005)(66066001)(3846002)(99286004)(52116002)(76176011)(50226002)(6486002)(486006)(71190400001)(6116002)(6436002)(25786009)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB4735; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Axn/CR5uFVDrjo8Xr6Knh2gln+IRcy4XKD/eejGw0zFrXYe7x4g0CkcgiTO0ybrLxS+DrLHyMPCrh4GPKAaX7OpAlGKFWmoNOQM5924YKE8BVZQU+U2U43VLOWXLoVct3OZyDsFHDfDSuVFmQATYK09jUe+rV4mMYsDpb8ywXDtE1LfgTIghX+FhN6y27WJ50VukJLXMeFDbjHKqLjLWmT3DhWMqF+Agi0L7HfXsc3QJkDiepwq450okpmgWG9QI9DTEOY0Fttmims1LxtpU6YJzTCSsL3kv7R+PcX0NzeOerAskyli9nfUzLCFiPkv20uqEfuFLCFKiSqJQGYzNMV0D4klOwQfxnLXIL6ZxtYbkUR5efAIeXzCodOuQFIIGuaoCwyKx3m+b+95tVtyXAwWHWj9KLzZRCIvbWpy1euI= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 293c351e-9eb7-4545-0a6b-08d685dd33a7 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:30:41.4418 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4735 Subject: [U-Boot] [PATCH v2 04/22] configs: imx6sabreauto: Add DM_USB support 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" Add the DM support for USB. For that, DM_REGULATOR is needed. Signed-off-by: Abel Vesa --- configs/mx6sabreauto_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index a3d63a2..4bdcbb1 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -52,9 +52,11 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_MII=y +CONFIG_DM_REGULATOR=y CONFIG_SPI=y CONFIG_MXC_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" From patchwork Tue Jan 29 11:30:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032679 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="xaC2v49N"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pks83vQQz9sMr for ; Tue, 29 Jan 2019 22:33:32 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 78398C21E13; Tue, 29 Jan 2019 11:32:25 +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=SPF_HELO_PASS, 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 DB88DC21E3E; Tue, 29 Jan 2019 11:30:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 35CC6C21E47; Tue, 29 Jan 2019 11:30:48 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80043.outbound.protection.outlook.com [40.107.8.43]) by lists.denx.de (Postfix) with ESMTPS id 60227C21DF9 for ; Tue, 29 Jan 2019 11:30:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DQIyqBa2O2x/XAIdZ3rQfvuewgXQiWSqR4k27CJNxpk=; b=xaC2v49NHiapDbHT+VpaWPpgNIa6Kl2THWM9w+8bi/BlYnB3DF7HL30ly34v51aSl7yaPpmBVrmHHsbMEN51JRLwSDvyKNg4J2ZBtO1XVsoY1M6K0JzfyCSL+AWpM1iNKcH0NDQ/0FXrbqsMFYkmX/62stIV2zCUvTatzEPwPGg= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB3070.eurprd04.prod.outlook.com (10.170.228.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.19; Tue, 29 Jan 2019 11:30:43 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:30:43 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 05/22] mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds Thread-Index: AQHUt8YR+zIPSPDcc02SkNUXrjSE3w== Date: Tue, 29 Jan 2019 11:30:43 +0000 Message-ID: <1548761421-8267-6-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0029.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::42) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB3070; 6:E7HZTN7orb9stnHXM3kP1E9vr/BDzOBqya79QJOWLLysc0Gu2INaY7qEevty4jtvs4JvUPnvhET/d2wAKGRIG8R33PQlFqsaKGvdh0VdMYU1+gCL/7nnwoR+sgxAXrukSwUjh4is9YB9luQ7ohLOBe/qFCcRaUPYYu0XtuuWAd713X4YTSPn+7VWGYdoQcbGqKEV7+xi1YvhhAFab9NT7lTPzm8nif+wy1uN8gNsmEJx9tPvLe934FRr/D/zaGIERAz4pBSuLwYbCH2iZeVNAUyYMBlrd7ChpocARShJEkM8RWghrzBaQ4uf3T9wD5h1Kh9zbb5HK5YehW/BOmQ72Imkryzdv9v3p7cuVH+wqAdfzTJdBpXsJBL2hcmErFbJGwkdErZWJGCGumAR5o67V4xnSwJercQoggv5dMHcJqan2VY6aLGih/dnsS1zmmlBqrweowohcoQMbPCl91+tVA==; 5:eOo6EKhoRo8eqvEQWebdDXjsCP5INFM/yqiEuagiBeIYfYCh4izF5fGTtjOSjCxqliDcSSLqbYci9WTzNKR05K5kmtEWEF3qZZM4tIqG66m/wdWhDbKlRxgVExQ2mZQVaTEuGu+6X0O4m74ipg9kVy+yZ5WAe3oHCCEhzFCmmxgQIBBEY+6Uq514cwwkB0mDKkxrI+ToFxL9X2YwvFs0uw==; 7:Z6LxbhgZIroDEvViTcf5IKIU/g/L76vUG6dTZmUN3gAtLCkrmntXRq3Dpb2OWs21iVt3WbcLJEfqiE5RsY7wwlLT5h0QTDV/Zh9Z99VV4bfGnFpfyjVlXEFP4Rkq0GhoicQRBUWtJa1UK4J1WwehwA== x-ms-office365-filtering-correlation-id: 1aa8e91d-42a6-4aca-7a38-08d685dd3438 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB3070; x-ms-traffictypediagnostic: VI1PR04MB3070: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(376002)(396003)(39860400002)(346002)(189003)(199004)(81166006)(6116002)(71190400001)(53936002)(25786009)(99286004)(36756003)(478600001)(316002)(52116002)(3846002)(54906003)(8936002)(76176011)(110136005)(81156014)(4326008)(8676002)(256004)(2906002)(6436002)(71200400001)(66066001)(486006)(102836004)(26005)(6512007)(2616005)(476003)(50226002)(6486002)(446003)(186003)(11346002)(105586002)(44832011)(6506007)(106356001)(386003)(7736002)(14454004)(68736007)(97736004)(305945005)(86362001)(2501003)(6636002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB3070; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: ZDNn64sGjB9mmJAtq4KHRqcS/a8AbdGztQnFatIGFtjLeO6RkkAWa39k/3zjC7C/r/Cak27k7KVkmday5bH4a0iBx4h6NjCP+qSpIBGgVuulk54+LeVBaKWr3oSMPOY3kc5GvKPZI4ZVBx4ZnJzZFZFfUL6xFAj5JFvyWudSdDQ8ohuleAQ98mO8nouy2fk3UFnLzV9WKqfwlSNrWQbfG0zRjSczhgxNlbvasZMzKVVxYHEkaRD/jZRd/BLnLRivBFLSuyDajHEhP8VM9KI8S/e4FwLwaen2udnXBQp2hdAzRmBTnIE2nsbkYKUKIa/AyZm+um7LpX2LMcFEW7Xb25SKl6Tf1FtWFeGTkRx4AdCQA9gZ7+odz4WKC4xk5KuLL20iZLjY4pRmH+vHzYMZBqahCai0JjGMjb2lkbW3HSQ= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1aa8e91d-42a6-4aca-7a38-08d685dd3438 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:30:42.4418 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3070 Subject: [U-Boot] [PATCH v2 05/22] mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds 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" Since the fsl_esdhc will also be used by SPL, make the preprocessor switches more generic to allow any kind of build. Signed-off-by: Abel Vesa --- drivers/mmc/fsl_esdhc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index b8171ba..47f2a8f 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -804,7 +804,7 @@ static int esdhc_set_voltage(struct mmc *mmc) case MMC_SIGNAL_VOLTAGE_330: if (priv->vs18_enable) return -EIO; -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED(DM_REGULATOR) if (!IS_ERR_OR_NULL(priv->vqmmc_dev)) { ret = regulator_set_value(priv->vqmmc_dev, 3300000); if (ret) { @@ -823,7 +823,7 @@ static int esdhc_set_voltage(struct mmc *mmc) return -EAGAIN; case MMC_SIGNAL_VOLTAGE_180: -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED(DM_REGULATOR) if (!IS_ERR_OR_NULL(priv->vqmmc_dev)) { ret = regulator_set_value(priv->vqmmc_dev, 1800000); if (ret) { @@ -1442,7 +1442,7 @@ static int fsl_esdhc_probe(struct udevice *dev) int node = dev_of_offset(dev); struct esdhc_soc_data *data = (struct esdhc_soc_data *)dev_get_driver_data(dev); -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED(DM_REGULATOR) struct udevice *vqmmc_dev; #endif fdt_addr_t addr; @@ -1500,7 +1500,7 @@ static int fsl_esdhc_probe(struct udevice *dev) priv->vs18_enable = 0; -#ifdef CONFIG_DM_REGULATOR +#if CONFIG_IS_ENABLED(DM_REGULATOR) /* * If emmc I/O has a fixed voltage at 1.8V, this must be provided, * otherwise, emmc will work abnormally. From patchwork Tue Jan 29 11:30:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032682 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="G1a1mzO+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pkth6dz7z9sMr for ; Tue, 29 Jan 2019 22:34:52 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 978B6C21CB1; Tue, 29 Jan 2019 11:31:57 +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=SPF_HELO_PASS, 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 A45D0C21D56; Tue, 29 Jan 2019 11:30:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 67F0FC21E2B; Tue, 29 Jan 2019 11:30:50 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80052.outbound.protection.outlook.com [40.107.8.52]) by lists.denx.de (Postfix) with ESMTPS id B12D9C21E29 for ; Tue, 29 Jan 2019 11:30:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4ZxAziBuIbh0il4Mq0wc6m0ILtEly+JYS3UGUKabj6o=; b=G1a1mzO+IdQA3H/zWW/hAVEXbHOIFboR7So0ytvEixW75YCvNoZ7/3BIOKefbzqAvmMOD0/gJ0WJjliz47URiDobGdB2XKDLrc+U0FhU91Y7eTq2/OhsoyOwnQGZaogyHvAhXqnq+ulYMsA3TMXSWni0dKK8Hn1noUEpQ5N51RI= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB3070.eurprd04.prod.outlook.com (10.170.228.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.19; Tue, 29 Jan 2019 11:30:45 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:30:45 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 06/22] board: mx6sabresd: Add board_fit_config_name_match to support FIT in SPL Thread-Index: AQHUt8YT4IJgpIVdn0m0+wKK3RtV8Q== Date: Tue, 29 Jan 2019 11:30:45 +0000 Message-ID: <1548761421-8267-7-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0029.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::42) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB3070; 6:Mi741jystv5tw9klGBKgC3RX7IOr+bAO6jKW7oawLHaibxTiWwz2wcOWBLEYqvFEPVHf3AnvoDgC64q27SXs/Hyz/WLyi6BIQlfYDxejMW+gurqRq/Y/EmEtyzJFEyZOA3C73INlq7VycRu10ENgfF8BasK4jiuHQ7C7IfQXu6VBA0EJxEg0iDOokgNzUks/MfX9ZmXIA6FZ9uZhkLUVVx6eN4IRT8xVoi9EWBWbsfOdOiO0BoRXvNYHM4SM8nYBX6kjE6B4vZP9rja6shaKaYL+4S+66POzpqXvelgn7SuUnF45Bky3g2tc5Lg0z3DUQAhaDO/rsJqNFr9j9IcsF5fH8pcuTy7ZwBbT4O56TChytHlgZpMvX73LehEZXWXZtXhPeQekfwChtGCGcp2SrFpkQDX2b7yu6A0kive5nYEXfiWFiONmiFizOMctZ1iP5/qQr5aukfrq+91tWPrr3A==; 5:3+YntmKKU0g09M3E4QWfoldi3vkaMluENJPEcXPmydAt8dY0lO8VJc0OQmjbVgjVMY4O0C+r7NQbhJXNlWucUtKaUnkrwZEQTn5A1EQUrrBsQb2m8tq5dbbiaGwOmw7AALqGEwNBV5WxH8PRnfag+tS+nFnNfNSW6QmVdcFoOeFKE98SG9aR4HnLYgDujSJrBmBZ4DZqtjFxdtM1NGL0rQ==; 7:LJjESa8vYrtZTRT5EWblOz4wZ6rLt4IysCTC6D/MIqMvs3i6Lfl4+f3wq4JBsXVUfveCB+WzaJkpu9JayEuIjVj6sw4VyRngfeFL3RywcpKJm5XHGZvj4QRXRHSND3+fVIlpkz6OsaR7mMieyrb2wA== x-ms-office365-filtering-correlation-id: b0001dc6-e8d6-41df-609c-08d685dd34c0 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB3070; x-ms-traffictypediagnostic: VI1PR04MB3070: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(376002)(396003)(39860400002)(346002)(189003)(199004)(81166006)(6116002)(71190400001)(53936002)(25786009)(99286004)(36756003)(478600001)(316002)(52116002)(3846002)(54906003)(8936002)(76176011)(110136005)(81156014)(4326008)(8676002)(256004)(2906002)(6436002)(71200400001)(66066001)(486006)(102836004)(26005)(6512007)(2616005)(476003)(50226002)(6486002)(446003)(186003)(11346002)(105586002)(4744005)(44832011)(6506007)(106356001)(386003)(7736002)(14454004)(68736007)(97736004)(305945005)(86362001)(2501003)(6636002)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB3070; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: iEjAvmobjtUML+Gzlu8wZdgdZVjddQ8JoBkrIr319dtZlTM3AGRLJfjtDvS6ejbQ6RWhMc+tEUQeTQ/sWp9C0X23nTW1astwbNeNwE+yEHvx2uphU2K/42KUxk3xRUJukQ1YyRQwcTucdRDHSMrsKWQ4uZqSKrmzk8NhaZeet6mXS+eDb+BvrtcfQoZ4VdqYdiK8vMMdoBIk343jx6/ZC1xS5SyFcbXjwYCTeZiF4t0uwYKdL3IzqqkjyhOCSReQWjiHlUmyIxqfHdus2/v4nvrDcw4vttZ1qtf5iaN+biSIUej+A3RnTeXQAadiMh8HGfDDYAgtRCfVnbjaN15R8C1lVl/IZ+wMlbX2f9A62A/I+Sx0uegl//3nf5wu2G0Cd7UlNjgXI4Nm2aXhYieouiN7i8rbcWjLhICW8jnz+IM= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0001dc6-e8d6-41df-609c-08d685dd34c0 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:30:43.3480 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3070 Subject: [U-Boot] [PATCH v2 06/22] board: mx6sabresd: Add board_fit_config_name_match to support FIT in SPL 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 matches one of the following three boards (or fails): - imx6q-sabresd - imx6qp-sabresd - imx6dl-sabresd Signed-off-by: Abel Vesa Reviewed-by: Peng Fan --- board/freescale/mx6sabresd/mx6sabresd.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 0183ede..4688095 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -1062,3 +1062,21 @@ void board_init_f(ulong dummy) board_init_r(NULL, 0); } #endif + +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match(const char *name) +{ + if (is_mx6dq()) { + if (!strcmp(name, "imx6q-sabresd")) + return 0; + } else if (is_mx6dqp()) { + if (!strcmp(name, "imx6qp-sabresd")) + return 0; + } else if (is_mx6dl()) { + if (!strcmp(name, "imx6dl-sabresd")) + return 0; + } + + return -1; +} +#endif From patchwork Tue Jan 29 11:30:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032681 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="lnNhOxy5"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pksf6whcz9sMr for ; Tue, 29 Jan 2019 22:33:58 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 5CDA6C21C27; Tue, 29 Jan 2019 11:32:39 +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=SPF_HELO_PASS, 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 77AFDC21E1A; Tue, 29 Jan 2019 11:31:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 92F61C21E1A; Tue, 29 Jan 2019 11:30:51 +0000 (UTC) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50080.outbound.protection.outlook.com [40.107.5.80]) by lists.denx.de (Postfix) with ESMTPS id 887E2C21E26 for ; Tue, 29 Jan 2019 11:30:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l/j7mpW8jV8XF9M1aCglYy6rISEcKcAv15xTJUunTv8=; b=lnNhOxy5px9VQgIf4IWNmNqk8P0t5MXQx5ogW4KX9V6kQJCVlmKJaRV1gNl0ziyCtekWXCB+Y4ALJPJNoHQeWej7T88IcXUEwLoEm9P7QtWA9rq0xK/lYd8fK5BcI8MFJwWiAdtz0jjDd70NzZAaNMcpvRkW3Z71l33yfRmVy7o= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB4735.eurprd04.prod.outlook.com (20.177.48.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:30:46 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:30:46 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 07/22] board: mx6sabreauto: Add board_fit_config_name_match to support FIT in SPL Thread-Index: AQHUt8YTSZrqhU/zXkC/ZdBkpTR5Zg== Date: Tue, 29 Jan 2019 11:30:46 +0000 Message-ID: <1548761421-8267-8-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0029.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::42) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB4735; 6:98mkw0OC71FbQdsONoeoAyMjoEK1vo0QcsQWu/FBgAdEVbStrdULGZzDW5fZ7AE0/IeY3/DK4csRaiXKJeHxIxOTq/WbjF1cmXEV5LtbvVPturliVXHfsDiqvhUA8UMOeRfDaG4dlVS+dBsBhjv/YLAnzYM+CG4KS7qA8Acwe/GYMDXm5yElCNs/tdsTJtisms52hO8t5HGp3XcC54bO0Go65Qu4N+D3zjHeu5nEvcd7BQJO0MbX5FxOYwZ3wX5W2ihTRhf8fOU7Wl2ab2Bd93smqECOri+GKglNe+SqykJMcFrk53QZScIvSYQxTTjVzmIJZDYJbrO/I1wcO1jSQahwlIIfHILqfT2zXWxkDDS1gd385e4tYmU8MScnRKgM0LWKs82ZyyMA+plF2R17OqA6dvf7ZK2hsBosbjXOj3mri9M8ADzuA95BFgr3rBLLXxauAclL1cVY0akn8bDmUg==; 5:hGDI0v2UqPjSKWOfdug1XItJWlWNvKKyJLN5dO708wRHZTZoEu0CpCpWYyUurMuJSwYuoQ85NICuonjnZNcPxfLi57vc8MTbzG/iRf3Bza58KAWCEGXm84ukAPLMCZDmChfN1yRBv+WrjYShY1S7F42A7iS9jds8ftyJ0c96Oya3dwlKhkpEhSBCl4X19PAFsf5xcHaRMJ7aJkuelfI5mQ==; 7:7qbrAQsNhVZA1esfzhO+dc/0xNOO03E+Gh77tzCCEda8j6M03X7Y/sx3bZN4zxnpUzWzD/ITHiayaHhZjCSFBi/1t+aD7fQRLRWJ7tD0ahZbx+dA8gj9lVmmJ+4uwQlTuF4BTPB6nDACsT7ASprB9A== x-ms-office365-filtering-correlation-id: af39da07-7bdb-4b8f-b454-08d685dd3617 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB4735; x-ms-traffictypediagnostic: VI1PR04MB4735: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(346002)(376002)(136003)(366004)(396003)(189003)(199004)(54906003)(110136005)(26005)(81156014)(86362001)(97736004)(2906002)(105586002)(106356001)(316002)(4326008)(446003)(6512007)(256004)(8676002)(36756003)(2616005)(44832011)(186003)(81166006)(53936002)(11346002)(476003)(478600001)(68736007)(386003)(6506007)(102836004)(14454004)(4744005)(71200400001)(6636002)(2501003)(7736002)(305945005)(66066001)(3846002)(99286004)(52116002)(76176011)(50226002)(6486002)(486006)(71190400001)(6116002)(6436002)(25786009)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB4735; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: lj+IKV5JdrGCKipE/fnVQn8vGwZ4x0cYUVE272qkN1RwQ7d8koBUAKVOWoDRBY2/UrB5cId98ENWZ0M0hTm4CuSJ5aqdPnGtSnzSaF53K3NvYFKoSPEzu/eEEcx/9quEUgnX6y95lZSGNCgo4D63CQPklVPBzXXOjsbiTL2Zway1YZ6Z+133LNcO/2he1sXVyc/RIoQ+A2kPqaVGKRnUMxjpyuV8/qKAq3UsDzZlrHI1/dH9oJPCuaxV080XBw/4qMnk/pbdSsEK6YbL/bkiE9Q694tYgMwiv6l4EdvDr0AUQRPRspkicOXzyEtzQbe5zM8UeboT9IMFzAxOGCEKryz4LyZYYh72WM8nrIY59uhCmrWSGH4FagXdFiwQUraAwzXeAH3Y63mWyabOlYUw1/CuoFIwj1Ll5Yo2+4rBjGY= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: af39da07-7bdb-4b8f-b454-08d685dd3617 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:30:45.5824 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4735 Subject: [U-Boot] [PATCH v2 07/22] board: mx6sabreauto: Add board_fit_config_name_match to support FIT in SPL 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 matches one of the following three boards (or fails): - imx6q-sabreauto - imx6qp-sabreauto - imx6dl-sabreauto Signed-off-by: Abel Vesa Reviewed-by: Peng Fan --- board/freescale/mx6sabreauto/mx6sabreauto.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index c1bef85..c8f1263 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -1097,3 +1097,21 @@ void board_init_f(ulong dummy) board_init_r(NULL, 0); } #endif + +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match(const char *name) +{ + if (is_mx6dq()) { + if (!strcmp(name, "imx6q-sabreauto")) + return 0; + } else if (is_mx6dqp()) { + if (!strcmp(name, "imx6qp-sabreauto")) + return 0; + } else if (is_mx6dl()) { + if (!strcmp(name, "imx6dl-sabreauto")) + return 0; + } + + return -1; +} +#endif From patchwork Tue Jan 29 11:30:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032680 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="j0JJCeeM"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pksJ01NWz9sMr for ; Tue, 29 Jan 2019 22:33:39 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9E242C21C27; Tue, 29 Jan 2019 11:32:10 +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=SPF_HELO_PASS, 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 5FD9EC21DFA; Tue, 29 Jan 2019 11:30:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 095E1C21E15; Tue, 29 Jan 2019 11:30:52 +0000 (UTC) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50079.outbound.protection.outlook.com [40.107.5.79]) by lists.denx.de (Postfix) with ESMTPS id F3D3FC21E08 for ; Tue, 29 Jan 2019 11:30:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=woNxsBjUNSXxjPakPaT2RmhjyIQluC17XbGXz6uo2RQ=; b=j0JJCeeM+JYpbODMaqcKVsn9aZ1rgPPK/n8lUHzrDu17jmhH2z4w9bui3X2btT0SiP1TIokYD75O7c49Hsh4ZP+IRwVf6dLFB5ayHGS9C179oqlkTOjmMJxqx6kmvC260o7ctndsMwFW6t5iF05VEtxi9cHIvSUE85Qv7SBsnmI= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB4735.eurprd04.prod.outlook.com (20.177.48.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:30:47 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:30:47 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 08/22] arm: dts: Add all the imx6[q|qp|dl] sabre[auto|sd] u-boot dts[i] files Thread-Index: AQHUt8YUEYzRGnC3K0m423ilWg4HcQ== Date: Tue, 29 Jan 2019 11:30:47 +0000 Message-ID: <1548761421-8267-9-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0029.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::42) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB4735; 6:L9x697+B8xyjqR0JsGDWiSOVDfAOLroOShdexZbbJM8nSNcCgEd3FXF91+qUVitIl5pjFNjW6jbkO3yw9bjf1i3F27+qkdxRiZUfe22wwbqs/auWEXKfLlnGzWdRkKe8G4EhLIZ5+pNv6v1eJ6W3kJD6/htUCC6R7Ecq6UiTgaPi4CaX/M5fivYRNC8xstAtVM5KD+6M6Ph4op3iW9fWwtq+6t4NrAyBfyX1CCdJCRa/aB/lfpZvxi96KVOcXKAioylLeNXp6GIaYY6GvLNLTHBYQ+LX+YQd3y1teLN4tAcc7R6Rm2zOZnd8zj8KSvHCGCBUKfuYVYNy2Bu2fOJKdBgCmImoSr9weQGBagRquQ25pbC8XoCI9C3TFeOuuRkgF63oNgyu3ctd29a8xWkZPEbY5Su1nqq3YSHnhBlzN+HQ+3GEKL4vNu9jFSu45asvtgCygHRUPfLY5Sg0T5PiGQ==; 5:0UhSslZRcdvco+KckWVDe1DO4jbXryCBhcv//nr39mmCZz0rgWdTLeqHjeiMezTDMPKZufX3VKsFWkmizeNS2E+21HHFLII0HPWYFw3LUEHxM+hIsMpuDfQ+gUxdVVGczud1HAw29di1Hsv+5h9pKTosjA+EwQTKoVx78CEhAmsu94KTB+PC8FxeNEm+mSnviTmRDDM7cTxvQJ5fOARxIQ==; 7:bKNZPztCehq0FwOIktQPJBGkpBw/pYO769NIuvRnhxt9z45/jt9zQ9gMbVmQkxdhsSWLk72iFrKKJ2z57gVgkUCCch9WkbVGwuGV0pabDznAFL4kfb+Ac96bGwkuGHP54SzS2PlaZdZi6NpbsNSsDg== x-ms-office365-filtering-correlation-id: f99b76eb-112b-427a-2444-08d685dd36a9 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB4735; x-ms-traffictypediagnostic: VI1PR04MB4735: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(346002)(376002)(136003)(366004)(396003)(189003)(199004)(54906003)(110136005)(26005)(81156014)(86362001)(97736004)(2906002)(105586002)(106356001)(316002)(4326008)(446003)(6512007)(256004)(8676002)(36756003)(14444005)(2616005)(44832011)(186003)(81166006)(53936002)(11346002)(476003)(478600001)(68736007)(386003)(6506007)(102836004)(14454004)(71200400001)(6636002)(2501003)(7736002)(305945005)(66066001)(3846002)(99286004)(52116002)(76176011)(50226002)(6486002)(486006)(71190400001)(6116002)(6436002)(25786009)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB4735; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: fYbct7BJj0ySeNwhCOZNHnoUXxl/H0J/hlqjU4NQc2S4GcAifIKP/IS3DSA6TbuxtW5xDvX3d2nECWmibSG+EheI4ua/tHqltOR4lpnpfXd16ux4ILfi4bs8bKOZCUepl9X072n+6SL4e/ROzr4K5OU3DH93iw/bxQOGumTjoPu26lUdAiKsJtPAtaCvFzsEzZJUyn2w/bWGxsHQcny6GxCKBg3b2axZnA4VU8eTn7yQ4vc5irfyW93vKMrnC7mvlX5FbqwyHKbgavASEXLxVuBLKcSLEi1rD89xGii6m8zaDj1WRoZWTF95xev62M9t9uHG9MoW+FKePf7GhoITmlLnmwHEPZQgNBdvHWvlGsvwsO+vHDGrl9uvCRlLHhj1PDzX8GYNyZw2YSWup0jGPYK+WRBPddJ4nQNMT0lrQpA= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f99b76eb-112b-427a-2444-08d685dd36a9 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:30:46.5199 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4735 Subject: [U-Boot] [PATCH v2 08/22] arm: dts: Add all the imx6[q|qp|dl] sabre[auto|sd] u-boot dts[i] files 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 allows us to keep the basic dts[i] files up-to-date with the ones in kernel, but at the same time allowing the u-boot to add its own properties to the existing nodes. Signed-off-by: Abel Vesa --- arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6dl-sabresd-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6q-sabreauto-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6q-sabresd-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi | 23 +++++++++++++++++++++++ arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi | 14 ++++++++++++++ arch/arm/dts/imx6qdl-u-boot.dtsi | 4 ++-- arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6qp-sabresd-u-boot.dtsi | 6 ++++++ 9 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-sabresd-u-boot.dtsi diff --git a/arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi b/arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi new file mode 100644 index 0000000..b3f5f2d --- /dev/null +++ b/arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Jagan Teki + */ + +#include "imx6qdl-sabreauto-u-boot.dtsi" diff --git a/arch/arm/dts/imx6dl-sabresd-u-boot.dtsi b/arch/arm/dts/imx6dl-sabresd-u-boot.dtsi new file mode 100644 index 0000000..e34cf3c --- /dev/null +++ b/arch/arm/dts/imx6dl-sabresd-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Jagan Teki + */ + +#include "imx6qdl-sabresd-u-boot.dtsi" diff --git a/arch/arm/dts/imx6q-sabreauto-u-boot.dtsi b/arch/arm/dts/imx6q-sabreauto-u-boot.dtsi new file mode 100644 index 0000000..b3f5f2d --- /dev/null +++ b/arch/arm/dts/imx6q-sabreauto-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Jagan Teki + */ + +#include "imx6qdl-sabreauto-u-boot.dtsi" diff --git a/arch/arm/dts/imx6q-sabresd-u-boot.dtsi b/arch/arm/dts/imx6q-sabresd-u-boot.dtsi new file mode 100644 index 0000000..e34cf3c --- /dev/null +++ b/arch/arm/dts/imx6q-sabresd-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Jagan Teki + */ + +#include "imx6qdl-sabresd-u-boot.dtsi" diff --git a/arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi b/arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi new file mode 100644 index 0000000..3995849 --- /dev/null +++ b/arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-u-boot.dtsi" + +/ { + aliases { + mmc0 = &usdhc3; + }; +}; + +&usdhc3 { + no-1-8-v; + keep-power-in-suspend; + enable-sdio-wakeup; + u-boot,dm-spl; +}; + +&pinctrl_usdhc3 { + u-boot,dm-spl; +}; diff --git a/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi b/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi new file mode 100644 index 0000000..45f02b1 --- /dev/null +++ b/arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-u-boot.dtsi" + +&usdhc3 { + u-boot,dm-spl; +}; + +&pinctrl_usdhc3 { + u-boot,dm-spl; +}; diff --git a/arch/arm/dts/imx6qdl-u-boot.dtsi b/arch/arm/dts/imx6qdl-u-boot.dtsi index dffc21b..45ae2fa 100644 --- a/arch/arm/dts/imx6qdl-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-u-boot.dtsi @@ -7,11 +7,11 @@ soc { u-boot,dm-spl; - aips-bus@02000000 { + aips-bus@2000000 { u-boot,dm-spl; }; - aips-bus@02100000 { + aips-bus@2100000 { u-boot,dm-spl; }; }; diff --git a/arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi b/arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi new file mode 100644 index 0000000..b3f5f2d --- /dev/null +++ b/arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Jagan Teki + */ + +#include "imx6qdl-sabreauto-u-boot.dtsi" diff --git a/arch/arm/dts/imx6qp-sabresd-u-boot.dtsi b/arch/arm/dts/imx6qp-sabresd-u-boot.dtsi new file mode 100644 index 0000000..e34cf3c --- /dev/null +++ b/arch/arm/dts/imx6qp-sabresd-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Jagan Teki + */ + +#include "imx6qdl-sabresd-u-boot.dtsi" From patchwork Tue Jan 29 11:30:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032684 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="C1BGOPJc"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pkvH1Tg3z9sNN for ; Tue, 29 Jan 2019 22:35:23 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CA4EAC21DB5; Tue, 29 Jan 2019 11:33:07 +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=SPF_HELO_PASS, 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 08C7CC21DF3; Tue, 29 Jan 2019 11:31:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 13A26C21E31; Tue, 29 Jan 2019 11:30:57 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80040.outbound.protection.outlook.com [40.107.8.40]) by lists.denx.de (Postfix) with ESMTPS id DC3CFC21DED for ; Tue, 29 Jan 2019 11:30:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VgRkgczswhjTYL0nz/3HGkmhQkLZVvcA8hMMXVM/gzA=; b=C1BGOPJct8rOaOOAVm/Ola5o9PzVEhsgwjmg1+RXBs2qssZOwcAqcxOCQsIowjV0+s5cfWoF5DDCPdYRDCmgPqyPnNevKCqUt/goVxuAQXDo68kL4a8y1Gp/Nq9AcMgmhtilEriEwRh+2Y930oNHSGaHmvrx4I2Hxmc6fxtKdFg= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB3070.eurprd04.prod.outlook.com (10.170.228.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.19; Tue, 29 Jan 2019 11:30:48 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:30:48 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 09/22] arm: dts: Update all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd] Thread-Index: AQHUt8YVzQ/X1h+vvUCpMopNwfVs6w== Date: Tue, 29 Jan 2019 11:30:48 +0000 Message-ID: <1548761421-8267-10-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P193CA0029.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:3e::42) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB3070; 6:XEt9NU7qM9wGoe084KhluUbEVFI9yMQUv3dS9PwBWBgPNxGzDG7udjmOopLUloqTfqk+uIlr0oK18VxUfoUxfnqfMGO2wdknxQqjTX3kbPOfUuRlPbPwv+VdLVs9GEOWbgbHGkBV6y+y68fhozLgs3SYWxK+2bd4rGIVeNDsZrO2agcXB2E3Usc/j6mH8FOJbeKep2hWC4CyUnp/oMAeWXFt/fD1VPWpPzkDS4otJOn/v93AOiEF5ipc9RfZxPha/Jccmo0G6rCqyV9TjTz42zQjrVvA6n6IJiz5RdecjvBgGFCLfFG901tGAlbShp0ej543VAvkwaE+YgwXEFvQ47C7yDZOkefYsWlgkntVLr98URkpcf0yx+q+c40Scq2iPH0NIAkp1aXsD/9R2wzDWf14PE8YUbYD/47tD3Yk8CFnVCdqdH4Moqp7Soh5QQCHOkzki4ZHdEmLxPoTqpI/NA==; 5:GkflqSQVE7Y7HBsfLKKExoKJx2sZ7mFxkZmaJsic0999NkxejSL5Gyk0/AKFVdUH3WlW1dI9G46Vpm3j8gW4R0Q3lZyZhIqjUvR+BlZtuJ4uImuA8JK1DAEFJYMVSP2ky+9wbTD+BOYGk/669RP1vsKevziQsfzdGV66CcAKB69sJPwKyKD8SAUfuIDlxYC68oa9gWmr79MUolNLgB9H8w==; 7:n/I49ag8lm31pMlM8QKO/E9/5FvBJrkzZrRLpA79PonOYJ6AGGTXqm4QQAOKyFYPukapQ3PqjzuoB7PE3qMpuMdwEsxMm/bDMT/5NQ+mXKmIKmgUnx692rMXzj8UdGpiak+JBibsZX66mqpDLHJ26g== x-ms-office365-filtering-correlation-id: e4d2a4f8-f1c9-4596-6cfb-08d685dd3733 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB3070; x-ms-traffictypediagnostic: VI1PR04MB3070: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(136003)(376002)(396003)(39860400002)(346002)(189003)(199004)(14444005)(81166006)(6116002)(71190400001)(53936002)(25786009)(99286004)(36756003)(53946003)(478600001)(316002)(52116002)(3846002)(54906003)(966005)(8936002)(76176011)(110136005)(81156014)(4326008)(2420400007)(8676002)(256004)(10710500007)(2906002)(6436002)(71200400001)(66066001)(486006)(102836004)(6306002)(26005)(30864003)(7110500001)(15650500001)(6512007)(2616005)(476003)(50226002)(6486002)(446003)(186003)(11346002)(105586002)(44832011)(6506007)(106356001)(386003)(7736002)(14454004)(68736007)(97736004)(305945005)(86362001)(2501003)(6636002)(2004002)(569006); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB3070; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 0w3O9AS9yiE2NeFZbxhoFXNMlIDusR9PByd1v/7WDqFORI7o8W8jJGAlgunoXNxzir7HgbXjE4GEErKMFTdxCn/teRrq+kO1SgPJ68nBZ0s0LEdacY1Z/OQnMEoTwCxJ1pFhUfh/ugtsUZ0k8yU6cgFuClgl70e3NLiJRuAP2lBsoiISVxWDof2Egbx9BtjDeJp09zgXLtxSpwXK8CDTYEPHkjsBvrVZ39h+WOW9nOphk5fCZwN7Y+SxpNVimYugCNYTFZXVO5eJmRfbwjJJaMfWB0YmtQfFEJFsGnM8EAMDbViw3VC4OLwI8vaufUUzhIAQv6afItJ+kWVX+w6TlwFrpygvvcwdJxsD/d/LXHjbToT2XIroYHuerVdJ8gqdqsgL9eSbvzawI5YTGzVRcvrBPshisL7Pa4Q6RenjFCE= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4d2a4f8-f1c9-4596-6cfb-08d685dd3733 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:30:47.4418 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3070 Subject: [U-Boot] [PATCH v2 09/22] arm: dts: Update all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd] 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" Update all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd] to the ones from kernel v4.20 (commit 8fe28cb58bcb2). Signed-off-by: Abel Vesa Acked-by: Peng Fan --- arch/arm/dts/Makefile | 8 +- arch/arm/dts/imx6dl-sabreauto.dts | 13 + arch/arm/dts/imx6dl-sabresd.dts | 18 + arch/arm/dts/imx6dl.dtsi | 306 ++++++++++++-- arch/arm/dts/imx6q-sabreauto.dts | 18 + arch/arm/dts/imx6q-sabresd.dts | 23 + arch/arm/dts/imx6q.dtsi | 310 ++++++++++++-- arch/arm/dts/imx6qdl-sabreauto.dtsi | 810 ++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-sabresd.dtsi | 741 +++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl.dtsi | 455 +++++++++++--------- arch/arm/dts/imx6qp-sabreauto.dts | 55 +++ arch/arm/dts/imx6qp-sabresd.dts | 55 +++ arch/arm/dts/imx6qp.dtsi | 115 +++++ 13 files changed, 2669 insertions(+), 258 deletions(-) create mode 100644 arch/arm/dts/imx6dl-sabreauto.dts create mode 100644 arch/arm/dts/imx6dl-sabresd.dts create mode 100644 arch/arm/dts/imx6q-sabreauto.dts create mode 100644 arch/arm/dts/imx6q-sabresd.dts create mode 100644 arch/arm/dts/imx6qdl-sabreauto.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabresd.dtsi create mode 100644 arch/arm/dts/imx6qp-sabreauto.dts create mode 100644 arch/arm/dts/imx6qp-sabresd.dts create mode 100644 arch/arm/dts/imx6qp.dtsi diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 5c3225b..c18da3d 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -443,7 +443,13 @@ dtb-$(CONFIG_MX6QDL) += \ imx6q-icore.dtb \ imx6q-icore-mipi.dtb \ imx6q-icore-rqs.dtb \ - imx6q-logicpd.dtb + imx6q-logicpd.dtb \ + imx6q-sabreauto.dtb \ + imx6q-sabresd.dtb \ + imx6dl-sabreauto.dtb \ + imx6dl-sabresd.dtb \ + imx6qp-sabreauto.dtb \ + imx6qp-sabresd.dtb dtb-$(CONFIG_MX6SL) += imx6sl-evk.dtb diff --git a/arch/arm/dts/imx6dl-sabreauto.dts b/arch/arm/dts/imx6dl-sabreauto.dts new file mode 100644 index 0000000..660d52a --- /dev/null +++ b/arch/arm/dts/imx6dl-sabreauto.dts @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2013 Freescale Semiconductor, Inc. + +/dts-v1/; + +#include "imx6dl.dtsi" +#include "imx6qdl-sabreauto.dtsi" + +/ { + model = "Freescale i.MX6 DualLite/Solo SABRE Automotive Board"; + compatible = "fsl,imx6dl-sabreauto", "fsl,imx6dl"; +}; diff --git a/arch/arm/dts/imx6dl-sabresd.dts b/arch/arm/dts/imx6dl-sabresd.dts new file mode 100644 index 0000000..cd6bbf2 --- /dev/null +++ b/arch/arm/dts/imx6dl-sabresd.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2013 Freescale Semiconductor, Inc. + +/dts-v1/; + +#include "imx6dl.dtsi" +#include "imx6qdl-sabresd.dtsi" + +/ { + model = "Freescale i.MX6 DualLite SABRE Smart Device Board"; + compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl"; +}; + +&ipu1_csi1_from_ipu1_csi1_mux { + clock-lanes = <0>; + data-lanes = <1 2>; +}; diff --git a/arch/arm/dts/imx6dl.dtsi b/arch/arm/dts/imx6dl.dtsi index 9a4c22c..f0607eb 100644 --- a/arch/arm/dts/imx6dl.dtsi +++ b/arch/arm/dts/imx6dl.dtsi @@ -1,12 +1,6 @@ - -/* - * Copyright 2013 Freescale Semiconductor, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - */ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright 2013 Freescale Semiconductor, Inc. #include #include "imx6dl-pinfunc.h" @@ -39,6 +33,7 @@ 396000 1175000 >; clock-latency = <61036>; /* two CLK32 periods */ + #cooling-cells = <2>; clocks = <&clks IMX6QDL_CLK_ARM>, <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, <&clks IMX6QDL_CLK_STEP>, @@ -56,39 +51,57 @@ device_type = "cpu"; reg = <1>; next-level-cache = <&L2>; + operating-points = < + /* kHz uV */ + 996000 1250000 + 792000 1175000 + 396000 1150000 + >; + fsl,soc-operating-points = < + /* ARM kHz SOC-PU uV */ + 996000 1175000 + 792000 1175000 + 396000 1175000 + >; + clock-latency = <61036>; /* two CLK32 periods */ + clocks = <&clks IMX6QDL_CLK_ARM>, + <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, + <&clks IMX6QDL_CLK_STEP>, + <&clks IMX6QDL_CLK_PLL1_SW>, + <&clks IMX6QDL_CLK_PLL1_SYS>; + clock-names = "arm", "pll2_pfd2_396m", "step", + "pll1_sw", "pll1_sys"; + arm-supply = <®_arm>; + pu-supply = <®_pu>; + soc-supply = <®_soc>; }; }; soc { - ocram: sram@00900000 { + ocram: sram@900000 { compatible = "mmio-sram"; reg = <0x00900000 0x20000>; clocks = <&clks IMX6QDL_CLK_OCRAM>; }; - aips1: aips-bus@02000000 { - iomuxc: iomuxc@020e0000 { + aips1: aips-bus@2000000 { + iomuxc: iomuxc@20e0000 { compatible = "fsl,imx6dl-iomuxc"; }; - pxp: pxp@020f0000 { + pxp: pxp@20f0000 { reg = <0x020f0000 0x4000>; interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>; }; - epdc: epdc@020f4000 { + epdc: epdc@20f4000 { reg = <0x020f4000 0x4000>; interrupts = <0 97 IRQ_TYPE_LEVEL_HIGH>; }; - - lcdif: lcdif@020f8000 { - reg = <0x020f8000 0x4000>; - interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>; - }; }; - aips2: aips-bus@02100000 { - i2c4: i2c@021f8000 { + aips2: aips-bus@2100000 { + i2c4: i2c@21f8000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c"; @@ -100,14 +113,177 @@ }; }; + capture-subsystem { + compatible = "fsl,imx-capture-subsystem"; + ports = <&ipu1_csi0>, <&ipu1_csi1>; + }; + display-subsystem { compatible = "fsl,imx-display-subsystem"; ports = <&ipu1_di0>, <&ipu1_di1>; }; +}; + +&gpio1 { + gpio-ranges = <&iomuxc 0 131 2>, <&iomuxc 2 137 8>, <&iomuxc 10 189 2>, + <&iomuxc 12 194 1>, <&iomuxc 13 193 1>, <&iomuxc 14 192 1>, + <&iomuxc 15 191 1>, <&iomuxc 16 185 2>, <&iomuxc 18 184 1>, + <&iomuxc 19 187 1>, <&iomuxc 20 183 1>, <&iomuxc 21 188 1>, + <&iomuxc 22 123 3>, <&iomuxc 25 121 1>, <&iomuxc 26 127 1>, + <&iomuxc 27 126 1>, <&iomuxc 28 128 1>, <&iomuxc 29 130 1>, + <&iomuxc 30 129 1>, <&iomuxc 31 122 1>; +}; + +&gpio2 { + gpio-ranges = <&iomuxc 0 161 8>, <&iomuxc 8 208 8>, <&iomuxc 16 74 1>, + <&iomuxc 17 73 1>, <&iomuxc 18 72 1>, <&iomuxc 19 71 1>, + <&iomuxc 20 70 1>, <&iomuxc 21 69 1>, <&iomuxc 22 68 1>, + <&iomuxc 23 79 2>, <&iomuxc 25 118 2>, <&iomuxc 27 117 1>, + <&iomuxc 28 113 4>; +}; + +&gpio3 { + gpio-ranges = <&iomuxc 0 97 2>, <&iomuxc 2 105 8>, <&iomuxc 10 99 6>, + <&iomuxc 16 81 16>; +}; + +&gpio4 { + gpio-ranges = <&iomuxc 5 136 1>, <&iomuxc 6 145 1>, <&iomuxc 7 150 1>, + <&iomuxc 8 146 1>, <&iomuxc 9 151 1>, <&iomuxc 10 147 1>, + <&iomuxc 11 152 1>, <&iomuxc 12 148 1>, <&iomuxc 13 153 1>, + <&iomuxc 14 149 1>, <&iomuxc 15 154 1>, <&iomuxc 16 39 7>, + <&iomuxc 23 56 1>, <&iomuxc 24 61 7>, <&iomuxc 31 46 1>; +}; - gpu-subsystem { - compatible = "fsl,imx-gpu-subsystem"; - cores = <&gpu_2d>, <&gpu_3d>; +&gpio5 { + gpio-ranges = <&iomuxc 0 120 1>, <&iomuxc 2 77 1>, <&iomuxc 4 76 1>, + <&iomuxc 5 47 9>, <&iomuxc 14 57 4>, <&iomuxc 18 37 1>, + <&iomuxc 19 36 1>, <&iomuxc 20 35 1>, <&iomuxc 21 38 1>, + <&iomuxc 22 29 6>, <&iomuxc 28 19 4>; +}; + +&gpio6 { + gpio-ranges = <&iomuxc 0 23 6>, <&iomuxc 6 75 1>, <&iomuxc 7 156 1>, + <&iomuxc 8 155 1>, <&iomuxc 9 170 1>, <&iomuxc 10 169 1>, + <&iomuxc 11 157 1>, <&iomuxc 14 158 3>, <&iomuxc 17 204 1>, + <&iomuxc 18 203 1>, <&iomuxc 19 182 1>, <&iomuxc 20 177 4>, + <&iomuxc 24 175 1>, <&iomuxc 25 171 1>, <&iomuxc 26 181 1>, + <&iomuxc 27 172 3>, <&iomuxc 30 176 1>, <&iomuxc 31 78 1>; +}; + +&gpio7 { + gpio-ranges = <&iomuxc 0 202 1>, <&iomuxc 1 201 1>, <&iomuxc 2 196 1>, + <&iomuxc 3 195 1>, <&iomuxc 4 197 4>, <&iomuxc 8 205 1>, + <&iomuxc 9 207 1>, <&iomuxc 10 206 1>, <&iomuxc 11 133 3>; +}; + +&gpr { + ipu1_csi0_mux { + compatible = "video-mux"; + mux-controls = <&mux 0>; + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + ipu1_csi0_mux_from_mipi_vc0: endpoint { + remote-endpoint = <&mipi_vc0_to_ipu1_csi0_mux>; + }; + }; + + port@1 { + reg = <1>; + + ipu1_csi0_mux_from_mipi_vc1: endpoint { + remote-endpoint = <&mipi_vc1_to_ipu1_csi0_mux>; + }; + }; + + port@2 { + reg = <2>; + + ipu1_csi0_mux_from_mipi_vc2: endpoint { + remote-endpoint = <&mipi_vc2_to_ipu1_csi0_mux>; + }; + }; + + port@3 { + reg = <3>; + + ipu1_csi0_mux_from_mipi_vc3: endpoint { + remote-endpoint = <&mipi_vc3_to_ipu1_csi0_mux>; + }; + }; + + port@4 { + reg = <4>; + + ipu1_csi0_mux_from_parallel_sensor: endpoint { + }; + }; + + port@5 { + reg = <5>; + + ipu1_csi0_mux_to_ipu1_csi0: endpoint { + remote-endpoint = <&ipu1_csi0_from_ipu1_csi0_mux>; + }; + }; + }; + + ipu1_csi1_mux { + compatible = "video-mux"; + mux-controls = <&mux 1>; + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + ipu1_csi1_mux_from_mipi_vc0: endpoint { + remote-endpoint = <&mipi_vc0_to_ipu1_csi1_mux>; + }; + }; + + port@1 { + reg = <1>; + + ipu1_csi1_mux_from_mipi_vc1: endpoint { + remote-endpoint = <&mipi_vc1_to_ipu1_csi1_mux>; + }; + }; + + port@2 { + reg = <2>; + + ipu1_csi1_mux_from_mipi_vc2: endpoint { + remote-endpoint = <&mipi_vc2_to_ipu1_csi1_mux>; + }; + }; + + port@3 { + reg = <3>; + + ipu1_csi1_mux_from_mipi_vc3: endpoint { + remote-endpoint = <&mipi_vc3_to_ipu1_csi1_mux>; + }; + }; + + port@4 { + reg = <4>; + + ipu1_csi1_mux_from_parallel_sensor: endpoint { + }; + }; + + port@5 { + reg = <5>; + + ipu1_csi1_mux_to_ipu1_csi1: endpoint { + remote-endpoint = <&ipu1_csi1_from_ipu1_csi1_mux>; + }; + }; }; }; @@ -119,6 +295,12 @@ compatible = "fsl,imx6dl-hdmi"; }; +&ipu1_csi1 { + ipu1_csi1_from_ipu1_csi1_mux: endpoint { + remote-endpoint = <&ipu1_csi1_mux_to_ipu1_csi1>; + }; +}; + &ldb { clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, <&clks IMX6QDL_CLK_LDB_DI1_SEL>, <&clks IMX6QDL_CLK_IPU1_DI0_SEL>, <&clks IMX6QDL_CLK_IPU1_DI1_SEL>, @@ -128,6 +310,82 @@ "di0", "di1"; }; +&mipi_csi { + port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc0_to_ipu1_csi0_mux: endpoint@0 { + reg = <0>; + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc0>; + }; + + mipi_vc0_to_ipu1_csi1_mux: endpoint@1 { + reg = <1>; + remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc0>; + }; + }; + + port@2 { + reg = <2>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc1_to_ipu1_csi0_mux: endpoint@0 { + reg = <0>; + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc1>; + }; + + mipi_vc1_to_ipu1_csi1_mux: endpoint@1 { + reg = <1>; + remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc1>; + }; + }; + + port@3 { + reg = <3>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc2_to_ipu1_csi0_mux: endpoint@0 { + reg = <0>; + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc2>; + }; + + mipi_vc2_to_ipu1_csi1_mux: endpoint@1 { + reg = <1>; + remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc2>; + }; + }; + + port@4 { + reg = <4>; + #address-cells = <1>; + #size-cells = <0>; + + mipi_vc3_to_ipu1_csi0_mux: endpoint@0 { + reg = <0>; + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc3>; + }; + + mipi_vc3_to_ipu1_csi1_mux: endpoint@1 { + reg = <1>; + remote-endpoint = <&ipu1_csi1_mux_from_mipi_vc3>; + }; + }; +}; + +&mux { + mux-reg-masks = <0x34 0x00000007>, /* IPU_CSI0_MUX */ + <0x34 0x00000038>, /* IPU_CSI1_MUX */ + <0x0c 0x0000000c>, /* HDMI_MUX_CTL */ + <0x0c 0x000000c0>, /* LVDS0_MUX_CTL */ + <0x0c 0x00000300>, /* LVDS1_MUX_CTL */ + <0x28 0x00000003>, /* DCIC1_MUX_CTL */ + <0x28 0x0000000c>; /* DCIC2_MUX_CTL */ +}; + &vpu { compatible = "fsl,imx6dl-vpu", "cnm,coda960"; }; diff --git a/arch/arm/dts/imx6q-sabreauto.dts b/arch/arm/dts/imx6q-sabreauto.dts new file mode 100644 index 0000000..6e981a3 --- /dev/null +++ b/arch/arm/dts/imx6q-sabreauto.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright 2012 Freescale Semiconductor, Inc. +// Copyright 2011 Linaro Ltd. + +/dts-v1/; + +#include "imx6q.dtsi" +#include "imx6qdl-sabreauto.dtsi" + +/ { + model = "Freescale i.MX6 Quad SABRE Automotive Board"; + compatible = "fsl,imx6q-sabreauto", "fsl,imx6q"; +}; + +&sata { + status = "okay"; +}; diff --git a/arch/arm/dts/imx6q-sabresd.dts b/arch/arm/dts/imx6q-sabresd.dts new file mode 100644 index 0000000..eec9446 --- /dev/null +++ b/arch/arm/dts/imx6q-sabresd.dts @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright 2012 Freescale Semiconductor, Inc. +// Copyright 2011 Linaro Ltd. + +/dts-v1/; + +#include "imx6q.dtsi" +#include "imx6qdl-sabresd.dtsi" + +/ { + model = "Freescale i.MX6 Quad SABRE Smart Device Board"; + compatible = "fsl,imx6q-sabresd", "fsl,imx6q"; +}; + +&sata { + status = "okay"; +}; + +&ipu1_csi1_from_mipi_vc1 { + clock-lanes = <0>; + data-lanes = <1 2>; +}; diff --git a/arch/arm/dts/imx6q.dtsi b/arch/arm/dts/imx6q.dtsi index c30c836..8381d24 100644 --- a/arch/arm/dts/imx6q.dtsi +++ b/arch/arm/dts/imx6q.dtsi @@ -1,12 +1,6 @@ - -/* - * Copyright 2013 Freescale Semiconductor, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - */ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright 2013 Freescale Semiconductor, Inc. #include #include "imx6q-pinfunc.h" @@ -44,6 +38,7 @@ 396000 1175000 >; clock-latency = <61036>; /* two CLK32 periods */ + #cooling-cells = <2>; clocks = <&clks IMX6QDL_CLK_ARM>, <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, <&clks IMX6QDL_CLK_STEP>, @@ -56,38 +51,119 @@ soc-supply = <®_soc>; }; - cpu@1 { + cpu1: cpu@1 { compatible = "arm,cortex-a9"; device_type = "cpu"; reg = <1>; next-level-cache = <&L2>; + operating-points = < + /* kHz uV */ + 1200000 1275000 + 996000 1250000 + 852000 1250000 + 792000 1175000 + 396000 975000 + >; + fsl,soc-operating-points = < + /* ARM kHz SOC-PU uV */ + 1200000 1275000 + 996000 1250000 + 852000 1250000 + 792000 1175000 + 396000 1175000 + >; + clock-latency = <61036>; /* two CLK32 periods */ + clocks = <&clks IMX6QDL_CLK_ARM>, + <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, + <&clks IMX6QDL_CLK_STEP>, + <&clks IMX6QDL_CLK_PLL1_SW>, + <&clks IMX6QDL_CLK_PLL1_SYS>; + clock-names = "arm", "pll2_pfd2_396m", "step", + "pll1_sw", "pll1_sys"; + arm-supply = <®_arm>; + pu-supply = <®_pu>; + soc-supply = <®_soc>; }; - cpu@2 { + cpu2: cpu@2 { compatible = "arm,cortex-a9"; device_type = "cpu"; reg = <2>; next-level-cache = <&L2>; + operating-points = < + /* kHz uV */ + 1200000 1275000 + 996000 1250000 + 852000 1250000 + 792000 1175000 + 396000 975000 + >; + fsl,soc-operating-points = < + /* ARM kHz SOC-PU uV */ + 1200000 1275000 + 996000 1250000 + 852000 1250000 + 792000 1175000 + 396000 1175000 + >; + clock-latency = <61036>; /* two CLK32 periods */ + clocks = <&clks IMX6QDL_CLK_ARM>, + <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, + <&clks IMX6QDL_CLK_STEP>, + <&clks IMX6QDL_CLK_PLL1_SW>, + <&clks IMX6QDL_CLK_PLL1_SYS>; + clock-names = "arm", "pll2_pfd2_396m", "step", + "pll1_sw", "pll1_sys"; + arm-supply = <®_arm>; + pu-supply = <®_pu>; + soc-supply = <®_soc>; }; - cpu@3 { + cpu3: cpu@3 { compatible = "arm,cortex-a9"; device_type = "cpu"; reg = <3>; next-level-cache = <&L2>; + operating-points = < + /* kHz uV */ + 1200000 1275000 + 996000 1250000 + 852000 1250000 + 792000 1175000 + 396000 975000 + >; + fsl,soc-operating-points = < + /* ARM kHz SOC-PU uV */ + 1200000 1275000 + 996000 1250000 + 852000 1250000 + 792000 1175000 + 396000 1175000 + >; + clock-latency = <61036>; /* two CLK32 periods */ + clocks = <&clks IMX6QDL_CLK_ARM>, + <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, + <&clks IMX6QDL_CLK_STEP>, + <&clks IMX6QDL_CLK_PLL1_SW>, + <&clks IMX6QDL_CLK_PLL1_SYS>; + clock-names = "arm", "pll2_pfd2_396m", "step", + "pll1_sw", "pll1_sys"; + arm-supply = <®_arm>; + pu-supply = <®_pu>; + soc-supply = <®_soc>; }; }; soc { - ocram: sram@00900000 { + ocram: sram@900000 { compatible = "mmio-sram"; reg = <0x00900000 0x40000>; clocks = <&clks IMX6QDL_CLK_OCRAM>; }; - aips-bus@02000000 { /* AIPS1 */ - spba-bus@02000000 { - ecspi5: ecspi@02018000 { + aips-bus@2000000 { /* AIPS1 */ + spba-bus@2000000 { + ecspi5: spi@2018000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -96,18 +172,18 @@ clocks = <&clks IMX6Q_CLK_ECSPI5>, <&clks IMX6Q_CLK_ECSPI5>; clock-names = "ipg", "per"; - dmas = <&sdma 11 7 1>, <&sdma 12 7 2>; + dmas = <&sdma 11 8 1>, <&sdma 12 8 2>; dma-names = "rx", "tx"; status = "disabled"; }; }; - iomuxc: iomuxc@020e0000 { + iomuxc: iomuxc@20e0000 { compatible = "fsl,imx6q-iomuxc"; }; }; - sata: sata@02200000 { + sata: sata@2200000 { compatible = "fsl,imx6q-ahci"; reg = <0x02200000 0x4000>; interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>; @@ -118,17 +194,17 @@ status = "disabled"; }; - gpu_vg: gpu@02204000 { + gpu_vg: gpu@2204000 { compatible = "vivante,gc"; reg = <0x02204000 0x4000>; interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_OPENVG_AXI>, <&clks IMX6QDL_CLK_GPU2D_CORE>; clock-names = "bus", "core"; - power-domains = <&gpc 1>; + power-domains = <&pd_pu>; }; - ipu2: ipu@02800000 { + ipu2: ipu@2800000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ipu"; @@ -143,10 +219,18 @@ ipu2_csi0: port@0 { reg = <0>; + + ipu2_csi0_from_mipi_vc2: endpoint { + remote-endpoint = <&mipi_vc2_to_ipu2_csi0>; + }; }; ipu2_csi1: port@1 { reg = <1>; + + ipu2_csi1_from_ipu2_csi1_mux: endpoint { + remote-endpoint = <&ipu2_csi1_mux_to_ipu2_csi1>; + }; }; ipu2_di0: port@2 { @@ -154,22 +238,27 @@ #size-cells = <0>; reg = <2>; - ipu2_di0_disp0: disp0-endpoint { + ipu2_di0_disp0: endpoint@0 { + reg = <0>; }; - ipu2_di0_hdmi: hdmi-endpoint { + ipu2_di0_hdmi: endpoint@1 { + reg = <1>; remote-endpoint = <&hdmi_mux_2>; }; - ipu2_di0_mipi: mipi-endpoint { + ipu2_di0_mipi: endpoint@2 { + reg = <2>; remote-endpoint = <&mipi_mux_2>; }; - ipu2_di0_lvds0: lvds0-endpoint { + ipu2_di0_lvds0: endpoint@3 { + reg = <3>; remote-endpoint = <&lvds0_mux_2>; }; - ipu2_di0_lvds1: lvds1-endpoint { + ipu2_di0_lvds1: endpoint@4 { + reg = <4>; remote-endpoint = <&lvds1_mux_2>; }; }; @@ -179,33 +268,136 @@ #size-cells = <0>; reg = <3>; - ipu2_di1_hdmi: hdmi-endpoint { + ipu2_di1_hdmi: endpoint@1 { + reg = <1>; remote-endpoint = <&hdmi_mux_3>; }; - ipu2_di1_mipi: mipi-endpoint { + ipu2_di1_mipi: endpoint@2 { + reg = <2>; remote-endpoint = <&mipi_mux_3>; }; - ipu2_di1_lvds0: lvds0-endpoint { + ipu2_di1_lvds0: endpoint@3 { + reg = <3>; remote-endpoint = <&lvds0_mux_3>; }; - ipu2_di1_lvds1: lvds1-endpoint { + ipu2_di1_lvds1: endpoint@4 { + reg = <4>; remote-endpoint = <&lvds1_mux_3>; }; }; }; }; + capture-subsystem { + compatible = "fsl,imx-capture-subsystem"; + ports = <&ipu1_csi0>, <&ipu1_csi1>, <&ipu2_csi0>, <&ipu2_csi1>; + }; + display-subsystem { compatible = "fsl,imx-display-subsystem"; ports = <&ipu1_di0>, <&ipu1_di1>, <&ipu2_di0>, <&ipu2_di1>; }; +}; + +&gpio1 { + gpio-ranges = <&iomuxc 0 136 2>, <&iomuxc 2 141 1>, <&iomuxc 3 139 1>, + <&iomuxc 4 142 2>, <&iomuxc 6 140 1>, <&iomuxc 7 144 2>, + <&iomuxc 9 138 1>, <&iomuxc 10 213 3>, <&iomuxc 13 20 1>, + <&iomuxc 14 19 1>, <&iomuxc 15 21 1>, <&iomuxc 16 208 1>, + <&iomuxc 17 207 1>, <&iomuxc 18 210 3>, <&iomuxc 21 209 1>, + <&iomuxc 22 116 10>; +}; + +&gpio2 { + gpio-ranges = <&iomuxc 0 191 16>, <&iomuxc 16 55 14>, <&iomuxc 30 35 1>, + <&iomuxc 31 44 1>; +}; + +&gpio3 { + gpio-ranges = <&iomuxc 0 69 16>, <&iomuxc 16 36 8>, <&iomuxc 24 45 8>; +}; + +&gpio4 { + gpio-ranges = <&iomuxc 5 149 1>, <&iomuxc 6 126 10>, <&iomuxc 16 87 16>; +}; + +&gpio5 { + gpio-ranges = <&iomuxc 0 85 1>, <&iomuxc 2 34 1>, <&iomuxc 4 53 1>, + <&iomuxc 5 103 13>, <&iomuxc 18 150 14>; +}; + +&gpio6 { + gpio-ranges = <&iomuxc 0 164 6>, <&iomuxc 6 54 1>, <&iomuxc 7 181 5>, + <&iomuxc 14 186 3>, <&iomuxc 17 170 2>, <&iomuxc 19 22 12>, + <&iomuxc 31 86 1>; +}; + +&gpio7 { + gpio-ranges = <&iomuxc 0 172 9>, <&iomuxc 9 189 2>, <&iomuxc 11 146 3>; +}; + +&gpr { + ipu1_csi0_mux { + compatible = "video-mux"; + mux-controls = <&mux 0>; + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + ipu1_csi0_mux_from_mipi_vc0: endpoint { + remote-endpoint = <&mipi_vc0_to_ipu1_csi0_mux>; + }; + }; + + port@1 { + reg = <1>; + + ipu1_csi0_mux_from_parallel_sensor: endpoint { + }; + }; - gpu-subsystem { - compatible = "fsl,imx-gpu-subsystem"; - cores = <&gpu_2d>, <&gpu_3d>, <&gpu_vg>; + port@2 { + reg = <2>; + + ipu1_csi0_mux_to_ipu1_csi0: endpoint { + remote-endpoint = <&ipu1_csi0_from_ipu1_csi0_mux>; + }; + }; + }; + + ipu2_csi1_mux { + compatible = "video-mux"; + mux-controls = <&mux 1>; + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + ipu2_csi1_mux_from_mipi_vc3: endpoint { + remote-endpoint = <&mipi_vc3_to_ipu2_csi1_mux>; + }; + }; + + port@1 { + reg = <1>; + + ipu2_csi1_mux_from_parallel_sensor: endpoint { + }; + }; + + port@2 { + reg = <2>; + + ipu2_csi1_mux_to_ipu2_csi1: endpoint { + remote-endpoint = <&ipu2_csi1_from_ipu2_csi1_mux>; + }; + }; }; }; @@ -229,6 +421,12 @@ }; }; +&ipu1_csi1 { + ipu1_csi1_from_mipi_vc1: endpoint { + remote-endpoint = <&mipi_vc1_to_ipu1_csi1>; + }; +}; + &ldb { clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, <&clks IMX6QDL_CLK_LDB_DI1_SEL>, <&clks IMX6QDL_CLK_IPU1_DI0_SEL>, <&clks IMX6QDL_CLK_IPU1_DI1_SEL>, @@ -275,6 +473,40 @@ }; }; +&mipi_csi { + port@1 { + reg = <1>; + + mipi_vc0_to_ipu1_csi0_mux: endpoint { + remote-endpoint = <&ipu1_csi0_mux_from_mipi_vc0>; + }; + }; + + port@2 { + reg = <2>; + + mipi_vc1_to_ipu1_csi1: endpoint { + remote-endpoint = <&ipu1_csi1_from_mipi_vc1>; + }; + }; + + port@3 { + reg = <3>; + + mipi_vc2_to_ipu2_csi0: endpoint { + remote-endpoint = <&ipu2_csi0_from_mipi_vc2>; + }; + }; + + port@4 { + reg = <4>; + + mipi_vc3_to_ipu2_csi1_mux: endpoint { + remote-endpoint = <&ipu2_csi1_mux_from_mipi_vc3>; + }; + }; +}; + &mipi_dsi { ports { port@2 { @@ -295,6 +527,16 @@ }; }; +&mux { + mux-reg-masks = <0x04 0x00080000>, /* MIPI_IPU1_MUX */ + <0x04 0x00100000>, /* MIPI_IPU2_MUX */ + <0x0c 0x0000000c>, /* HDMI_MUX_CTL */ + <0x0c 0x000000c0>, /* LVDS0_MUX_CTL */ + <0x0c 0x00000300>, /* LVDS1_MUX_CTL */ + <0x28 0x00000003>, /* DCIC1_MUX_CTL */ + <0x28 0x0000000c>; /* DCIC2_MUX_CTL */ +}; + &vpu { compatible = "fsl,imx6q-vpu", "cnm,coda960"; }; diff --git a/arch/arm/dts/imx6qdl-sabreauto.dtsi b/arch/arm/dts/imx6qdl-sabreauto.dtsi new file mode 100644 index 0000000..a6dc5c4 --- /dev/null +++ b/arch/arm/dts/imx6qdl-sabreauto.dtsi @@ -0,0 +1,810 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright 2012 Freescale Semiconductor, Inc. +// Copyright 2011 Linaro Ltd. + +#include +#include + +/ { + chosen { + stdout-path = &uart4; + }; + + memory@10000000 { + reg = <0x10000000 0x80000000>; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_leds>; + + user { + label = "debug"; + gpios = <&gpio5 15 GPIO_ACTIVE_HIGH>; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_keys>; + + home { + label = "Home"; + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; + linux,code = ; + wakeup-source; + }; + + back { + label = "Back"; + gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; + linux,code = ; + wakeup-source; + }; + + program { + label = "Program"; + gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; + linux,code = ; + wakeup-source; + }; + + volume-up { + label = "Volume Up"; + gpios = <&gpio2 15 GPIO_ACTIVE_LOW>; + linux,code = ; + wakeup-source; + }; + + volume-down { + label = "Volume Down"; + gpios = <&gpio5 14 GPIO_ACTIVE_LOW>; + linux,code = ; + wakeup-source; + }; + }; + + clocks { + codec_osc: anaclk2 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <24576000>; + }; + }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + reg_audio: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "cs42888_supply"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + reg_usb_h1_vbus: regulator@1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "usb_h1_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&max7310_b 7 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_usb_otg_vbus: regulator@2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "usb_otg_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&max7310_c 1 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + }; + + sound-cs42888 { + compatible = "fsl,imx6-sabreauto-cs42888", + "fsl,imx-audio-cs42888"; + model = "imx-cs42888"; + audio-cpu = <&esai>; + audio-asrc = <&asrc>; + audio-codec = <&codec>; + audio-routing = + "Line Out Jack", "AOUT1L", + "Line Out Jack", "AOUT1R", + "Line Out Jack", "AOUT2L", + "Line Out Jack", "AOUT2R", + "Line Out Jack", "AOUT3L", + "Line Out Jack", "AOUT3R", + "Line Out Jack", "AOUT4L", + "Line Out Jack", "AOUT4R", + "AIN1L", "Line In Jack", + "AIN1R", "Line In Jack", + "AIN2L", "Line In Jack", + "AIN2R", "Line In Jack"; + }; + + sound-spdif { + compatible = "fsl,imx-audio-spdif", + "fsl,imx-sabreauto-spdif"; + model = "imx-spdif"; + spdif-controller = <&spdif>; + spdif-in; + }; + + backlight { + compatible = "pwm-backlight"; + pwms = <&pwm3 0 5000000>; + brightness-levels = <0 4 8 16 32 64 128 255>; + default-brightness-level = <7>; + status = "okay"; + }; + + i2cmux { + compatible = "i2c-mux-gpio"; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3mux>; + mux-gpios = <&gpio5 4 0>; + i2c-parent = <&i2c3>; + idle-state = <0>; + + i2c@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + + adv7180: camera@21 { + compatible = "adi,adv7180"; + reg = <0x21>; + powerdown-gpios = <&max7310_b 2 GPIO_ACTIVE_LOW>; + interrupt-parent = <&gpio1>; + interrupts = <27 IRQ_TYPE_LEVEL_LOW>; + + port { + adv7180_to_ipu1_csi0_mux: endpoint { + remote-endpoint = <&ipu1_csi0_mux_from_parallel_sensor>; + bus-width = <8>; + }; + }; + }; + + max7310_a: gpio@30 { + compatible = "maxim,max7310"; + reg = <0x30>; + gpio-controller; + #gpio-cells = <2>; + }; + + max7310_b: gpio@32 { + compatible = "maxim,max7310"; + reg = <0x32>; + gpio-controller; + #gpio-cells = <2>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_max7310>; + reset-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; + }; + + max7310_c: gpio@34 { + compatible = "maxim,max7310"; + reg = <0x34>; + gpio-controller; + #gpio-cells = <2>; + }; + + light-sensor@44 { + compatible = "isil,isl29023"; + reg = <0x44>; + interrupt-parent = <&gpio5>; + interrupts = <17 IRQ_TYPE_EDGE_FALLING>; + }; + + magnetometer@e { + compatible = "fsl,mag3110"; + reg = <0x0e>; + interrupt-parent = <&gpio2>; + interrupts = <29 IRQ_TYPE_EDGE_RISING>; + }; + + accelerometer@1c { + compatible = "fsl,mma8451"; + reg = <0x1c>; + interrupt-parent = <&gpio6>; + interrupts = <31 IRQ_TYPE_LEVEL_LOW>; + }; + }; + }; +}; + +&ipu1_csi0_from_ipu1_csi0_mux { + bus-width = <8>; +}; + +&ipu1_csi0_mux_from_parallel_sensor { + remote-endpoint = <&adv7180_to_ipu1_csi0_mux>; + bus-width = <8>; +}; + +&ipu1_csi0 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0>; +}; + +&clks { + assigned-clocks = <&clks IMX6QDL_PLL4_BYPASS_SRC>, + <&clks IMX6QDL_PLL4_BYPASS>, + <&clks IMX6QDL_CLK_LDB_DI0_SEL>, + <&clks IMX6QDL_CLK_LDB_DI1_SEL>, + <&clks IMX6QDL_CLK_PLL4_POST_DIV>; + assigned-clock-parents = <&clks IMX6QDL_CLK_LVDS2_IN>, + <&clks IMX6QDL_PLL4_BYPASS_SRC>, + <&clks IMX6QDL_CLK_PLL3_USB_OTG>, + <&clks IMX6QDL_CLK_PLL3_USB_OTG>; + assigned-clock-rates = <0>, <0>, <0>, <0>, <24576000>; +}; + +&ecspi1 { + cs-gpios = <&gpio3 19 0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>; + status = "disabled"; /* pin conflict with WEIM NOR */ + + flash: m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,m25p32", "jedec,spi-nor"; + spi-max-frequency = <20000000>; + reg = <0>; + }; +}; + +&esai { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_esai>; + assigned-clocks = <&clks IMX6QDL_CLK_ESAI_SEL>, + <&clks IMX6QDL_CLK_ESAI_EXTAL>; + assigned-clock-parents = <&clks IMX6QDL_CLK_PLL4_AUDIO_DIV>; + assigned-clock-rates = <0>, <24576000>; + status = "okay"; +}; + +&fec { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet>; + phy-mode = "rgmii"; + interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, + <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; + fsl,err006687-workaround-present; + status = "okay"; +}; + +&gpmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpmi_nand>; + status = "okay"; +}; + +&hdmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hdmi_cec>; + ddc-i2c-bus = <&i2c2>; + status = "okay"; +}; + +&i2c2 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; + + pmic: pfuze100@8 { + compatible = "fsl,pfuze100"; + reg = <0x08>; + + regulators { + sw1a_reg: sw1ab { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw1c_reg: sw1c { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw2_reg: sw2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + }; + + sw3a_reg: sw3a { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + sw3b_reg: sw3b { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + sw4_reg: sw4 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + }; + + 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: vgen1 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen2_reg: vgen2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen3_reg: vgen3 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + }; + + vgen4_reg: vgen4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen5_reg: vgen5 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen6_reg: vgen6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; + }; + + codec: cs42888@48 { + compatible = "cirrus,cs42888"; + reg = <0x48>; + clocks = <&codec_osc>; + clock-names = "mclk"; + VA-supply = <®_audio>; + VD-supply = <®_audio>; + VLS-supply = <®_audio>; + VLC-supply = <®_audio>; + }; + + touchscreen@4 { + compatible = "eeti,egalax_ts"; + reg = <0x04>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_egalax_int>; + interrupt-parent = <&gpio2>; + interrupts = <28 IRQ_TYPE_EDGE_FALLING>; + wakeup-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>; + }; +}; + +&i2c3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + status = "okay"; +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + imx6qdl-sabreauto { + pinctrl_hog: hoggrp { + fsl,pins = < + MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x80000000 + MX6QDL_PAD_SD2_DAT2__GPIO1_IO13 0x80000000 + MX6QDL_PAD_GPIO_18__SD3_VSELECT 0x17059 + >; + }; + + pinctrl_ecspi1: ecspi1grp { + fsl,pins = < + MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1 + MX6QDL_PAD_EIM_D18__ECSPI1_MOSI 0x100b1 + MX6QDL_PAD_EIM_D16__ECSPI1_SCLK 0x100b1 + >; + }; + + pinctrl_ecspi1_cs: ecspi1cs { + fsl,pins = < + MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 + >; + }; + + pinctrl_egalax_int: egalax-intgrp { + fsl,pins = < + MX6QDL_PAD_EIM_EB0__GPIO2_IO28 0xb0b1 + >; + }; + + pinctrl_enet: enetgrp { + fsl,pins = < + MX6QDL_PAD_KEY_COL1__ENET_MDIO 0x1b0b0 + MX6QDL_PAD_KEY_COL2__ENET_MDC 0x1b0b0 + MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b030 + MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b030 + MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b030 + MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b030 + MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b030 + MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b030 + MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0 + MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b030 + MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b030 + MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b030 + MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b030 + MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b030 + MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030 + MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1 + >; + }; + + pinctrl_esai: esaigrp { + fsl,pins = < + MX6QDL_PAD_ENET_CRS_DV__ESAI_TX_CLK 0x1b030 + MX6QDL_PAD_ENET_RXD1__ESAI_TX_FS 0x1b030 + MX6QDL_PAD_ENET_TX_EN__ESAI_TX3_RX2 0x1b030 + MX6QDL_PAD_GPIO_5__ESAI_TX2_RX3 0x1b030 + MX6QDL_PAD_ENET_TXD0__ESAI_TX4_RX1 0x1b030 + MX6QDL_PAD_ENET_MDC__ESAI_TX5_RX0 0x1b030 + MX6QDL_PAD_GPIO_17__ESAI_TX0 0x1b030 + MX6QDL_PAD_NANDF_CS3__ESAI_TX1 0x1b030 + MX6QDL_PAD_ENET_MDIO__ESAI_RX_CLK 0x1b030 + MX6QDL_PAD_GPIO_9__ESAI_RX_FS 0x1b030 + >; + }; + + pinctrl_gpio_keys: gpiokeysgrp { + fsl,pins = < + MX6QDL_PAD_SD2_CMD__GPIO1_IO11 0x1b0b0 + MX6QDL_PAD_SD2_DAT3__GPIO1_IO12 0x1b0b0 + MX6QDL_PAD_SD4_DAT4__GPIO2_IO12 0x1b0b0 + MX6QDL_PAD_SD4_DAT7__GPIO2_IO15 0x1b0b0 + MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14 0x1b0b0 + >; + }; + + pinctrl_gpio_leds: gpioledsgrp { + fsl,pins = < + MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15 0x80000000 + >; + }; + + pinctrl_gpmi_nand: gpminandgrp { + fsl,pins = < + MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1 + MX6QDL_PAD_NANDF_ALE__NAND_ALE 0xb0b1 + MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0xb0b1 + MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000 + MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0xb0b1 + MX6QDL_PAD_NANDF_CS1__NAND_CE1_B 0xb0b1 + MX6QDL_PAD_SD4_CMD__NAND_RE_B 0xb0b1 + MX6QDL_PAD_SD4_CLK__NAND_WE_B 0xb0b1 + MX6QDL_PAD_NANDF_D0__NAND_DATA00 0xb0b1 + MX6QDL_PAD_NANDF_D1__NAND_DATA01 0xb0b1 + MX6QDL_PAD_NANDF_D2__NAND_DATA02 0xb0b1 + MX6QDL_PAD_NANDF_D3__NAND_DATA03 0xb0b1 + MX6QDL_PAD_NANDF_D4__NAND_DATA04 0xb0b1 + MX6QDL_PAD_NANDF_D5__NAND_DATA05 0xb0b1 + MX6QDL_PAD_NANDF_D6__NAND_DATA06 0xb0b1 + MX6QDL_PAD_NANDF_D7__NAND_DATA07 0xb0b1 + MX6QDL_PAD_SD4_DAT0__NAND_DQS 0x00b1 + >; + }; + + pinctrl_hdmi_cec: hdmicecgrp { + fsl,pins = < + MX6QDL_PAD_EIM_A25__HDMI_TX_CEC_LINE 0x1f8b0 + >; + }; + + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1 + MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c3: i2c3grp { + fsl,pins = < + MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c3mux: i2c3muxgrp { + fsl,pins = < + MX6QDL_PAD_EIM_A24__GPIO5_IO04 0x0b0b1 + >; + }; + + pinctrl_ipu1_csi0: ipu1csi0grp { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12 0x1b0b0 + MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13 0x1b0b0 + MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14 0x1b0b0 + MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15 0x1b0b0 + MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16 0x1b0b0 + MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17 0x1b0b0 + MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18 0x1b0b0 + MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19 0x1b0b0 + MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK 0x1b0b0 + MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC 0x1b0b0 + MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC 0x1b0b0 + >; + }; + + pinctrl_max7310: max7310grp { + fsl,pins = < + MX6QDL_PAD_SD2_DAT0__GPIO1_IO15 0x1b0b0 + >; + }; + + pinctrl_pwm3: pwm1grp { + fsl,pins = < + MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1 + >; + }; + + pinctrl_gpt_input_capture0: gptinputcapture0grp { + fsl,pins = < + MX6QDL_PAD_SD1_DAT0__GPT_CAPTURE1 0x1b0b0 + >; + }; + + pinctrl_gpt_input_capture1: gptinputcapture1grp { + fsl,pins = < + MX6QDL_PAD_SD1_DAT1__GPT_CAPTURE2 0x1b0b0 + >; + }; + + pinctrl_spdif: spdifgrp { + fsl,pins = < + MX6QDL_PAD_KEY_COL3__SPDIF_IN 0x1b0b0 + >; + }; + + pinctrl_uart4: uart4grp { + fsl,pins = < + MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1 + MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1 + >; + }; + + pinctrl_usbotg: usbotggrp { + fsl,pins = < + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059 + >; + }; + + pinctrl_usdhc3: usdhc3grp { + fsl,pins = < + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059 + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059 + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059 + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059 + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059 + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059 + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059 + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059 + >; + }; + + pinctrl_usdhc3_100mhz: usdhc3grp100mhz { + fsl,pins = < + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170b9 + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100b9 + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170b9 + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170b9 + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170b9 + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170b9 + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170b9 + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170b9 + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170b9 + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170b9 + >; + }; + + pinctrl_usdhc3_200mhz: usdhc3grp200mhz { + fsl,pins = < + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170f9 + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100f9 + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170f9 + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170f9 + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170f9 + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170f9 + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170f9 + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170f9 + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170f9 + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170f9 + >; + }; + + pinctrl_weim_cs0: weimcs0grp { + fsl,pins = < + MX6QDL_PAD_EIM_CS0__EIM_CS0_B 0xb0b1 + >; + }; + + pinctrl_weim_nor: weimnorgrp { + fsl,pins = < + MX6QDL_PAD_EIM_OE__EIM_OE_B 0xb0b1 + MX6QDL_PAD_EIM_RW__EIM_RW 0xb0b1 + MX6QDL_PAD_EIM_WAIT__EIM_WAIT_B 0xb060 + MX6QDL_PAD_EIM_D16__EIM_DATA16 0x1b0b0 + MX6QDL_PAD_EIM_D17__EIM_DATA17 0x1b0b0 + MX6QDL_PAD_EIM_D18__EIM_DATA18 0x1b0b0 + MX6QDL_PAD_EIM_D19__EIM_DATA19 0x1b0b0 + MX6QDL_PAD_EIM_D20__EIM_DATA20 0x1b0b0 + MX6QDL_PAD_EIM_D21__EIM_DATA21 0x1b0b0 + MX6QDL_PAD_EIM_D22__EIM_DATA22 0x1b0b0 + MX6QDL_PAD_EIM_D23__EIM_DATA23 0x1b0b0 + MX6QDL_PAD_EIM_D24__EIM_DATA24 0x1b0b0 + MX6QDL_PAD_EIM_D25__EIM_DATA25 0x1b0b0 + MX6QDL_PAD_EIM_D26__EIM_DATA26 0x1b0b0 + MX6QDL_PAD_EIM_D27__EIM_DATA27 0x1b0b0 + MX6QDL_PAD_EIM_D28__EIM_DATA28 0x1b0b0 + MX6QDL_PAD_EIM_D29__EIM_DATA29 0x1b0b0 + MX6QDL_PAD_EIM_D30__EIM_DATA30 0x1b0b0 + MX6QDL_PAD_EIM_D31__EIM_DATA31 0x1b0b0 + MX6QDL_PAD_EIM_A23__EIM_ADDR23 0xb0b1 + MX6QDL_PAD_EIM_A22__EIM_ADDR22 0xb0b1 + MX6QDL_PAD_EIM_A21__EIM_ADDR21 0xb0b1 + MX6QDL_PAD_EIM_A20__EIM_ADDR20 0xb0b1 + MX6QDL_PAD_EIM_A19__EIM_ADDR19 0xb0b1 + MX6QDL_PAD_EIM_A18__EIM_ADDR18 0xb0b1 + MX6QDL_PAD_EIM_A17__EIM_ADDR17 0xb0b1 + MX6QDL_PAD_EIM_A16__EIM_ADDR16 0xb0b1 + MX6QDL_PAD_EIM_DA15__EIM_AD15 0xb0b1 + MX6QDL_PAD_EIM_DA14__EIM_AD14 0xb0b1 + MX6QDL_PAD_EIM_DA13__EIM_AD13 0xb0b1 + MX6QDL_PAD_EIM_DA12__EIM_AD12 0xb0b1 + MX6QDL_PAD_EIM_DA11__EIM_AD11 0xb0b1 + MX6QDL_PAD_EIM_DA10__EIM_AD10 0xb0b1 + MX6QDL_PAD_EIM_DA9__EIM_AD09 0xb0b1 + MX6QDL_PAD_EIM_DA8__EIM_AD08 0xb0b1 + MX6QDL_PAD_EIM_DA7__EIM_AD07 0xb0b1 + MX6QDL_PAD_EIM_DA6__EIM_AD06 0xb0b1 + MX6QDL_PAD_EIM_DA5__EIM_AD05 0xb0b1 + MX6QDL_PAD_EIM_DA4__EIM_AD04 0xb0b1 + MX6QDL_PAD_EIM_DA3__EIM_AD03 0xb0b1 + MX6QDL_PAD_EIM_DA2__EIM_AD02 0xb0b1 + MX6QDL_PAD_EIM_DA1__EIM_AD01 0xb0b1 + MX6QDL_PAD_EIM_DA0__EIM_AD00 0xb0b1 + >; + }; + }; +}; + +&ldb { + status = "okay"; + + lvds-channel@0 { + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + status = "okay"; + + display-timings { + native-mode = <&timing0>; + timing0: hsd100pxn1 { + clock-frequency = <65000000>; + hactive = <1024>; + vactive = <768>; + hback-porch = <220>; + hfront-porch = <40>; + vback-porch = <21>; + vfront-porch = <7>; + hsync-len = <60>; + vsync-len = <10>; + }; + }; + }; +}; + +&pwm3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm3>; + status = "okay"; +}; + +&spdif { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spdif>; + status = "okay"; +}; + +&uart4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart4>; + status = "okay"; +}; + +&usbh1 { + vbus-supply = <®_usb_h1_vbus>; + status = "okay"; +}; + +&usbotg { + vbus-supply = <®_usb_otg_vbus>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbotg>; + status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default", "state_100mhz", "state_200mhz"; + pinctrl-0 = <&pinctrl_usdhc3>; + pinctrl-1 = <&pinctrl_usdhc3_100mhz>; + pinctrl-2 = <&pinctrl_usdhc3_200mhz>; + cd-gpios = <&gpio6 15 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&weim { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_weim_nor &pinctrl_weim_cs0>; + ranges = <0 0 0x08000000 0x08000000>; + status = "disabled"; /* pin conflict with SPI NOR */ + + nor@0,0 { + compatible = "cfi-flash"; + reg = <0 0 0x02000000>; + #address-cells = <1>; + #size-cells = <1>; + bank-width = <2>; + fsl,weim-cs-timing = <0x00620081 0x00000001 0x1c022000 + 0x0000c000 0x1404a38e 0x00000000>; + }; +}; diff --git a/arch/arm/dts/imx6qdl-sabresd.dtsi b/arch/arm/dts/imx6qdl-sabresd.dtsi new file mode 100644 index 0000000..2cd5a9f --- /dev/null +++ b/arch/arm/dts/imx6qdl-sabresd.dtsi @@ -0,0 +1,741 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright 2012 Freescale Semiconductor, Inc. +// Copyright 2011 Linaro Ltd. + +#include +#include +#include + +/ { + aliases { + mmc1 = &usdhc3; + }; + + chosen { + stdout-path = &uart1; + }; + + memory@10000000 { + reg = <0x10000000 0x40000000>; + }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + reg_usb_otg_vbus: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "usb_otg_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio3 22 0>; + enable-active-high; + vin-supply = <&swbst_reg>; + }; + + reg_usb_h1_vbus: regulator@1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "usb_h1_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio1 29 0>; + enable-active-high; + vin-supply = <&swbst_reg>; + }; + + reg_audio: regulator@2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "wm8962-supply"; + gpio = <&gpio4 10 0>; + enable-active-high; + }; + + reg_pcie: regulator@3 { + compatible = "regulator-fixed"; + reg = <3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcie_reg>; + regulator-name = "MPCIE_3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio3 19 0>; + enable-active-high; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_keys>; + + power { + label = "Power Button"; + gpios = <&gpio3 29 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = ; + }; + + volume-up { + label = "Volume Up"; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = ; + }; + + volume-down { + label = "Volume Down"; + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = ; + }; + }; + + sound { + compatible = "fsl,imx6q-sabresd-wm8962", + "fsl,imx-audio-wm8962"; + model = "wm8962-audio"; + ssi-controller = <&ssi2>; + audio-codec = <&codec>; + audio-routing = + "Headphone Jack", "HPOUTL", + "Headphone Jack", "HPOUTR", + "Ext Spk", "SPKOUTL", + "Ext Spk", "SPKOUTR", + "AMIC", "MICBIAS", + "IN3R", "AMIC"; + mux-int-port = <2>; + mux-ext-port = <3>; + }; + + backlight_lvds: backlight-lvds { + compatible = "pwm-backlight"; + pwms = <&pwm1 0 5000000>; + brightness-levels = <0 4 8 16 32 64 128 255>; + default-brightness-level = <7>; + status = "okay"; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_leds>; + + red { + gpios = <&gpio1 2 0>; + default-state = "on"; + }; + }; + + panel { + compatible = "hannstar,hsd100pxn1"; + backlight = <&backlight_lvds>; + + port { + panel_in: endpoint { + remote-endpoint = <&lvds0_out>; + }; + }; + }; +}; + +&ipu1_csi0_from_ipu1_csi0_mux { + bus-width = <8>; + data-shift = <12>; /* Lines 19:12 used */ + hsync-active = <1>; + vsync-active = <1>; +}; + +&ipu1_csi0_mux_from_parallel_sensor { + remote-endpoint = <&ov5642_to_ipu1_csi0_mux>; +}; + +&ipu1_csi0 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0>; +}; + +&mipi_csi { + status = "okay"; + + port@0 { + reg = <0>; + + mipi_csi2_in: endpoint { + remote-endpoint = <&ov5640_to_mipi_csi2>; + clock-lanes = <0>; + data-lanes = <1 2>; + }; + }; +}; + +&audmux { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_audmux>; + status = "okay"; +}; + +&clks { + assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, + <&clks IMX6QDL_CLK_LDB_DI1_SEL>; + assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>, + <&clks IMX6QDL_CLK_PLL3_USB_OTG>; +}; + +&ecspi1 { + cs-gpios = <&gpio4 9 0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ecspi1>; + status = "okay"; + + flash: m25p80@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "st,m25p32", "jedec,spi-nor"; + spi-max-frequency = <20000000>; + reg = <0>; + }; +}; + +&fec { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet>; + phy-mode = "rgmii"; + phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + +&hdmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hdmi_cec>; + ddc-i2c-bus = <&i2c2>; + status = "okay"; +}; + +&i2c1 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c1>; + status = "okay"; + + codec: wm8962@1a { + compatible = "wlf,wm8962"; + reg = <0x1a>; + clocks = <&clks IMX6QDL_CLK_CKO>; + DCVDD-supply = <®_audio>; + DBVDD-supply = <®_audio>; + AVDD-supply = <®_audio>; + CPVDD-supply = <®_audio>; + MICVDD-supply = <®_audio>; + PLLVDD-supply = <®_audio>; + SPKVDD1-supply = <®_audio>; + SPKVDD2-supply = <®_audio>; + gpio-cfg = < + 0x0000 /* 0:Default */ + 0x0000 /* 1:Default */ + 0x0013 /* 2:FN_DMICCLK */ + 0x0000 /* 3:Default */ + 0x8014 /* 4:FN_DMICCDAT */ + 0x0000 /* 5:Default */ + >; + }; + + ov5642: camera@3c { + compatible = "ovti,ov5642"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ov5642>; + clocks = <&clks IMX6QDL_CLK_CKO>; + clock-names = "xclk"; + reg = <0x3c>; + DOVDD-supply = <&vgen4_reg>; /* 1.8v */ + AVDD-supply = <&vgen3_reg>; /* 2.8v, rev C board is VGEN3 + rev B board is VGEN5 */ + DVDD-supply = <&vgen2_reg>; /* 1.5v*/ + powerdown-gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; + status = "disabled"; + + port { + ov5642_to_ipu1_csi0_mux: endpoint { + remote-endpoint = <&ipu1_csi0_mux_from_parallel_sensor>; + bus-width = <8>; + hsync-active = <1>; + vsync-active = <1>; + }; + }; + }; +}; + +&i2c2 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; + + ov5640: camera@3c { + compatible = "ovti,ov5640"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ov5640>; + reg = <0x3c>; + clocks = <&clks IMX6QDL_CLK_CKO>; + clock-names = "xclk"; + DOVDD-supply = <&vgen4_reg>; /* 1.8v */ + AVDD-supply = <&vgen3_reg>; /* 2.8v, rev C board is VGEN3 + rev B board is VGEN5 */ + DVDD-supply = <&vgen2_reg>; /* 1.5v*/ + powerdown-gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio1 20 GPIO_ACTIVE_LOW>; + + port { + ov5640_to_mipi_csi2: endpoint { + remote-endpoint = <&mipi_csi2_in>; + clock-lanes = <0>; + data-lanes = <1 2>; + }; + }; + }; + + pmic: pfuze100@8 { + compatible = "fsl,pfuze100"; + reg = <0x08>; + + regulators { + sw1a_reg: sw1ab { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw1c_reg: sw1c { + regulator-min-microvolt = <300000>; + regulator-max-microvolt = <1875000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw2_reg: sw2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw3a_reg: sw3a { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + sw3b_reg: sw3b { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-boot-on; + regulator-always-on; + }; + + sw4_reg: sw4 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + 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: vgen1 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen2_reg: vgen2 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen3_reg: vgen3 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + }; + + vgen4_reg: vgen4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen5_reg: vgen5 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen6_reg: vgen6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; + }; +}; + +&i2c3 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + status = "okay"; + + egalax_ts@4 { + compatible = "eeti,egalax_ts"; + reg = <0x04>; + interrupt-parent = <&gpio6>; + interrupts = <7 2>; + wakeup-gpios = <&gpio6 7 0>; + }; +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + imx6qdl-sabresd { + pinctrl_hog: hoggrp { + fsl,pins = < + MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x1b0b0 + MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x1b0b0 + MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0 + MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x1b0b0 + MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0 + MX6QDL_PAD_NANDF_CLE__GPIO6_IO07 0x1b0b0 + MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x1b0b0 + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0 + MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x1b0b0 + >; + }; + + pinctrl_audmux: audmuxgrp { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x130b0 + MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x130b0 + MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x110b0 + MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x130b0 + >; + }; + + pinctrl_ecspi1: ecspi1grp { + fsl,pins = < + MX6QDL_PAD_KEY_COL1__ECSPI1_MISO 0x100b1 + MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI 0x100b1 + MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK 0x100b1 + MX6QDL_PAD_KEY_ROW1__GPIO4_IO09 0x1b0b0 + >; + }; + + pinctrl_enet: enetgrp { + fsl,pins = < + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 + MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b030 + MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b030 + MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b030 + MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b030 + MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b030 + MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b030 + MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0 + MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b030 + MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b030 + MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b030 + MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b030 + MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b030 + MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b030 + MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8 + >; + }; + + pinctrl_gpio_keys: gpio_keysgrp { + fsl,pins = < + MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x1b0b0 + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x1b0b0 + MX6QDL_PAD_GPIO_5__GPIO1_IO05 0x1b0b0 + >; + }; + + pinctrl_hdmi_cec: hdmicecgrp { + fsl,pins = < + MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0 + >; + }; + + pinctrl_i2c1: i2c1grp { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1 + MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1 + >; + }; + + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1 + MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c3: i2c3grp { + fsl,pins = < + MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1 + MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1 + >; + }; + + pinctrl_ipu1_csi0: ipu1csi0grp { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12 0x1b0b0 + MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13 0x1b0b0 + MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14 0x1b0b0 + MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15 0x1b0b0 + MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16 0x1b0b0 + MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17 0x1b0b0 + MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18 0x1b0b0 + MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19 0x1b0b0 + MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK 0x1b0b0 + MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC 0x1b0b0 + MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC 0x1b0b0 + >; + }; + + pinctrl_ov5640: ov5640grp { + fsl,pins = < + MX6QDL_PAD_SD1_DAT2__GPIO1_IO19 0x1b0b0 + MX6QDL_PAD_SD1_CLK__GPIO1_IO20 0x1b0b0 + >; + }; + + pinctrl_ov5642: ov5642grp { + fsl,pins = < + MX6QDL_PAD_SD1_DAT0__GPIO1_IO16 0x1b0b0 + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 0x1b0b0 + >; + }; + + pinctrl_pcie: pciegrp { + fsl,pins = < + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x1b0b0 + >; + }; + + pinctrl_pcie_reg: pciereggrp { + fsl,pins = < + MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x1b0b0 + >; + }; + + pinctrl_pwm1: pwm1grp { + fsl,pins = < + MX6QDL_PAD_SD1_DAT3__PWM1_OUT 0x1b0b1 + >; + }; + + pinctrl_uart1: uart1grp { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1 + MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1 + >; + }; + + pinctrl_usbotg: usbotggrp { + fsl,pins = < + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059 + >; + }; + + pinctrl_usdhc2: usdhc2grp { + fsl,pins = < + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059 + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059 + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059 + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059 + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059 + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059 + MX6QDL_PAD_NANDF_D4__SD2_DATA4 0x17059 + MX6QDL_PAD_NANDF_D5__SD2_DATA5 0x17059 + MX6QDL_PAD_NANDF_D6__SD2_DATA6 0x17059 + MX6QDL_PAD_NANDF_D7__SD2_DATA7 0x17059 + >; + }; + + pinctrl_usdhc3: usdhc3grp { + fsl,pins = < + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059 + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059 + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059 + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059 + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059 + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059 + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059 + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059 + >; + }; + + pinctrl_usdhc4: usdhc4grp { + fsl,pins = < + MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059 + MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059 + MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059 + MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059 + MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059 + MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059 + MX6QDL_PAD_SD4_DAT4__SD4_DATA4 0x17059 + MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x17059 + MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x17059 + MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17059 + >; + }; + + pinctrl_wdog: wdoggrp { + fsl,pins = < + MX6QDL_PAD_GPIO_1__WDOG2_B 0x1b0b0 + >; + }; + }; + + gpio_leds { + pinctrl_gpio_leds: gpioledsgrp { + fsl,pins = < + MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x1b0b0 + >; + }; + }; +}; + +&ldb { + status = "okay"; + + lvds-channel@1 { + fsl,data-mapping = "spwg"; + fsl,data-width = <18>; + status = "okay"; + + port@4 { + reg = <4>; + + lvds0_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; +}; + +&pcie { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcie>; + reset-gpio = <&gpio7 12 GPIO_ACTIVE_LOW>; + vpcie-supply = <®_pcie>; + status = "okay"; +}; + +&pwm1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm1>; + status = "okay"; +}; + +®_arm { + vin-supply = <&sw1a_reg>; +}; + +®_pu { + vin-supply = <&sw1c_reg>; +}; + +®_soc { + vin-supply = <&sw1c_reg>; +}; + +&snvs_poweroff { + status = "okay"; +}; + +&ssi2 { + status = "okay"; +}; + +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; + status = "okay"; +}; + +&usbh1 { + vbus-supply = <®_usb_h1_vbus>; + status = "okay"; +}; + +&usbotg { + vbus-supply = <®_usb_otg_vbus>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbotg>; + disable-over-current; + status = "okay"; +}; + +&usdhc2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2>; + bus-width = <8>; + cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc3>; + bus-width = <8>; + cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; + wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&usdhc4 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc4>; + bus-width = <8>; + non-removable; + no-1-8-v; + status = "okay"; +}; + +&wdog1 { + status = "disabled"; +}; + +&wdog2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wdog>; + fsl,ext-reset-output; + status = "okay"; +}; diff --git a/arch/arm/dts/imx6qdl.dtsi b/arch/arm/dts/imx6qdl.dtsi index b13b0b2..e4daf15 100644 --- a/arch/arm/dts/imx6qdl.dtsi +++ b/arch/arm/dts/imx6qdl.dtsi @@ -1,21 +1,23 @@ -/* - * Copyright 2011 Freescale Semiconductor, Inc. - * Copyright 2011 Linaro Ltd. - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright 2011 Freescale Semiconductor, Inc. +// Copyright 2011 Linaro Ltd. #include #include -#include "skeleton.dtsi" - / { + #address-cells = <1>; + #size-cells = <1>; + /* + * The decompressor and also some bootloaders rely on a + * pre-existing /chosen node to be available to insert the + * command line and merge other ATAGS info. + * Also for U-Boot there must be a pre-existing /memory node. + */ + chosen {}; + memory { device_type = "memory"; }; + aliases { ethernet0 = &fec; can0 = &can1; @@ -49,9 +51,6 @@ }; clocks { - #address-cells = <1>; - #size-cells = <0>; - ckil { compatible = "fsl,imx-ckil", "fixed-clock"; #clock-cells = <0>; @@ -71,6 +70,75 @@ }; }; + tempmon: tempmon { + compatible = "fsl,imx6q-tempmon"; + interrupt-parent = <&gpc>; + interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>; + fsl,tempmon = <&anatop>; + fsl,tempmon-data = <&ocotp>; + clocks = <&clks IMX6QDL_CLK_PLL3_USB_OTG>; + }; + + ldb: ldb { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,imx6q-ldb", "fsl,imx53-ldb"; + gpr = <&gpr>; + status = "disabled"; + + lvds-channel@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + status = "disabled"; + + port@0 { + reg = <0>; + + lvds0_mux_0: endpoint { + remote-endpoint = <&ipu1_di0_lvds0>; + }; + }; + + port@1 { + reg = <1>; + + lvds0_mux_1: endpoint { + remote-endpoint = <&ipu1_di1_lvds0>; + }; + }; + }; + + lvds-channel@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + status = "disabled"; + + port@0 { + reg = <0>; + + lvds1_mux_0: endpoint { + remote-endpoint = <&ipu1_di0_lvds1>; + }; + }; + + port@1 { + reg = <1>; + + lvds1_mux_1: endpoint { + remote-endpoint = <&ipu1_di1_lvds1>; + }; + }; + }; + }; + + pmu: pmu { + compatible = "arm,cortex-a9-pmu"; + interrupt-parent = <&gpc>; + interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>; + }; + soc { #address-cells = <1>; #size-cells = <1>; @@ -78,7 +146,7 @@ interrupt-parent = <&gpc>; ranges; - dma_apbh: dma-apbh@00110000 { + dma_apbh: dma-apbh@110000 { compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh"; reg = <0x00110000 0x2000>; interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>, @@ -91,7 +159,7 @@ clocks = <&clks IMX6QDL_CLK_APBH_DMA>; }; - gpmi: gpmi-nand@00112000 { + gpmi: gpmi-nand@112000 { compatible = "fsl,imx6q-gpmi-nand"; #address-cells = <1>; #size-cells = <1>; @@ -111,7 +179,7 @@ status = "disabled"; }; - hdmi: hdmi@0120000 { + hdmi: hdmi@120000 { #address-cells = <1>; #size-cells = <0>; reg = <0x00120000 0x9000>; @@ -139,7 +207,7 @@ }; }; - gpu_3d: gpu@00130000 { + gpu_3d: gpu@130000 { compatible = "vivante,gc"; reg = <0x00130000 0x4000>; interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>; @@ -147,20 +215,20 @@ <&clks IMX6QDL_CLK_GPU3D_CORE>, <&clks IMX6QDL_CLK_GPU3D_SHADER>; clock-names = "bus", "core", "shader"; - power-domains = <&gpc 1>; + power-domains = <&pd_pu>; }; - gpu_2d: gpu@00134000 { + gpu_2d: gpu@134000 { compatible = "vivante,gc"; reg = <0x00134000 0x4000>; interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_GPU2D_AXI>, <&clks IMX6QDL_CLK_GPU2D_CORE>; clock-names = "bus", "core"; - power-domains = <&gpc 1>; + power-domains = <&pd_pu>; }; - timer@00a00600 { + timer@a00600 { compatible = "arm,cortex-a9-twd-timer"; reg = <0x00a00600 0x20>; interrupts = <1 13 0xf01>; @@ -168,7 +236,7 @@ clocks = <&clks IMX6QDL_CLK_TWD>; }; - intc: interrupt-controller@00a01000 { + intc: interrupt-controller@a01000 { compatible = "arm,cortex-a9-gic"; #interrupt-cells = <3>; interrupt-controller; @@ -177,7 +245,7 @@ interrupt-parent = <&intc>; }; - L2: l2-cache@00a02000 { + L2: l2-cache@a02000 { compatible = "arm,pl310-cache"; reg = <0x00a02000 0x1000>; interrupts = <0 92 IRQ_TYPE_LEVEL_HIGH>; @@ -188,7 +256,7 @@ arm,shared-override; }; - pcie: pcie@0x01000000 { + pcie: pcie@1ffc000 { compatible = "fsl,imx6q-pcie", "snps,dw-pcie"; reg = <0x01ffc000 0x04000>, <0x01f00000 0x80000>; @@ -196,6 +264,7 @@ #address-cells = <3>; #size-cells = <2>; device_type = "pci"; + bus-range = <0x00 0xff>; ranges = <0x81000000 0 0 0x01f80000 0 0x00010000 /* downstream I/O */ 0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */ num-lanes = <1>; @@ -204,9 +273,9 @@ #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0x7>; interrupt-map = <0 0 0 1 &gpc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 2 &gpc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 3 &gpc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, - <0 0 0 4 &gpc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; + <0 0 0 2 &gpc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 3 &gpc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 4 &gpc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_PCIE_AXI>, <&clks IMX6QDL_CLK_LVDS1_GATE>, <&clks IMX6QDL_CLK_PCIE_REF_125M>; @@ -214,26 +283,21 @@ status = "disabled"; }; - pmu { - compatible = "arm,cortex-a9-pmu"; - interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>; - }; - - aips-bus@02000000 { /* AIPS1 */ + aips-bus@2000000 { /* AIPS1 */ compatible = "fsl,aips-bus", "simple-bus"; #address-cells = <1>; #size-cells = <1>; reg = <0x02000000 0x100000>; ranges; - spba-bus@02000000 { + spba-bus@2000000 { compatible = "fsl,spba-bus", "simple-bus"; #address-cells = <1>; #size-cells = <1>; reg = <0x02000000 0x40000>; ranges; - spdif: spdif@02004000 { + spdif: spdif@2004000 { compatible = "fsl,imx35-spdif"; reg = <0x02004000 0x4000>; interrupts = <0 52 IRQ_TYPE_LEVEL_HIGH>; @@ -253,7 +317,7 @@ status = "disabled"; }; - ecspi1: ecspi@02008000 { + ecspi1: spi@2008000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -267,7 +331,7 @@ status = "disabled"; }; - ecspi2: ecspi@0200c000 { + ecspi2: spi@200c000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -281,7 +345,7 @@ status = "disabled"; }; - ecspi3: ecspi@02010000 { + ecspi3: spi@2010000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -295,7 +359,7 @@ status = "disabled"; }; - ecspi4: ecspi@02014000 { + ecspi4: spi@2014000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -309,7 +373,7 @@ status = "disabled"; }; - uart1: serial@02020000 { + uart1: serial@2020000 { compatible = "fsl,imx6q-uart", "fsl,imx21-uart"; reg = <0x02020000 0x4000>; interrupts = <0 26 IRQ_TYPE_LEVEL_HIGH>; @@ -321,7 +385,7 @@ status = "disabled"; }; - esai: esai@02024000 { + esai: esai@2024000 { #sound-dai-cells = <0>; compatible = "fsl,imx35-esai"; reg = <0x02024000 0x4000>; @@ -337,7 +401,7 @@ status = "disabled"; }; - ssi1: ssi@02028000 { + ssi1: ssi@2028000 { #sound-dai-cells = <0>; compatible = "fsl,imx6q-ssi", "fsl,imx51-ssi"; @@ -353,7 +417,7 @@ status = "disabled"; }; - ssi2: ssi@0202c000 { + ssi2: ssi@202c000 { #sound-dai-cells = <0>; compatible = "fsl,imx6q-ssi", "fsl,imx51-ssi"; @@ -369,7 +433,7 @@ status = "disabled"; }; - ssi3: ssi@02030000 { + ssi3: ssi@2030000 { #sound-dai-cells = <0>; compatible = "fsl,imx6q-ssi", "fsl,imx51-ssi"; @@ -385,7 +449,7 @@ status = "disabled"; }; - asrc: asrc@02034000 { + asrc: asrc@2034000 { compatible = "fsl,imx53-asrc"; reg = <0x02034000 0x4000>; interrupts = <0 50 IRQ_TYPE_LEVEL_HIGH>; @@ -410,12 +474,12 @@ status = "okay"; }; - spba@0203c000 { + spba@203c000 { reg = <0x0203c000 0x4000>; }; }; - vpu: vpu@02040000 { + vpu: vpu@2040000 { compatible = "cnm,coda960"; reg = <0x02040000 0x3c000>; interrupts = <0 12 IRQ_TYPE_LEVEL_HIGH>, @@ -424,16 +488,16 @@ clocks = <&clks IMX6QDL_CLK_VPU_AXI>, <&clks IMX6QDL_CLK_MMDC_CH0_AXI>; clock-names = "per", "ahb"; - power-domains = <&gpc 1>; + power-domains = <&pd_pu>; resets = <&src 1>; iram = <&ocram>; }; - aipstz@0207c000 { /* AIPSTZ1 */ + aipstz@207c000 { /* AIPSTZ1 */ reg = <0x0207c000 0x4000>; }; - pwm1: pwm@02080000 { + pwm1: pwm@2080000 { #pwm-cells = <2>; compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm"; reg = <0x02080000 0x4000>; @@ -444,7 +508,7 @@ status = "disabled"; }; - pwm2: pwm@02084000 { + pwm2: pwm@2084000 { #pwm-cells = <2>; compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm"; reg = <0x02084000 0x4000>; @@ -455,7 +519,7 @@ status = "disabled"; }; - pwm3: pwm@02088000 { + pwm3: pwm@2088000 { #pwm-cells = <2>; compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm"; reg = <0x02088000 0x4000>; @@ -466,7 +530,7 @@ status = "disabled"; }; - pwm4: pwm@0208c000 { + pwm4: pwm@208c000 { #pwm-cells = <2>; compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm"; reg = <0x0208c000 0x4000>; @@ -477,7 +541,7 @@ status = "disabled"; }; - can1: flexcan@02090000 { + can1: flexcan@2090000 { compatible = "fsl,imx6q-flexcan"; reg = <0x02090000 0x4000>; interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>; @@ -487,7 +551,7 @@ status = "disabled"; }; - can2: flexcan@02094000 { + can2: flexcan@2094000 { compatible = "fsl,imx6q-flexcan"; reg = <0x02094000 0x4000>; interrupts = <0 111 IRQ_TYPE_LEVEL_HIGH>; @@ -497,7 +561,7 @@ status = "disabled"; }; - gpt: gpt@02098000 { + gpt: gpt@2098000 { compatible = "fsl,imx6q-gpt", "fsl,imx31-gpt"; reg = <0x02098000 0x4000>; interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>; @@ -507,7 +571,7 @@ clock-names = "ipg", "per", "osc_per"; }; - gpio1: gpio@0209c000 { + gpio1: gpio@209c000 { compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio"; reg = <0x0209c000 0x4000>; interrupts = <0 66 IRQ_TYPE_LEVEL_HIGH>, @@ -518,7 +582,7 @@ #interrupt-cells = <2>; }; - gpio2: gpio@020a0000 { + gpio2: gpio@20a0000 { compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio"; reg = <0x020a0000 0x4000>; interrupts = <0 68 IRQ_TYPE_LEVEL_HIGH>, @@ -529,7 +593,7 @@ #interrupt-cells = <2>; }; - gpio3: gpio@020a4000 { + gpio3: gpio@20a4000 { compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio"; reg = <0x020a4000 0x4000>; interrupts = <0 70 IRQ_TYPE_LEVEL_HIGH>, @@ -540,7 +604,7 @@ #interrupt-cells = <2>; }; - gpio4: gpio@020a8000 { + gpio4: gpio@20a8000 { compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio"; reg = <0x020a8000 0x4000>; interrupts = <0 72 IRQ_TYPE_LEVEL_HIGH>, @@ -551,7 +615,7 @@ #interrupt-cells = <2>; }; - gpio5: gpio@020ac000 { + gpio5: gpio@20ac000 { compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio"; reg = <0x020ac000 0x4000>; interrupts = <0 74 IRQ_TYPE_LEVEL_HIGH>, @@ -562,7 +626,7 @@ #interrupt-cells = <2>; }; - gpio6: gpio@020b0000 { + gpio6: gpio@20b0000 { compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio"; reg = <0x020b0000 0x4000>; interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>, @@ -573,7 +637,7 @@ #interrupt-cells = <2>; }; - gpio7: gpio@020b4000 { + gpio7: gpio@20b4000 { compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio"; reg = <0x020b4000 0x4000>; interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>, @@ -584,7 +648,7 @@ #interrupt-cells = <2>; }; - kpp: kpp@020b8000 { + kpp: kpp@20b8000 { compatible = "fsl,imx6q-kpp", "fsl,imx21-kpp"; reg = <0x020b8000 0x4000>; interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>; @@ -592,14 +656,14 @@ status = "disabled"; }; - wdog1: wdog@020bc000 { + wdog1: wdog@20bc000 { compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt"; reg = <0x020bc000 0x4000>; interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_DUMMY>; }; - wdog2: wdog@020c0000 { + wdog2: wdog@20c0000 { compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt"; reg = <0x020c0000 0x4000>; interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>; @@ -607,7 +671,7 @@ status = "disabled"; }; - clks: ccm@020c4000 { + clks: ccm@20c4000 { compatible = "fsl,imx6q-ccm"; reg = <0x020c4000 0x4000>; interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>, @@ -615,7 +679,7 @@ #clock-cells = <1>; }; - anatop: anatop@020c8000 { + anatop: anatop@20c8000 { compatible = "fsl,imx6q-anatop", "syscon", "simple-bus"; reg = <0x020c8000 0x1000>; interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>, @@ -625,8 +689,8 @@ regulator-1p1 { compatible = "fsl,anatop-regulator"; regulator-name = "vdd1p1"; - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1375000>; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1200000>; regulator-always-on; anatop-reg-offset = <0x110>; anatop-vol-bit-shift = <8>; @@ -634,6 +698,7 @@ anatop-min-bit-val = <4>; anatop-min-voltage = <800000>; anatop-max-voltage = <1375000>; + anatop-enable-bit = <0>; }; regulator-3p0 { @@ -648,20 +713,22 @@ anatop-min-bit-val = <0>; anatop-min-voltage = <2625000>; anatop-max-voltage = <3400000>; + anatop-enable-bit = <0>; }; regulator-2p5 { compatible = "fsl,anatop-regulator"; regulator-name = "vdd2p5"; - regulator-min-microvolt = <2000000>; + regulator-min-microvolt = <2250000>; regulator-max-microvolt = <2750000>; regulator-always-on; anatop-reg-offset = <0x130>; anatop-vol-bit-shift = <8>; anatop-vol-bit-width = <5>; anatop-min-bit-val = <0>; - anatop-min-voltage = <2000000>; - anatop-max-voltage = <2750000>; + anatop-min-voltage = <2100000>; + anatop-max-voltage = <2875000>; + anatop-enable-bit = <0>; }; reg_arm: regulator-vddcore { @@ -716,15 +783,7 @@ }; }; - tempmon: tempmon { - compatible = "fsl,imx6q-tempmon"; - interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>; - fsl,tempmon = <&anatop>; - fsl,tempmon-data = <&ocotp>; - clocks = <&clks IMX6QDL_CLK_PLL3_USB_OTG>; - }; - - usbphy1: usbphy@020c9000 { + usbphy1: usbphy@20c9000 { compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy"; reg = <0x020c9000 0x1000>; interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>; @@ -732,7 +791,7 @@ fsl,anatop = <&anatop>; }; - usbphy2: usbphy@020ca000 { + usbphy2: usbphy@20ca000 { compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy"; reg = <0x020ca000 0x1000>; interrupts = <0 45 IRQ_TYPE_LEVEL_HIGH>; @@ -740,7 +799,7 @@ fsl,anatop = <&anatop>; }; - snvs: snvs@020cc000 { + snvs: snvs@20cc000 { compatible = "fsl,sec-v4.0-mon", "syscon", "simple-mfd"; reg = <0x020cc000 0x4000>; @@ -756,22 +815,27 @@ compatible = "syscon-poweroff"; regmap = <&snvs>; offset = <0x38>; + value = <0x60>; mask = <0x60>; status = "disabled"; }; + + snvs_lpgpr: snvs-lpgpr { + compatible = "fsl,imx6q-snvs-lpgpr"; + }; }; - epit1: epit@020d0000 { /* EPIT1 */ + epit1: epit@20d0000 { /* EPIT1 */ reg = <0x020d0000 0x4000>; interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH>; }; - epit2: epit@020d4000 { /* EPIT2 */ + epit2: epit@20d4000 { /* EPIT2 */ reg = <0x020d4000 0x4000>; interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>; }; - src: src@020d8000 { + src: src@20d8000 { compatible = "fsl,imx6q-src", "fsl,imx51-src"; reg = <0x020d8000 0x4000>; interrupts = <0 91 IRQ_TYPE_LEVEL_HIGH>, @@ -779,7 +843,7 @@ #reset-cells = <1>; }; - gpc: gpc@020dc000 { + gpc: gpc@20dc000 { compatible = "fsl,imx6q-gpc"; reg = <0x020dc000 0x4000>; interrupt-controller; @@ -787,91 +851,57 @@ interrupts = <0 89 IRQ_TYPE_LEVEL_HIGH>, <0 90 IRQ_TYPE_LEVEL_HIGH>; interrupt-parent = <&intc>; - pu-supply = <®_pu>; - clocks = <&clks IMX6QDL_CLK_GPU3D_CORE>, - <&clks IMX6QDL_CLK_GPU3D_SHADER>, - <&clks IMX6QDL_CLK_GPU2D_CORE>, - <&clks IMX6QDL_CLK_GPU2D_AXI>, - <&clks IMX6QDL_CLK_OPENVG_AXI>, - <&clks IMX6QDL_CLK_VPU_AXI>; - #power-domain-cells = <1>; - }; - - gpr: iomuxc-gpr@020e0000 { - compatible = "fsl,imx6q-iomuxc-gpr", "syscon"; - reg = <0x020e0000 0x38>; - }; - - iomuxc: iomuxc@020e0000 { - compatible = "fsl,imx6dl-iomuxc", "fsl,imx6q-iomuxc"; - reg = <0x020e0000 0x4000>; - }; - - ldb: ldb@020e0008 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,imx6q-ldb", "fsl,imx53-ldb"; - gpr = <&gpr>; - status = "disabled"; + clocks = <&clks IMX6QDL_CLK_IPG>; + clock-names = "ipg"; - lvds-channel@0 { + pgc { #address-cells = <1>; #size-cells = <0>; - reg = <0>; - status = "disabled"; - port@0 { + power-domain@0 { reg = <0>; - - lvds0_mux_0: endpoint { - remote-endpoint = <&ipu1_di0_lvds0>; - }; + #power-domain-cells = <0>; }; - - port@1 { + pd_pu: power-domain@1 { reg = <1>; - - lvds0_mux_1: endpoint { - remote-endpoint = <&ipu1_di1_lvds0>; - }; + #power-domain-cells = <0>; + power-supply = <®_pu>; + clocks = <&clks IMX6QDL_CLK_GPU3D_CORE>, + <&clks IMX6QDL_CLK_GPU3D_SHADER>, + <&clks IMX6QDL_CLK_GPU2D_CORE>, + <&clks IMX6QDL_CLK_GPU2D_AXI>, + <&clks IMX6QDL_CLK_OPENVG_AXI>, + <&clks IMX6QDL_CLK_VPU_AXI>; }; }; + }; - lvds-channel@1 { - #address-cells = <1>; - #size-cells = <0>; - reg = <1>; - status = "disabled"; - - port@0 { - reg = <0>; - - lvds1_mux_0: endpoint { - remote-endpoint = <&ipu1_di0_lvds1>; - }; - }; + gpr: iomuxc-gpr@20e0000 { + compatible = "fsl,imx6q-iomuxc-gpr", "syscon", "simple-mfd"; + reg = <0x20e0000 0x38>; - port@1 { - reg = <1>; - - lvds1_mux_1: endpoint { - remote-endpoint = <&ipu1_di1_lvds1>; - }; - }; + mux: mux-controller { + compatible = "mmio-mux"; + #mux-control-cells = <1>; }; }; - dcic1: dcic@020e4000 { + iomuxc: iomuxc@20e0000 { + compatible = "fsl,imx6dl-iomuxc", "fsl,imx6q-iomuxc"; + reg = <0x20e0000 0x4000>; + }; + + dcic1: dcic@20e4000 { reg = <0x020e4000 0x4000>; interrupts = <0 124 IRQ_TYPE_LEVEL_HIGH>; }; - dcic2: dcic@020e8000 { + dcic2: dcic@20e8000 { reg = <0x020e8000 0x4000>; interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>; }; - sdma: sdma@020ec000 { + sdma: sdma@20ec000 { compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma"; reg = <0x020ec000 0x4000>; interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>; @@ -883,7 +913,7 @@ }; }; - aips-bus@02100000 { /* AIPS2 */ + aips-bus@2100000 { /* AIPS2 */ compatible = "fsl,aips-bus", "simple-bus"; #address-cells = <1>; #size-cells = <1>; @@ -892,7 +922,6 @@ crypto: caam@2100000 { compatible = "fsl,sec-v4.0"; - fsl,sec-era = <4>; #address-cells = <1>; #size-cells = <1>; reg = <0x2100000 0x10000>; @@ -916,11 +945,11 @@ }; }; - aipstz@0217c000 { /* AIPSTZ2 */ + aipstz@217c000 { /* AIPSTZ2 */ reg = <0x0217c000 0x4000>; }; - usbotg: usb@02184000 { + usbotg: usb@2184000 { compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; reg = <0x02184000 0x200>; interrupts = <0 43 IRQ_TYPE_LEVEL_HIGH>; @@ -933,7 +962,7 @@ status = "disabled"; }; - usbh1: usb@02184200 { + usbh1: usb@2184200 { compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; reg = <0x02184200 0x200>; interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>; @@ -947,7 +976,7 @@ status = "disabled"; }; - usbh2: usb@02184400 { + usbh2: usb@2184400 { compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; reg = <0x02184400 0x200>; interrupts = <0 41 IRQ_TYPE_LEVEL_HIGH>; @@ -960,7 +989,7 @@ status = "disabled"; }; - usbh3: usb@02184600 { + usbh3: usb@2184600 { compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; reg = <0x02184600 0x200>; interrupts = <0 42 IRQ_TYPE_LEVEL_HIGH>; @@ -973,16 +1002,17 @@ status = "disabled"; }; - usbmisc: usbmisc@02184800 { + usbmisc: usbmisc@2184800 { #index-cells = <1>; compatible = "fsl,imx6q-usbmisc"; reg = <0x02184800 0x200>; clocks = <&clks IMX6QDL_CLK_USBOH3>; }; - fec: ethernet@02188000 { + fec: ethernet@2188000 { compatible = "fsl,imx6q-fec"; reg = <0x02188000 0x4000>; + interrupt-names = "int0", "pps"; interrupts-extended = <&intc 0 118 IRQ_TYPE_LEVEL_HIGH>, <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; @@ -993,14 +1023,14 @@ status = "disabled"; }; - mlb@0218c000 { + mlb@218c000 { reg = <0x0218c000 0x4000>; interrupts = <0 53 IRQ_TYPE_LEVEL_HIGH>, <0 117 IRQ_TYPE_LEVEL_HIGH>, <0 126 IRQ_TYPE_LEVEL_HIGH>; }; - usdhc1: usdhc@02190000 { + usdhc1: usdhc@2190000 { compatible = "fsl,imx6q-usdhc"; reg = <0x02190000 0x4000>; interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>; @@ -1012,7 +1042,7 @@ status = "disabled"; }; - usdhc2: usdhc@02194000 { + usdhc2: usdhc@2194000 { compatible = "fsl,imx6q-usdhc"; reg = <0x02194000 0x4000>; interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>; @@ -1024,7 +1054,7 @@ status = "disabled"; }; - usdhc3: usdhc@02198000 { + usdhc3: usdhc@2198000 { compatible = "fsl,imx6q-usdhc"; reg = <0x02198000 0x4000>; interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>; @@ -1036,7 +1066,7 @@ status = "disabled"; }; - usdhc4: usdhc@0219c000 { + usdhc4: usdhc@219c000 { compatible = "fsl,imx6q-usdhc"; reg = <0x0219c000 0x4000>; interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>; @@ -1048,7 +1078,7 @@ status = "disabled"; }; - i2c1: i2c@021a0000 { + i2c1: i2c@21a0000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c"; @@ -1058,7 +1088,7 @@ status = "disabled"; }; - i2c2: i2c@021a4000 { + i2c2: i2c@21a4000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c"; @@ -1068,7 +1098,7 @@ status = "disabled"; }; - i2c3: i2c@021a8000 { + i2c3: i2c@21a8000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c"; @@ -1078,55 +1108,66 @@ status = "disabled"; }; - romcp@021ac000 { + romcp@21ac000 { reg = <0x021ac000 0x4000>; }; - mmdc0: mmdc@021b0000 { /* MMDC0 */ + mmdc0: mmdc@21b0000 { /* MMDC0 */ compatible = "fsl,imx6q-mmdc"; reg = <0x021b0000 0x4000>; }; - mmdc1: mmdc@021b4000 { /* MMDC1 */ + mmdc1: mmdc@21b4000 { /* MMDC1 */ reg = <0x021b4000 0x4000>; }; - weim: weim@021b8000 { + weim: weim@21b8000 { + #address-cells = <2>; + #size-cells = <1>; compatible = "fsl,imx6q-weim"; reg = <0x021b8000 0x4000>; interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6QDL_CLK_EIM_SLOW>; + fsl,weim-cs-gpr = <&gpr>; + status = "disabled"; }; - ocotp: ocotp@021bc000 { + ocotp: ocotp@21bc000 { compatible = "fsl,imx6q-ocotp", "syscon"; reg = <0x021bc000 0x4000>; clocks = <&clks IMX6QDL_CLK_IIM>; }; - tzasc@021d0000 { /* TZASC1 */ + tzasc@21d0000 { /* TZASC1 */ reg = <0x021d0000 0x4000>; interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>; }; - tzasc@021d4000 { /* TZASC2 */ + tzasc@21d4000 { /* TZASC2 */ reg = <0x021d4000 0x4000>; interrupts = <0 109 IRQ_TYPE_LEVEL_HIGH>; }; - audmux: audmux@021d8000 { + audmux: audmux@21d8000 { compatible = "fsl,imx6q-audmux", "fsl,imx31-audmux"; reg = <0x021d8000 0x4000>; status = "disabled"; }; - mipi_csi: mipi@021dc000 { + mipi_csi: mipi@21dc000 { + compatible = "fsl,imx6-mipi-csi2"; reg = <0x021dc000 0x4000>; - }; - - mipi_dsi: mipi@021e0000 { #address-cells = <1>; #size-cells = <0>; + interrupts = <0 100 0x04>, <0 101 0x04>; + clocks = <&clks IMX6QDL_CLK_HSI_TX>, + <&clks IMX6QDL_CLK_VIDEO_27M>, + <&clks IMX6QDL_CLK_EIM_PODF>; + clock-names = "dphy", "ref", "pix"; + status = "disabled"; + }; + + mipi_dsi: mipi@21e0000 { reg = <0x021e0000 0x4000>; status = "disabled"; @@ -1152,12 +1193,14 @@ }; }; - vdoa@021e4000 { + vdoa@21e4000 { + compatible = "fsl,imx6q-vdoa"; reg = <0x021e4000 0x4000>; interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clks IMX6QDL_CLK_VDOA>; }; - uart2: serial@021e8000 { + uart2: serial@21e8000 { compatible = "fsl,imx6q-uart", "fsl,imx21-uart"; reg = <0x021e8000 0x4000>; interrupts = <0 27 IRQ_TYPE_LEVEL_HIGH>; @@ -1169,7 +1212,7 @@ status = "disabled"; }; - uart3: serial@021ec000 { + uart3: serial@21ec000 { compatible = "fsl,imx6q-uart", "fsl,imx21-uart"; reg = <0x021ec000 0x4000>; interrupts = <0 28 IRQ_TYPE_LEVEL_HIGH>; @@ -1181,7 +1224,7 @@ status = "disabled"; }; - uart4: serial@021f0000 { + uart4: serial@21f0000 { compatible = "fsl,imx6q-uart", "fsl,imx21-uart"; reg = <0x021f0000 0x4000>; interrupts = <0 29 IRQ_TYPE_LEVEL_HIGH>; @@ -1193,7 +1236,7 @@ status = "disabled"; }; - uart5: serial@021f4000 { + uart5: serial@21f4000 { compatible = "fsl,imx6q-uart", "fsl,imx21-uart"; reg = <0x021f4000 0x4000>; interrupts = <0 30 IRQ_TYPE_LEVEL_HIGH>; @@ -1206,7 +1249,7 @@ }; }; - ipu1: ipu@02400000 { + ipu1: ipu@2400000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ipu"; @@ -1221,6 +1264,10 @@ ipu1_csi0: port@0 { reg = <0>; + + ipu1_csi0_from_ipu1_csi0_mux: endpoint { + remote-endpoint = <&ipu1_csi0_mux_to_ipu1_csi0>; + }; }; ipu1_csi1: port@1 { @@ -1232,22 +1279,27 @@ #size-cells = <0>; reg = <2>; - ipu1_di0_disp0: disp0-endpoint { + ipu1_di0_disp0: endpoint@0 { + reg = <0>; }; - ipu1_di0_hdmi: hdmi-endpoint { + ipu1_di0_hdmi: endpoint@1 { + reg = <1>; remote-endpoint = <&hdmi_mux_0>; }; - ipu1_di0_mipi: mipi-endpoint { + ipu1_di0_mipi: endpoint@2 { + reg = <2>; remote-endpoint = <&mipi_mux_0>; }; - ipu1_di0_lvds0: lvds0-endpoint { + ipu1_di0_lvds0: endpoint@3 { + reg = <3>; remote-endpoint = <&lvds0_mux_0>; }; - ipu1_di0_lvds1: lvds1-endpoint { + ipu1_di0_lvds1: endpoint@4 { + reg = <4>; remote-endpoint = <&lvds1_mux_0>; }; }; @@ -1257,22 +1309,27 @@ #size-cells = <0>; reg = <3>; - ipu1_di1_disp1: disp1-endpoint { + ipu1_di1_disp1: endpoint@0 { + reg = <0>; }; - ipu1_di1_hdmi: hdmi-endpoint { + ipu1_di1_hdmi: endpoint@1 { + reg = <1>; remote-endpoint = <&hdmi_mux_1>; }; - ipu1_di1_mipi: mipi-endpoint { + ipu1_di1_mipi: endpoint@2 { + reg = <2>; remote-endpoint = <&mipi_mux_1>; }; - ipu1_di1_lvds0: lvds0-endpoint { + ipu1_di1_lvds0: endpoint@3 { + reg = <3>; remote-endpoint = <&lvds0_mux_1>; }; - ipu1_di1_lvds1: lvds1-endpoint { + ipu1_di1_lvds1: endpoint@4 { + reg = <4>; remote-endpoint = <&lvds1_mux_1>; }; }; diff --git a/arch/arm/dts/imx6qp-sabreauto.dts b/arch/arm/dts/imx6qp-sabreauto.dts new file mode 100644 index 0000000..d4caeeb --- /dev/null +++ b/arch/arm/dts/imx6qp-sabreauto.dts @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +// +// Copyright 2016 Freescale Semiconductor, Inc. + +/dts-v1/; + +#include "imx6qp.dtsi" +#include "imx6qdl-sabreauto.dtsi" + +/ { + model = "Freescale i.MX6 Quad Plus SABRE Automotive Board"; + compatible = "fsl,imx6qp-sabreauto", "fsl,imx6qp"; +}; + +&i2c2 { + max7322: gpio@68 { + compatible = "maxim,max7322"; + reg = <0x68>; + gpio-controller; + #gpio-cells = <2>; + }; +}; + +&iomuxc { + imx6qdl-sabreauto { + pinctrl_enet: enetgrp { + fsl,pins = < + MX6QDL_PAD_KEY_COL1__ENET_MDIO 0x1b0b0 + MX6QDL_PAD_KEY_COL2__ENET_MDC 0x1b0b0 + MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b018 + MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b018 + MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b018 + MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b018 + MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b018 + MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b018 + MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b018 + MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b018 + MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b018 + MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b018 + MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b018 + MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b018 + MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8 + MX6QDL_PAD_GPIO_6__ENET_IRQ 0x000b1 + >; + }; + }; +}; + +&pcie { + status = "disabled"; +}; + +&vgen3_reg { + regulator-always-on; +}; diff --git a/arch/arm/dts/imx6qp-sabresd.dts b/arch/arm/dts/imx6qp-sabresd.dts new file mode 100644 index 0000000..f1b9cb1 --- /dev/null +++ b/arch/arm/dts/imx6qp-sabresd.dts @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +// +// Copyright 2016 Freescale Semiconductor, Inc. + +/dts-v1/; + +#include "imx6qp.dtsi" +#include "imx6qdl-sabresd.dtsi" + +/ { + model = "Freescale i.MX6 Quad Plus SABRE Smart Device Board"; + compatible = "fsl,imx6qp-sabresd", "fsl,imx6qp"; +}; + +®_arm { + vin-supply = <&sw2_reg>; +}; + +&iomuxc { + imx6qdl-sabresd { + pinctrl_usdhc2: usdhc2grp { + fsl,pins = < + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059 + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10071 + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059 + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059 + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059 + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059 + MX6QDL_PAD_NANDF_D4__SD2_DATA4 0x17059 + MX6QDL_PAD_NANDF_D5__SD2_DATA5 0x17059 + MX6QDL_PAD_NANDF_D6__SD2_DATA6 0x17059 + MX6QDL_PAD_NANDF_D7__SD2_DATA7 0x17059 + >; + }; + + pinctrl_usdhc3: usdhc3grp { + fsl,pins = < + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10071 + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059 + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059 + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059 + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059 + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059 + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059 + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059 + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059 + >; + }; + }; +}; + +&pcie { + status = "disabled"; +}; diff --git a/arch/arm/dts/imx6qp.dtsi b/arch/arm/dts/imx6qp.dtsi new file mode 100644 index 0000000..5f51f8e --- /dev/null +++ b/arch/arm/dts/imx6qp.dtsi @@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +// +// Copyright 2016 Freescale Semiconductor, Inc. + +#include "imx6q.dtsi" + +/ { + soc { + ocram2: sram@940000 { + compatible = "mmio-sram"; + reg = <0x00940000 0x20000>; + clocks = <&clks IMX6QDL_CLK_OCRAM>; + }; + + ocram3: sram@960000 { + compatible = "mmio-sram"; + reg = <0x00960000 0x20000>; + clocks = <&clks IMX6QDL_CLK_OCRAM>; + }; + + aips-bus@2100000 { + pre1: pre@21c8000 { + compatible = "fsl,imx6qp-pre"; + reg = <0x021c8000 0x1000>; + interrupts = ; + clocks = <&clks IMX6QDL_CLK_PRE0>; + clock-names = "axi"; + fsl,iram = <&ocram2>; + }; + + pre2: pre@21c9000 { + compatible = "fsl,imx6qp-pre"; + reg = <0x021c9000 0x1000>; + interrupts = ; + clocks = <&clks IMX6QDL_CLK_PRE1>; + clock-names = "axi"; + fsl,iram = <&ocram2>; + }; + + pre3: pre@21ca000 { + compatible = "fsl,imx6qp-pre"; + reg = <0x021ca000 0x1000>; + interrupts = ; + clocks = <&clks IMX6QDL_CLK_PRE2>; + clock-names = "axi"; + fsl,iram = <&ocram3>; + }; + + pre4: pre@21cb000 { + compatible = "fsl,imx6qp-pre"; + reg = <0x021cb000 0x1000>; + interrupts = ; + clocks = <&clks IMX6QDL_CLK_PRE3>; + clock-names = "axi"; + fsl,iram = <&ocram3>; + }; + + prg1: prg@21cc000 { + compatible = "fsl,imx6qp-prg"; + reg = <0x021cc000 0x1000>; + clocks = <&clks IMX6QDL_CLK_PRG0_APB>, + <&clks IMX6QDL_CLK_PRG0_AXI>; + clock-names = "ipg", "axi"; + fsl,pres = <&pre1>, <&pre2>, <&pre3>; + }; + + prg2: prg@21cd000 { + compatible = "fsl,imx6qp-prg"; + reg = <0x021cd000 0x1000>; + clocks = <&clks IMX6QDL_CLK_PRG1_APB>, + <&clks IMX6QDL_CLK_PRG1_AXI>; + clock-names = "ipg", "axi"; + fsl,pres = <&pre4>, <&pre2>, <&pre3>; + }; + }; + }; +}; + +&fec { + /delete-property/interrupts-extended; + interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>, + <0 119 IRQ_TYPE_LEVEL_HIGH>; +}; + +&gpc { + compatible = "fsl,imx6qp-gpc", "fsl,imx6q-gpc"; +}; + +&ipu1 { + compatible = "fsl,imx6qp-ipu", "fsl,imx6q-ipu"; + fsl,prg = <&prg1>; +}; + +&ipu2 { + compatible = "fsl,imx6qp-ipu", "fsl,imx6q-ipu"; + fsl,prg = <&prg2>; +}; + +&ldb { + clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, <&clks IMX6QDL_CLK_LDB_DI1_SEL>, + <&clks IMX6QDL_CLK_IPU1_DI0_SEL>, <&clks IMX6QDL_CLK_IPU1_DI1_SEL>, + <&clks IMX6QDL_CLK_IPU2_DI0_SEL>, <&clks IMX6QDL_CLK_IPU2_DI1_SEL>, + <&clks IMX6QDL_CLK_LDB_DI0_PODF>, <&clks IMX6QDL_CLK_LDB_DI1_PODF>; + clock-names = "di0_pll", "di1_pll", + "di0_sel", "di1_sel", "di2_sel", "di3_sel", + "di0", "di1"; +}; + +&mmdc0 { + compatible = "fsl,imx6qp-mmdc", "fsl,imx6q-mmdc"; +}; + +&pcie { + compatible = "fsl,imx6qp-pcie", "snps,dw-pcie"; +}; From patchwork Tue Jan 29 11:35:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032687 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="biAIAUn2"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pkvY58g8z9sNq for ; Tue, 29 Jan 2019 22:35:36 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6DD66C21DF9; Tue, 29 Jan 2019 11:35:31 +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=SPF_HELO_PASS, 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 3FFEBC21E2F; Tue, 29 Jan 2019 11:35:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D9775C21DD4; Tue, 29 Jan 2019 11:35:15 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60084.outbound.protection.outlook.com [40.107.6.84]) by lists.denx.de (Postfix) with ESMTPS id 0DD03C21D56 for ; Tue, 29 Jan 2019 11:35:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=X9xIwfcVJvue/y31ZUgIqAXC0Hw5w313uiXX8PsHZAk=; b=biAIAUn2cVL0zY01PaWCMRHTa5BSDafwvbIzmEnw8FFrCjh2owkyBvQcRp7E4SZmDuXEKrKFXdSwOWKdWThTAY/F+BCHJJm0Fn6ObAARN0LOcheoAnk7jY4MT6wCNlHqhUR8Wg1NvUaz8cBi/Tn85D/NGlXxjWCc9LYhh5XxKI4= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB2109.eurprd04.prod.outlook.com (10.166.43.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:35:13 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:35:13 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 10/22] arm: imx: Add FIT SPL its Thread-Index: AQHUt8ayLhcw9ZG84kST7x3LehvM5w== Date: Tue, 29 Jan 2019 11:35:13 +0000 Message-ID: <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR02CA0014.eurprd02.prod.outlook.com (2603:10a6:20b:6e::27) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB2109; 6:88iwSpcttvYJN3ZRQoBPaQxw7hyjfgmJTLtB/ALezdaNoKUoyjfYhQladEt2C9OpaFxvDNzUay+OO7A9ZuvgVgnlAtLPN0ttKJ5asVN3CcPHlg07bm4inq73DXryNdulm/C9uZZhAGq6M1NOg+jZmqbD6NG9N9xq1rorU62ZYPJVXrfSA4vh4KNmz44WYaolVoQ+YGShMN5MzruS1rIc9RPijT1z+klZjl02qQFdOqudaFvdjfvjl34Skxq1ufB8U7xHeJx9merKRVE/NaUHFN98bD0k1g/wQnttGgC5OK9+yMxYPZyMDwjBX8au2S4YgxW91HxG5urxE6zqZP8XuXHd93PJorGQbc8Sd3AASC/CO3FX5Z6ZtIR9TKuh8EuaKDebzNU3XlfngbaV8cWENZqI0ef4nJ8UVMxQodgeGFvTZtExibx2ptWwgfE+QJ2me94oC3q+nI5Av7RHxvh3Zg==; 5:EEPnflJxNR04GjUQAgVhD2Bfoexyrht9MoinBHARXjDvbM1YVa7p7KQH54AR2Rd7qQ7pkc4Wj29ndGm7KFLSh1NOFTuv3vVk5VLTCX/J2cSBveDGP9YCFxQCvG6Z8Dv1Ddi97pzkvlk6WnooheeMUSBoEd9EkPyzi12TOHiZWlWu44W/Fysekxn9FikrxohUmDwGsL5ZSSxCt/XWxP55wQ==; 7:MrqI/iWoV9lur7l1GmLm1DTi51h5U0JG1h1QIyaqw1SdncU23NDjwNJPB1oGSvhsxkm6+midbH3VVxcjAn6GqY7Jkz7TK7PrSgmuJKeOu7oABvZQmXfIqr5eT1KitGH9Iwkdu74MOlCmRR4kYcdZmg== x-ms-office365-filtering-correlation-id: 4cec581a-da7f-430a-829c-08d685ddd491 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB2109; x-ms-traffictypediagnostic: VI1PR04MB2109: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(136003)(366004)(376002)(346002)(189003)(199004)(6486002)(25786009)(2501003)(486006)(4326008)(54906003)(52116002)(110136005)(53936002)(99286004)(6436002)(7736002)(2906002)(305945005)(6512007)(86362001)(6506007)(102836004)(26005)(6636002)(316002)(76176011)(386003)(217873002)(50226002)(8936002)(81166006)(8676002)(81156014)(14454004)(71200400001)(71190400001)(106356001)(476003)(11346002)(36756003)(186003)(66066001)(68736007)(14444005)(3846002)(6116002)(2616005)(105586002)(44832011)(478600001)(97736004)(446003)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB2109; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: RvUH5WBfOBRum4dGDDUM6OpsnwCiwq0lXcFcdiDGjuO6Wm1iP/yHPnJv9nXQxq3YXz82p4ZatPAOHsvAizASaLnNF/r7+GnDcEWNHXesPsYeSzDC4Z/8pSvlW8CYWTQV8WwN9yca+yVNabRq+AMN8rOIUeR+H7BYi3XL7oP03AAFSSmiu7mBmecoqwZ/BvBlBuC7yNKxHORvurlVrb03g04h91VG2ib0IW+IaG9Ndq43PfndTi6kzGNWH8x2seExhu7XQASOIyVJ4oHTy1kFUk1ZtSJ4Csak+e4gy8EevmzPR34V3wwUHiBiGt0uncjU4qc3ongK0L08Zg/C/kaVQMGWty8YAo7uIKEgIWIkdUF/XCk3eehSHoDthU3Kabj+tIqAfNVmOeZwan4+icylL0dWtmQ38Il/TOcac4vZVNA= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4cec581a-da7f-430a-829c-08d685ddd491 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:35:11.3513 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2109 Subject: [U-Boot] [PATCH v2 10/22] arm: imx: Add FIT SPL its 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" Add simple its in order to allow SPL to boot u-boot proper via FIT table. Signed-off-by: Abel Vesa Reviewed-by: Peng Fan --- arch/arm/mach-imx/mx6/fit_spl.its | 41 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 arch/arm/mach-imx/mx6/fit_spl.its diff --git a/arch/arm/mach-imx/mx6/fit_spl.its b/arch/arm/mach-imx/mx6/fit_spl.its new file mode 100644 index 0000000..bf3ffee --- /dev/null +++ b/arch/arm/mach-imx/mx6/fit_spl.its @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2018 NXP + * + * Simple U-boot fit source file containing U-Boot (with dtb appended) + */ + +/dts-v1/; + +/ { + description = "Image for u-boot proper (with dtb appended)"; + #address-cells = <1>; + + images { + #address-cells = <1>; + #size-cells = <0>; + + uboot@1 { + reg = <0>; + description = "U-Boot"; + data = /incbin/("../../../../u-boot-fit-dtb.bin"); + type = "standalone"; + os = "U-Boot"; + compression = "none"; + arch = "arm"; + load = <0x17800000>; + }; + }; + + configurations { + #address-cells = <1>; + #size-cells = <0>; + + default = "conf@1"; + + conf@1 { + reg = <0>; + description = "i.MX armv7"; + loadables = "uboot@1"; + }; + }; +}; From patchwork Tue Jan 29 11:35:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032707 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="DNtlbGNm"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pl510L1Tz9sNr for ; Tue, 29 Jan 2019 22:43:48 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id ADB4EC21E53; Tue, 29 Jan 2019 11:41:07 +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.8 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID, UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E181BC21E7D; Tue, 29 Jan 2019 11:35:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 321DCC21E62; Tue, 29 Jan 2019 11:35:16 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60087.outbound.protection.outlook.com [40.107.6.87]) by lists.denx.de (Postfix) with ESMTPS id 9913CC21D56 for ; Tue, 29 Jan 2019 11:35:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7LFU3ohIaxwRwerg+2JB6HY5hY4R4F0/hlXzOcWoz80=; b=DNtlbGNmiYSU7cm8WVSlP/ZsFpqETVW4gVTC068exWTxeNryKKScrOqXkciNhKCkPC/yBUQgTLq6WTIryts9JXJ87tKpW99IvZJ2fHQrG5p4wTjL9k8eaXk7YgGjJWWh4sDaHWKh61hC6HJcyYxcsrUiIkBvmiU77GTnOG2/ZOc= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB2109.eurprd04.prod.outlook.com (10.166.43.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:35:15 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:35:15 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 11/22] configs: mx6sabreauto: Add SPL FIT and DM support Thread-Index: AQHUt8a0XH8SC9fM6UmcmriEpbw5Bw== Date: Tue, 29 Jan 2019 11:35:15 +0000 Message-ID: <1548761705-10975-2-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR02CA0014.eurprd02.prod.outlook.com (2603:10a6:20b:6e::27) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB2109; 6:ZEBwfko34QdmgX9A1mQ8UQdWosEmS0mdrY99cVyLRVDvOQqe0DxpKZdbym2C+Nmzq9GrIcQmx4tb8aUXcGkmAHuGpr2htTzMdpx5hk9U1kynFrjwYO4mMBARD9EtfKKwhtaLi9Vrtt56wPKoQo0Gp8IY6w4XKXz4WvO8mtplNYaiPACA58Cg59uh2spYJEiKQm+hQ9tQk9N+C2ZColkTRO2zEHkygvinMWifNP7VZRJUqbiF0hWzall2im/PNVHUKgaxDG/VONOZJjzGs3KuhWrjzbuSEJZtQamvIGLEHMz3mVNm6tDob5HyqCCwPEsJH9ua9rDWczhWizEYKNvbkJj+1bd1jQLBI7UAUOJI39V2n4uk/jvtNVKNzRo4yHqpusbJdrn9w43/VdpeWvKh3BGgE8cOEOwNJ3j7C8jMgrfkQvWaeQuVeNHdBTvmSjKGyBVTucOKJcwOfFahWmBXaA==; 5:9DDmfRqH2B0mBeJTfza6/h+WT8QxDXeoCaArLE6R3JhKopA68MkSKjPc2XjCHKfaahyd9VIhRmt0/8F9pe641AvgR47U7zxuZgqfzNVR1qewXWepfqdNpXpevos7Ge4yo2NcULIYFh/G8yur6Fe3P5yBl6jFS+jkLHXJ0Vdjj0WvT74y6AI/84K408nVr5TnE2yAoMvRFIkxRYCQHkwJvw==; 7:VFZuXMxipJ9KZKOIdXI6e95qQ5rtI5b5MBEq19ZT/K+otbC0UEEDycAx1UpKhA7agB5+8y1yVMIx65QM3QpBLDbJWvAJhEFa5q2v6MJrQeBNauNfoBmE+NsokK8Gl6tie+wnlDi6m0zJ5R1bUHeNCA== x-ms-office365-filtering-correlation-id: c037045a-07e2-49a4-5be4-08d685ddd64f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB2109; x-ms-traffictypediagnostic: VI1PR04MB2109: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(136003)(366004)(376002)(346002)(189003)(199004)(6486002)(25786009)(2501003)(486006)(4326008)(54906003)(52116002)(110136005)(53936002)(99286004)(6436002)(7736002)(2906002)(305945005)(6512007)(86362001)(6506007)(102836004)(26005)(6636002)(316002)(76176011)(386003)(217873002)(50226002)(8936002)(81166006)(8676002)(81156014)(14454004)(71200400001)(71190400001)(106356001)(476003)(11346002)(36756003)(186003)(66066001)(68736007)(14444005)(3846002)(6116002)(2616005)(105586002)(44832011)(478600001)(97736004)(446003)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB2109; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 6KQbbDO/s+JX/PIBMoB+alukZmGb9im6rhnb5jhvUEdOU0R5pqF+yzU332neo3GzZRia4wJuzxiWroB2o1kJt3ZqmPnXBFhVrSYmD2ijnCICNHUfzoptEkba2Xdz1G1F0nBYEq8+3H5xIuEBJzsNkGDB4sdVYdpIS0tGo1dNWWc/cTx89j8Y9DqD9tdPDqWn7o2dJUDFQ2wpnYnreaxePJuRxCUMqXJrLa36sQzElSqrQ47i7pfwU3B5iLtFGO2qIT4Gb2KepU582LCyQxxQ5VF9AP9ZgiXEUWkw3hBaHiDafcTj5EU94gj9SltGdx3XGaEFnRSL1vaghU+RqNtmHkpAYXLXW7DPDd8POFO2LnwaT1WH0fftwGhxHYY69FZIe0gslCZRI9XJ03K7JUBaV9pmtY5Y0aSpcG9mf3Zy0MA= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c037045a-07e2-49a4-5be4-08d685ddd64f X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:35:13.7420 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2109 Subject: [U-Boot] [PATCH v2 11/22] configs: mx6sabreauto: Add SPL FIT and DM support 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" Enable all the necessary configs for SPL DM and FIT support for mx6sabreauto. Signed-off-by: Abel Vesa --- configs/mx6sabreauto_defconfig | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index 4bdcbb1..c64ec66 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -4,19 +4,28 @@ CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_MX6SABREAUTO=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_NXP_BOARD_REVISION=y CONFIG_NR_DRAM_BANKS=1 +CONFIG_TPL_SYS_MALLOC_F_LEN=0x400 +CONFIG_FIT=y +CONFIG_SPL_FIT_PRINT=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_SPL_FIT_SOURCE="arch/arm/mach-imx/mx6/fit_spl.its" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOUNCE_BUFFER=y +CONFIG_SPL_SEPARATE_BSS=y +CONFIG_SPL_FIT_IMAGE_TINY=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y @@ -40,8 +49,15 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto" +CONFIG_OF_LIST="imx6dl-sabreauto imx6q-sabreauto imx6qp-sabreauto" +CONFIG_MULTI_DTB_FIT=y +CONFIG_SPL_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y CONFIG_DM_MMC=y @@ -68,4 +84,3 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set -CONFIG_OF_LIBFDT=y From patchwork Tue Jan 29 11:35:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032698 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="vu1QEw3v"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pl1j2KFTz9sNf for ; Tue, 29 Jan 2019 22:40:56 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3BDA3C21D8E; Tue, 29 Jan 2019 11:40:13 +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.8 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID, UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3C084C21E57; Tue, 29 Jan 2019 11:35:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 249A5C21E38; Tue, 29 Jan 2019 11:35:17 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150043.outbound.protection.outlook.com [40.107.15.43]) by lists.denx.de (Postfix) with ESMTPS id A17EFC21E44 for ; Tue, 29 Jan 2019 11:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tpeZvLamFbWI7vwBKOfdvB94H7TQIE3EaMAlKu6cADc=; b=vu1QEw3v8gd7ZmXVbUfiqZtYrZMF6KJNLi4rngl+v809EVUmrq3uAFD2ELk/4Ds3feLjUuK/OykLFfJtUWYyEh7lWotYmyxRAvWg0yn6vE9EBHAqcB9h7LOXpDcz8CEWQOM7LoK5aat0M2Fpp6e47iEWEUHfg3fPeafOupqpRAw= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB2109.eurprd04.prod.outlook.com (10.166.43.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:35:16 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:35:16 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 12/22] configs: mx6sabresd: Add SPL FIT and DM support Thread-Index: AQHUt8a0aXxoyX5zL0KTJaqzMGD0jQ== Date: Tue, 29 Jan 2019 11:35:16 +0000 Message-ID: <1548761705-10975-3-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR02CA0014.eurprd02.prod.outlook.com (2603:10a6:20b:6e::27) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB2109; 6:tZBPj8gyDLnn6B29KXmCORMd1IwObITF2Izb4v26f1wA+zo6PObBJOVJcWWN8hmkBCjmvBshM3cZ6bnmVjqdI64bB6fSEbU/0x7AaiDDrMdbo3+jHuDjsX6k1HaUNtCJQDGCqV639++fZrYJzWWYT1cu5BE+v4Dj3ak0jvgYawyIuJA4kKBz2AvXUpYHwu3ZCtFLd0/r3qnE12hYe31SDu0KgFbJSU2qxeMqjcPHg9/AoM1Zc/d3JT3ACpo5UqQm8ym3qjIvBA725GF3K+7bRWIQyFzmVzrcb8utPAtzPcBh/GmOfKRJOgt/Ra6w6wLGVw0AEHqGmxq4sgSYtHyizsDdgkp9n/v5m5Q7rXV7Kkf5W/sMC1C/bawHvXoR866oUHYg96+VsIIcTBgDphTpCju0SVFFzG3sgE466CEtHM3gyEyLrbXV6ppvZ92RUojtTtpOupDaZ40mdUBCO6UNJA==; 5:bmWUAHGUohBpskysFvyHbos5E12GpmIbipKm7f8dNxbgTVn9FkrK/gAlS1rPzho91P9cNbldBnhoBtfCPGoPMQTnM5yjbYfEb/NCg1cgOUkzDW8C+xx92rEqO8D3aPpj54Nn6YoBeD+ymquX7r9mE8zXooIMCJK1a8inreCzgd+hMaFtB9gtdSw4tqtoAj6Ivg93UO8Kj4F7ezvJon998Q==; 7:SCijaTvkxMhGQO3gh8nHGEiF60fzsKi+YYEFsQQFwlS+7wRTK4pLqdctyxOYecKGjkHkhyzwNqX+chVzvUY1iUHn5RB7ZnyG1Vx5Mss0p8GshI++Z8g/ArGI7Gb2gp+fOAEUSUEO3sFk7OZ83AJdcQ== x-ms-office365-filtering-correlation-id: 2609ff77-21be-4562-67f2-08d685ddd6fd x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB2109; x-ms-traffictypediagnostic: VI1PR04MB2109: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(136003)(366004)(376002)(346002)(189003)(199004)(6486002)(25786009)(2501003)(486006)(4326008)(54906003)(52116002)(110136005)(53936002)(99286004)(6436002)(7736002)(2906002)(305945005)(6512007)(86362001)(6506007)(102836004)(26005)(6636002)(316002)(76176011)(386003)(217873002)(50226002)(8936002)(81166006)(8676002)(81156014)(14454004)(71200400001)(71190400001)(106356001)(476003)(11346002)(36756003)(186003)(66066001)(68736007)(14444005)(3846002)(6116002)(2616005)(105586002)(44832011)(478600001)(97736004)(446003)(256004)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB2109; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 37MwCVPO4WlRNhpPI92HQRrMGCBz562nCQiUl/6MtqAAeK9MluBBlkLyhl+L/pvLyDMlDOVO6mKu1rR6kn68v9a8po+R+hd8HQv4atVcK5hDqpiYwRFnEl3EHW4cx/JsLQsHXAEsYA8a89n52EWpUOl3v/R/1U8k3pktlIynFd/ihZ+m/rQpTYI01Z0MMiAleykH7+Bb+n6VQS09HjAY2Zc/Zvvq9OLg2utD4cn3N6LGe2no5e37QzUmySHrXs+Xx2REqu/Yfw17an0YaHPH8I4a2fdJ/d7ZxS4Spt7pBplg6eiXjFejpVqwYQ0x2taxghs93w0je0NypC5gYcXmmK84KiCmzbuGd8fxKPurUckcnd03UGBjtHfg2yEi2dwDKSXyzAPDwSknacHZr8pcrDqY90GdBFGv/Rzk6+WSBMo= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2609ff77-21be-4562-67f2-08d685ddd6fd X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:35:15.5233 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2109 Subject: [U-Boot] [PATCH v2 12/22] configs: mx6sabresd: Add SPL FIT and DM support 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" Enable all the necessary configs for SPL DM and FIT support for mx6sabresd. Signed-off-by: Abel Vesa --- configs/mx6sabresd_defconfig | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 3babfd5..2b585b2 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -4,18 +4,27 @@ CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_MX6SABRESD=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 +CONFIG_TPL_SYS_MALLOC_F_LEN=0x400 +CONFIG_FIT=y +CONFIG_SPL_FIT_PRINT=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_SPL_FIT_SOURCE="arch/arm/mach-imx/mx6/fit_spl.its" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOUNCE_BUFFER=y +CONFIG_SPL_SEPARATE_BSS=y +CONFIG_SPL_FIT_IMAGE_TINY=y CONFIG_SPL_EXT_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_OS_BOOT=y @@ -47,23 +56,34 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y +CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabresd" +CONFIG_OF_LIST="imx6q-sabresd imx6qp-sabresd imx6dl-sabresd" +CONFIG_MULTI_DTB_FIT=y +CONFIG_SPL_MULTI_DTB_FIT=y +CONFIG_SPL_OF_LIST="imx6dl-sabresd imx6q-sabresd imx6qp-sabresd" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_SPL_DM=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_SIZE=0x10000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=2 +CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_PCI=y +CONFIG_DM_REGULATOR=y CONFIG_SPI=y CONFIG_MXC_SPI=y CONFIG_USB=y -CONFIG_USB_STORAGE=y +CONFIG_DM_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525 @@ -73,4 +93,3 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set -CONFIG_OF_LIBFDT=y From patchwork Tue Jan 29 11:35:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032697 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="hadtTjg4"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pl1M3XcGz9sNs for ; Tue, 29 Jan 2019 22:40:38 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6FF25C21E13; Tue, 29 Jan 2019 11:40: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=SPF_HELO_PASS, 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 AD8D5C21E50; Tue, 29 Jan 2019 11:35:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 63684C21C4A; Tue, 29 Jan 2019 11:35:19 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150084.outbound.protection.outlook.com [40.107.15.84]) by lists.denx.de (Postfix) with ESMTPS id C935EC21E49 for ; Tue, 29 Jan 2019 11:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+Ag/ulGn5RSmC+p1F7B+sNxMrLwdszgJLaaMnSkviJU=; b=hadtTjg4UaPGL2nfG8fy8rNgVDIerkvma+C+BC70TsHbXaAAU2UnHSCwFViIAFtBijD/dPkqHnSWw336tEcLcD/lpqKH7khqMX9uO+kKSDpUt+tJ5DNpyd0Ib1ZceFVg49l8fE4O7uj7CbSp3q92zmO/yUH35ma1B3R0QnuerIA= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB2109.eurprd04.prod.outlook.com (10.166.43.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:35:17 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:35:17 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 13/22] mx6sabreauto: Add DM_GPIO support Thread-Index: AQHUt8a1u0lfGS3ePkydwjEvOxDReQ== Date: Tue, 29 Jan 2019 11:35:17 +0000 Message-ID: <1548761705-10975-4-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR02CA0014.eurprd02.prod.outlook.com (2603:10a6:20b:6e::27) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB2109; 6:pNuSMNaE5Jcs9Jcb3KDqcUWp+HWxGidrxNArJkDZrDqlgkdysZwJrXjzBwKp72LxyBI8MiQguceBJFPrBVeSM+C6Akf/0xSExh9aIZTAt81hYVt7p3xf/XOXqPYB5mQLGYNywwMLjuulFLmjCq1knrXRSGMtXGrD/z/StIbtPD9cYCCOC4ZZKk/Yk5wCLeimGdC3wi4zOdvpxXqkQm5GMO0ISBhGzNLjw8ctzb7La1uUW+o3jc+5j5qOyxnpB9MzKnQgmsuPa2xdPboc/U9xdnutLN9RUxU3juXmV3mumpN1MTVemaHEWgnjM+3maePNjSrif3pylOymtToy4z0iBA+s4bvs88CJOWbHzKN53gtKAfAombJBSPgE2aKgw7+vbt0XpmZ89j5B1YhfgoZ6VS3Ha/Q9q7a3apRsFAznuJ6qadSCNvjTMZSQMWqHVQ6MGMJJRvm3zn3orab2YytWYg==; 5:J60ucvHDdXxelI4UM3V2TshKb+YphmA5x5MF/VEgnvBrS9LXCO7K4DZ2HwzLI68XXOFA+WWcozOwl0wxxklAnUY1ofNwdrF8vxEU2K9T80y/GYtmF0IZOLoef44vqVBqGXp8KMkio6ln2Q73HAImhfsUOz7kEHN7LMC2YADx4XFwVbb/SZH3FznuKkJWOOpzsMPfsNz8H2xugwY59NITnQ==; 7:2XUOLOY7Q1VUif2L4udzahxvvhlebWUMurxzVrGPr4bXBYf2FmtASnaXgEd8yMdQDnkzofNEO2FAjw5UMp83+nOkJ47re0oXjhf92gc8qQCUxuRpeuGXGPnNBHqDhAcmAuL4WSztSlXgtMYXTHKAHQ== x-ms-office365-filtering-correlation-id: 7c4b5765-fb76-4849-d7f2-08d685ddd78e x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB2109; x-ms-traffictypediagnostic: VI1PR04MB2109: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(136003)(366004)(376002)(346002)(189003)(199004)(6486002)(25786009)(2501003)(486006)(4326008)(54906003)(52116002)(110136005)(53936002)(99286004)(6436002)(7736002)(2906002)(305945005)(6512007)(86362001)(6506007)(102836004)(26005)(6636002)(316002)(76176011)(386003)(50226002)(8936002)(81166006)(8676002)(81156014)(14454004)(71200400001)(71190400001)(106356001)(476003)(11346002)(36756003)(186003)(66066001)(68736007)(14444005)(3846002)(6116002)(2616005)(105586002)(44832011)(478600001)(97736004)(446003)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB2109; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: GCDUnTpIPx+elbATL6hD9fP1smG8QZ3REBR4EC9bDEAAUnXK9yWbRritrAnL6QKK+JBj15TGs3JZ0tJvKkqtl4b/AnpHvBBhpVPTyikNRSMjQnPUBfugtrGVKzquGjIU/fPupGj5Lef7g51gD9pTXniQH5MqoQAv2VSBkZ+A8LaFWXAhHAUbYoiMXY7GOxWtalzYbHUHJghrvmTeDTFe0bUQ7JQLrKGNjxQjVICaToerB2QdS0UJgniU5Ggwy+FP/TM+UvIO3UdeBwSmEpNvXqagdHMX4SnDVHwx/phfGldcsAaLMtRmKDpAF8Ji2XDIf619WSzAwlLiJrS8br5d2RHk37BiRs70kslVuNPzWVcFUH/Qzwqi3VXv3J4iPHgJZx2KUERiY6RHlKFhMjoujtlkPE7SEQWlU4ypii/+GKw= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c4b5765-fb76-4849-d7f2-08d685ddd78e X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:35:16.4920 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2109 Subject: [U-Boot] [PATCH v2 13/22] mx6sabreauto: Add DM_GPIO support 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" Add the DM_GPIO related config for mx6sabreauto. Also add the gpio request calls. Signed-off-by: Abel Vesa Reviewed-by: Peng Fan --- board/freescale/mx6sabreauto/mx6sabreauto.c | 3 +++ configs/mx6sabreauto_defconfig | 1 + 2 files changed, 4 insertions(+) diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index c8f1263..c7e3e67 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -501,6 +501,7 @@ iomux_v3_cfg_t const backlight_pads[] = { static void setup_iomux_backlight(void) { + gpio_request(IMX_GPIO_NR(2, 9), "backlight"); gpio_direction_output(IMX_GPIO_NR(2, 9), 1); SETUP_IOMUX_PADS(backlight_pads); } @@ -594,6 +595,7 @@ int board_init(void) else setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c_pad_info1); /* I2C 3 Steer */ + gpio_request(IMX_GPIO_NR(5, 4), "steer logic"); gpio_direction_output(IMX_GPIO_NR(5, 4), 1); SETUP_IOMUX_PADS(i2c3_pads); #ifndef CONFIG_SYS_FLASH_CFI @@ -602,6 +604,7 @@ int board_init(void) else setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c_pad_info2); #endif + gpio_request(IMX_GPIO_NR(1, 15), "expander en"); gpio_direction_output(IMX_GPIO_NR(1, 15), 1); SETUP_IOMUX_PADS(port_exp); diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index c64ec66..4a9739c 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -60,6 +60,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_DFU_SF=y +CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_NAND=y From patchwork Tue Jan 29 11:35:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032708 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="X91vM+aN"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pl554g5kz9sP2 for ; Tue, 29 Jan 2019 22:43:53 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 36FD5C21E15; Tue, 29 Jan 2019 11:41:47 +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=SPF_HELO_PASS, 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 BBFE9C21E89; Tue, 29 Jan 2019 11:35:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4F3E5C21D65; Tue, 29 Jan 2019 11:35:20 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150081.outbound.protection.outlook.com [40.107.15.81]) by lists.denx.de (Postfix) with ESMTPS id D8C91C21E44 for ; Tue, 29 Jan 2019 11:35:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aFWos7e9+VyTwV0iSS/gPustzsaTtRDmAV4aDnheoQM=; b=X91vM+aNxxJKD+N3ptNvwRx/48HimZJzEOGzSJpWNc6zlWVKyajfYlQ0P2gjW5p9B4v9HjTPz3CB6uxnCzynULNY/J9pGlNHQuN3Z/qR+Rj5kSpfO/4fZq6xLFdCltu++eX/tKHpBuChHalqJZtqLdUxiX8ckzi363QCJ1gy7vw= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB2109.eurprd04.prod.outlook.com (10.166.43.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:35:18 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:35:18 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 14/22] mx6sabresd: Add DM_GPIO support Thread-Index: AQHUt8a2u723r8K65UGJFifCWa20tw== Date: Tue, 29 Jan 2019 11:35:18 +0000 Message-ID: <1548761705-10975-5-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR02CA0014.eurprd02.prod.outlook.com (2603:10a6:20b:6e::27) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB2109; 6:JWHZQd8n6gmKPuRR52Tv0trlA7K4nxDR2bhAtkAfvMV+E4Wn8GwfK1FCcE5ZNG/HOGfK+q24tCQi/w11EgRBlRU2iCYE309pDztfk/KLD7CAijquWGPZWMNBnOn/nf6dRKx0THG0AxLfBoNC9VMjh92TKCDdUUQ1MniyBvZ/GoDe/XwA57i9x4OKIxhd6QaKCUyb6Xa6ZeZEoPOPuSs7tHGHG44rrVUXS2pIO5G3wtP/2abpBeMdCtsk4iLaUIoKOjoIZTAu5REMx5R82aScIQJtAhZRExIM070iPwezlPy6JFrWKuPyuN1+oivhyoftQne8UQvPG2e98AOPS+vhizBzORi6T9uCId28zBMxP2P9STYwRgFOutAHjziXnuxEsKS6dQr3kxE0BvooWhgSZiZhizBEzJwc6WmiBSxK3VvORwQYdldCOU25tWcfqIcMTfcsHXj+0mBlXAo6ZZxS8g==; 5:LmBq0WbVIVQiEjMuc5Td0lxbXZt3Yh2LVv7UkTdxdk2ovVe4h7vjAd5t+KlY7gHZrfzyh2Ay9+02Aekhls7kTwYMn+NYbQUFwontRXScxG3ka3lXx5YLtqMp2yMrsokHtjMW85VZ1/a2dk6P+5QPkd7iG6ynZQ1JPkeHzP0JKqOA8BEqM+eDeQAvPUx5zhlfztAfmk1Hy3PgibMR3yBHaw==; 7:IZ9w+cGXFEVjeyUZAJ0tjUzMJucRQJsBqiWfq7cyIlLFG3s5VoB8/i11SYs1/Yp1+vaY5lQVhN92PBegXPnCUXhQYBN2Ec2Y3LEdFBjhP4y+09M6ssgf+c3KdPsRGMOri2QoxxCRekr1PBrnkkOu9g== x-ms-office365-filtering-correlation-id: a6aad18e-d89f-45d8-f70b-08d685ddd84f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB2109; x-ms-traffictypediagnostic: VI1PR04MB2109: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(136003)(366004)(376002)(346002)(189003)(199004)(6486002)(25786009)(2501003)(486006)(4326008)(54906003)(52116002)(110136005)(53936002)(99286004)(6436002)(7736002)(2906002)(305945005)(6512007)(86362001)(6506007)(102836004)(26005)(6636002)(316002)(76176011)(386003)(50226002)(8936002)(81166006)(8676002)(81156014)(14454004)(71200400001)(71190400001)(106356001)(476003)(11346002)(36756003)(186003)(66066001)(68736007)(14444005)(3846002)(6116002)(2616005)(105586002)(44832011)(478600001)(97736004)(446003)(256004)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB2109; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: uNfrkxE4utJYzGZSqRm+5RtMPpVqEI3lVHoLVER5RSA2zyJEBMoU87tTbGx/fNnGUlGFlUqoCsFfDRtJ6wB2ETKIlhqfR77Y/qziol9KZO0fvY/zWxG26cbfM/F5CRvBuA522gWIoazmAc0aXYUeb8fmYjFArDlTmft0sZ21+qZp3qR505WKJmqrmRt3sb5KfE/n9nZOZgheGTuoXDq6pNPYSdGyKm6Ns7IFBOPfLTIAwAX5mVGmc9+cVWjvIxzoD9hSSexBuU78ER0x+Bf0vSn9Xk+L3yzYqsIFbogSygHb83fN7fNN34ModGZQYufyPPT0ETXSHnye0oRFTL1BXMjWxv+SXU+EQyDPH+16W7aaBIrHDyOMGYrN+XIylHX8TKwBBDVPSOi2QHjtzU/cosLAvlyEYbG8z6eG1RWturs= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6aad18e-d89f-45d8-f70b-08d685ddd84f X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:35:17.7420 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2109 Subject: [U-Boot] [PATCH v2 14/22] mx6sabresd: Add DM_GPIO support 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" Add the DM_GPIO related config for mx6sabresd. Also add the gpio request calls. Signed-off-by: Abel Vesa Reviewed-by: Peng Fan --- board/freescale/mx6sabresd/mx6sabresd.c | 5 +++++ configs/mx6sabresd_defconfig | 1 + 2 files changed, 6 insertions(+) diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 4688095..99002bd 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -96,6 +96,7 @@ static void setup_iomux_enet(void) SETUP_IOMUX_PADS(enet_pads); /* Reset AR8031 PHY */ + gpio_request(IMX_GPIO_NR(1, 25), "ENET PHY Reset"); gpio_direction_output(IMX_GPIO_NR(1, 25) , 0); mdelay(10); gpio_set_value(IMX_GPIO_NR(1, 25), 1); @@ -189,6 +190,7 @@ static iomux_v3_cfg_t const bl_pads[] = { static void enable_backlight(void) { SETUP_IOMUX_PADS(bl_pads); + gpio_request(DISP0_PWR_EN, "Display Power Enable"); gpio_direction_output(DISP0_PWR_EN, 1); } @@ -307,11 +309,13 @@ int board_mmc_init(bd_t *bis) switch (i) { case 0: SETUP_IOMUX_PADS(usdhc2_pads); + gpio_request(USDHC2_CD_GPIO, "USDHC2 CD"); gpio_direction_input(USDHC2_CD_GPIO); usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); break; case 1: SETUP_IOMUX_PADS(usdhc3_pads); + gpio_request(USDHC3_CD_GPIO, "USDHC3 CD"); gpio_direction_input(USDHC3_CD_GPIO); usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); break; @@ -729,6 +733,7 @@ int checkboard(void) #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { + gpio_request(KEY_VOL_UP, "KEY Volume UP"); gpio_direction_input(KEY_VOL_UP); /* Only enter in Falcon mode if KEY_VOL_UP is pressed */ diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 2b585b2..4f3a619 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -71,6 +71,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x12000000 CONFIG_FASTBOOT_BUF_SIZE=0x10000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=2 +CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_SPI_FLASH=y From patchwork Tue Jan 29 11:35:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032700 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Zmijqa5R"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pl3Z3TnYz9sP9 for ; Tue, 29 Jan 2019 22:42:34 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C6FA8C21E34; Tue, 29 Jan 2019 11:40:25 +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=SPF_HELO_PASS, 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 C9FCEC21E6C; Tue, 29 Jan 2019 11:35:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4B06AC21C27; Tue, 29 Jan 2019 11:35:21 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150043.outbound.protection.outlook.com [40.107.15.43]) by lists.denx.de (Postfix) with ESMTPS id E57EDC21E6A for ; Tue, 29 Jan 2019 11:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NAockahcxoAhDtAy4Itf986QJtNdyZHjwuJbMyjhLwM=; b=Zmijqa5RxNNSAlbrMqviM4sXZYRMYV/U9bd6qdth7GFgJLU3iksg+/EpiBvas0WpLNUBhG/VCYQOkSY9r1L9Eh9oaeDe6omJJTeeOBRIiNYs/ZBvUEg/0ry1OhY7vgMHcP8gTqvlWWlpo2/kHSMEQzEmIerPV8ngWdHvAd4suSo= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB2109.eurprd04.prod.outlook.com (10.166.43.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:35:20 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:35:20 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 15/22] configs: mx6sabreauto: Add DM_SPI_FLASH necessary configs Thread-Index: AQHUt8a2fi1igZ9RD06NGx70iN6FIA== Date: Tue, 29 Jan 2019 11:35:19 +0000 Message-ID: <1548761705-10975-6-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR02CA0014.eurprd02.prod.outlook.com (2603:10a6:20b:6e::27) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB2109; 6:u8oZYVTbUmNCotfJkEjGMKhEvWANG2f/3vBKTAhWo67v4skbLO8Ewj+rXXF+z5pqyukgylMOp9fjjfSlk1SchUdrlgu1n+IDY6D05X34QTVDyvLTUWKzv+1eYplUvrBA+8tgpTo574ORA8Hd/Ahof4OZ4DqDHKy9f3X58eqdQv8wmNeh3yhp3UdBJ3qIuMxy2u0ilhfG9Al4wO3/mhe6qs2NrQN453gkNACKa+ww3CMT8jJ9y0Zm5NN9gF/sq3pwEmjXUNKUhkDWNb53ktWiBqNJEL21ee1XP1NRfXcz2nFta6+bu8oYXIDJWZ4C9o/4FlIH7dk6+0KaymwLJHZKgUyeD0d5yEKe58cxSvi+9kUwx/Iyukk8dI0TJzAxy/l6sJ3OJA43g4nsc8Q7OVSWZWhoAwGbAQ+I/0+5W8se+nfrTlIuvgHo7Umh90ep86D8oeZwePI1vSPUyLFWz2Tp6A==; 5:Ysln/NUyRA7ZNeZMssE5nTNq20LvKkX2xO2eQss2MGDhnkM8Ufygg78OPQeI3s724dGi4cj4BWF1QeAxvFQ9cDIaYj7MHAwKxSWNoE9oUQUaP1UR5Zn9xgxh/AXH61+rDKrjK3LEl/CpQl7QId+b2pc4rA6Ai57hS4WFTSwfoWXlGUFTDVeXpDDas5dj0zOs8FeFnUvB7Vo078idK/0cyA==; 7:9uU7Gbm5L7h7rK/Da55qNCJX0Gb3lczv9PhQ/zDvZZP1BBZwrC2S2Sl9mcvGrwcx30/VgpAyzUKQSCI+lzLPmpx+suTkhWR2qqcdztxF9CLcMuZ+Dxp27YOypsrJNR75eqlI1FIgw30WbVq59Wo0yA== x-ms-office365-filtering-correlation-id: 7df1c59c-b314-4b09-52d1-08d685ddd8ed x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB2109; x-ms-traffictypediagnostic: VI1PR04MB2109: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(136003)(366004)(376002)(346002)(189003)(199004)(6486002)(25786009)(2501003)(486006)(4326008)(54906003)(52116002)(110136005)(53936002)(99286004)(6436002)(7736002)(2906002)(305945005)(6512007)(86362001)(6506007)(102836004)(26005)(6636002)(316002)(76176011)(386003)(50226002)(8936002)(81166006)(8676002)(81156014)(4744005)(14454004)(71200400001)(71190400001)(106356001)(476003)(11346002)(36756003)(186003)(66066001)(68736007)(3846002)(6116002)(2616005)(105586002)(44832011)(478600001)(97736004)(446003)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB2109; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 0n7hmAyDt37ze5NyVKeBLryz6AgW5jdCtIRFvFNA516hBSz2Ehz3MXSIWELu+3+QFXesX3zwbzwKMbPPexiIaSku/P9a9we8Ux2HT2voiC+DbceMa1fLPxJ6wNQqbtr64+vEVD8qurJU590v/hw09K6aqjmReLl81QVpwpmHiq8FYk4KPky1v8ZXemvrcBIqphqHNQGYGlvClCc09hqumLUOnH0WgcJWqDfz2/Hpmo/zqt8l2PsH+SHtbS00KSekeEnapbCKemD+8ziTJ44S2ooFbN1dfC4rj+yylp+Wo++LkxyP3J5JnN+QvD8yLfrHnHoloshVGTuQ6nURd33bjyexieAuB1+Bb1V9HzActfeJOK+vgZ2lwp0JKpOvCH1WSK4PmI/Zct5L2JN+Cu9MYMg+aZenPDFX7Ua8gijQHzk= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7df1c59c-b314-4b09-52d1-08d685ddd8ed X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:35:18.7733 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2109 Subject: [U-Boot] [PATCH v2 15/22] configs: mx6sabreauto: Add DM_SPI_FLASH necessary configs 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" Enable all neceassary configs to support DM_SPI_FLASH on mx6sabreauto. Signed-off-by: Abel Vesa Reviewed-by: Peng Fan --- configs/mx6sabreauto_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index 4a9739c..e1b4b2f 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -65,12 +65,14 @@ CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_NAND=y CONFIG_NAND_MXS=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_MII=y CONFIG_DM_REGULATOR=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_DM_USB=y From patchwork Tue Jan 29 11:35:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032706 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="XBEOtCY4"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pl4v73hSz9sP9 for ; Tue, 29 Jan 2019 22:43:43 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 5EEDCC21E08; Tue, 29 Jan 2019 11:41:33 +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=SPF_HELO_PASS, 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 34268C21E70; Tue, 29 Jan 2019 11:35:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id ED32DC21E74; Tue, 29 Jan 2019 11:35:22 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150077.outbound.protection.outlook.com [40.107.15.77]) by lists.denx.de (Postfix) with ESMTPS id CBF36C21DF3 for ; Tue, 29 Jan 2019 11:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wkggIcwZntL2VQ7pz+bF6tKZ4Twy3PLtkYQuK13FHxM=; b=XBEOtCY4Xcfoh7+e5c05roaNHbp7xrByAZaMZmC1+kIRDiWPSDZZm9HjgtPseXK8jSw4zjBB/mvIkeNhBBAH94dd30iZPF+ii9BJuZwTfWXWrhUsGsm8LG9K7TLOcD6jC3/K6KusOHkxrQCS9Eh/w6gyZXEkLsG/tbPENMqmArE= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB2109.eurprd04.prod.outlook.com (10.166.43.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:35:20 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:35:20 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 16/22] configs: mx6sabresd: Add DM_SPI_FLASH necessary configs Thread-Index: AQHUt8a3IA6cEIaeLUmdLkCBNJCxPQ== Date: Tue, 29 Jan 2019 11:35:20 +0000 Message-ID: <1548761705-10975-7-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR02CA0014.eurprd02.prod.outlook.com (2603:10a6:20b:6e::27) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB2109; 6:iqqtwD0WxgvEZNKSfSQmsa/55DQo4kIh/IhcDPll6Cn5BR3s6BMCjboxqjkbkHvuoTJ3yteeS7DfCoJV0upQ9tKdkHvqHi2hIlckWVzfYyISj6MatrZjjyAoqttpPhitrijISdRAQaElcEpHWZxhqjA5HhiAxIt44NvxSDfls7YCpOtkI45Vsk6/uEGbz9Qy/p3eHNv1Yux2GI3lX5hOCoGQB62y/IQgl/y3kjLxLOirmxlGnxC9sAeEGbLYPuJ170kRCMYtOkbtprZsAiALFxjz/LagbwEy0L7HfqeWPD8YVOxd7A0qk/bW99esSz5Ng9SarO0fEfunoFlIqb5foK5/XXkRsalF4S0dGeaokMaUQ7JR7JJgrZOtz24G7RBhRsRqGhylZV67NL53WqsXwEJmTR9Og4AR3JWubS9/ByUUrXPdCwjQ3zLMDgjQH90LCs1uWtNh2Qj68RPcNWC/6g==; 5:37i+BdXDMo8FlZRAKd9CNoHW2Y8wh2gaWUQUEXCY/b04WTqumpndLVsUc0gPYl4L4+L7RN1q0WBn1nDRQb+mJaN8vhfwc28yY4OANtySPD/ubVa1QwaMkVeYOlAW9rpcdx2/KZ6oaKLkyrlM7KdzGfQr1KncJFFhVblY8q61qzOp4D5Lw0AB/nPGl3ZMRCINmMlYnmUKj1YxoOzka/QJcA==; 7:mmXWPyl/o5NwMzPSnYNyZnX8xWbpl90brDbACHuL7cW7Z2laPPnl6l5ZwUhX7iUKsAYGS9kDhPWg+rD7f5h0GfwJeF2JRTjfSHi9cCSic+7szRTl1kkfmsmpiq/iqFIzUgJlSu5Fx7OSgUdTv0dVVg== x-ms-office365-filtering-correlation-id: cc823365-e2a5-4fbf-fe06-08d685ddd979 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB2109; x-ms-traffictypediagnostic: VI1PR04MB2109: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(136003)(366004)(376002)(346002)(189003)(199004)(6486002)(25786009)(2501003)(486006)(4326008)(54906003)(52116002)(110136005)(53936002)(99286004)(6436002)(7736002)(2906002)(305945005)(6512007)(86362001)(6506007)(102836004)(26005)(6636002)(316002)(76176011)(386003)(50226002)(8936002)(81166006)(8676002)(81156014)(4744005)(14454004)(71200400001)(71190400001)(106356001)(476003)(11346002)(36756003)(186003)(66066001)(68736007)(3846002)(6116002)(2616005)(105586002)(44832011)(478600001)(97736004)(446003)(256004)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB2109; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: QNxseJ9iDiPXRKGd06GAeDvuHjUF40WjPzomJcHnrwHTZBgsiYSbg9Sn18ySGrmP7Kv3/ZIb+ua9Mm2xHudmamz+GIVsnN90gGwMcz7OnzVCysygcAtRJnu/0HV+E0kn304uPlIbkpKaKAmMarL1O5dV1gGr7//l/P0ijmc+1YOSqP8EQO+zD9IS2F1nyuw4NG4fA7pmVXOulHM8rUgbNhpGclTLH5rh+DKGKlwpJmLtE+lTZu09/b6v0wetr3vlPGTAHL5h9MNjdY1OgBHs1c4AZEv0/PgL5bIQrAgfehcylZa3sF6sMtx/Zg8QiXBjUHG0rLJUBBnq69VUbqmK2xoWXQ24gTf0IRHa8Yvj5luWBSiSGA/fb9LlZQiR3vk/UZqI+RqFNwlUo4DaR5alU3sgVZPMEdg4Sht2nn0azi0= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc823365-e2a5-4fbf-fe06-08d685ddd979 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:35:19.6796 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2109 Subject: [U-Boot] [PATCH v2 16/22] configs: mx6sabresd: Add DM_SPI_FLASH necessary configs 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" Enable all neceassary configs to support DM_SPI_FLASH on mx6sabresd. Signed-off-by: Abel Vesa Reviewed-by: Peng Fan --- configs/mx6sabresd_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 4f3a619..14adf65 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -74,6 +74,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=2 CONFIG_DM_GPIO=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y +CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y @@ -81,6 +82,7 @@ CONFIG_MII=y CONFIG_PCI=y CONFIG_DM_REGULATOR=y CONFIG_SPI=y +CONFIG_DM_SPI=y CONFIG_MXC_SPI=y CONFIG_USB=y CONFIG_DM_USB=y From patchwork Tue Jan 29 11:35:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032689 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Hbte/iPn"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pkwS4YdTz9sMr for ; Tue, 29 Jan 2019 22:36:24 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 40800C21E35; Tue, 29 Jan 2019 11:36:04 +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=SPF_HELO_PASS, 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 1EBDCC21E1A; Tue, 29 Jan 2019 11:35:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7B6AAC21E4F; Tue, 29 Jan 2019 11:35:23 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150077.outbound.protection.outlook.com [40.107.15.77]) by lists.denx.de (Postfix) with ESMTPS id 53D24C21E30 for ; Tue, 29 Jan 2019 11:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5qTG9bkbufo+p8zcy3xRo5IlyLGuoV1va17TJ5nOl3Y=; b=Hbte/iPnkuvVoyvfgRzI89sWMbh1Dd//ot0aTxYslLG5/wNP9xO6Wp7w3qM0szZkIW7zIqDnO1KkUKiCYsxEX+h/hfqshFZLwUE7oo0E9wYKZuWo7a2OG59MbW4cTOcMXInUrw5/pd1LoR7AMbeEarzCV5ckNbsWKNyqXxITJhI= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB2109.eurprd04.prod.outlook.com (10.166.43.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:35:22 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:35:22 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 17/22] board: mx6sabreauto: Remove the non-DM code Thread-Index: AQHUt8a4VdwYKkf6ekKHSVrr24SHGg== Date: Tue, 29 Jan 2019 11:35:22 +0000 Message-ID: <1548761705-10975-8-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR02CA0014.eurprd02.prod.outlook.com (2603:10a6:20b:6e::27) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB2109; 6:5vOyd7CNCEG35cwIP9Ur7W+s00HbUinNslERZC50MjDoTdvviCPy4iT6YSoqv3PMp6mq6tiKyMp+Qe0v9IG7Mmz3d/wp5x9bIFbJQPr2PAWqh88/3zk7BLe5tED1DBwxer569Kr7w0fTnAy5e4IGCcM/niTlRmWax3o4y4Toi80kf8ReNa5nJQg77rjo7ja/Xf4RngB1I1ttA7uOyJatuixgGm76SK/aKryXCtb1u1MAjkEeltjBSVtDp+9c+zEgZQl+9uLrryW1/I57Q8Uwi+XmNRRyehsH39bt2PusRf0JjWrhTA0N06GJU6W0eFOuQYu30ksgw9DcEbniCY4399zHSSpfaPiAMacV69d1fLXm0uo0+YyjHdy9O2j/2j+2aFA2W06Wjppbg7IeiUf6IvVNFvSeCUvvHVTPsDRKqEkCF+SEKYhaglX43qV81I65B8BLj0t7sL5mSMvbRtsN2g==; 5:iKvaItR3yJAuS4FX8Qvy2F965+1FTpuQ6fyOS0j9vQD1KkBqXX9Kk/+FqylKqF4DT+56D2q9mInzEMyjI10UIllChU1isTcLIfpBs8A7A/5A83cysEaXRNBe+4KKIddNvrM2pHqI/72hu/9sc3apOnBr+bfqCA6BlScj0OUtPf3OyQDcnTlg6JJLwrt4rSQ/EaTv381CzdjKiwvtkW4HXA==; 7:pGSG6Q2YD1StszZBcSb87Kl3+yKsKKiTuKsvp/9qiZ1eJ2Wvch4LjZDoMAhFAhIIW8LC5kPuSm4jzuPVg5GS8zz8jApWA3cpGCNhdW7gHrZrSBYlqfmRLCFgBRjNZ4CqITgNrS9XhjRMqRu8Fai60w== x-ms-office365-filtering-correlation-id: 06d2fafd-e625-45cf-e300-08d685ddda20 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB2109; x-ms-traffictypediagnostic: VI1PR04MB2109: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(136003)(366004)(376002)(346002)(37524003)(189003)(199004)(6486002)(25786009)(2501003)(486006)(4326008)(54906003)(52116002)(110136005)(53936002)(99286004)(6436002)(7736002)(2906002)(305945005)(6512007)(86362001)(6506007)(102836004)(26005)(6636002)(316002)(76176011)(386003)(50226002)(8936002)(81166006)(8676002)(81156014)(14454004)(71200400001)(71190400001)(106356001)(476003)(11346002)(36756003)(186003)(66066001)(68736007)(3846002)(6116002)(2616005)(105586002)(44832011)(478600001)(97736004)(446003)(256004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB2109; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: +9DKQkBfky0R+2GLo3DuKowApEh7+jMMXkbZc1OA53+QYJ+ncMzcNdyB7H0WlskgtED2v1xNuXeyKZub4NukQsf2zw1JbnIINy/Mr1RG4NB8aJyzMhP2ixNLBRWi4YIWUUvWGcCLzXnzSDHir/5JjpSJyJl1X4pmQohld1XEjD71KuxdjoloKiJnm26rLjmo7OUjplzfcs3hIQRxtWodoZaAaFsh8oekLoDeWGGEzDnf2Kw8Kg4qHvg8Lb0mrasAuP6Taq3NcksnF1gUTGGfEUn3nCpVmgXn+m+Vfc68KmNxY5yEzP8LN3pooQR49JgkP7U+N36PnjJGTiig/Gnin7c9Dc3FyY/XVNwLMjn473DmJr9WmgmUfgT9qXF9H5C4hVP5TzPkIId6dAldiefMNY++fwS3Kj3BqBrtjf0/BhA= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06d2fafd-e625-45cf-e300-08d685ddda20 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:35:20.8046 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2109 Subject: [U-Boot] [PATCH v2 17/22] board: mx6sabreauto: Remove the non-DM code 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" Since the mx6sabreauto has DM support, remove the unused non-DM code from mx6sabreauto board file. Signed-off-by: Abel Vesa --- board/freescale/mx6sabreauto/mx6sabreauto.c | 70 ----------------------------- 1 file changed, 70 deletions(-) diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index c7e3e67..dd72de9 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -159,44 +159,6 @@ static iomux_v3_cfg_t const port_exp[] = { IOMUX_PADS(PAD_SD2_DAT0__GPIO1_IO15 | MUX_PAD_CTRL(NO_PAD_CTRL)), }; -/*Define for building port exp gpio, pin starts from 0*/ -#define PORTEXP_IO_NR(chip, pin) \ - ((chip << 5) + pin) - -/*Get the chip addr from a ioexp gpio*/ -#define PORTEXP_IO_TO_CHIP(gpio_nr) \ - (gpio_nr >> 5) - -/*Get the pin number from a ioexp gpio*/ -#define PORTEXP_IO_TO_PIN(gpio_nr) \ - (gpio_nr & 0x1f) - -static int port_exp_direction_output(unsigned gpio, int value) -{ - int ret; - - i2c_set_bus_num(2); - ret = i2c_probe(PORTEXP_IO_TO_CHIP(gpio)); - if (ret) - return ret; - - ret = pca953x_set_dir(PORTEXP_IO_TO_CHIP(gpio), - (1 << PORTEXP_IO_TO_PIN(gpio)), - (PCA953X_DIR_OUT << PORTEXP_IO_TO_PIN(gpio))); - - if (ret) - return ret; - - ret = pca953x_set_val(PORTEXP_IO_TO_CHIP(gpio), - (1 << PORTEXP_IO_TO_PIN(gpio)), - (value << PORTEXP_IO_TO_PIN(gpio))); - - if (ret) - return ret; - - return 0; -} - #ifdef CONFIG_MTD_NOR_FLASH static iomux_v3_cfg_t const eimnor_pads[] = { IOMUX_PADS(PAD_EIM_D16__EIM_DATA16 | MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL)), @@ -681,19 +643,10 @@ int checkboard(void) } #ifdef CONFIG_USB_EHCI_MX6 -#define USB_HOST1_PWR PORTEXP_IO_NR(0x32, 7) -#define USB_OTG_PWR PORTEXP_IO_NR(0x34, 1) - -iomux_v3_cfg_t const usb_otg_pads[] = { - IOMUX_PADS(PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(NO_PAD_CTRL)), -}; - int board_ehci_hcd_init(int port) { switch (port) { case 0: - SETUP_IOMUX_PADS(usb_otg_pads); - /* * Set daisy chain for otg_pin_id on 6q. * For 6dl, this bit is reserved. @@ -708,29 +661,6 @@ int board_ehci_hcd_init(int port) } return 0; } - -int board_ehci_power(int port, int on) -{ - switch (port) { - case 0: - if (on) - port_exp_direction_output(USB_OTG_PWR, 1); - else - port_exp_direction_output(USB_OTG_PWR, 0); - break; - case 1: - if (on) - port_exp_direction_output(USB_HOST1_PWR, 1); - else - port_exp_direction_output(USB_HOST1_PWR, 0); - break; - default: - printf("MXC USB port %d not yet supported\n", port); - return -EINVAL; - } - - return 0; -} #endif #ifdef CONFIG_SPL_BUILD From patchwork Tue Jan 29 11:35:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032703 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="MBKgTll6"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pl4R5hcHz9sP9 for ; Tue, 29 Jan 2019 22:43:19 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 79E40C21DED; Tue, 29 Jan 2019 11:40:39 +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=SPF_HELO_PASS, 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 5A212C21E34; Tue, 29 Jan 2019 11:35:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9BC87C21C27; Tue, 29 Jan 2019 11:35:25 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60075.outbound.protection.outlook.com [40.107.6.75]) by lists.denx.de (Postfix) with ESMTPS id 17E89C21E2F for ; Tue, 29 Jan 2019 11:35:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zttHDWAxQZmf1jfSZRdC7Pb6a53xYlwrPO3hHHQfuRU=; b=MBKgTll6TohgcXMSl0edCxlJS3naw5GGYgFne/2HrE8LkdNZc2CCg20+bLLOtVBdtS3YDYUBmH810fnwhOmscrc/BJs5E4eX3CHvGSp9i9JcVR/T1Yodye0qS0oMCypygRJih4Pc4PFWhzdC3Rq9xWRo61eoI1Prtg5W69XidX8= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB2109.eurprd04.prod.outlook.com (10.166.43.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:35:24 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:35:24 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 18/22] board: mx6sabresd: Remove non-DM code Thread-Index: AQHUt8a5likCLvxPHkytELbm7wihlQ== Date: Tue, 29 Jan 2019 11:35:23 +0000 Message-ID: <1548761705-10975-9-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR02CA0014.eurprd02.prod.outlook.com (2603:10a6:20b:6e::27) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB2109; 6:JHRU5z2M2SKac82e7s7sw/0PY13lXayt2vSqQKUHJwhngO+tVyrhHg6t7X9d0lXu4n02w4ldvxUR0Nrk/K7RGUp5fe+KovKv6XBdd2intCfwdahSLefFnv1G3EM/fgbq7yb+fK24HCUwq39gc0K0kOs5dYQuSB3pMJUjepOzGerOvIX95sddsAH9VtoKOdClTs7/i65KyMKCzhNAABABKICreqh6oQvWV9PEQKHpL1R7kg9+HLV7z4848wahMV8IMC3Vd6fSMtllmoM6hf7ZU8yhQkfR4DDPnrIDCuyL+fajWkH9pi0rCRMWDEpf1CJg9Q9Ous5ftHL75udlwd4+tAHeJeCMWT3C63P6HNalzocZ7g2b7eNUximZuEYfDmwz/oXvx1r10kAjN1IhKhgzXNoDwclPsm8IK5pXx3BVfrMPW0eSI6UMUGh47HM16l1U2Z/BuIHVUI/o39u+p3QL7Q==; 5:Ku1WdZ1Eohiwu4iqntC6VYPc/yayAXEBk1zaWix5iNUR7VntRXt3Gu1pBM0RZm9KHoukhyzYBfzsfnMYFFkwRlYLvvOXWZkN9OAk3vuwEEnbx00Np6cWJi8gbfT/s8RZ/Y0GqltJWRXFI1R/h8NB/t0apxstTRjZ5fmEGxiaXy3FEfXTuCOZ0KVwLjkHNiwLKDVRy7r0C/FH6T9zh7NLrw==; 7:k0sXHOn/grs+BURFMemw6gAzsA/NjmwEganjtpUL65L0FA81b/RrKYDK+s5HEzJcWVLvOnwLcOxRMxPPVW0lYsQeFNt1JPfeo0IIjiW4V4+IWb+8Q11R8nc0j8j5Euj/ppl+SrJRijjmlPRk4xuomQ== x-ms-office365-filtering-correlation-id: c15b67ae-589d-4595-b2aa-08d685dddaf2 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB2109; x-ms-traffictypediagnostic: VI1PR04MB2109: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(136003)(366004)(376002)(346002)(189003)(199004)(6486002)(25786009)(2501003)(486006)(4326008)(54906003)(52116002)(110136005)(53936002)(99286004)(6436002)(7736002)(2906002)(305945005)(6512007)(86362001)(6506007)(102836004)(26005)(6636002)(316002)(76176011)(386003)(50226002)(8936002)(81166006)(8676002)(81156014)(14454004)(71200400001)(71190400001)(106356001)(476003)(11346002)(36756003)(186003)(66066001)(68736007)(3846002)(6116002)(2616005)(105586002)(44832011)(478600001)(97736004)(446003)(256004)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB2109; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: y/+xrbQ2nKfOIK3vaxWGtnPfslpRDtlpINziVoNUNFG11Od2gJ9kcRF8D1u4kZuXCH6QaD1jx1Z1QCEm8zVl2mw/WAs/NSLGWCNHUHTBYQ0yPNN9py0TzhwM+hZsrdp91IjxfPXjdglZEJeIYB+Qy3C8nklWwNEiQ5Zarsjw5uafQhzjYeKx5015ABBOSH4n1Rlh5DG6UdIBgDOSm0bWeti0xDFg+nZwoyEnZwKzhFAzpAwrnWlG3FEBbWGdryrTJesJZd2gzA0rzren0tXI+s7JyFUb1l/qL9ts3tBs79JfutffMPoO8ZSmyJRBP4bt/UnjEi6hzADe1jllicxa2XSr1zRbPsydnMXs0qVALws5qJM1ukgSvxwpvaTbrBQO0whl9jLCuagG0OOweSS8xFVXGqKI/50I3FJi1o0tL9Q= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c15b67ae-589d-4595-b2aa-08d685dddaf2 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:35:22.1640 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB2109 Subject: [U-Boot] [PATCH v2 18/22] board: mx6sabresd: Remove non-DM code 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" Since the mx6sabreauto has DM support, remove the unused non-DM code from mx6sabresd board file. Signed-off-by: Abel Vesa --- board/freescale/mx6sabresd/mx6sabresd.c | 50 --------------------------------- 1 file changed, 50 deletions(-) diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 99002bd..0824a05 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -563,63 +563,13 @@ int board_eth_init(bd_t *bis) } #ifdef CONFIG_USB_EHCI_MX6 -#define USB_OTHERREGS_OFFSET 0x800 -#define UCTRL_PWR_POL (1 << 9) - -static iomux_v3_cfg_t const usb_otg_pads[] = { - IOMUX_PADS(PAD_EIM_D22__USB_OTG_PWR | MUX_PAD_CTRL(NO_PAD_CTRL)), - IOMUX_PADS(PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(NO_PAD_CTRL)), -}; - -static iomux_v3_cfg_t const usb_hc1_pads[] = { - IOMUX_PADS(PAD_ENET_TXD1__GPIO1_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL)), -}; - static void setup_usb(void) { - SETUP_IOMUX_PADS(usb_otg_pads); - /* * set daisy chain for otg_pin_id on 6q. * for 6dl, this bit is reserved */ imx_iomux_set_gpr_register(1, 13, 1, 0); - - SETUP_IOMUX_PADS(usb_hc1_pads); -} - -int board_ehci_hcd_init(int port) -{ - u32 *usbnc_usb_ctrl; - - if (port > 1) - return -EINVAL; - - usbnc_usb_ctrl = (u32 *)(USB_BASE_ADDR + USB_OTHERREGS_OFFSET + - port * 4); - - setbits_le32(usbnc_usb_ctrl, UCTRL_PWR_POL); - - return 0; -} - -int board_ehci_power(int port, int on) -{ - switch (port) { - case 0: - break; - case 1: - if (on) - gpio_direction_output(IMX_GPIO_NR(1, 29), 1); - else - gpio_direction_output(IMX_GPIO_NR(1, 29), 0); - break; - default: - printf("MXC USB port %d not yet supported\n", port); - return -EINVAL; - } - - return 0; } #endif From patchwork Tue Jan 29 11:35:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032692 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="REpCnaWA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pl0Q4rXRz9sNQ for ; Tue, 29 Jan 2019 22:39:50 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 54FACC21DFD; Tue, 29 Jan 2019 11:39:46 +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=SPF_HELO_PASS, 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 2335FC21E4F; Tue, 29 Jan 2019 11:35:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0529AC21E3A; Tue, 29 Jan 2019 11:35:26 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30079.outbound.protection.outlook.com [40.107.3.79]) by lists.denx.de (Postfix) with ESMTPS id 36416C21E6A for ; Tue, 29 Jan 2019 11:35:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UWZ4cjX2S8zOSTyCR2EDZfk5zCNa55hwjfjvvn1QsAE=; b=REpCnaWAg2LZhaK9666Elg2waUGBOasQ4Z6wTTtb8FdUAh+ppUidRQMOGOW7d9RF/4vG6VYo5rl2+c2mIwA/IIGfYb7vYrq+8r0UAJpyqMhTo7w+OZ2Fs+0aGz8Fuafy6s9mukB2hZ0dECsXyBlloimarctYp3CaR2qO70xqMcI= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB6046.eurprd04.prod.outlook.com (20.179.24.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:35:25 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:35:25 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 19/22] board: mx6sabresd: Remove the enet reset gpio handling Thread-Index: AQHUt8a5q6bBGYZGpUywovUEqNWOfg== Date: Tue, 29 Jan 2019 11:35:24 +0000 Message-ID: <1548761705-10975-10-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR02CA0014.eurprd02.prod.outlook.com (2603:10a6:20b:6e::27) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB6046; 6:8BCQHskkHPW17JinfJnxv7BIPc8UC3CVAd5Po6hg4+XfVAwlcfQRNGuYvdxBkvxEzwzQfxPksumZ3N697uRHscop4a7u3PTd+a0ORpl3IoTkkMZvwzkpdBUiTf5CzFoJo0MXqBx0GKkUNtkUta0WcO97EbUBJtbaO5vNhh5+/7OnRx7vYoWF2gkXq35G8/Ub15KCh96ZOxQvkh+F4/FZA7Rq2iHfVNSnNmUC0Sat2es6NS+UlGp+jyZgnl0wl056jcVC2yKdX2NQHMtRRLWSLWUVcSc1R+2NaJxvEvjZ+Yz631EPaCY+NlWm9KrqGNLz+5cWYQBlQ7F7BwjxraP3hRNKzf9JGofJQx7r2daFCGNOngP7gJMqIpwErm5pDrvVmkROwZRgwFjiT3/Fzjkf6KbbdoMvW2OvywiRcCTjjRqseujMbspgsvK+vTfZL3v3Hzf6nrx9wAVvUZXyZujw1g==; 5:1cnuTK6aMJirl9kyXrSxHySJoJkqLJ25YjKniQaJA4KOo3WvftnBwiMHVYX9GK/H99JxRHlDBLzAOlM+YAKuzaVg7OzO1JhuoZvTw0UlZQ9l0nQNvREE/ZLpynQ/tvccjD3VdhUAmodfDz5bQpUjAW9qKWcpSE4qhYmcDqp/tu8S+MSH9KSb0epbN/fshBf7lRiwwxfSqSISarlGur4XDg==; 7:OpKgSCr+a8AhvsQvCEazNwl6EidddIeOz2l2rkE8XfRQr5CYZmZuNUgIfwcLfjt2RNfgaCvl3EoPLgDIZe7agh+GgbVGSN6NafV+q4Qzwmk+i860CCC9CLxAvXMHeVq149D/Q1GEIuPDTo4WBnwzNw== x-ms-office365-filtering-correlation-id: b4e66a87-f7d1-44dc-a6b6-08d685dddc09 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB6046; x-ms-traffictypediagnostic: VI1PR04MB6046: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(366004)(136003)(396003)(346002)(189003)(199004)(25786009)(6486002)(6436002)(66066001)(105586002)(6512007)(486006)(44832011)(50226002)(71190400001)(2906002)(2501003)(99286004)(52116002)(14454004)(106356001)(4326008)(6116002)(6636002)(71200400001)(3846002)(102836004)(4744005)(11346002)(26005)(186003)(2616005)(256004)(476003)(7736002)(305945005)(53936002)(386003)(6506007)(478600001)(8676002)(97736004)(14444005)(81166006)(81156014)(86362001)(316002)(36756003)(68736007)(54906003)(110136005)(8936002)(446003)(76176011)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB6046; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 6vHCLyvv2yZXAJ10Nb20jZaJuMqKKvef+2PzUounBBum3o636a1PrCXxstm01D82iTi6Qnf6KCxirp/gy7Y+wc+CmAJm4GnAY6tq8/gLWw1HEp1I+CXcmOyVOs92sqXRPK8JSZM+0IECShc3r5f5PXTTaUAndPf3Tu3N5euyQiDsFRJ71KmeXyUgFt7YSZFX5J1pgKXaOFpdx30h4SxbcG4WeRBcxufiInZ7AnJquujDc/eGM+P/7j1MgWsfhn3Rg+cCUnUjqvaOtngAP47CZQPPKSFO3hnmdct2mPkfigRaXRKP/G0IVB7SC2Xo9uXAN8BXoH3GTDkEQu0H+ge0gFppivvg5k+ndVNIj0cZPW7SHZXt9jqoNFGkF23Yle+qycR6Ja9+F0+pIm3VCyfkSYggVVQjslrwtECfsSm+XTw= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b4e66a87-f7d1-44dc-a6b6-08d685dddc09 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:35:23.9609 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6046 Subject: [U-Boot] [PATCH v2 19/22] board: mx6sabresd: Remove the enet reset gpio handling 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" Rely on the phy-reset-gpios which is set in imx6qdl-sabresd dtsi and get rid of the enet reset gpio handling from the board file. Signed-off-by: Abel Vesa --- board/freescale/mx6sabresd/mx6sabresd.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index 0824a05..385a18e 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -94,13 +94,6 @@ static iomux_v3_cfg_t const enet_pads[] = { static void setup_iomux_enet(void) { SETUP_IOMUX_PADS(enet_pads); - - /* Reset AR8031 PHY */ - gpio_request(IMX_GPIO_NR(1, 25), "ENET PHY Reset"); - gpio_direction_output(IMX_GPIO_NR(1, 25) , 0); - mdelay(10); - gpio_set_value(IMX_GPIO_NR(1, 25), 1); - udelay(100); } static iomux_v3_cfg_t const usdhc2_pads[] = { From patchwork Tue Jan 29 11:35:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032709 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="NmVVlftH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pl6H53Ysz9sP6 for ; Tue, 29 Jan 2019 22:44:55 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4B500C21E3B; Tue, 29 Jan 2019 11:41:20 +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=SPF_HELO_PASS, 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 A0633C21E49; Tue, 29 Jan 2019 11:35:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5BDD9C21E3E; Tue, 29 Jan 2019 11:35:27 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30075.outbound.protection.outlook.com [40.107.3.75]) by lists.denx.de (Postfix) with ESMTPS id EA1C0C21E34 for ; Tue, 29 Jan 2019 11:35:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1dAO1CDI+5X5H8FD3tlRvHMw+PoMw02l3wV+BjJ/+T8=; b=NmVVlftHt/tHaH7OuyVGWzlZwTzzmDHgf6GEusypLlRtEJIzVUDGqsEah5wXyaIvz5kKRRkwlvrtalMh5w91Bbpvl1t28XYYe2ka3mURr0W18e01fwyPfT3DjCPsv5U3qrQGVHBdj7a7hDfUqOUw8UMDGWoH0duyp3P1+3JaEu8= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB6046.eurprd04.prod.outlook.com (20.179.24.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:35:26 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:35:26 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 20/22] configs: mx6sabresd: Reduce size for SPL by disabling SPL_DOS and SPL_EFI Thread-Index: AQHUt8a6Kc2KLC53WECq77CDj3jq5Q== Date: Tue, 29 Jan 2019 11:35:25 +0000 Message-ID: <1548761705-10975-11-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR02CA0014.eurprd02.prod.outlook.com (2603:10a6:20b:6e::27) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB6046; 6:YcnTQJ8vfBiOhYpfvkmmyHYCYMAEJT0KcrnMTCo6oibnNrMxgZA3KFvdRLeoy9VL/0ErNn81lr50kTf3ysZE+wUrH80719reYHK6gzmTrN52nM4rOe6tf2VFARVuZw2iWpnYkCd0tYmGsZPPtGunC7ulAadPexQAYvd7oBbkqk5eAJmrZKaVGcA3wRBQINx92zl3uL9hHZ6zl29+/01kHFwNnrRQb2S/tCcvjfoEjqdy6Pqd7de91oLRePWGNN4fg7RxWXBDNbugJ9SeJxQ9Eg2rXwv7MueyriwsNDJpsOfDE9zbad0voyRP9H/9z+79sKSoea5DcitM2/EAl5SBLpxnEZc57g11zZwvi/lwsXsiBXg9Qaz7PLPkJDPfDJ4FLV5YtgbtFIsqxEk6M/KubkAbN1yL6ApsjevST4s1LSl7rilD6MgMafgv3donvruKUalR8Q3eiGv2djH8KVcGBQ==; 5:QOE3/41Wm9ohKc1XMiP/VrShHbP3LA/aGrIGGaIrTz8bC4KxkblVwito5a3+vyF3NR0HjFY95zZRv1Av9lZZGuMJZ2PweBR2U/ES4XXakTb2A97k7YDX5tn/I4ak/lhRxBdQv+uhRuZIMBeq/EufT4F3C+TdOVLPErtaa1zVsebnS4zGSvLoIA0Bnod1dtRbrXfdyJB2Hb8dAclWkUodhw==; 7:0Zjra1FAgCaqoiLR1/lHKTe9LdxUIwGvfjRImzFihxTNTHFRVQ8C4wtA0xb6eMIC+7vd9KjavF/UOcmC4NLyWOoUBsd7sYV/NeaUTmrnZmlrMhng10pY9NeHTbuonKtze3uxCrbb66J5AqzWi5WgLg== x-ms-office365-filtering-correlation-id: ffbe71e3-36df-4c96-0254-08d685dddca7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB6046; x-ms-traffictypediagnostic: VI1PR04MB6046: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(366004)(136003)(396003)(346002)(189003)(199004)(25786009)(6486002)(6436002)(66066001)(105586002)(6512007)(486006)(44832011)(50226002)(71190400001)(2906002)(2501003)(99286004)(52116002)(14454004)(106356001)(4326008)(6116002)(6636002)(71200400001)(3846002)(102836004)(4744005)(11346002)(26005)(186003)(2616005)(256004)(476003)(7736002)(305945005)(53936002)(386003)(6506007)(478600001)(8676002)(97736004)(81166006)(81156014)(86362001)(316002)(36756003)(68736007)(54906003)(110136005)(8936002)(446003)(76176011)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB6046; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: gb/VQBDp9ktMrE1q92/zBqlVgIA2euC7U/SgrAC2Y7GsgwhA4PyRwBC64zZNyJGfdz1tRP2rko6OxCg/BxBrv8lAPc2QZ8fYVh3C+Ovz+WTbuvxQlFuRTf59uJTC+mMvTx3A15CZfPO76OGIOf5aRYvM0/jdDiRfNgjfw6B1eoYZtk2OYPdK1yy4UK8sV+VjS5c9Cm2GIG74ZpCzdXJxnAxnm9iLDC8kTf4lMmav1waDGGpewOauDBq6th1OZbb4XydmFjtyrnHXmQwwY1IKJbDU8DPKpmTmrAqAPblKEqYZui4c8smPqhtk56cQ1+WS46KTqt4C940fWTiyie5b9aOxyz6liacaoFdK5hlcGiFmqXeEXYDdxmbJV3XoZnYmWfWfiHIzRBCXx/vxdhxtetzr40L7Wm6AI0kfvCGsP8k= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ffbe71e3-36df-4c96-0254-08d685dddca7 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:35:24.9609 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6046 Subject: [U-Boot] [PATCH v2 20/22] configs: mx6sabresd: Reduce size for SPL by disabling SPL_DOS and SPL_EFI 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" With DM and FIT enabled in SPL, there is an sram overflow. By disabling CONFIG_SPL_DOS_PARTITION and CONFIG_SPL_EFI_PARTITION, we get to keep the 'one binary to fit all' for imx6[q|qp|dl] on sabresd since the final SPL image is now under 64KB. Signed-off-by: Abel Vesa --- configs/mx6sabresd_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 14adf65..26d30fd 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -56,6 +56,8 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabresd" From patchwork Tue Jan 29 11:35:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032704 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="kd85rTUL"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pl4W4W1wz9sP9 for ; Tue, 29 Jan 2019 22:43:23 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3F81AC21DA6; Tue, 29 Jan 2019 11:42: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=SPF_HELO_PASS, 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 633DBC21EB9; Tue, 29 Jan 2019 11:35:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C6E3EC21E49; Tue, 29 Jan 2019 11:35:28 +0000 (UTC) Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40061.outbound.protection.outlook.com [40.107.4.61]) by lists.denx.de (Postfix) with ESMTPS id 67F59C21E44 for ; Tue, 29 Jan 2019 11:35:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=stMb2HlsaKj3HmKY3YtZVDIzdsNnAy3CtFkygH3l4WM=; b=kd85rTULsrVJu18zVhTiaWvSezL6va+ZcaHhA1TiO8SByxbk8pI8fsc26e8mqN3k+yUDb6OjWhteAGlusAcmcx0XzPmjFtqRhFK4XLbGgCK6Ou+AVXDtnjjJeAM3Ts4F0SCWGHf6woqVIRpkLnvpxEzONb8WGndvtISxS/R9+Ck= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB6046.eurprd04.prod.outlook.com (20.179.24.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:35:27 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:35:27 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 21/22] board: mx6sabreauto: Update README with the SPL DM FIT info Thread-Index: AQHUt8a7CXOErYKTJEeS2eXAu072gg== Date: Tue, 29 Jan 2019 11:35:27 +0000 Message-ID: <1548761705-10975-12-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR02CA0014.eurprd02.prod.outlook.com (2603:10a6:20b:6e::27) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB6046; 6:/NCyTY4dddw59EHpKqL/7EO1khxF7gqXzlE5+C/GLWdH0895UeWamzGbMVf/0SP65IEymZvdwVF7aXymjB4Gwm09FgZaEw15zp29+wNi8p6hsl10q0m9m3IPzqAoVgELD4rzbh0rgMwl43DypSiwcDDJeNHeuO/6FI8nn9zzxqa1osxt7WBKBLYoe8ejDb3fd0K/KaDuGJdyQuj49B3BDfp1LKY7Mw6tM0P9OxzplEeSUqZ1tf6Veb7w3hMpmcyBNXXf2QARe31qPq69d1QO7YqWE9sfRKpsPBF6b/LMzcvPwLNc06IE85/dfrFIRaTVY4uX2uogkkBDCS0+gWxHXhhhQ2TXxFs6GNBtqFxeHfmTnAeQc99x86Px5nm5eZmmvJ/m1HbZNdSH2yDxT1pArx/yzcLNaUYmJLsCFWJqWbqlBNgDXkfQandfTyUMTbqHfxsDLEQ8BHOull5G3aU3Pg==; 5:aR9dQCSe5ykvN/KYWDeZ5FZ+afoTkF+T3HsD99731b6V65lVb+Y0OuNu+sZ1gwvyMzJIVP1W3iNn/sUUMo+OBFdUVUGa2/y7ZKS+p02GV7vmxi1Pdp/8L8M3nI/nYukmByi0ba9IeNMqN1wKoDchLxyT/aEvwpOCviMewo8bMOgNIVnxHqIVxFgbNK4pL+Bo4OjuESZR0+cxgKf3a7BlMA==; 7:MEHGb6JiwbMJH7rIyIpk1y+5JqHKc+DZFY/9BGb2kKsQqWsmqwiAPRYLzOKrBDqW1wGDEqIdj5ApPe/+KdclnKdkc/fBwmG1aUVOtwIRddqmTNT9LZvubyl0/6meX3G8r+m/jvagJoSaTCIxTt3M4Q== x-ms-office365-filtering-correlation-id: 80273494-d28b-4077-fbbd-08d685dddd41 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB6046; x-ms-traffictypediagnostic: VI1PR04MB6046: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(366004)(136003)(396003)(346002)(189003)(199004)(25786009)(6486002)(6436002)(66066001)(105586002)(6512007)(486006)(44832011)(50226002)(71190400001)(2906002)(2501003)(99286004)(52116002)(14454004)(106356001)(4326008)(6116002)(6636002)(71200400001)(3846002)(102836004)(11346002)(26005)(186003)(2616005)(256004)(476003)(7736002)(305945005)(53936002)(386003)(6506007)(478600001)(8676002)(97736004)(14444005)(81166006)(81156014)(86362001)(316002)(36756003)(68736007)(54906003)(110136005)(8936002)(446003)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB6046; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: ryuYweKPqBu8IdE99SAL+416Wx6z2BVJl9DfWtUvJNFfYf7QrSn0tQf+uHHVMF/lWEPFXQDVvuzJR/+vl997IlQCqR/12UtEP9a7Cnt4CSKNddZqjUi/SS2eRqZIyAl0uS1Z0DB0atMqkAT7Yd6Chswtah/wZDisgXGBy1SAdE5Bn0tEvRYE2pCWnMsg5wAP7z4DN56/n8AuXqmL8jMgc0azMlrHAev8Js08Nn0gTA9/+aZdCOY+BeZEIWo8XmaJ6/2O3tJMqXSvMtQD1Hyh+PEMaGXwGS4HIMbCOm0SNKmYWXEwB6iC2Gf61GMZIuD1Q8bNFSUWoJ+8PEyVZ/EtizLGHanGaEfIr7g+M2tfC9rpbmacqeVPBZVFc2vgLs3XGo0eRE/ydjpleAJgkD2wqvcYkfwVLKgZy1cxehMyRHc= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80273494-d28b-4077-fbbd-08d685dddd41 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:35:26.0390 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6046 Subject: [U-Boot] [PATCH v2 21/22] board: mx6sabreauto: Update README with the SPL DM FIT info 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" There is a new step now. The need to build the u-boot.itb. And instead of flashing the .img file, now the .itb file needs to be flashed. Signed-off-by: Abel Vesa --- board/freescale/mx6sabreauto/README | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/board/freescale/mx6sabreauto/README b/board/freescale/mx6sabreauto/README index e8c589b..960a7d7 100644 --- a/board/freescale/mx6sabreauto/README +++ b/board/freescale/mx6sabreauto/README @@ -8,6 +8,7 @@ In order to build it: $ make mx6sabreauto_defconfig $ make +$ make u-boot.itb This will generate the SPL and u-boot.img binaries. @@ -17,7 +18,7 @@ $ sudo dd if=SPL of=/dev/sdX bs=1K seek=1 && sync - Flash the u-boot.img binary into the SD card: -$ sudo dd if=u-boot.img of=/dev/sdX bs=1K seek=69 && sync +$ sudo dd if=u-boot.itb of=/dev/sdX bs=1K seek=69 && sync Booting via Falcon mode ----------------------- @@ -31,6 +32,7 @@ In order to build it: $ make mx6sabreauto_defconfig $ make +$ make u-boot.itb This will generate the SPL image called SPL and the u-boot.img. @@ -40,7 +42,7 @@ $ sudo dd if=SPL of=/dev/sdb bs=1K seek=1 && sync - Flash the u-boot.img image into the SD card: -$ sudo dd if=u-boot.img of=/dev/sdb bs=1K seek=69 && sync +$ sudo dd if=u-boot.itb of=/dev/sdb bs=1K seek=69 && sync Create a FAT16 boot partition to store uImage and the dtb file, then copy the files there: From patchwork Tue Jan 29 11:35:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1032699 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="cnLbF4xc"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43pl2H1YlPz9sNq for ; Tue, 29 Jan 2019 22:41:27 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BB5B7C21E08; Tue, 29 Jan 2019 11:40:52 +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=SPF_HELO_PASS, 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 28805C21E3E; Tue, 29 Jan 2019 11:35:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A8B53C21D65; Tue, 29 Jan 2019 11:35:29 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30089.outbound.protection.outlook.com [40.107.3.89]) by lists.denx.de (Postfix) with ESMTPS id 4E153C21E49 for ; Tue, 29 Jan 2019 11:35:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RfRS+L7P6cKhXqXFdBsh6tSyFgFnHtwwGP3/e9Q6kNE=; b=cnLbF4xcqQ1Bwins9Pww+RvJhgGQIt4CYIP0OKNFkTqwFYdJhRne5fEufGSe9DPWUg7MsNU5IIpW+HndCcJK84T/aUP9eHNNAZRkt9PcQ0oRPAEJIkQWyvqdxy5MYQCjcdz8FEeFZBIVLhg4IttV3Y+X/eTG3TF7m0DUxUeOLaA= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB6046.eurprd04.prod.outlook.com (20.179.24.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.17; Tue, 29 Jan 2019 11:35:28 +0000 Received: from VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f]) by VI1PR04MB5008.eurprd04.prod.outlook.com ([fe80::2d2c:455a:16e9:cd4f%2]) with mapi id 15.20.1558.023; Tue, 29 Jan 2019 11:35:28 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v2 22/22] board: mx6sabresd: Update README with the SPL DM FIT info Thread-Index: AQHUt8a7hrKMsPBUdEGkJUPa2TzU1g== Date: Tue, 29 Jan 2019 11:35:28 +0000 Message-ID: <1548761705-10975-13-git-send-email-abel.vesa@nxp.com> References: <1548761421-8267-1-git-send-email-abel.vesa@nxp.com> <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548761705-10975-1-git-send-email-abel.vesa@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR02CA0014.eurprd02.prod.outlook.com (2603:10a6:20b:6e::27) To VI1PR04MB5008.eurprd04.prod.outlook.com (2603:10a6:803:57::33) x-originating-ip: [95.76.156.53] authentication-results: spf=none (sender IP is ) smtp.mailfrom=abel.vesa@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.7.4 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR04MB6046; 6:JtwfxDH0y2r2Cn7RDXfsdPUaUL/Zt19eW7uMRuaGh6DOLhV5lqVk5w2g87zRc0EgGrk46Aa864bw7gvvDbXC2pzgPGLJfqW/H8XsPCPcWEJN8MGaBGUQTr0OADnO04JKE+WHPfwNayo6qrcoakkujYBxUeOueff6thUhS1+5H0YD+2Xs5M5jRHnIt5vFKvgD5Kswh4eejXpgAaPUMRLlO3qqq8Q0Frt5a6P7T5/HD2nhl11xxSx1KCpdjhRT1xhyInvptj5W4c0810t3BK6NiHozy0blni4YEc/ShP+vl0mF21XGkNZLOAvamaG15jjr4FoeOCMbHU0GhlBB9+3a29xMDlJnMFUPdhVQ9tCIDGjGVFHmJzgqW0uJw2JXSz6qeab/pQsDXM8KkqGEBF3UgPGLhDocf1bUusJtjxWJ4kbLFvA86cxe00rrq6dehSXkiKc3GrhIBBqH1giOvAGswg==; 5:BQud1/j8mK/X9kPIY7ms0dbapUe+REO0WvqpDI6vzETMP66hkFMMcoNjJ0CK6TEaekFh6ikx38ROlcUJrFQ21XnKoWqsfj/XtDaf5pf9PiWxELYGcVfih7PfEXmR9FaR7315ng5Eu7Lto5mR4R2aMQIlSIC0CBbFwjk/1J+QQMhoypif5+kqZ4xWcFhAZ2UHBOF5l/GA421QE25qHcLvfg==; 7:hGhQ3I+kgDHJ+xVm0bHxgWKJ0UKDaDFLSoJ4U3Zm+c9akp0U8pBqvkbdxFho2ioVm2yfpLrJTyWhkjwkMgtyGUAbhoLZNoV1LqEo7ph/Yp/uDXH7JgqLMf978c7Cfr5WrsEKLfAg8db8S2xEAq3L1Q== x-ms-office365-filtering-correlation-id: 4f3b82b6-5ca0-4c7d-a44d-08d685ddde0c x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB6046; x-ms-traffictypediagnostic: VI1PR04MB6046: x-microsoft-antispam-prvs: x-forefront-prvs: 093290AD39 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(366004)(136003)(396003)(346002)(189003)(199004)(25786009)(6486002)(6436002)(66066001)(105586002)(6512007)(486006)(44832011)(50226002)(71190400001)(2906002)(2501003)(99286004)(52116002)(14454004)(106356001)(4326008)(6116002)(6636002)(71200400001)(3846002)(102836004)(11346002)(26005)(186003)(2616005)(256004)(476003)(7736002)(305945005)(53936002)(386003)(6506007)(478600001)(8676002)(97736004)(14444005)(81166006)(81156014)(86362001)(316002)(36756003)(68736007)(54906003)(110136005)(8936002)(446003)(76176011)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB6046; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: r3XV2e0MfE0krqucuFFawE0KmwZPON7+svsjtsgQ4aAbXXdTJU4qrGqzgOkNBXML9b0Rg3rnX9/zwlU/3vSamAyt7J3n4qoivkR3WCKUQsAOQyb2F8cZoPc+dw7SsWrkFPTSWjROkc99Lb7wd3br03QEcrdDeQ6Qy8e+YSXcIDlX4Ux3qy7T7oVMqmPekz4E5uk/+JgbiPVvUt6U3tdAKIkfT7+bfu4i8KpNjucZtrnIN9jNGUYAfQzFoBStwbTWwnO3llYQ8jysr6wpj6vvcE0P+pxYceFHgCfxP1w7dq7BPTZQqGKINJE3530Cru+J2AfMHtWj6LGRhJbPKU1lli5m+5dT9Xm5zl0TaV2Oiw03PlZ/uBUnPLTmu0rYBtCzLT02iMteMZEGBTQIQBqtRrfWRTWqAW4a7NS0P3q0vQ0= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f3b82b6-5ca0-4c7d-a44d-08d685ddde0c X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2019 11:35:27.3672 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6046 Subject: [U-Boot] [PATCH v2 22/22] board: mx6sabresd: Update README with the SPL DM FIT info 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" There is a new step now. The need to build the u-boot.itb. And instead of flashing the .img file, now the .itb file needs to be flashed. Signed-off-by: Abel Vesa --- board/freescale/mx6sabresd/README | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/board/freescale/mx6sabresd/README b/board/freescale/mx6sabresd/README index 4b4df06..9b7f7cd 100644 --- a/board/freescale/mx6sabresd/README +++ b/board/freescale/mx6sabresd/README @@ -20,6 +20,7 @@ In order to build it: $ make mx6sabresd_defconfig $ make +$ make u-boot.itb This will generate the SPL and u-boot.img binaries. @@ -29,7 +30,7 @@ $ sudo dd if=SPL of=/dev/sdX bs=1K seek=1 && sync - Flash the u-boot.img binary into the SD card: -$ sudo dd if=u-boot.img of=/dev/sdX bs=1K seek=69 && sync +$ sudo dd if=u-boot.itb of=/dev/sdX bs=1K seek=69 && sync 2. Booting from eMMC @@ -38,6 +39,7 @@ $ sudo dd if=u-boot.img of=/dev/sdX bs=1K seek=69 && sync $ make mx6sabresd_defconfig $ make +$ make u-boot.itb This will generate the SPL and u-boot.img binaries. @@ -54,7 +56,7 @@ Mount the eMMC in the host PC: - Flash SPL and u-boot.img binaries into the eMMC: $ sudo dd if=SPL of=/dev/sdX bs=1K seek=1 && sync -$ sudo dd if=u-boot.img of=/dev/sdX bs=1K seek=69 && sync +$ sudo dd if=u-boot.itb of=/dev/sdX bs=1K seek=69 && sync Set SW6 to eMMC 8-bit boot: 11010110 @@ -64,6 +66,7 @@ Set SW6 to eMMC 8-bit boot: 11010110 $ make mx6sabresd_defconfig $ make +$ make u-boot.itb This will generate the SPL image called SPL and the u-boot.img. @@ -73,7 +76,7 @@ $ sudo dd if=SPL of=/dev/sdX bs=1K seek=1 oflag=sync status=none && sync - Flash the u-boot.img image into the SD card: -$ sudo dd if=u-boot.img of=/dev/sdX bs=1K seek=69 oflag=sync status=none && sync +$ sudo dd if=u-boot.itb of=/dev/sdX bs=1K seek=69 oflag=sync status=none && sync Create a partition for root file system and extract it there: