From patchwork Wed Jan 30 13:39:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033538 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="TqGaWcDs"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPdB6z0mz9sBZ for ; Thu, 31 Jan 2019 00:40:30 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 98F42C21E68; Wed, 30 Jan 2019 13:40:17 +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 CC562C21D4A; Wed, 30 Jan 2019 13:39:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 21521C21C4A; Wed, 30 Jan 2019 13:39:54 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80074.outbound.protection.outlook.com [40.107.8.74]) by lists.denx.de (Postfix) with ESMTPS id E87F5C21C2C for ; Wed, 30 Jan 2019 13:39:52 +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=TqGaWcDsO281AepKfPdoAbcqwcrHtzqCk2IuZuKAO6YsyjjhiIgATfgbseOD4jPbjXIBE1QywNhmaZU7+ft46hwGy2J4ePbhm8pz9KcGF/ssHBgnRzdCKBQrfZ6MwQOHYGyy6tj67kcummHgjYLoD0Podibr+25x+J/wz9JyiV4= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB5694.eurprd04.prod.outlook.com (20.178.126.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Wed, 30 Jan 2019 13:39:51 +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.025; Wed, 30 Jan 2019 13:39:51 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 01/22] usb: Rename SPL_USB_SUPPORT to SPL_USB_STORAGE Thread-Index: AQHUuKFG2epQ2PNGB02kjA05r80hOw== Date: Wed, 30 Jan 2019 13:39:51 +0000 Message-ID: <1548855578-12529-2-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB5694; 6:JxyhVZndzJJ8OcvanePcn4CG8NWG6Sw149iHzHWGz/BKgaRnZ8EzT1QM20BKuUT1ldZvKr/XqmH23B0syb8ys2CV4PR+1BieA78fGA6Dh5PMmnmycP/FPGv84DKtmNmq2QPHym3jWEr0Zas7TRrfSY50HgHUlEOK/lXdSaQX4xmKvojNlCm2lqZpAVR3qebdth5AVTkCMD0is/aagd+rfsLVGgFD1/1X3gqo7i7sNF30PRJ+FApbBjQ9DWTyNgLNJgL7BlmXBOiKxdRlS04W7NexeUqsYUGbbrr9dvUlkvKfwEdMcsLEkdm9qpw9Mp7Ko2Ayg4VYzPdHPaJNmhK1qwh8ukCH2Fc13BFZhiklDapSv9GBJNGM8E07ETTX7PYv3WsesNnMUdHVkd4DRACdWrS9ANIZ4065WWuRDsqa/I7YtwsQbps3lwm6+eKOeENZaA6QPurBka8swFu4ag6srA==; 5:vUM/1IPxf3O5Nil9NBz0gPyvKkKsK10Mbgf2ezZTjzthnGG8q7HDu/MEEMmf3o1qYSXfsfq6Ojv7TbumQmDImG42+i6sBaFZ7CfSu+GdwdbvqeK1lZe8LaVWCWq8VzYQ5SwWlmfjXtT9fxG/WfZJDTsb3HdLOlROYCwN+pFIYIebMiMHBYGCGHaukRiFVj3rZdG/OONLZnteKlV1apJ4RQ==; 7:tz7xixFsysEXmcSUGe09zqoZYVMd1J3158V+EfurDkUlNmsF3FpSl3Jc+FPACltBDLPnNutoh2Mag5mqu6hxG4malHgd/qS/fbCmk/YeVQsIkB01MBFT+nhK4wHcBm5c5dahmK6bdFWyTAg54W9JUg== x-ms-office365-filtering-correlation-id: 7f2b2d58-65b0-423c-c0e8-08d686b868f7 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:VI1PR04MB5694; x-ms-traffictypediagnostic: VI1PR04MB5694: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(346002)(136003)(39860400002)(189003)(199004)(7736002)(6436002)(4326008)(305945005)(102836004)(6636002)(2906002)(6506007)(386003)(53936002)(26005)(81166006)(11346002)(2616005)(81156014)(446003)(6512007)(8676002)(486006)(8936002)(476003)(50226002)(44832011)(6486002)(25786009)(186003)(316002)(110136005)(54906003)(71190400001)(2501003)(71200400001)(36756003)(66066001)(52116002)(14444005)(478600001)(106356001)(5024004)(105586002)(86362001)(68736007)(97736004)(3846002)(99286004)(256004)(6116002)(14454004)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB5694; 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: MkIM85d/ECOO/GzjcSV3NspjQRA/BW/mnnFvTQ32bMvsOFCt1pwNQPVlsGqg8d4w3KzTJPsUoWwktcmRDPIcQXRbPJYU2qT3bKuKJszv3gTWRtecdO6TWemgnRCO/nVrKK6UcYA74X85PDWVQfdQ7LhsK9yAbYdpFkupwXGxSszHHutOS7bzwHl0r3AQm2lv5B51vPsl2NJUdb3IQcC5cLFvBZHL4Mu0ww6EFwK5neUuQci56U9cYhd8/nnAIpdGu1m3knZQ8EXT4IHfclE7/CoLHoI4CjLUg1LV3OF0gBYKntFY4IRfinPwlD/mRVy5/+Q6pqrx4TGeJHlXWBCujpncAZlulH4EhAp1L+8aa2TtTkHSu8gGYsvaBd4++Rc5Mhzsiu3BFVVNPhA29Ma85Y9AWkxC+mOecwuyMwKpxaI= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f2b2d58-65b0-423c-c0e8-08d686b868f7 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:39:50.7206 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5694 Subject: [U-Boot] [PATCH v3 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 Wed Jan 30 13:39:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033539 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="uudjmuWG"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPdx6j5dz9s9G for ; Thu, 31 Jan 2019 00:41:09 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9BD9FC21DF8; Wed, 30 Jan 2019 13:40:37 +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 2FA72C21DFB; Wed, 30 Jan 2019 13:39:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4C6A1C21C2C; Wed, 30 Jan 2019 13:39:54 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80054.outbound.protection.outlook.com [40.107.8.54]) by lists.denx.de (Postfix) with ESMTPS id EC67FC21C27 for ; Wed, 30 Jan 2019 13:39:53 +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=gj3qE/lQV79JgOnHZwTlqzT3kRlSlWe8VTMA0m2LJZQ=; b=uudjmuWGRwKhVKk3uR1IaemVWVULjD/Q8ni/rUVtHHDkMqxzT9IVinPpdKUGHyBv1YXx+h2qxt54qm8BFzOzHmssaKWyb13g8h8hKhniDZbras25WomkVJ2xoAclca5UF9Zjv31FPOSD3/azDTD9RMnpxCip+qTG9gLJgGBxGCY= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB5694.eurprd04.prod.outlook.com (20.178.126.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Wed, 30 Jan 2019 13:39:52 +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.025; Wed, 30 Jan 2019 13:39:52 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 02/22] usb: ehci-mx6: Make regulator DM_REGULATOR dependent Thread-Index: AQHUuKFHog/0hXSi+0ONfFDJYOVR8Q== Date: Wed, 30 Jan 2019 13:39:52 +0000 Message-ID: <1548855578-12529-3-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB5694; 6:1igBQ9If3D2JeCevrOMRQ+FwqKXuE0V7xOVmXLAnmAysX0hMDaeVl4El36qDGfbM21Cvxpo/P9FfsLrUO7pB4c5aZ6kTDinU2iqyzmSRKeuzXOnsg/YZ5Nkep2Nm2hQs2/3S3Oxdgj488Xsy628Fnv504mQ7Bv9Ywt+0e3l7K+KREe9/RmE5krl8n6OorjhFC7q3YmDywOqfeJGLt70ldSduGph+GLPz1na1j3dZN0B8H36qFU98wfsrVhCQBaPNUU5ESgZ/UPo0+m1MtsvS35Od6VlbrllAEpLW5uIDwm6KR1y+FgyeHjIEeNGJVx4X52zdEiu6c7/h9QLEwD0bMMrkfth/D2fWkmQwVc/uRruffiBde2WK9VGE5pD3QI3r+HsoiOgcUdSqctPujWmu0TjSftJFrlAzX13/P5pbRok/WnoyfTRLkean8axj6VcHebdd3tZaCaDKYit0dvRHKw==; 5:xEAwSUTTqB3/kGUokwGxogNWb87NBPzK6rPr60qo/6Cz9gJVUhaF4RV/Bxc8UaSQAjTwUgbnYhkKKjc+Q+rM704SUenC3TiQfJKXif94VpkoeMF/NbYBmU6ORpjdx0aVjhm0URZbHnDOGvzJhKK9C8fvT1M32ecqIQceAG5haxrvvKJCGVrTfTXRLzNpKIVYE2H8sgJPOPvR1AE27SjkVg==; 7:5YTS9waSu7awgGSifq4GjZ2xGmjHoLqKAf8e/4wijiIR0uo5EwSPsgZIdE+x2Vfcir6Cqilg62Q6MKytmb9a+kVkV0lNFcRe4Z03pC8k9bcHUIyBZn39GzPqr7hrZ6wR62rXromdfXsAW9aRxU+WMw== x-ms-office365-filtering-correlation-id: d3c438ee-a3dd-4892-e11e-08d686b86999 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:VI1PR04MB5694; x-ms-traffictypediagnostic: VI1PR04MB5694: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(346002)(136003)(39860400002)(189003)(199004)(7736002)(6436002)(4326008)(305945005)(102836004)(6636002)(2906002)(6506007)(386003)(53936002)(26005)(81166006)(11346002)(2616005)(81156014)(446003)(6512007)(8676002)(486006)(8936002)(476003)(50226002)(44832011)(6486002)(25786009)(186003)(316002)(110136005)(54906003)(71190400001)(2501003)(71200400001)(36756003)(66066001)(52116002)(14444005)(478600001)(106356001)(105586002)(86362001)(68736007)(97736004)(3846002)(99286004)(256004)(6116002)(14454004)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB5694; 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: XpudJ2ND+Z/LVjNr9W9L374SHvizZn1EbAnDUR8FADGCeACKiryj2+Eu0HELLXJUcSpRQgEBp8k+DBdW+s3yLAG6xpTXBTqKkY9i9BobOXLmJiUN/j1xs+QbOR3tzenETEWQtpP/RiFmSdEnfCB/Xr66dE9ySlAL/C3X57H7PAnas9iCifQMTY978vB8HF8BHYNRFsFYoxWXd3NdNHq6QBXOlyuARKD9DqO8tHLvcWHpE+TtlOh6RAd8XZ2Y3gquWVxBRgpqIalSu5VIXO49203+oeF5/lSvbly+VkDv1tld28U7WvT3Y47dXWXSMmTZnuHulBeMJN3YfKYVCeQKNwBY7kftaGwBo0W/lWtxsp5KvoCkw8gP3iIXU4nFD5R0fckj5E5k5HC/kMlhoYqNISWucOXBCUuvstn22DwkcD4= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3c438ee-a3dd-4892-e11e-08d686b86999 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:39:51.7831 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5694 Subject: [U-Boot] [PATCH v3 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 Wed Jan 30 13:39:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033540 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="wjSpOOoe"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPfW5cyHz9s9G for ; Thu, 31 Jan 2019 00:41:39 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 36960C21DA2; Wed, 30 Jan 2019 13:40:56 +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 7F185C21E08; Wed, 30 Jan 2019 13:40:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8BBC3C21D56; Wed, 30 Jan 2019 13:40:00 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80059.outbound.protection.outlook.com [40.107.8.59]) by lists.denx.de (Postfix) with ESMTPS id B6F05C21CB1 for ; Wed, 30 Jan 2019 13:39:54 +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=wjSpOOoeeyE/fbkGHcJRyCVplHoGxgNkTy8zbAMxUv68QfX0+JddqVP79+XDUR21ZvoSvfQq/zrec+1J/d0y+etE+gqRQPIn3T5ojiQJ8aD+WNxmnnIM53sqdE8mPHVlLyR6ZN+RAZ3jwNIpAfjr5kGlulCrMYBaOZJ5jwBJkQk= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB5694.eurprd04.prod.outlook.com (20.178.126.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Wed, 30 Jan 2019 13:39:53 +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.025; Wed, 30 Jan 2019 13:39:53 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 03/22] configs: imx6sabreauto: Add DM_MMC support Thread-Index: AQHUuKFHrVOBIdrZFkSRHN8ifuaKaQ== Date: Wed, 30 Jan 2019 13:39:53 +0000 Message-ID: <1548855578-12529-4-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB5694; 6:ASs8anVcSFjwDFY8dcqJg0G5uyrPfeqkukHisyMTzzRJF2TZWmg+/k8N/6ruz0Bx5Hx7FVeUYkyHw1B/youQC8xv4vAOkTwPjc5/TajmdcP7JJhC5zmuGpCaTmV/3K0baPm5pmrKMG4VmvQ9IKVnk/b4wZTWo0B7bLHlPwx/rKUd8sZ09z0A1ibevHP2jNKpkAxgytteeRMO1M09pV2umUlaoxAeAkEnfvhgiekO1nDSxrAO8XSSO8OevoCs+RxjBsFQCRS4zgdgafpkj9AxmzuS36z2NV+15XJeAsFKMKB2Lmc8+Kmgojpj4146k0sR6hwje7f/AJ1lARDYTi+pVcm63qw4IE8O/wzJGs8ycFet0jqiAYJfwp6FsCH6pcB1AN0KYcKLiWPL6eaVfGsAyeF/y96UH1Dc5RynOa6d2tSDbkheQ5QnbaJapJ2RY9QpUAmhiOL8J+z6D2nLPKmrmA==; 5:EiY/konh+TGbB2AgwUjXbozsKAMhaFo5cxu05Xzr8rVwFy1RGR1kHkTqsSp4syAbTbsuPg6hBSK1zqDXFVfdAQ1o7tiQq3jO/AUmrInA6FgUQXvl9Wr91DZWdzbquYvuq5oxINMenikXs6AkaDPZtDJr5Fuo50YZnvgfeclVAqdSrv28jaG8fR3h46/0foYK/e8HWU7Ya+9cek66wBpeRQ==; 7:lQlRTHg7o0zn2tjLI9afS7keDQTadx4PifZRYOWYrxN3pee+e5WUppPjMKHkIuUaASFFxhboV4kzOd4Rx5MzKV4QrW86p/e4z+zCrlxU2z5QSUXTX08i4xhbxrr1qAjrxwbkXnztr7mXEyiPZztYVw== x-ms-office365-filtering-correlation-id: 758e3424-70af-46ee-015e-08d686b86a3c 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:VI1PR04MB5694; x-ms-traffictypediagnostic: VI1PR04MB5694: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(346002)(136003)(39860400002)(189003)(199004)(7736002)(6436002)(4326008)(305945005)(102836004)(6636002)(2906002)(6506007)(386003)(53936002)(26005)(81166006)(11346002)(2616005)(81156014)(446003)(6512007)(8676002)(486006)(8936002)(476003)(50226002)(44832011)(6486002)(25786009)(186003)(316002)(110136005)(54906003)(71190400001)(2501003)(71200400001)(36756003)(66066001)(52116002)(478600001)(106356001)(105586002)(86362001)(68736007)(97736004)(3846002)(99286004)(256004)(6116002)(4744005)(14454004)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB5694; 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: vWK5lhgbkE4Epmlyb6BYepvgXfA4DtscmjpY35jE3QyglXSpHbueohGrbNCvav3i0Ew8OR+NfHbH25EN7Ee7UB13+KiGko0SGQ/WIPnQzG0LUz0h+UYfo85sdKRlgqyhdJK+sb7zNS1+G0Ec2zXxGfZ4JN0ofnOWC3iOZ79TjE6BJ6pWDvbN4/gc6nFtgEeYSv0UoVMAWURyv/u2+mP0AFsDCBKqJLxJNGT3U/Iv3iDyNBeMqNUadNTM7SNqE88RQSurs9gea4GtKO74lzwkVlP5WbnoLR53uZD0YHFhl6BmmGTz0eOV6ej706809dVomp+QofSAoBOaoX30b5sdOT56bgBW4x6pSQp06mj7nKIYTj9g6uZ03DMrDIOEFFsegyDcw2ckC6bmyOZxNyVrGXSr1N0NK46fCnPfS9S5qps= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 758e3424-70af-46ee-015e-08d686b86a3c X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:39:52.8613 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5694 Subject: [U-Boot] [PATCH v3 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 Wed Jan 30 13:39:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033544 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="l0wTFUQ6"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPhV1zP8z9sBZ for ; Thu, 31 Jan 2019 00:43:22 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DD3E9C21D8A; Wed, 30 Jan 2019 13:41:12 +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 1F6FCC21D65; Wed, 30 Jan 2019 13:40:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 65E93C21E2F; Wed, 30 Jan 2019 13:40:01 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80055.outbound.protection.outlook.com [40.107.8.55]) by lists.denx.de (Postfix) with ESMTPS id B5186C21DB6 for ; Wed, 30 Jan 2019 13:39:55 +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=l0wTFUQ6N4mEAJZOJvvpkvM5oL+8vmd0OEed3okUhhPxB2gvhAwKTax3A5CyITdW7dnxnpwrSFVsb4d9mzDimlFdmwRn7O40IkYxGGi31zBG3LUq6qJGb2Nu7E001ffs3Y1wEQ3A42PzpoUdYp9oPgGFoEcV0t/asFbzBMHi1mU= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB5694.eurprd04.prod.outlook.com (20.178.126.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Wed, 30 Jan 2019 13:39:54 +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.025; Wed, 30 Jan 2019 13:39:54 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 04/22] configs: imx6sabreauto: Add DM_USB support Thread-Index: AQHUuKFISfpBFukZHEKSVPSUI7zryA== Date: Wed, 30 Jan 2019 13:39:54 +0000 Message-ID: <1548855578-12529-5-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB5694; 6:f/09GisMgNokiLY0LGo1Kb8Q4ia75ZdAJ4GuTIPhNQ4CX7m/zsBL2OwJz1OWz2ocPLkNft3WleqEBr8n8T6Qy3r36Z9XpXVIzip4zopGQyb7j6zZVVoh885O3OFohNNy9IrxTbAPs8Fy5+eF12w1RwgLQmkL3QTCE63O1kUkEEmkFGT2YNNg5nOfjMcSPke0YJYL2IxYymtOiSxnS/EmHEeZgK/mTcRmqFNfeKesiRKkCBzLpG2pFJPTAXX83OqWNwbWJt5uEYk2QHeBcRWPtWoMvx6x0DMDMMWpeNbHVwPObTie+gXSoVUmLAlxIgRqwJOBIdLfR3+gqGi2bECZ78WQYdy31uQB6krpMLXsYNHHlCkZWtUdNa74I7tO+W2hyzpm/lC2Np1iKczD/r8AyAPPIunlmDVNuxtHfMKoh+oL+Vekd49lPqQdxZgvjWqumceO1BacSj8KyCGlIKyIIg==; 5:MZAMNzOeOAQSITo/Buz8bLkdiu9jSYT/nLC/DOWqOvd+xjgx5XT6f1dLNubKFXx3xE863xHb81EwVcbuBmDVxM6YW3ogbIFG9yznYsGkDuw8y0NuEA6vj0wD2bgT5GsYmRM8ibm85NSJGOxeJ9jMF035d6E2klM7/AnTMUhH6MqSxPR27AVj8hNMCSKqxmszNtPP3rFNLCFAsc0jOKzrYA==; 7:3KFDfeHj8L7kXFsXcecNLcRYeYGYBKApdH7i2O9knRnRVg2LeQauD8HGDrtdXAJ+9oPaTcHLOqlDslhhiwh/VkGt4Ks1oo/Y8IHkEmGsFN8SnPB5g4NXfGVy1hr7julH5YzUcwFS+hyrZzY9Qgd/6g== x-ms-office365-filtering-correlation-id: eb97cbf1-0d29-4089-d370-08d686b86acf 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:VI1PR04MB5694; x-ms-traffictypediagnostic: VI1PR04MB5694: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(346002)(136003)(39860400002)(189003)(199004)(7736002)(6436002)(4326008)(305945005)(102836004)(6636002)(2906002)(6506007)(386003)(53936002)(26005)(81166006)(11346002)(2616005)(81156014)(446003)(6512007)(8676002)(486006)(8936002)(476003)(50226002)(44832011)(6486002)(25786009)(186003)(316002)(110136005)(54906003)(71190400001)(2501003)(71200400001)(36756003)(66066001)(52116002)(14444005)(478600001)(106356001)(105586002)(86362001)(68736007)(97736004)(3846002)(99286004)(256004)(6116002)(4744005)(14454004)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB5694; 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: wOqDTyo9TRvJAMk/CfiJxyT85XRhGD5ZnaKD47pDO4T8zpmKoCtbqrXVrg8JIE15eTw5oci4QwxOS9B3MbTHcptjobOvaRHshBoWZgaBA5HPq9sHx9yZgCj8lPsESbKkBtW0M+mjORytcYl7pZ9oTXF7/hB+PTSYyTPPxjEiZS4Yz89mZH7uTH3+rMaG7saeRedqiZ0FFUwXwOuqQxWelPLSH2VjivsI6LytHWgrB0MWp59isFBsxC5uk+rFqQIQmIu61UM8M68KkLGX2p/iKJFyXnaCUfURB6D7voRvqMGsf7ROn8SahRMzexsth9ANOAeuM1FBH/XOJITINe8ZSGkUCKbTEMwZUQdK5dK5R1kDR3DuYGsZ/K/vn6xgVALZ9CBFd2GoWfKcJcbkJU8P1K+G9itupHrnM6dT+Hs+n6M= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb97cbf1-0d29-4089-d370-08d686b86acf X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:39:53.8300 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5694 Subject: [U-Boot] [PATCH v3 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 Wed Jan 30 13:39:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033542 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="Vg8wYPsr"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPhL1nPZz9sBQ for ; Thu, 31 Jan 2019 00:43:14 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id EC976C21DF9; Wed, 30 Jan 2019 13:41:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=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 1A369C21E36; Wed, 30 Jan 2019 13:40:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B4F39C21D65; Wed, 30 Jan 2019 13:40:01 +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 A890CC21DD9 for ; Wed, 30 Jan 2019 13:39:56 +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=Vg8wYPsrIs0f8rkTZnl8loLHUAVaIf2ZaGFYPFhs7fLZnXi7c7cbKrtJtZz+smMDj8VEWEacpCP4NXK9jK3R8QW19wZxFJuGfmibGHDIBg1J1Xi/t0fiSPGEO9WI90cxY+xQMieYRTwELtjlT2+Yd8Q65igomEyk1RCGMiayTyo= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB5694.eurprd04.prod.outlook.com (20.178.126.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Wed, 30 Jan 2019 13:39:55 +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.025; Wed, 30 Jan 2019 13:39:55 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 05/22] mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds Thread-Index: AQHUuKFJcfljcyYv0k6eKaKIp5zztg== Date: Wed, 30 Jan 2019 13:39:55 +0000 Message-ID: <1548855578-12529-6-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB5694; 6:GWLCt/k3HqdnQLGG0PsbXgdL6BVHYpna4KK22JoQUgVHHEzMC70t1ps33Z8nSEZeL+xXKsewLEVqkYwBw5AzOiAXsu1OPoHvacR8UIyZiL47GvlnBtIfV2w6K+FE37v6lnK64zcI62Z7amj2c5qe7DiJOgJvDedi02Lhmd+YerMEsE4ReW1ryNz7HwmiWfYFqnG39HLW3b00f3P++wiFpwPIK5nCprLiTcFPwKEDTRTWP2AYnJmM426WnfdaxKHm3cWd5YYAfUYjKJzDgGUlsVnCU8EJ7+5zDNUo3nI8X3kCi+Vi84ZNF0RTYY+SfUs0vqVPkn+u2+XijLedptEalipdfW2VlhTAmUtCimihpPLQqU8QLOwpxpRusoGY2dp3tWLAYXr63Z5gUao2Ev2i2gYvNrf6L419e0SRpHzmP3MNEPE0ClwZgSndh1JF3uE7wXvlnfF8jYYKg/fuQIrl7w==; 5:4GJ+PGeWTv19c3ZUzzSGWyd8FFxwB7cCkGhZq7SQ1vp1HRd0BrS361KA7k1hjDU1svJqNFLoz6i7uKpNGuGtmlU9jtTGwUEPwbgOMgA/vlNjJ84J1OCTej3GWZxPHmsXKNbfTs4hqlY/8c/RsqudFnLjhy+vlyhw29n2RRKpz64Kzc42ANMFl1s76Nndd1IIDcAz2fBX48asA21aQqisqQ==; 7:5hPz7yDRdqBe5dkaUmwLYXvOdlHtZwUdebMxOlien6zbH8XG83hdYXft3JNqLGQAc44Zn7iquDtNtE/weT/FM78Q6lvBG4arlu/HwrBw/Okhu14q2d2MQ8UXFlmqg6arAgla+qJBwPIRtVaiDHSS5Q== x-ms-office365-filtering-correlation-id: a418abf8-b35f-4d69-2ef1-08d686b86b6d 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:VI1PR04MB5694; x-ms-traffictypediagnostic: VI1PR04MB5694: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(396003)(376002)(346002)(136003)(39860400002)(189003)(199004)(7736002)(6436002)(4326008)(305945005)(102836004)(6636002)(2906002)(6506007)(386003)(53936002)(26005)(81166006)(11346002)(2616005)(81156014)(446003)(6512007)(8676002)(486006)(8936002)(476003)(50226002)(44832011)(6486002)(25786009)(186003)(316002)(110136005)(54906003)(71190400001)(2501003)(71200400001)(36756003)(66066001)(52116002)(478600001)(106356001)(105586002)(86362001)(68736007)(97736004)(3846002)(99286004)(256004)(6116002)(14454004)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB5694; 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: E0Nb9UzsCk11zdzEVLBeofy8J2nmqX9eMOHDapv3ojT0l1YJx2sQlxCGjlluqfn41krYUYjzJGbfn0Cd6RJeUpRNg6bfJZgkBiHxSq1moY1LEfra2nbiuOP+N9WjLaCNgIcRGIjaH9k+DjOp3Smct5uuSeyatPU4FgMogBuCJOV4UIY3wvnLv2J0poF0B7HMKGk0tHSLo+EQOOQMynR5i/V/6QoX4UgvFaBOVip3TR2nn2MUHDi4V8tGiIT3cb1cygD1r7iI/5ov7P9lvwD6oIvOINDY2G3vwJZ+IE/Tyhc+0Lp6sS17gjunD/FYjcA4c9VFAWaSdx7s8oDI2H+HIe/StMenVyhnqdaIO1W6nJXrznCaBAYenxKEyFzTIyCycp0l50GCkW+XqMhVHcJEhtaFTDSIvrPFqP1kxAol790= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a418abf8-b35f-4d69-2ef1-08d686b86b6d X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:39:54.8300 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5694 Subject: [U-Boot] [PATCH v3 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 Wed Jan 30 13:39:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033545 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="nmJIDwsP"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPkM1dwBz9sBQ for ; Thu, 31 Jan 2019 00:44:59 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D759FC21C27; Wed, 30 Jan 2019 13:41: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 941AFC21E15; Wed, 30 Jan 2019 13:40:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D4FC4C21E16; Wed, 30 Jan 2019 13:40:01 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150088.outbound.protection.outlook.com [40.107.15.88]) by lists.denx.de (Postfix) with ESMTPS id 23156C21DD7 for ; Wed, 30 Jan 2019 13:39:58 +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=meZq/2IoJhQ1XUsMcVhPcM6WIUJPU3M7c3Eufi5jNoM=; b=nmJIDwsPWljx8qb+vyqlQyMf+KUlVnb6vl1+TbV+9/K0J/Cs0ws926eLtbRIXQ3wMdBb5wNizs4M24oB16rQBIkuW5jb4XcTYMTn76YPd0hO7VFLff2CxjFotbcxVxWGMq6omXLbt7Dlg8JtYrS6C6+mjcI/0sU0xMNU8uX2eAI= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:39:56 +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.025; Wed, 30 Jan 2019 13:39:56 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 06/22] board: mx6sabresd: Add board_fit_config_name_match to support FIT in SPL Thread-Index: AQHUuKFJzThfMdiWIk6lxq1dbBec0Q== Date: Wed, 30 Jan 2019 13:39:56 +0000 Message-ID: <1548855578-12529-7-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:RDm3NjhA3DbBLLcur21LhldyMFHP0hPE91+PEHZUS/GYYyKcEIZdwhIjJWAXivlg3fBIZ7fVwfqMClpNLSwqVPyjxiOo8Iyy8ETq6/04vePguvsn9HwztW49FKZa+5SA+TNivVEaoJ/KGvW82/2ksTt3Joo5ulTO+hHY8BHIZlxX72UjypcqXtIkPf+EIrTjYbmLPhwmV3k3skfF3jT//aQWk4o0vaPiTKySk9orsEJS8t76of1PjbdoKw5+J/A4EJL0wSVuUKEuvsXwDzl2qvVEfSDGq76m2j814qO6jluH1xeN7gZKv6+4KBw6y/nD9kZ1Iz6CNVyV72JgDSuAVll2o12QUcKWaRLQWGakS6AY085H6s98Uh83+LjPazzXdC6agKKMH7r6PKMJytBjxGqyQS6voXqPQZQkvJhsVpbSfVctFUKTatJh932Xu14zJGE8K3J0rsrvUVRxAPh4xg==; 5:RYU+2Vqr9QUZVbOIQQq2Vheqn+f/+jzrub02n/OxRyAGqUk/udbTLu7NIJw4YhrHblqI03gYGQP4/KFC4Opoy1ADt1xo/lPoe15uqRwBYAbrpxAIro/tjUKE8dCzssRzQLHBJ+wsRviR1LOQZyD33QXgYGrwN6WYqAhLCSQdgdoysbw1uI+4fdrFtEV+8gOVrsY3t/kMkgs6PEJZ97a9gA==; 7:p6ocebmM4kVdPSc0V8lB2xCnu4Q3rCn+N3NHDggTVVzG/MKU4uNDa/kWsRRF+EC4RJT+J6VsBcno96+HU3iCBTLhZIweQBBElullS1oV4BMgsm42LsI6KqchOKxUjz20pju2TA8qdsolXdK8fXdAaA== x-ms-office365-filtering-correlation-id: 5f9439e6-49d8-48cb-7798-08d686b86bf7 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(256004)(6436002)(2906002)(6486002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(4744005)(50226002)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: cpXiQ3M52r4IQ94DFUIKdabbncee0+6sTEP+/cd8sivVJVGUknhAv7dbE2pLIXRYl1aH+wzcBtGdtIO0wZsyvaQnlLmd4HzRRwwDoe5wTjQAnsc8YwLkMrLP5A1kpTFZHuyBT3mLmOwFMyxDGrvsfqaCP2JvIjln6Osutibc5+TtKkUBpVz1NQ3wKlwSlwgsyLuuS6S7LdHfUed94ShfIgy0OSJgBv4vh53QFmJ+7xb+GKHzzAhidYtHPD+hmqdMQ0DS9ZuHEK/ad9tpRWj/XyYnslVEPpMbD4xQC6FffMUxGiL6WKR/j3GImE84BL+mzGZ/X0NEHEbu/qkDBZKY95NHXk3tssCEbRHsZ7sraAt7jhnQj4z9dG2ubeIa5FBqhiucnuX3kXgeRF0J4E6MZoYRtAKKB+NngF1KiGuC3NQ= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f9439e6-49d8-48cb-7798-08d686b86bf7 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:39:55.7519 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 Wed Jan 30 13:39:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033543 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="u5IW2xzS"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPhV1hHtz9sBQ for ; Thu, 31 Jan 2019 00:43:22 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C9A33C21D65; Wed, 30 Jan 2019 13:41:28 +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 9F207C21D8A; Wed, 30 Jan 2019 13:40:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9B5F9C21E1E; Wed, 30 Jan 2019 13:40:02 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150088.outbound.protection.outlook.com [40.107.15.88]) by lists.denx.de (Postfix) with ESMTPS id 79074C21DD3 for ; Wed, 30 Jan 2019 13:39:58 +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=YrDS8c9uezvMN+39Aa7lN7t1WegT9W2z4S6uQNRrCnI=; b=u5IW2xzS/LBPz1JQTqqW3eRTzIVeOyhFh4GT+CH1I+M9IIDRwf0EjgyKsxygoWAxDJL5Aj49g1veaOs5sRHE86eQNs1Dw3KfWUWKU/6aD5fTCncnSZLXgTZ1zJ10y1HI1B0DwxP4jYbB8wYOJFYaI2nWdTtfYze1OlxkdD38EA4= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:39:57 +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.025; Wed, 30 Jan 2019 13:39:57 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 07/22] board: mx6sabreauto: Add board_fit_config_name_match to support FIT in SPL Thread-Index: AQHUuKFKnKTJYtGBuUqqQqTz7jLJTA== Date: Wed, 30 Jan 2019 13:39:57 +0000 Message-ID: <1548855578-12529-8-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:Tr4fuOjnyPjDnTwc3NYxdb7gspxLdggYRdK/N8zpTVbtIKIyTi1+Is9b+o6D0gt5otrc3181RFm5Axp+iTE/6Bsb2S+N0oRUc6us2qBuN0c5fstR6yKzzBd2AesWtktZaaasj7wMAotd9wUOmb8zpWRs73//gKlgHTXT3IW2dvRBJJhV/L9RVznNCCZehQ17H2kTLXF4+6+lAB6I2lUWMbQyXX+TX57wzSc/0kzYvBTeQO8MunF9ZiOlL4cBQWGgwRidpXSpJNXJ+jBeIagr9xgzKitDnUe6xLY0EuCzJhYLquot1YVlPJ1JFeZa/6DHHc0NWVjgxQDw2OO2oX4ivHQlM8iCceE/VxvKXs0vvzO9hzkXoqCXj30U6701kdD7+QIeNBFcJDJbXhsg+kbHu94NKCcRN+a49CPcdBhbpzRDLXKKoL6jGtYbJ/pngzhB/XcHtdfEQN9BlPCdaS9WqA==; 5:AEXY/oU1RIPAxC/CE9HLTiVbBUl2l9mjhvgNNquVEgHg4f5m6ElslIF/WCCt8A5RKplKUI+FUNpMkAfzcQ2JYjZlDXsqAC4CXIXdJDLO5jD3sH6J9SZW+Gsy/3VfBBtX9P0kGNCQe6njELkeQ2EOLInvKqeHncO5HTpcn+wL9AqiCaCF4Oj9T9fMwdaziVJcizU89STcVX96F4dD+zobTQ==; 7:apI8rBuAMhRBIK+xRvaSz8E9HNs60yYofFGhaxKQkvWymE0qqpVQxm4wU+JfflteH2LLarlfhfoLGt12zD5yZR94r06bA9Ca9+M48jMZlCGhw6Bfox72zymmDNbrqXcVakrPIGLhBIaUSjREKMN+GA== x-ms-office365-filtering-correlation-id: 1b42e490-f246-4d08-e752-08d686b86c88 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(256004)(6436002)(2906002)(6486002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(4744005)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: Vwa+LuZRyDNnLtWhVEOiBL1fnlnodqAxpEncDhBFfu1+9s1YiTB9AE5kHmUUiiBkKMlJPHYZazQXYTatXguIL72biz0JA5SIkVd4wAjdcJet/NdYcOCilF7iKFpxpBRw/VuzH8aAmMzth9rL1IUTm79x3VIaj2/L1jGzAADHbuaCtiwJbyoBl0q1FDwTt/2VaXnBaclwWaWFhLssRS9K7X7Icl3quenQHHppV5PpkFs12j+PigGnxBugJr6JIrEJV7lz2uCWya6atYp42Aof+C8iX5R0zzUkNMNtSL1fJFiH0o9AKdrvvQT/EexJ/XLsM/MmOPEu92PWEiKuE5SMM8pWyDoWRk9GJpr4dNcsJIj+E7pxUY/MoilTMvlmHvLXhVRB7wmf/qLISdhH65M2xx5fHYPI+voV7unRulXJOFU= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b42e490-f246-4d08-e752-08d686b86c88 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:39:56.7050 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 Wed Jan 30 13:39:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033557 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="TD8jX/TF"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPpd2gqQz9sBQ for ; Thu, 31 Jan 2019 00:48:41 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 077A5C21E56; Wed, 30 Jan 2019 13:42: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 8DB31C21D4A; Wed, 30 Jan 2019 13:40:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 76210C21E30; Wed, 30 Jan 2019 13:40:03 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00071.outbound.protection.outlook.com [40.107.0.71]) by lists.denx.de (Postfix) with ESMTPS id D815EC21DED for ; Wed, 30 Jan 2019 13:39:59 +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=8c0zu8KoNYWCFhhZ8R+ViHgawzJPCV2vR1spbV2UlN4=; b=TD8jX/TFw4R90opL9lyBDrUctIEgRx29qM1NBELUBeZjF04eu/8sqolX6CkLKov+7S3p0BHDD84FO5MwZRD1hGT/nleVohETWJSM37Yp2ApFkqp++/iz1YYw+fpSMo4ENxNfkqxBpeECmSFXUd0cQGiO3tlPye0621KgbGk+kmk= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:39:58 +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.025; Wed, 30 Jan 2019 13:39:58 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 08/22] arm: dts: Add all the imx6[q|qp|dl] sabre[auto|sd] u-boot dts[i] files Thread-Index: AQHUuKFKWNE5b6M5AkizQR7DjOysJQ== Date: Wed, 30 Jan 2019 13:39:58 +0000 Message-ID: <1548855578-12529-9-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:UqzsdiVk29qplKzT3/KcflXYLbs/9qSlff/8+CyBIJMTbX1Y2VQmYM4oxEv/U18EE6VW7IVFZ68vUh35mqTplgA0BOQJHFEiOGF7ZJjEKbpDv40fBlZgqDdJGURQH4TUn+Jo180R2JSvjtc2Z/0NSulHbJVBcKaLhaqIssx42N8vPNn09doRUDQhKynT+bustFOBCF0UQY4kAV/owFdMHt5iREtdpvcq5bBPZapETJKmXP1TfF7igRzfMw2dSeBklT+LibokHPblsw6+bk/+fdRhANFSSXg2Wpwma9ZBxnQ/OnujUr8Bd5UmHMVXlag7VTvNuqVUFu7IP7bwxzg/DgSjZcCyaAXTlHROqFdLyMgNYO09CvKotOi4Z7Pn3toYRmjXm/tLlhttMi6GfZhnilncbHldmxEJiGIWsMNOCzDOVfZFL9OF5cc9UzLh8xKBvV43sEiyaZ7uXsApjTUt9A==; 5:FNNdmanif09rCZE2yG+g9hrI0GKidQntltgQQZqbfHKkzokXk3izE4Qx0xsCaohu+NFBYKwC06+E1WGWS7qgoj8gkSIC6oSH+ltatR5q5NCKB1Q0FiUD3c2C8IiMSLyTQNgjwmxtGOBq1HR5mo0/lo07I7iRU27HA1WLelfqnqmAaVFja8txPFBXUGdeEtGEmRpSvZCUifqHK2q5FTZwww==; 7:59d/VrXROTOAT8tCyZuwtH7pvvWDNja8gzrERAFmQOqSkP4tnQFu8xKrZgkXRRjWX4/ZD75AxgJjSEp2ArRrj11enHgFNo1I9bmMADI9len1ltbR9Dk4C7eIb8sHXQ+CzzydPYOOwOE6h3HyQi0P8w== x-ms-office365-filtering-correlation-id: 7a7cb880-8e81-43da-f4af-08d686b86d17 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(256004)(6436002)(2906002)(6486002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: bqFhRbolee+CFf/HNfwNkzOsZZTEpx7T0CWOLO3P4cy3106Utqdt7kAXIvH40ovSj+brHAtzsyMnPF7VkvvsGgI3HFQVuH+WZ4rj0egHzC5/zaTsWOV43fJ1X51j5PNX5bIvHWKXDlKrh1aDmMHfhuHxap6AMdYzMrM0p7SAhfHFv0JG5l92DooXC3QITWOnkNCJn8nrghinYoyRI6Map3+u2UX0HylwQgb0fd9te0YRuvkecT5gdh9kjs3B3WSz+0Xtgl96DLGGNCrH6EaC55FCC7aRMIWQW9boszl6GHYHkrvSx7l6DUvj2jdzuSDSNaTDck4rjr878UoVI+6BKTx9pt6wALDCpZcbSqVbwgP/WgQ96VnLvV2C1P6hVBZb8+L+vmY22GOlF099b/nRi02WIy0d0nKTiPqIotvp/qk= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a7cb880-8e81-43da-f4af-08d686b86d17 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:39:57.6582 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 | 21 +++++++++++++++++++++ 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, 73 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..d75fcc1 --- /dev/null +++ b/arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#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..e4d7d28 --- /dev/null +++ b/arch/arm/dts/imx6dl-sabresd-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#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..d75fcc1 --- /dev/null +++ b/arch/arm/dts/imx6q-sabreauto-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#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..e4d7d28 --- /dev/null +++ b/arch/arm/dts/imx6q-sabresd-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#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..ea90f40 --- /dev/null +++ b/arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-u-boot.dtsi" + +/ { + aliases { + mmc0 = &usdhc3; + }; +}; + +&usdhc3 { + no-1-8-v; + 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..d75fcc1 --- /dev/null +++ b/arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#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..e4d7d28 --- /dev/null +++ b/arch/arm/dts/imx6qp-sabresd-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 NXP + */ + +#include "imx6qdl-sabresd-u-boot.dtsi" From patchwork Wed Jan 30 13:39:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033551 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="DiBXIx2N"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPln1YRWz9sBQ for ; Thu, 31 Jan 2019 00:46:13 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E2134C21E31; Wed, 30 Jan 2019 13:45: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 AF32DC21E68; Wed, 30 Jan 2019 13:40:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id ED35EC21DFA; Wed, 30 Jan 2019 13:40:10 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00050.outbound.protection.outlook.com [40.107.0.50]) by lists.denx.de (Postfix) with ESMTPS id 7B6F0C21DD7 for ; Wed, 30 Jan 2019 13:40:02 +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=Uq4epUoWhignVzPvR1Asc6IcC8EJVJYClw7W/j6cpvM=; b=DiBXIx2NWcvpiEt2bzH7ooMHEsIqhvuUb4czjlO6hwUb4WAaGKBiri7rEJjZmuOj6h6OGEeUAbzTIH+jubNcU1jCblbDEnjkaOKwDLTHackkNZHsxMAC4Yjr9sGXgS9vESPkX3aDMEEBDc9zzYbxfzGUSV+4yQ0xmY02tgj4anY= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:40:00 +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.025; Wed, 30 Jan 2019 13:40:00 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 09/22] arm: dts: Update all the dts[i] files for imx6[q|qp|dl] sabre[auto|sd] Thread-Index: AQHUuKFLcfik6GLQjU+aLL/HSXWxAw== Date: Wed, 30 Jan 2019 13:39:59 +0000 Message-ID: <1548855578-12529-10-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:Xn5wdLFuZTyiiInCzMd1P8NaFVJwFmOpZeUJapRHphqmY0DTx2ijAdJzTQ3eZSsCRABIMkHrjShhd4MZ3xVwwUUaTP+fpTdggNr7qI5c1re3BODMnW9WVMEFWlDQ1zefFS5jCwf0LvT1Bc3YmlARK51AGUnf+SI8MCN+Hwn92AUzChCLZlR4RF7wauXD45MGD+zDqHILveBt0jimz/r9P6Aq3rPUf9P9ChfcBTf1vrZZwdopNRbMKz9rZ6605waWZq8q8R7yLY+TJNbPoU+TLYk+LtLgshKwqwRso/AEUl8OQj33JVKq7F5kLim1b7sWFRqqRB5FI6PJSIeNkhpHGEJ5afOJV4SSz/ifBM0jddToI7KH1owb7BRqYMvpF7gi3/fv9jAflKMHRytaUg170J0h419N4ufmJj4LrffMLyJ+sUwF9YEFKv5WQguJ0rBQYXxN8qtHYkt+NFAIzR0Wlg==; 5:8OzNzVRbhQQ4Q4vX/9zp1LsROS7K87fjXNNWhfwX2+UKJ2g1U99Pf3+rwTlWiULOUg5o6zyIYobOYToa6RfHXhVQqrnUCj691GVxTwAdj9wX/bysfaYqTLljhXfNwNAQRfFKB4otR7o764UN/BBEOvM2/HO48OJUo8xGytPOu0rSSiULUd9XOUAKVN47kX8EWbVWJ8iabGc11V7N3lnIaA==; 7:I/TMGdU4i+sOv3IN7OAp/tYYRfcxXzLTGz5vJLH2DZ5yk4RjQVFljiNbyCAaD+lk/N8FnnrggkF/7KJqMEec7RJ7wx3/kaDxeErJUhc+K8VxevTCJbQxsecmF/tpUiIkHPUt3BdO/o0qe9fhUrN7IA== x-ms-office365-filtering-correlation-id: 2234436f-30e3-4f81-6313-08d686b86dc8 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(15650500001)(7110500001)(2501003)(14444005)(256004)(30864003)(6436002)(2906002)(6486002)(10710500007)(4326008)(6636002)(2420400007)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(53946003)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(6306002)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(966005)(305945005)(50226002)(2004002)(569006); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: 7NqXWWT29Tm0LFq67k2Diow7M8DiUggUyuFI9NumtLIM57wffDpj/Ub8PMkaYi+cJSw2mX+ulE9Wf5+iLiD9fGcrYq2E/hQiZEfIt4brqF4kOY9Vo0O7q4VvVOKaLKWTGPq9+pW3u1UnBjK4ACGyWADW91TwVL6TAoCaKCC/ithw3RFYqK5v9qsIGiRErxT4UFEw83zKX+rjqcSlzA9jwaYhCdHWWCZwo2UjJlLVxPwUmPcyvwjBLa9bqxF/naFs2WNlh4fNWDkwVS53m5mJ1NHdTHbxjBY+sJLIro6ih70R2CYo3H1qEaGMGzjo71DFkOS+Vc2TLCLlUKxz2mAiAJwKvBZb921RYCSU/HpvxshbWRH6ozH3hZAtHnfhPuNK2lVqmWUpS8JX/j4s0sx001bqDDYurKExJ01EO2YnR1Y= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2234436f-30e3-4f81-6313-08d686b86dc8 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:39:58.7988 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 Wed Jan 30 13:40:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033546 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="QtrLIXFV"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPkd6X44z9sBQ for ; Thu, 31 Jan 2019 00:45:13 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 84B7AC21E1A; Wed, 30 Jan 2019 13:42:48 +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 1931FC21E1D; Wed, 30 Jan 2019 13:40:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 61A8FC21E0F; Wed, 30 Jan 2019 13:40:06 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00060.outbound.protection.outlook.com [40.107.0.60]) by lists.denx.de (Postfix) with ESMTPS id DF2EBC21DF3 for ; Wed, 30 Jan 2019 13:40:01 +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=DLr+eiRQ/gFThPjJI7/ZGZ19fUWF0DMnQ72LXa6HFOk=; b=QtrLIXFVTHjsR75eMPH8Jq45sj+UqHJ9y3ft2nSX/fn0ATueUuLFst0v1gaO7RnVc0EdZ31QeUwbDqk+eCALyyyKLd7jmmSbQRFp8FyaaM24sbEOkd/2kNwETYaQKRlfLb9Twk/OGn1mfxwqWs//vBV+MQEjtAH/EhI0dsLpBuE= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:40:00 +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.025; Wed, 30 Jan 2019 13:40:00 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 10/22] arm: imx: Add FIT SPL its Thread-Index: AQHUuKFMlC3jbYV81k+G1Sn9TJ5GsQ== Date: Wed, 30 Jan 2019 13:40:00 +0000 Message-ID: <1548855578-12529-11-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:jfH9qSBtWqhS0+UMPtxAjTuxja6rXA8yjnvuppeNNTMfA2P67si4FFv/ZruOhgIRaZL3h7ZyIKSHKTPcGczOFNHEjXWvuXIP0emT52Cu+X0BXjHiX7TmrcEvoZdtxj35CuhVJMJEYR0ELOvs1j5Nvy3C74yHrIwHhNHEbmtSxdebOj5EgdH9I0ZpeRjGXxN0szrFV2OXCvotJUf2wYX4FCucg+95WIIaf0yq8cazlfflOkwj4X5EzXbTrPkCh+oqpKZRQ7X2qvDywMcatVoQQixL2TlAHUPOq2jHMPvVPkx0tEMElGbQcqm6EhPZZcfwetCddGUKtMR3fNCVj6IlPhFA+7OY5vkAsuoP01WMcM3nW1GC3RVb1zHMQHOgpfj3S1teUKUdRNYu8AoTUUz6iK5zXT70xGo2AAs/Zhbv07gmc3F9hA+7tE4PTAuaUGILabolGmPpQ0ODU8JmL+meSg==; 5:CuQcmhI98ts/IO+IRk6o/u5nN0a6Rj5uejBG1v2c8SeGWTNF0EB2lprAmROpCntf5mh2ug11NoXLDrpC2MnCqO6TgUEe4Szb67rjFJmN6cSInfQhKpg1zXWMEuzn+F81CHDx/fjN1vdcP5MXGHmOU9mL1ULm/REP6zz1fUwQAH5Hb4d0yrnXNNwP1Q2ARqIbC6crz+FFTzHTLnTlI+Y/WQ==; 7:FLfEGrXV8OZWym0Ts3/i1AL5hvhxitRtUvV/vhgGlWIeIJzL2SKvcL1Du36nFpZ9t5kAXnKTlT8dIp9PpbSxhWDBkt23oopah0gF6Z/o7ZD/bSXb4BFeGbcPNF3ozIMnG9kg5LQVijmQjyN2/+7tOQ== x-ms-office365-filtering-correlation-id: 5dc702f1-6709-480f-6f10-08d686b86e76 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(14444005)(256004)(6436002)(2906002)(6486002)(217873002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: MEVyNTxrNMtvKHsWLvKTiBvGA/KX1aHZ5dB5BeM1Jv1Rq7AZavYvInI4CTyKeG26rkn+Zg0Rb3puVpugO5uNP3hwECZcANUkrgkbeEDs0kyxwGbLsb8gNSbeCbvF/dXvVunvNH02OLweVGgM+5oq/BzMsI++wZFdm7RkILWhNeyuxw0AlX2xzVm/8k0EJSx3YjiHqFbCBVniI7V4Jh97ctoXbCBzVCqxIwiwZIMPf680F/bJLKjb2kHD2/IonBG7Sn9PI7FBvUIyoI4ZE2b+k3O8MTCA3rTgQojmAAYn9QC283okHdQS6a90KjbFFAwujfhIxFomx35lIydv4cfVQ12wDC9gi/86y5jWJmUxggUOYnzBmYFcX7wTsKhOjXxvjNWV/BDzBYJVlpBpG2vU+sH590vEs8W3GHALjlNQaqo= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5dc702f1-6709-480f-6f10-08d686b86e76 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:39:59.9238 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 Wed Jan 30 13:40:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033552 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="ENtppoxF"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPlq2D02z9sBZ for ; Thu, 31 Jan 2019 00:46:15 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DEE55C21C4A; Wed, 30 Jan 2019 13:42:14 +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 2B1FDC21E26; Wed, 30 Jan 2019 13:40:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A7FBFC21E34; Wed, 30 Jan 2019 13:40:09 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00050.outbound.protection.outlook.com [40.107.0.50]) by lists.denx.de (Postfix) with ESMTPS id CAED3C21E0F for ; Wed, 30 Jan 2019 13:40:02 +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=YkS0H64RwEczGqnjxVOGauWfH8JoZk1OkF4lW3VWHzI=; b=ENtppoxFWpb3+frn2MmRPrxlyGf39K4VCiRY9WEW5VPSAY4Mm/GnUNWWPnTVILgOWGSKRAcfGxQxyZSnRabIt5aOqxhKluTy1oinOAtoZDHw/fRpH5JXZ3jfr0rSzAYi1v6lv5YdHFVsl7G0FqMKQBFEatYxbP3Vu+8UsJQTvoU= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:40:02 +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.025; Wed, 30 Jan 2019 13:40:02 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 11/22] configs: mx6sabreauto: Add SPL FIT and DM support Thread-Index: AQHUuKFMubR4lXzuH0SOch3wv7PyJA== Date: Wed, 30 Jan 2019 13:40:01 +0000 Message-ID: <1548855578-12529-12-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:bLk0yS7SZSkvjZJsis3oJ+yocgZAogyOjRlEN+Yq4mP0dUS3waXqKD49KOPcrF+Z9lSppSDMePGcn9EUdZyFtIMzROpluITWjRjJlAUgqIsNaS5PRVdIso7uItmDao8NJI7TpcYF/99oBTAQ1/GeqCAq0G4OFdohdXXrnn6Q5e1NnsdDSsZfh3Y8Yj24BtykwPX/r/uhziUy5fbQCLl2F37UuRVzAMEoE1p15nHO7nmYejuiVCx81OR88vMLLttum3YOQyvTySP/P/rVNhGBDVFZnaagjtF8fYlKDge62fmtBwTe+Of4KvJfb9ymyFAfePV5GTYt0KVDz8gOzoHeDzlOHgX5+AEFHkpDWeRTBb+3nSv2wF+Wqonv1vVMJSgkLAi4K3i1G7/iYdglV599DFqWVZFwtgVKN0HjW5NXNy8CtrqskN5yEQ88FzJeQaN0cf7IkoY3pn0Ed6L5yWv8pw==; 5:9+gykm8iJrsXi17K2puHxMfXtGLmrMhozffJFbJSCd+51FBnFgCsO+NxsA4ag0GErnrPIWjF3ou8FymWAWDHIzIKOHOhX6xfZegobgyAzT46wVdp6dfg1ms2thEPayv8ADt7fY/bzIVKD+sAXFjJWvei4ArhDcHqo8vHymvjavqyLPlOW3YFLIDoQoN6QmZ2Sl+fRh1RMapL2ib9QZrkBg==; 7:yuEauRbX2m9Saj3q0g6wPPAn7YbJYLZrWLgxfVH+fvPhV3TXvi3+6doUFqkE258ODNGbeXXoXbEeuUnLS62VW+XVCQluC+whCNFKb7OgLyJWMQQAOWuhIlekYIOdY6oRs8jycdwnMpDNVpwBUO2+8w== x-ms-office365-filtering-correlation-id: 327f01a1-c0df-4f6e-555b-08d686b86efe 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(979002)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(14444005)(256004)(6436002)(2906002)(6486002)(217873002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(50226002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: jhERg9XqbaR3MjXnteiVxLllBRGoJFJr3m6s2LCqsDi9d0jpGgK1ea2NNDkKDKHnmhTS2l6JkF4IXGl2ZlwB5pcTR6sS4Uc658yxnd3tVeTxXieKoTB5yQBN1rwdOCpm5LKEkkDyA9eV5POFQhu8QrNxVSKK8UPS2m4Sik/o0bpr4hEmigWmF2t1CDtDlH7pc2d6jvfT4or3UzY8vSNdBM5nomDaB2C1bYdt7u5RiPLWq2jdDVEwrSUmamz6q7LaNOX0onxyVVg++yRqr/Rq9PM4RJUCjQuUohzy32adJ1THKBwqh6OQAWTKulmZK+idfa7807AhapdoJrT02iKsyEn2PWLtx3Vqlge3sblGK3WYxlE1Uh56ydO78PO8zgEJkV33xDFn41zyp4rGor/lDEZDFX1Ug6FpE1rnpWKe+8Y= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 327f01a1-c0df-4f6e-555b-08d686b86efe X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:40:00.8301 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index 4bdcbb1..6a4d3a4 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -11,12 +11,19 @@ CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_NXP_BOARD_REVISION=y CONFIG_NR_DRAM_BANKS=1 +# CONFIG_SYS_MALLOC_F is not set +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 +47,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 +82,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 Wed Jan 30 13:40:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033560 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="craf21ck"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPqQ2Rbbz9sBQ for ; Thu, 31 Jan 2019 00:49:22 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E406BC21E60; Wed, 30 Jan 2019 13:43:09 +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 949A0C21E12; Wed, 30 Jan 2019 13:40:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 770B0C21DA6; Wed, 30 Jan 2019 13:40:09 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00070.outbound.protection.outlook.com [40.107.0.70]) by lists.denx.de (Postfix) with ESMTPS id 0197EC21E1D for ; Wed, 30 Jan 2019 13:40:04 +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=GW7cTwn9QmEax7Z1iPRSfj94zw+GdSPuhrH15Jo9QO0=; b=craf21ckeplGJKOGS+XXBshD2pRwlhJa74A51DIBLiv9yXrxiE5GlcaRJ8tc2ysOOoyzCBrTHnkEuzw5Sz54+LHbTf3+g0sTcLxViSqJVK4YbPf3yNvfm3HAtROzo5VlMt2aJxDMyaflZfydUB/8Y0ILLS6NWLinWCGyTXTwjJU= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:40:03 +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.025; Wed, 30 Jan 2019 13:40:03 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 12/22] configs: mx6sabresd: Add SPL FIT and DM support Thread-Index: AQHUuKFNe9ARrS+I+0+uF/MnswXreQ== Date: Wed, 30 Jan 2019 13:40:02 +0000 Message-ID: <1548855578-12529-13-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:4/kmdMX4Vw5Wr2ZRQDuGVWtSt9JmIIRMMtp8MU2fQijiMlPyjMWMakC9snnn5Gpe8xFLqKxYJPoQ0O4RWZmXXrcd4kDpt17Vo79ta5INZcCPfDyTuCyfuSNI9t2nIm2ladk6ns4Z58vmxjFhXJ5wTf0NDyJo6qATLz8S+vHDHM4Hds5YEQYzzJhgxpd+rwm/59occ70MHecWYyoV4gXac1EHNgPrn0VO88Uu7gGdf8UKWT0EIWo/p8nG6wJ+hmNxsFGj9Ok67leGqjSTirIhgyIbic+2M4IW/SirHwVtZmjWtnziFNb4oA4MJK8fbnOAwiQ1KR3qZDt0e4SpZtLF1mS7FkiR4aJTluKEDoT6dm1IeSRP8GWNCngg0M3Ca7WpkSrPminpwJgH+Eqab9F8xtlUkk+rDkd+Ky823y4PKe0j8JQNnGx9ylfOh95rNIvgbVT87a5REQVXruMBVBlQnA==; 5:Jq++p5GZ1qWRSMhK16es5xiWd/1TH4iLnC6GvVI6/mt7tDmI1JyuCf97sIerC+3a90zmtyk3e7lWXlD7pn/iYgbsJY3/0lEO5Q9YxljLvFLgc2S+V3jg7xqjr67IW8pNkwC/XMXRdnsRvBgBjmVzQO59zmaStZYong+y2XLaia2MAzD3Ibs5ByBB5K2iJm+2HoWEflIOAHdb0j+oUo6dZg==; 7:TgglcAxNktLB7YOWXJhOLn/MFUuA2sUaCKWm47lz9Vrvko0JqfWlGcnSopVhvDcHaF9pgJktKSk7znQ1N7iThwfU0L2w1K3az6yJmNMZuGk+7VBy2KA2XpbXymxKaJhfmmCU7kfKo8fX2P9S+WEF0w== x-ms-office365-filtering-correlation-id: 38c89ba4-40b2-4031-ff05-08d686b86fa9 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(14444005)(256004)(6436002)(2906002)(6486002)(217873002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(50226002)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: 8gyOSNSZd3y/arVbDEOfPW+FY1zRihh+PrTOVkQtle0PswG8vpX+jpCZxrztdp3RwzCszK9cmIY1s7g1BSOARxoZY/8moZDgYwsHPGQI6SZRJgly+UaBSXy7ZJwoSvVEuN0vx6iGPEAFYAYVr7ITlu1iwhEB25HEoxkF0GP87fWIyz/vo4pywfRX8MqloGlsIgg8tSKAAN4ysSGaTawdE6mWS9y64ATijeRFKVoDCav2HaHEOM2UwvWyajqQpuA6yeI3Yc2NnFCoaLS5cwsjsJt0ULXdAd0WtC1salE/cLFYTQP7JhVGL/X0m402eYQGSyStCdmFLWkIWKNsqSKY1CUSNAaatE4xiHJEXcveVsOMDpGNUorGAVrxunF+8+XtvHxuDkSUkUxAS9FgXHSzXOBBMH/E8Ds1G1hldZGSnjw= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38c89ba4-40b2-4031-ff05-08d686b86fa9 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:40:01.9707 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 3babfd5..d5a4365 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -10,12 +10,19 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 +# CONFIG_SYS_MALLOC_F is not set +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 +54,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 +91,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 Wed Jan 30 13:40:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033558 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="cNP77Kag"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPpg5GT5z9sBZ for ; Thu, 31 Jan 2019 00:48:43 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0FA14C21E60; Wed, 30 Jan 2019 13:45:21 +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 2D93CC21E7D; Wed, 30 Jan 2019 13:40:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 24FEEC21DEC; Wed, 30 Jan 2019 13:40:10 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00064.outbound.protection.outlook.com [40.107.0.64]) by lists.denx.de (Postfix) with ESMTPS id D733EC21E13 for ; Wed, 30 Jan 2019 13:40:04 +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=QXdkrdLu39a+5d/zrk+sh8ulc8RzDp1BQd9u6NLcjIM=; b=cNP77KagqdDVyLu7uSnrXFATT46a2x1E6FsJ+6XXb+AtMQE8LTicZnde7Gx+5pCgqOHdshqQwVt8c782llxup343tG5diOqB/QB4AQZJ4P29IJkwgXfvrRzETdC6THS1XYLjGh6/MsITA7469tN8KEsvMMFv52wiHBWMtYcU4z0= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:40:04 +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.025; Wed, 30 Jan 2019 13:40:04 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 13/22] mx6sabreauto: Add DM_GPIO support Thread-Index: AQHUuKFOhr+ohuL3Qk+lh56GFC8XAw== Date: Wed, 30 Jan 2019 13:40:03 +0000 Message-ID: <1548855578-12529-14-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:Y1rW+a8ldwJhIywU7plxNMoysNruG4FdbG8/M0gGwaZr1fIXjOtgLEuyLATGtU0JuT6whJhTJMuaogf+E/CwUzPw/HHZ/mM4BpkeNET1C/WweVR/etrm9lzbI3x3uen+4Cc4yqq1OAFdUrEBuF5nfHiPQ5vTdQDQR0va/xaU/G6aakTg66j06lUvBFfIQym857oaesYJue7tsjNPxythgLueBx1iZhAkwV4R6rv6onqzj45NsD4PBd0btfNoZHUP5KVMnW5MRG8cwsDzABEBGtwETKO6vGXRT9HjShBXUZJMPBayuM3D62QraIEIMgTTvG4jsClf7r7hDUOtp1lkR/jWWq4Uf9j33T0PQTGEn2ScN06M6lEP9JfuzEaXBg7lDiwJUijD57WNk2jtfDj98sVWhbRoZsF4ca58SqkybnK5H//VXKO24Ci2s8h0M0HY31pDXGZ/jAs3t/lsHs2x1g==; 5:yN+U2zY9mECQItn6Wf1x+AnA5FAo+kMESoSUihv/bfgq/h44SjPH1PWJgqSf+MVEra5/2pQXmc1muX8IlVKSZJFeeEIH0f8ycEnPinzYa1IFjfR+GunHxSoQk+8CUKVehzgyNANhJtwjaL2nDsrkO6FUp8tsozYi+S6EtGCKKKWfSgmcL7e/5im2/JOgpUvFumUweIki+P63wwqveAvHig==; 7:FrDaQ+PNhQcHHBt1j/IPNwYkTPtisINPrsuWrMWFsWGfkkxbygB7wtV3eqv3giNB5z+lgpIFE0/GvoalDvlr6oYv+L0yKhUZ3nrwn1PkHCG3n5Blt+56n5Z6GMYrkYA/zOcCVNpX/IyLw+cBa6XVOg== x-ms-office365-filtering-correlation-id: 33179b5f-7012-40e6-818f-08d686b8704e 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(14444005)(256004)(6436002)(2906002)(6486002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: YEBXmjUSopX879IV2lo8xqLY6g1RPVprKiIhzyArq9NaytkBE7wVSFtfHd+ZuuwyWgMdHXCh5Y4MhS3rl4AAzAmpBM7wyEUAQemlXgU7YpIf/DAW5ZI/FGhDVqz4+EajhOU6CRdbX3BhOmkubxjtr9PiOHt8ymEa+4y+IOBoh4/3JFSy5ZHftR5k1VMAM+PEwdHTv5gp/VyP8gK6cvbSDPeIj/lBe8+7uPaG6PO0cA2GftDRKqp792b8Mq6K4cKQSjZGuLyGVuYmnIdH43P/r+2vavY3egVgbxIqyMTz+P0Vhkm/Px4hNuC/1RbdjYqeLC57pDFxVX9avG8J1k1doAt+UaA0RK5CEDC353Tg4z9j7046vXIH23xvNNBapIjZ0icsdt3ZnZxzDgwbMS04hdB8qoOC+BujbHnsNyZ/VzI= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33179b5f-7012-40e6-818f-08d686b8704e X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:40:03.0332 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 6a4d3a4..31e8153 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -58,6 +58,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 Wed Jan 30 13:40:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033554 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="AcLp/gCp"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPnq04N8z9sBZ for ; Thu, 31 Jan 2019 00:47:58 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A6E16C21E13; Wed, 30 Jan 2019 13:44:16 +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 D141EC21E75; Wed, 30 Jan 2019 13:40:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C8D51C21E4E; Wed, 30 Jan 2019 13:40:11 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00057.outbound.protection.outlook.com [40.107.0.57]) by lists.denx.de (Postfix) with ESMTPS id EBD0DC21DDC for ; Wed, 30 Jan 2019 13:40:05 +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=/YwR3Lx+OXhN29xHmqeWBsX2UdWRfWlMwWlfsnTe+34=; b=AcLp/gCpgPXd2O/nA9cec4e6JLi0fkeEF1XTj/k6nNx9OUKnnxWfgdgA0+tttgZWHyxwtD7FQ4/biu+Lgq9+gMEpAOI6isuPaemRrquMTHZk/nM/RbIjHt9usxkPoBH76jmWruieJx0Oan1kOCNFl2ko77VxXEClXkvX+alda7c= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:40:05 +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.025; Wed, 30 Jan 2019 13:40:05 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 14/22] mx6sabresd: Add DM_GPIO support Thread-Index: AQHUuKFOitBb0biGl06EpO2MALmjvQ== Date: Wed, 30 Jan 2019 13:40:04 +0000 Message-ID: <1548855578-12529-15-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:tMOQCtxbxvvaVOPRw8+RWCW9vISQw3SuB8s0Bw7ZJTvfkd0npJmbAzDFbjCW93SGLuxDMnWiI6CXSbjIkOvYzU7R3rjuzkrxYmIkq2P7pV+5PdpZTDTvaAbKlLuW1iWXMJW3lGpxo7Zvf8ngNLuzIxO8cjCl61WGwG/Lclbl5AHTsUz7pO2E1SaZQqetXgx+T4/ht/vQS+H5C5Bye+4aF0hmybmb09ctnQaHBiZ04CLkFgqm1XTxVUe0Zg3PdpBuYmgyrOpe4OGMTGBzxAgjN8KHh+yjsGdJEvUzJs2cOdnu6cn1mFT61FZURiE5YGSMifMqjHwmuUr8NW52EBqyEgqKtBUtNVHWxuOwyU2z4frTRTor6LtiHoLGTy7XcUyhl2eZnaHzbMMv67QLOhhV4ejWloDe22BWyMMPM05/8HQ1KOFeIN0RJszYgDfhxTyb84UT8fa1SISS70gpqMsePw==; 5:bggyGymBJGAkrgAgzbQZpTVf6uJNROenvCN+9hVshjrsHGoYuAujmpaTeBr+A69L1JSPjn2ULl8w+ajL2wtyzmJyblEOdYpjP2I18jlT7jQJVRaJWbabF+WYCMXY4LSbzqC7nm8JFW8u3fPckmO3UO7CKbjij87VfoiL7SRcM6hrBjVl+ylx9MGOM4jzZcGminK11yWkexxRPa6nQAOnPg==; 7:ElwTVC6Oz5VqvsFNm5t4aAXZwfQNyD5sL6wxzmarcVstQjAwRqDIh1PwASVcw8k6Kh92Sql0DUX9Ka6v6xOnc0kwmUiWDzrrj8VhoVaAjAuZBq7LHvs85j+CjoOd9sRKM08H+WZikfdbCwH0nmucCA== x-ms-office365-filtering-correlation-id: 68ffd991-1397-4e31-8ef5-08d686b870dd 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(14444005)(256004)(6436002)(2906002)(6486002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(50226002)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: sZCWYm5jSUAtNWbey143r3uHk/QdCrvQbrn8BIadI7GzuNhOaLI3bvulF0gWan35jAK0z5oetfGc1HhLpQR00kOMvgliox8QCYTeQyrBR+WrWpuwxuJYKx4KK9d6fa+u762V31+H0I715FwIGbgmJ12xsl8n0IDsH04ynFMb6HXrY3zvgCmJdvnd4Fk+cm3f/7X8p8rCWqVHMi/dFuqiVKSDSScyf0Nw6u6NDjyOVAYj8pXu9CLKaAGvzg6ok788V8gbhurFfg7LAyNuCkX/pmpqU2iReoGe3FDS6j31rcschf03Mo2Bmqrwv4dlSMAESODHfeHeDJ/YN2GycOuS8vKC+nuwKa5ylACaH4zlDkwEQR8KXWLWG3mwvDVEA94RJZqz7IxFfcnqPINpBZ5N7AO+c+RiCZ/s3ytdGxrdeL8= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 68ffd991-1397-4e31-8ef5-08d686b870dd X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:40:03.9551 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 d5a4365..1f4c5c5 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -69,6 +69,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 Wed Jan 30 13:40:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033550 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="Uiy3K8TZ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPlh4r9Yz9sBZ for ; Thu, 31 Jan 2019 00:46:08 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E7986C21C2C; Wed, 30 Jan 2019 13:43:27 +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 20150C21E47; Wed, 30 Jan 2019 13:40:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2AC36C21E02; Wed, 30 Jan 2019 13:40:12 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00041.outbound.protection.outlook.com [40.107.0.41]) by lists.denx.de (Postfix) with ESMTPS id DC97EC21E34 for ; Wed, 30 Jan 2019 13:40:06 +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=3x3lxNsPU/kxBF2sRKYRvkxR5ZKcVjxUJD08+jYUgFA=; b=Uiy3K8TZQwX1q2uOi3ZhWc1do0+I/LnK8cpU40m+duQ956yQJmZkqfjDtNkyHGb+pGhx9e2OBUdbkU1b0aDxH/D0xV2e6mnL6lFlJ1BcKMdvUQpdPjPs1uzKF5MzhaTwav+RDtRQV0dNfmqT1u5UxnUTeIXoLD0JKpMTXExBdNk= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:40:06 +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.025; Wed, 30 Jan 2019 13:40:06 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 15/22] configs: mx6sabreauto: Add DM_SPI_FLASH necessary configs Thread-Index: AQHUuKFPEPHMmskzRkW5sXsIdC/l+w== Date: Wed, 30 Jan 2019 13:40:05 +0000 Message-ID: <1548855578-12529-16-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:rgu16/mwAyNf6yTss2wIRLMK1gYBXSIJxgur5TTxqfB8piyU6oBb+pkhhtZSROY4sn0K4970DMwZ072BCr0bqZ56hZAmL+7snNCi3qn3tiEhEVRNfxOqxMXbabBTnQAL9SPR60p0zKIWuY1THB6pIWs7om3iqiQsw2vegctvEQTYp0QxBgta0LnyqHl6A1CfLG4aZRcLdouf+yUvaBSICPx9hNI+jCO94ypVmUpYVBpMjK2Ekd2I5B3y0U3wwlpAbvjUftop17Zac7ckJ8zDNmHthbscSQjfyY/Kbk6Vhfzh8BrWYXghZBikaKI5MIw/Ub0GySBp/XE9NUCvAikbc3YbCLwHmGIfuUGQepw/+W4Ia0Zx/PPxrAe+4XzA9IQ1ddMV2mouKTUq753Ocao+n5k0lzLIOCxI5OA6FntB7da6GfpgNdkLHnwiYOtSx1VBBw6TVI1Rt58JRIG18esqGg==; 5:N4EBrQX4gW/8QBIsNo1Hbs52gQ4MMnAsQX8lizOreRONhO1iYMytZN8vot+1+ylckAcT+sq2fMW8qkP3MeybYbVagvGlVbGsWueqAkm33gdNi6DXXGjJ1Wo1IzDroLMqWSbyAnf2FeoiEAqYI+gUMOd8yQS8kC/RYySGVOEBlHT1t6J/EkIrwgH3Xhl8l0OTe/kwUUFBnV3GHxC/8X9ykQ==; 7:4+MuWNHsE4JCfgb9ti8Trk/bsoilaHbOzw50NlJMveOtNAeleDreL5OD3nclOdqyCNeu/cFl8YamNNKu16S/mxqE7c1L2xoHIu4Eu5Gct7QRfoDl3WuYUsYKSihtE410bfYWbJkx2CimzCztzlWP2A== x-ms-office365-filtering-correlation-id: dc166357-140a-4163-38a3-08d686b87189 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(256004)(6436002)(2906002)(6486002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(4744005)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: WlKay99opTmzvEzftINyYx4fsSV50PChKsw+3f9EjzMWNt+Po7hvHygfjCHRrMNJb0MDti/gZzMUteF0n8B98le48DlSf3wzT0lFeNsCo4v4vn+rOk51jIbGWSMvVQ4CowwgWxgqxkL7oltYG+idhBj0xDYhGYroFqfIABOScYEPl3GGxRKRuFDiWUzqmcUi1LnKRnA2H4l9X/vI/sUAUc64RDcVq6BGNQqdHabaya+FgsCS4wsq+6TrT0AbeOtaVPOzjXVEkJ0WFlc+R87rIiFreaisvESoTX6fieNB3UzAnkj57vHQaFd3vSHa6XI9g0Ub6g86mGISi9g6iOfH53heEAFGLq63HO38Xy6WwvKpCWAKP4DrXA6uRnQ77Ei6A5i6R4T6X62WesXqxKkKdkB5Ywkm//K1CH5SfB72xA0= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc166357-140a-4163-38a3-08d686b87189 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:40:05.0489 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 31e8153..34fb9d04 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -63,12 +63,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 Wed Jan 30 13:40:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033555 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="bc9j1eIk"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPnw53dPz9sBZ for ; Thu, 31 Jan 2019 00:48:04 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 71147C21E44; Wed, 30 Jan 2019 13:43:42 +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 A2245C21E53; Wed, 30 Jan 2019 13:40:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 33789C21E1E; Wed, 30 Jan 2019 13:40:12 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00074.outbound.protection.outlook.com [40.107.0.74]) by lists.denx.de (Postfix) with ESMTPS id D3338C21DB5 for ; Wed, 30 Jan 2019 13:40:07 +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=3/47SbUulJBM1nE6OXghwZbw8BjDtXO7bKxLQKmU2ik=; b=bc9j1eIkq7DJedoHaMxh9bLk6EK27cc3GbTT5V3LqKebtOxGZOSi2PsHqNrhmH18+DYjV4TO/JVwPvJkWuPHKI2zjW3bMP/E+Jk7pPDQLjP+H/TJmwI0Yfde41yT7fOUVZ5mPR7ga9IMZVL+7sxxb2jDQMxs9MY+5FJQTaCxUZY= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:40:07 +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.025; Wed, 30 Jan 2019 13:40:07 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 16/22] configs: mx6sabresd: Add DM_SPI_FLASH necessary configs Thread-Index: AQHUuKFPmEAoVKlEjkWKjFVcaNg4Xg== Date: Wed, 30 Jan 2019 13:40:06 +0000 Message-ID: <1548855578-12529-17-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:PXUNqmpVxNxNyFkJx2Qvz0o8MTFl81yVxElmq+KprypUppP4029PUcKSvDKGgLicmYk/VJTlVYohVj/Uri+9UmQZKWKK29CYxlTeBgIfRg1fcMHvI/52TAC/RR4I8hvClN1XMQJVY0xI78Ies3jL+DZW+N5LOx0Fixv5vn9Zt4IUMhVEGWGI3tXKNqgU2844KiLFNCtN301SIJ1MyYnYAoQGT3PhZlmIeyzw4J3DwsFCh3NV6AJCdisChar7jZ52nBt6gEZhaFS/jmM7vJllRmI6sNMM5We7fJVsH7m2Khp7raYzJG55AeAUrxVC1V3M666fEV9gSreU5vdHvJr+W0WOLwq0cGBSxt/8sPQ1YtXIk0y1uoYvJFG3a2D4Cfu4GPueFsCiw6HuIj8SG3hKSZrqR+TI3z3esI1fUEryLtBwpkSwdBu5+0wtRmCoL6AU5NyJdoBVtJvaN8Ot8a2CeA==; 5:LP2NmqpvxG8n3I7tK9m0iJG/8HMbxIXpI0SoT+YuDPGHs9+Yml9KdLOKV5gDsmomr1pSSYoG8AUUwTI8GS2F/BB+1Nov2XyyK09v6FOSxHRW1MFt7KDEb9wikA9c1LKQbUe5MmP8TG9jYQoWD//1T/42eo5TBBlE0LRo3bpWlyTYiTc7IZ6dFY+h49ZpLotkXOC8rFFCSdVYYJy9TjYLpw==; 7:DlWw/4Ju+vrPYsRw3lCmZ7ECupffPshlIe9EmZkc0d5uglH4FfDXxfeEsEboy41i/BcsNmJsbB3jCvOIYZZVGYOQrGeEZMyGHAblqMIspwZuWqec/UPUggBfD92uYYY7kiqlpLM2JxAyTmUT91SuRQ== x-ms-office365-filtering-correlation-id: dc63c44c-c33f-43ed-a85d-08d686b8721a 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(256004)(6436002)(2906002)(6486002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(4744005)(50226002)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: tX4LYP7srIqtOMzgr6Jvn7vAWM5HZCK0qozaqz12N1pyVXDThAhCgINnQTeBbGR/LOBohUbCHfD8/s9IshbS9QroNJRs5/Qw/QzxBxDldYYFCkbOwjO6FzhP9kmEkJPT+b0lJ7T9CsoyFTpRpihLYW43L+eEKvvD8KrFbFh7fynutjbbHYEFRcSs4KZuQ+2UqBzeTmSXvQZu/SYfbj8G2gCL+JuvdTFg6W+tK6DCpnLMbe+Dn5DdLx+jlYg9GkWTceeKY9h+vSQOhdUZphDYSdZLs5WHXB0zjtw45D/Y6LwKgBmG6cj+2swKnm3aI73eBVoJqfOrO3cz89CNLgR6OBvVYnJ10gHTpImBZJKn0PjkC+Q62xC6FlEJpySXVIeZTHb5NwA2Qs1ZOsxyspIRqUDT6Wr9bMcKavC/au4/Ik8= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc63c44c-c33f-43ed-a85d-08d686b8721a X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:40:06.0645 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 1f4c5c5..b26e764 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -72,6 +72,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 @@ -79,6 +80,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 Wed Jan 30 13:40:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033562 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="oyQ1nDTH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPqz5Gtxz9sBQ for ; Thu, 31 Jan 2019 00:49:51 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 51E05C21E6A; Wed, 30 Jan 2019 13:45:06 +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 89E90C21E6C; Wed, 30 Jan 2019 13:40:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EB7BCC21E70; Wed, 30 Jan 2019 13:40:14 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30062.outbound.protection.outlook.com [40.107.3.62]) by lists.denx.de (Postfix) with ESMTPS id D6E73C21DF3 for ; Wed, 30 Jan 2019 13:40:09 +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=oyQ1nDTHrmtDysy12/nhGZG8aCvzK/xR2Wj6c+5wei2cC3LdUn20bjX7Wsa7/xO4eSuwnwiPT/zG8jo/MhBxSi2yNov+5dIwZ1HGo2CUmJLr9b1n+1jl/Ykpi4qFJcxe0G5SoDVWD8VcEmYQuvYJbPOtrPooP+LLF2L0jbvMQmw= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB5774.eurprd04.prod.outlook.com (20.178.127.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:40:07 +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.025; Wed, 30 Jan 2019 13:40:07 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 17/22] board: mx6sabreauto: Remove the non-DM code Thread-Index: AQHUuKFQoBtYKXRyUkiGTJ0qq6yt/g== Date: Wed, 30 Jan 2019 13:40:07 +0000 Message-ID: <1548855578-12529-18-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB5774; 6:DkFoxJMsbHJvJYChulxFr/rr5FRtud36kuB6LzH8cUkR97So8Nm13sbglPkTDHzJjgRwT/QMRqltnaZOGRALCQtBbN79xU/tXFLmG6U3OwbksWclmkSoQEpU8JzPUY+axP3R7W8e45uHnhOaUcT6eGAJaK5rGBvvb3RyLAClgLUXwhIc9afOLTEazJ/m7+rDSloAp0ctmaT+qu+BgSq3MAIH4DNNIm375mMryt3cbQMEWgy8GAOmsXGYbED/MRtTY/prsLh047XFM5c+CdcAw+FZ3u7T7EjbODHG9pHEGcKxIK5JK/tWgdCpBuSL99dcPVtX89fTEidKAOI9N+YKuOuBnSdwNZpkv3BeDYb/TN0avdtMxT4Sbl9TXDbbNnOa9rBi3+f7iQ5UAPOQSYWZ04ZUmXt/2EC6mmtEhsdvVBHuUHvmK++KT9Vl0fiDeTj6GTPnGIQABZ1qafs0JenoIw==; 5:qiid2sRSj6JvO+OaVrq3ia+FSvmW7lAYcCmE0kbX0XDEjoIA/0jltLAc8XFVScuIeORLWQ2L9JeqBVju70haPkvIYDdZgpDcckfpf3I7Dbtexjrqvn8AhmeE4iOeA/xJDZbhI5qnVGthpcaSIt5jA2M/L/GinN4GHKeT3V0QTOhvGUPDEY9KEF1Ty50Xqz/hkYbLs+PMV3s536warVX91w==; 7:U0oUNsAK3h7LWSiSWA15KEkv2n5tADtbPjzbUeOgDEZOfVPwBWbQxetHiKZtF2zSP2eyobivWsEvqdnmBEMIEVwY/JETj/fKxxDRzfC6MRt3NaOpESdzHJrt1fsCs9amj7w9tmWnqxy8c9UA5Q1zDQ== x-ms-office365-filtering-correlation-id: ebc4340c-c3c3-4fc0-f0fc-08d686b872a4 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:VI1PR04MB5774; x-ms-traffictypediagnostic: VI1PR04MB5774: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(376002)(136003)(396003)(39860400002)(366004)(37524003)(199004)(189003)(2501003)(4326008)(8936002)(66066001)(86362001)(81156014)(14454004)(25786009)(54906003)(446003)(2616005)(8676002)(81166006)(386003)(102836004)(6506007)(186003)(305945005)(7736002)(36756003)(316002)(52116002)(71200400001)(97736004)(11346002)(76176011)(26005)(71190400001)(110136005)(2906002)(256004)(99286004)(478600001)(6486002)(6512007)(6436002)(3846002)(106356001)(105586002)(6116002)(486006)(44832011)(6636002)(476003)(68736007)(50226002)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB5774; H:VI1PR04MB5008.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: T3lHmcjvfQULA12JXedAGUmQspQSSVR2JjvohlG6RAda4Z8AF7fouHZBhXipd7YX2JETGmjIzT38I7aiwDjQ9wJpLCJLMEYBd4Fl1O6uPoVcBfU27EnpEU6MFjFTAlDlfvBtjLOwK3yiKECmcezBQx0mRD9lGHpr8BsRn+pryQIHbaK41tnQL2HeWKLt/tbigRiue0Udkep9MwWJOgH+7vQkIFigqca4yDozEJfmZntid7qW+8RYed6+Uobwav2rZsKWfxgeYcAkqAOBT2bsn3eIV5gUT1KgyPfPC0+NIoWfEUY7scNSPy5ZFCW0kRvQZXfJsaMpUTU4YntA/9ob3qHseGM90Nx1eFISjhFHo080O9L08Kbj9NWHD2ssBVHTjsUN/GhMMwBnutYfuXGRwA0XlMQD4oU4XSrOIakgajk= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebc4340c-c3c3-4fc0-f0fc-08d686b872a4 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:40:06.9395 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5774 Subject: [U-Boot] [PATCH v3 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 Wed Jan 30 13:40:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033548 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="jpoEmsM+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPlR577Lz9sCL for ; Thu, 31 Jan 2019 00:45:55 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 221C0C21E1D; Wed, 30 Jan 2019 13:44:01 +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 4716EC21DED; Wed, 30 Jan 2019 13:40:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6ACD2C21E4F; Wed, 30 Jan 2019 13:40:13 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00074.outbound.protection.outlook.com [40.107.0.74]) by lists.denx.de (Postfix) with ESMTPS id C57F5C21DA6 for ; Wed, 30 Jan 2019 13:40:09 +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=jpoEmsM+rdbTl2RvREkJ/tZKJFUeD00pRCamfr4Id8/jP+MpWxO36gvFhJ4+RRSD9hCaMuPUF5Z2Dc7eX5S7KkwSSWJsun5ZBga35Yh9SSJEVvW+f9nHl5DP8EpAqN+2vu3qtHRFt6fGEGOrSDrt0kJgFCh7ZvhF4tPS04kULBc= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:40:09 +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.025; Wed, 30 Jan 2019 13:40:08 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 18/22] board: mx6sabresd: Remove non-DM code Thread-Index: AQHUuKFQJojOaYJv0kSPZeRSDn/QcA== Date: Wed, 30 Jan 2019 13:40:08 +0000 Message-ID: <1548855578-12529-19-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:dPJYfOLqvZeIgHzEZoVrJ3V95/NMx+KWCzbyIIl2EoKChCerxJ2TAa5TN8dbF7ORdfT3pj2iqir9aVEe4tHDM7WV7s8JrpcM/gvCfau5dPAlnBsJhfUAXb4nmVRb/oYvtFL5ACDAnuPcUw613AcRO6OdNEz9yhyzZqYYJSAY/xPJLhzdEjFukrIwiObKAoYP7GRbVnaHixppr1axW6uHdVo+KIA5fxkV2uysPKYXwTxWd2TS69dMyEvENQLE73cRCEYcaEvchOOaF5vL9rbqNUJ+wJrcXjIX3e8W8ptvOnC9XXPV2YQHoOTRB22yYxeg1ktDp3i9a2i4467WcprdyxEs1Fy0QVlzqEIYeMoMkYtyW0rNR9IhV9AZPWSYNVSzjwkzNaDwXU2gvP4LkaPPFFdUhes5Txj+OgS3s6hbkV0vmL9zGQZXGvUcimvCh6rHqRAHgzdHUH0UBOWLM2i6QA==; 5:4lKc5WQTbVBSA4CDwbkUw0VSJ8N3M+70T7mSfnLZd3/ILrmIiWaqydocrL1jcIgz4+yrm4YUTglUNcFA0nH8ajppAVHoivHF6ayKlvwUfREG7nHyNFto+s24FkHWxvZAWg6N+0h1FgwfhHATv272LEvtwGqxrmqUAHxRDq9/6MM+Mv0uzKKIZVHhRwEPoN80y6BbCt42ZoflDh4OxXlVtg==; 7:K3Az6AONQrs+HJuDjgACbknr5P1lCzvN8DdQm858iMvCU3CppQcV+CUhocBdGN5cMaWlBwNZgBbmyo3Ls5UmMpLqOeBGWYudVuKGy4tBm+XsHFW+iCcJpuH7JfXJZxjE32FmO5i94wRB0VvIpWHksQ== x-ms-office365-filtering-correlation-id: 6be0c724-7b43-4268-ea20-08d686b8733f 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(256004)(6436002)(2906002)(6486002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(50226002)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: NmzO0E3FjhLkmWkW2RwGREgR53YETr6BO81xqrv31xSpReMBnbPfy4pyOiE54F2K2+rIbV2Gyare9HbcMv1PZ+8xIzsk/l+LyT4o35Bc87a9CiBEOR+FJbEb3in3QEt1qhx2DInU8RIPO8ZbrbxHyx5epjq/1J115Q2RNDxBABIgZfshP/GBoizF51JZYn0IK7bVu2f4T6hNT1e/nbBM/3SnID8+P2XYPz5P0fH84rTRlOHTcQrhCKotZU1e9Iw0i7qQbFYjlPCdIX/lEXoDRmK8q3o4K0GoxQrYHjmYxmnoS/kAnDWsBQ8LUjis2ITe/99OetuauX558iLMnn+9Hcvn+39Bv0hUuXdltFaNPpay9PzIQK6Fj1Egi2iiI5gtZCSZDA03b3ovafRw1VsmRcOEOA1KyKLSZgWlvMkzYsI= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6be0c724-7b43-4268-ea20-08d686b8733f X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:40:07.9395 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 Wed Jan 30 13:40:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033561 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="Txk5Krea"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPqh13Hgz9sBQ for ; Thu, 31 Jan 2019 00:49:36 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C7421C21E1B; Wed, 30 Jan 2019 13:44:35 +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 74807C21E13; Wed, 30 Jan 2019 13:40:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 36CDEC21E02; Wed, 30 Jan 2019 13:40:15 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00077.outbound.protection.outlook.com [40.107.0.77]) by lists.denx.de (Postfix) with ESMTPS id 157DEC21DD9 for ; Wed, 30 Jan 2019 13:40:11 +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=Txk5Kreak/9FstaWHNOHwZlKGTq78AcTx6zdjHGpnIsalRGSuT7bJETrbJKNEe1MB7K1El6qGljFzBkb1lO5P8AriU/aNDTo2KTN4y3W8VnWtAUDeHerJkM6jQQp/82WNxQcaiC8egFhNzTIV7XjK/3NFoZWc7n7WXow1tYQk1Y= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:40:10 +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.025; Wed, 30 Jan 2019 13:40:10 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 19/22] board: mx6sabresd: Remove the enet reset gpio handling Thread-Index: AQHUuKFRG/YV30KthkuAm4QMtXiADw== Date: Wed, 30 Jan 2019 13:40:09 +0000 Message-ID: <1548855578-12529-20-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:7ql/rSC7dQWvTKb0j/QBhS1//LMMDf9qyWlde1Wm3lFtXrCR/+L+4uzTiOtDA6wZPOiZABfDGtTQFLA0qSQ1pTdf1fMIXKYPcBI7G0Zxsxf2x53/LI+Q0XH6ymnaxtsQ42TfDe9+KQS1H8SAEQurqx+BCajHwAmaxtD7gIfUW5/qYB2LYrGuVCa2C/v/mouyKxVQUEtB8GKaIVookjGphF50ZeKciRgIPpHLQbfIpAR1y1OS8qy2uvGvdyKJzoPdE+bQiBzfu3Y0mJTaNqT87MMIMSGkzixIq7mQAhXqxd4kin0b/CloneLi0KFsOuAu0eXd8+eSXk7TXw5KcOLiL8RlG1ZzU7zYpcM8Qtm6/P+YYIUe4W8KIhBf+e+jxtVCsF+CkQJqGr3EraZTSkQnkPCf9vG9BYkuF/Ars89yMNsNBWGUSKtiKCnxn6bg7YZqXhN+YqNbEBppZNZu5ZdokQ==; 5:TFbp1vtx7Ag/JbqJ3iYLozUQOe9zti7jeEieTaayKKLvtczBfZg0ROD9ekPut3ds/+r4VfUGXHr1aEfjgKt7ZgfZ/pi9NaTDexfWXRqyHrFqfqWHyEnYSZtYKrHCAey1bh4H8v1Ppg8qrtKPK3WsBCwGXsAxU6XxOr6Jm5evmPR1ewzgDVlM9f8i4IS+UtN1E7FlzBKJKxwzczdOwfFw+w==; 7:3lqwT5GADfV8GyFbyz9be7tF7AkDrdmqH0WQObWjKbakiMn1zrxLLOgKsUP5ucPhGwuPo29kmJeSSvXtys16utXz3vbGtS7eURDOsAtUl++tIF8PcIAfRgMZ1/PUglf4vPHWEAZADGlz6JOkDVoE9A== x-ms-office365-filtering-correlation-id: 77caa5d2-5e71-4746-59de-08d686b873d1 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(14444005)(256004)(6436002)(2906002)(6486002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(4744005)(50226002)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: 8/krvpelK8TCqZjFmchb3h9yKw3VczAx9DT3jJY6hMVpOdwsPqkeqL6QRQR2py9waH/OeWIPq02QCNwLZ4nJEZ1lKfRAxKQabf4k6Ox6w+hxzUjqh6RJ1peRvi44l0sx4MHx0ymhEwV2+nm6r6J0IgQgNhFJTBRAfTdhdBIs06efebmxpWLZ7+mhmTNYAwZWenU56oXp/3dYotTj6275TEjLegA7Hr8rWLEOY+8QUEWG4yqJcnqb5tWlSIGUQz65hnaydCSdE05xUEyv95rMcq7CzlLpzDBqkeaaXWBY+TWfFn23eQrIsDCQX6AfMTj7zwSBA7vbjcFj48z0om8ivaElhFKSY5754TY0snE0NGdA4EfPwkIczs4YdKVT569ORUM4nz6H1b6bDsGvc6UBGagb18lzNMvdOlkKfugPzlQ= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77caa5d2-5e71-4746-59de-08d686b873d1 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:40:08.9239 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 Wed Jan 30 13:40:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033563 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="IZ9N9tbe"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPs91XFNz9sBQ for ; Thu, 31 Jan 2019 00:50:53 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BA429C21E47; Wed, 30 Jan 2019 13:44:49 +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 11A49C21E77; Wed, 30 Jan 2019 13:40:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CC978C21DF3; Wed, 30 Jan 2019 13:40:17 +0000 (UTC) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00061.outbound.protection.outlook.com [40.107.0.61]) by lists.denx.de (Postfix) with ESMTPS id E9092C21E02 for ; Wed, 30 Jan 2019 13:40:11 +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=iuLfhHramf/7KPN3zJmp4NFxC5zVQpVma0GMfzFU34o=; b=IZ9N9tbevGXndbKWXuC9RsSAPgChPQXwdbs5RgLdfU0F1jm0adu+0eK3JakUlc3Q02PQl9uhtFxtL0wV57JVQ/n6jwLUBRpfQhqgENx81Nrw3B2URk7X7fSf7y93LDKMDRZ5BHz/E7KNY8qJpVASZzpl46DubYuYg4RM3jJpn5U= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:40:11 +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.025; Wed, 30 Jan 2019 13:40:11 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 20/22] configs: mx6sabresd: Reduce size for SPL by disabling SPL_DOS and SPL_EFI Thread-Index: AQHUuKFS+3+dvjld4k6gUebaP5Ut3A== Date: Wed, 30 Jan 2019 13:40:11 +0000 Message-ID: <1548855578-12529-21-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:rxbB9QTcifphfAUvf1VD2/624fDraEy4EsrKe8BO5nShpwaIHKksOPkzCF9Amf+XvmaTQXUnLN79D16895UAmqzER2wyY2zQNsMH/XgWwurXthXxN3mnZTypUvfMa1BMkbScKewmupZnEIoFN+RCvg45qXLd2y3L4FBOnxclcRDF20to3e2Qpthw4WCLEYeFo2RJQu2UdmV/347Y9guVIqK97bg0pJpKrovmIKakEldYV7jKwghV7nHwvXIWupXpT/szmoXpc/ho1st5s7R2J62DrFgg/TzEcoC88eqi9wVaaDoOLCbZglQ2nL7eu/P3YOMdMlaYcHFUjX+rou3VIq5etcgypDetAbjSxx5XMpCVjIfZpvHaW7YsmmHMRXDzLkR4DTSjMp7HxrOfxeH3E48AOGwP0UiQEUrfIHinRC7aS/85Gpr0AYdyuBz+IU3mVh/xwMWrbdWAzangfgiaAw==; 5:c2J1vk6jUVY0l8BHwS2UXcAl8bbV0LMlpf/+ryQFF4Ew9F6KDg549U1NU0hEEbpWrAG1SdCHqol6OY8rX6jLLvUinp3uLQDlgmKRTlI6zRK3HtGCg3mhrgd3PbzSuSgN9zx131KZs2lZEmWWH6/QllVcvC2itpUx/60vo7h41n0VQsH2xvIpD7H9c6LWAZjXTC5yCnu103XK3+o9uNarxg==; 7:S/xbvruaOLHwBWrRPxYW/P9TcmvobPaDMUuXZTihoJQstpyCm+xjeizXj7C0iwLezEvsD8yXvxWw/IYSYzPMm+RYmbVHYFdh3Ix5QZI9uht+4e6Rzuccc5VH/xTxM9wN7hTCI7dJ9KGeqiCJJgoH/g== x-ms-office365-filtering-correlation-id: 16fc438c-cc67-45c6-3eca-08d686b87478 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(256004)(6436002)(2906002)(6486002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(4744005)(50226002)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: HRqnKrOJXbUk+/sWAROc7CY7S/j69ip2R2FD3ikK1HJqgqqvvicSLV0rclsIhio2H4Wld5Hrp5I+s/smca5UAV7PB80nJaqNT6hqFTzEAWu327KugSc08YH+R5DdpCUZqKCvvx77GW4gDxulCrQ0HRstzHRdnD4/5+VDRBNN5xcVM35fFPV4CkalrRgJcSUTxChJOuA282M+4lBubvadmOplba+7k40SfKBpqgq4hJCRQ/0qz2IacESyDuiYjJfHwd2cw7fKimOr4kqEx9shCQN/Qx1R0e1eFwzUucg8VqQ6rTnTJ6m5Z3cuGVUNfz8J7sNbT5H/jLyO7p/s56FtXT2Z1bk/KrXoDchWcxq8dW3wkeo2eji60jxnPj040EWzvzeutsrlJwIQ6pMFsGBRaaAGTnqUoiJF33nuSoI9Dc8= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16fc438c-cc67-45c6-3eca-08d686b87478 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:40:10.0333 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 b26e764..84840fe 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -54,6 +54,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 Wed Jan 30 13:40:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033564 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="cyfTaBxJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPsT2nSYz9sBQ for ; Thu, 31 Jan 2019 00:51:09 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 042F3C21E62; Wed, 30 Jan 2019 13:47:35 +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 2D582C21E90; Wed, 30 Jan 2019 13:41:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 15978C21E2C; Wed, 30 Jan 2019 13:40:19 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150082.outbound.protection.outlook.com [40.107.15.82]) by lists.denx.de (Postfix) with ESMTPS id 06F95C21DC1 for ; Wed, 30 Jan 2019 13:40:13 +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=cyfTaBxJFUY0kjD/AFGXytJOIradGO7SGT/NZth0+SmhJhGpanPpMqTXipSHmoKH53SS/Le7SOGFUH1EzON+/9DHNHqpDIvkAYiYNneHI8tTKhBZm5iK/CI5IHPs0VCK7yhlqdy/1EPRyWSmZeyqkoy9tjFzd5yc/vrK/kIiz3M= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:40:12 +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.025; Wed, 30 Jan 2019 13:40:12 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 21/22] board: mx6sabreauto: Update README with the SPL DM FIT info Thread-Index: AQHUuKFSokNIEAKiu0G5Yk3cihIA/Q== Date: Wed, 30 Jan 2019 13:40:11 +0000 Message-ID: <1548855578-12529-22-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:+mjSFA3MoSFcyWHLPTiODIJdPkCptkR+KGzku5MAEn1X3f8Ie/dQvEzuC8TouZXXW1hzAXBE8llnkCs3TYctiYxjK01gnDJF3UGGnB710CRQryh8N/gHMoF/bwQFttSaL0dY0q0lCz1leSHgVJb1dDHLssquZqfPFe1v+i0Xh+dlNZTMNTiYPXAD0EL1HH4FmqGfJAWX0RK3uXe5i19UK/IxEvbXOhAjmnASAyQYFueTiPy+rhQQMi4oKnrC2HXgtT26gdzqr3HGwNVMP2KvOiA7tH+WXcFNr1jQnVnqEzUM8MTadffj+f8Q7Hov3fzkQx4zqDlnClgyn/WLrJzQqxaZAhulvFY3gw2W80dKVhog+iv+qLDbVmlLh4v+etDtOX1j76iUQX5ik+BucUusPJV3ZsEKDublPvN2P3NBBh6FAAlFsT2R70iGeMQvoWH4LVw+oGvYva2JB0iYocysqQ==; 5:xQmtEDLYGIS7Ekjd34Z9ZiDlZ8QKfPnXHt0vv4KT0DOBQtdUq1Ke3hHwDMSQ+WiEI+wHpfv7VDUKzhdix+FzXX4XOAFsXr/JF35QDEWbpXKgGm0rBjMRV1q28pcruXGUBvHv5R0IXuZbZJDhDwbpiE/V0yuzxr1Zd442nBS4mN32fLujo6ldykJfWkxBwrJUll0OwE8MoDYA02wmmvuSEw==; 7:JCeFrMwq/dk08x4CkS5HLjtXcKIPjFmS3WNzdMxMAmaELU5fVJ/bluYrdw3pgZORRzgd6olmaqF365iXxi5QiSv13V5YmXv9pKS9GyHLM8Z4JyLIPdcN/gws0QeSLx3pIx3mlHhI7v2NX0qxIgQK+A== x-ms-office365-filtering-correlation-id: c86958cc-7897-481d-23ba-08d686b8751f 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(14444005)(256004)(6436002)(2906002)(6486002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: DfVeDmGWMSz0Z1ybJMAV5d7yp9hQxuvGOQukzyZLG0xBmJYpk2HuegzN13r/Mxg33JCUxgTPQ3qXmqdDu/E9wDJOBXjEDhdANYT7FhwkeSJ7NNNi82CwVKSf+FUGf/gGSngtkL7hZv4Yq4sguAY/dP0i8V9ZxwmMcu/FUXmOn0YGnkWJwuY57RMa1izsBdsbeOTKkKxwANOcacQj8DLflqJscEwN8bJf0IdhuLUjN/mSZX7ZAaAlppz/tCG9QqCplFz4JrLvO+87rU2BDsgYvIA18setJpZ4oYpv1C0tL2bQ6sKllGW5jwCWf2ZAPxk0KtXOyOD7UP67vZEUBs/0SJmC+xM6pgeAH4aBuleCqHYvu9UpWD9hKr3f0vzCJrfJu+rETF4gU1zTdikq+tNF27EOhoSWdFscQiX2efW2ZFU= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c86958cc-7897-481d-23ba-08d686b8751f X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:40:11.1114 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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 Wed Jan 30 13:40:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 1033565 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="jpNVE0OY"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43qPt14jwvz9sBZ for ; Thu, 31 Jan 2019 00:51:37 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 51F93C21C27; Wed, 30 Jan 2019 13:47:21 +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 5E1E7C21E4E; Wed, 30 Jan 2019 13:40:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D54EEC21DF8; Wed, 30 Jan 2019 13:40:19 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150041.outbound.protection.outlook.com [40.107.15.41]) by lists.denx.de (Postfix) with ESMTPS id 07808C21E0B for ; Wed, 30 Jan 2019 13:40:14 +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=jpNVE0OYEy1bh+wdO3Cl0OtOHZfO6SS9toMWiiNz63M9P0Ia1kZOHf7/uNwAzm0NOp9GamxNiKp5tTW4WuFiibmgYU83R8unj/oQR5w6hHOb8x1ndsZKm5R8KBOVQ+yttuL8eekHr+7azg0gG80Ghuwm3f0Ef3Y87D9VTAC89U8= Received: from VI1PR04MB5008.eurprd04.prod.outlook.com (20.177.49.225) by VI1PR04MB1582.eurprd04.prod.outlook.com (10.164.84.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Wed, 30 Jan 2019 13:40: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.025; Wed, 30 Jan 2019 13:40:13 +0000 From: Abel Vesa To: Tom Rini , Fabio Estevam , "u-boot@lists.denx.de" , dl-uboot-imx , Peng Fan Thread-Topic: [PATCH v3 22/22] board: mx6sabresd: Update README with the SPL DM FIT info Thread-Index: AQHUuKFTbkIAWqJsokG79M9MmgMelQ== Date: Wed, 30 Jan 2019 13:40:12 +0000 Message-ID: <1548855578-12529-23-git-send-email-abel.vesa@nxp.com> References: <1548855578-12529-1-git-send-email-abel.vesa@nxp.com> In-Reply-To: <1548855578-12529-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: AM5PR0701CA0017.eurprd07.prod.outlook.com (2603:10a6:203:51::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; VI1PR04MB1582; 6:5pX9YOeS3kqfnc40ybMKmy0wO5bJScrXF/Rh0JM0OtIzti+H1TpYOzkwel4Ul+X0KpC1qRE/npJXpZk4UnV8r79Cc1z2TeF9dNSnCnoY3YTKR5zAbDhSyTE8HfXWQbapMAwi6awzoANb1wirAQyO2c7detp9eR1fNLO+9MqjL1tqKfPlQ9TPt1qWW3jMBSsUaA2WY9b4r+I4bxIyZS1CfTbNlZqZ37qurPjvughxJpEHIzLks0QJMd/NacZkwpckVXYHGh9goLDx1ct/Qf4sOV39nRLXzYm2+lyjgWswFVS3zNZMIFx9cA+b3wZ8ZD9ypiXFQoeMoSjCAyrRHjsExnNoI/lkrpmP3g09KSNtVXI1OatvQVugQL7svoOGRmHSBX/Dgn5RlCMXnCIoqwzgJUrGkebBB1WeCEzpTGILfwe40X+E4shHB2Kne4H/5/hwtsrDCJZC78V0X+vN1Vkgjw==; 5:JgiKfnAt72EBqh2ayPqqWDWf9b4k31e1wmF0L+BJZs3bOySi80VxznS6AW3ghcXxmkkx7kPe3URWDq31ju3SsrjGyTzjNS9cYYjCHHY14l2mAKf70AsfJn5r9P158/7pu8E88H89K5bQpGWNwvXQNjI9/uGGqpj+pR7ACgzcwRHIUihR5y46Tr6auiUTUFwwfHMKJCwVtEcJ//xDJ/sFjA==; 7:fwxY8w051Y2m6mSLVEvUnk0Qgf94XesRwfCoUE0cDHNchQGUYW8M+PR6q5bfBqDEQUJn9MUZyKlxnz/42EFW0LZ6TMU3Dj34DSv8VMrmwHXBorNEGYyK6DCaazmZWvjr61pCGCjTnIWcgEt88n+rsg== x-ms-office365-filtering-correlation-id: b303c748-6e25-4c8d-9374-08d686b875b0 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:VI1PR04MB1582; x-ms-traffictypediagnostic: VI1PR04MB1582: x-microsoft-antispam-prvs: x-forefront-prvs: 0933E9FD8D x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(189003)(199004)(186003)(2501003)(14444005)(256004)(6436002)(2906002)(6486002)(4326008)(6636002)(99286004)(66066001)(97736004)(102836004)(53936002)(54906003)(26005)(316002)(76176011)(52116002)(386003)(36756003)(6506007)(110136005)(81156014)(8676002)(7736002)(14454004)(106356001)(11346002)(6512007)(68736007)(25786009)(44832011)(71200400001)(71190400001)(478600001)(476003)(81166006)(3846002)(6116002)(86362001)(486006)(8936002)(446003)(2616005)(105586002)(305945005)(50226002)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1582; 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: iWUtD/bj3rrUCsQ4eo+PaYYc0H/iaA1sCy2jJxeb82w1A+r3gDHVdynDNpkSS5rhVKV4TjZR1Tmc6ms4yqOIGDW0rsMWv+Yrf1kqAXvdV+R9kp3dJubaOqvV0IAdvYpdKflxd102r7tMCJj2Pr9sgqfxg4iKgxnVEIDVzUpoaPns7/BlTX1qcKC0n+o6LdalOr9dK9+1BkJsdJdJ8iS3uCriuKu8jIYhbpHMkAUinIe4r1lyV+VZu7IZyB6BOPiOukJ21AXq4A4HkbNfsrebxk9zaOx24SukZWfVYHOIJGhPytaZAqJ1FJ6UAEwmkL+FDi+nRkmfHe8P/hHdfDa8F8CrxVaPq5b30r/D/KB0IT/PHqfE8gLZ2L/dZl2j4gHtpowicC2ek40xj0oMZIO9wPtcYx6E6UeGTjxHufqmRo0= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b303c748-6e25-4c8d-9374-08d686b875b0 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2019 13:40:12.0645 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1582 Subject: [U-Boot] [PATCH v3 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: