From patchwork Wed Aug 14 09:27:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1146883 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="GeGTxmQb"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 467kkd2BBzz9s7T for ; Wed, 14 Aug 2019 19:27:21 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EDB39C21DF3; Wed, 14 Aug 2019 09:27:11 +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 421F7C21C27; Wed, 14 Aug 2019 09:27:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8CB35C21BE5; Wed, 14 Aug 2019 09:27:08 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70073.outbound.protection.outlook.com [40.107.7.73]) by lists.denx.de (Postfix) with ESMTPS id E8DCBC21BE5 for ; Wed, 14 Aug 2019 09:27:07 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AU/+AF2Thrb6xve+Q83OKjPsRfoV47O1j4R3BK9To0SWJEBw3NZR3Hi7RrbgPFU2ljkDAzIp0cmvfU9v1DVi276zRyDQ5c/WJ5LQ5KPfNI/rJYPh5dZW7LKcrvtvWJIRT47y//1W4TQMQbiAgZzAqjEyTNKMdK9mUNEI869ibcVxeQXF+Y3scO4GeSZJtaSa36P9P31ZuD8IWamrCzGKFfQKvkZxWpboty5Zms7pjMlkjYNleZRtoqYdiqWPcbo7J1mvvN9BAG932h7gHaRYZ2A4ftAWmwnkytfoX0SbtDJ7dMq4YDUmOrbes+JQQhzMNt91ET9YmdJrZTq/sMywJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oBJDVDmcBNYTWTZfq8JetLGQtrA7QPHPbneHMw0UHjM=; b=DJ7BmZmSqWTfDHOM9rQNqVvTb5XoAZyS6aE3LREHNKVcLCzgGty3Bfo0kxhm04q8FN4biE9ZAmN+ccb19Colm7IjP2NG1UFkdwvRj88FnGgsoG9pYL4rKxpvZN4qiEi5+PkNjf7ywbteahb7MwUp72sY9jfBE1lxPosGHKPJtBr2hJIp0IZH1XonTGeEtR2igDiMrNoZeXpUlWd2EptImrJR3O1oN1Fn5zpz2lSBg7aeWwwVa/Fqdpev7i/gzw0XDelrNg56qUfIIghOaWX9sYTnHDqJzrGfYAd/miIz7chZsRuvZ+QOcZ2l4xzIYBAteOIrVjYeFutKbknmdwVijw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oBJDVDmcBNYTWTZfq8JetLGQtrA7QPHPbneHMw0UHjM=; b=GeGTxmQbRCa6akxYwGE70VNiaC4aFEHVzjS8Hd6e41fVnafZy3Wic9h8dgYu7D5AMcqjeZDxLMIse8LQA7ha4KRJF1Na7eRmzCFxL+j/MDw/stWaiOvMSUc7os+ekV9Oyf6C4tJ+cStb60/qK6PI8e/5K8/asGzbyjfYaTrSD6A= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB3969.eurprd04.prod.outlook.com (52.134.95.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.13; Wed, 14 Aug 2019 09:27:06 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4%4]) with mapi id 15.20.2157.022; Wed, 14 Aug 2019 09:27:06 +0000 From: Peng Fan To: "sbabic@denx.de" , "festevam@gmail.com" , "jagan@amarulasolutions.com" , "agust@denx.de" , "lukma@denx.de" Thread-Topic: [PATCH] imx: imx6qdl: dtsi: move U-Boot specific change to u-boot.dtsi Thread-Index: AQHVUoJwInjtDMO3O02AmkvALLaBtg== Date: Wed, 14 Aug 2019 09:27:06 +0000 Message-ID: <20190814094252.30912-1-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.16.4 x-clientproxiedby: HK0PR03CA0079.apcprd03.prod.outlook.com (2603:1096:203:72::19) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.71] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: df5d0169-a529-4fdd-77e9-08d7209992f8 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:AM0PR04MB3969; x-ms-traffictypediagnostic: AM0PR04MB3969: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:20; x-forefront-prvs: 01294F875B x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(396003)(136003)(376002)(346002)(39860400002)(199004)(189003)(4326008)(66446008)(1076003)(50226002)(66066001)(66556008)(316002)(64756008)(186003)(66946007)(53936002)(6506007)(6486002)(26005)(7736002)(71190400001)(110136005)(256004)(66476007)(71200400001)(305945005)(2501003)(386003)(54906003)(486006)(52116002)(44832011)(86362001)(6512007)(6116002)(3846002)(14454004)(36756003)(478600001)(81166006)(81156014)(8936002)(99286004)(2201001)(6436002)(2616005)(25786009)(8676002)(2906002)(476003)(102836004)(5660300002)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB3969; H:AM0PR04MB4481.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: cFBpqYZ3Q1/pwMp2l3N7QY91UUMGxrwmZl4AdY6sSGHsMHssV5FcVj0kEjaqib8A7vDiSC+U+V8CA+T7Mw43QTzS8tu9mjrJSh7wmpn3dMGRfCWlgnZ71lvaAaSSpnzwS3nuIP5ZuwumlociRND50VVser8HF6vvzqBWDJ0qwqnfRcgj39foDKCLwLeBnRFHAXQxZrx20FVdMEaGdRWc0w4ZqPfCa2cmQmqFrAmAOSEFchcRhf4fb/HeAgy3MPgjCOWGYZf8UZrpnvAiB9SFJnzzqfD31SxCj9PPNgXXdCbCiHsVICzAy/Bl8nZSr3an1/A9us3/MqDJT/a/q+K/fRTrEJKBs1PXho2y00mvFVbFkkLCkEF+gPtJdCEH7QDpE0arfT+Uenvqo4Z1y1B+e4ShDUrytnlYyBn4kVtqXpc= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: df5d0169-a529-4fdd-77e9-08d7209992f8 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Aug 2019 09:27:06.6075 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: kHgj3NTZK1gAj57yZBEYrGI1L9QLQBBX29rL4yrMdLalwW9w1K+i7CJwRCbbQ59Z8J91XQTVfYbGvBL2H00XUw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB3969 Cc: "u-boot@lists.denx.de" , dl-uboot-imx Subject: [U-Boot] [PATCH] imx: imx6qdl: dtsi: move U-Boot specific change to u-boot.dtsi 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" The changes were added by following patch: commit <9002e735e717> ("imx: mx6sabresd: fix boot hang with video") commit ("imx6: dts: add 'u-boot, dm-pre-reloc' to soc and ipu nodes") Let's move the U-Boot specific change to imx6qdl-u-boot.dtsi Signed-off-by: Peng Fan --- arch/arm/dts/imx6qdl-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6qdl.dtsi | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/imx6qdl-u-boot.dtsi b/arch/arm/dts/imx6qdl-u-boot.dtsi index e161ebb9af..1279cc2338 100644 --- a/arch/arm/dts/imx6qdl-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-u-boot.dtsi @@ -6,10 +6,12 @@ / { aliases { usb0 = &usbotg; + video0 = &ipu1; }; soc { u-boot,dm-spl; + u-boot,dm-pre-reloc; aips-bus@2000000 { u-boot,dm-spl; @@ -31,3 +33,7 @@ &iomuxc { u-boot,dm-spl; }; + +&ipu1 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/imx6qdl.dtsi b/arch/arm/dts/imx6qdl.dtsi index 83eeb5cc59..e4daf15088 100644 --- a/arch/arm/dts/imx6qdl.dtsi +++ b/arch/arm/dts/imx6qdl.dtsi @@ -33,7 +33,6 @@ i2c1 = &i2c2; i2c2 = &i2c3; ipu0 = &ipu1; - video0 = &ipu1; mmc0 = &usdhc1; mmc1 = &usdhc2; mmc2 = &usdhc3; @@ -146,7 +145,6 @@ compatible = "simple-bus"; interrupt-parent = <&gpc>; ranges; - u-boot,dm-pre-reloc; dma_apbh: dma-apbh@110000 { compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh"; @@ -1263,7 +1261,6 @@ <&clks IMX6QDL_CLK_IPU1_DI1>; clock-names = "bus", "di0", "di1"; resets = <&src 2>; - u-boot,dm-pre-reloc; ipu1_csi0: port@0 { reg = <0>;