From patchwork Wed Jan 20 12:40:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin song X-Patchwork-Id: 570696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 07655140317 for ; Wed, 20 Jan 2016 23:48:22 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=Nyr8HOMW; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EEBEC4BC97; Wed, 20 Jan 2016 13:47:40 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tHiEqHtQj_Y7; Wed, 20 Jan 2016 13:47:40 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E8B1D4BBCB; Wed, 20 Jan 2016 13:47:01 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 75B2A4BB6A for ; Wed, 20 Jan 2016 13:40:30 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xDR8kuHS0rCg for ; Wed, 20 Jan 2016 13:40:30 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from emea01-am1-obe.outbound.protection.outlook.com (mail-am1on0064.outbound.protection.outlook.com [157.56.112.64]) by theia.denx.de (Postfix) with ESMTPS id 29FB74BB58 for ; Wed, 20 Jan 2016 13:40:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-nxp-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=vKXFi5NV9E2c3NjceIVIt3UAkyb+EXvkfkFv5PLc+ts=; b=Nyr8HOMWpMDaew1BQq8O0RDW57tQ2QaR3m+orELMZdRviQxpBUzcdUMl4gklzybK1LArPq2rlbX55p/NQHoJwLt7D5HQEJVLhCOgwZF2LBEvgzsHFgKMKOBiNJ+EUgDOiHqS9pbnaqTsEfeL4jUJIlPzQ30dKmfbJrDcjZBt9CI= Received: from DB5PR04MB1319.eurprd04.prod.outlook.com (10.162.157.13) by DB5PR04MB0968.eurprd04.prod.outlook.com (10.161.196.24) with Microsoft SMTP Server (TLS) id 15.1.365.19; Wed, 20 Jan 2016 12:40:25 +0000 Received: from DB5PR04MB1319.eurprd04.prod.outlook.com ([10.162.157.13]) by DB5PR04MB1319.eurprd04.prod.outlook.com ([10.162.157.13]) with mapi id 15.01.0365.024; Wed, 20 Jan 2016 12:40:24 +0000 From: Wenbin Song To: Wenbin Song , "yorksun@freescale.com" , Mingkai Hu , Qianyu Gong , Shaohui Xie , "u-boot@lists.denx.de" , "bmeng.cn@gmail.com" Thread-Topic: [PATCH v2 2/3] armv8/ls1043aqds: Spilt off board device tree Thread-Index: AQHRU37qssFRCzpW+E6TzfQxHHuVuZ8EVF6AgAAEBjA= Date: Wed, 20 Jan 2016 12:40:24 +0000 Message-ID: References: <1453292744-36773-1-git-send-email-wenbin.song@nxp.com> <1453292744-36773-3-git-send-email-wenbin.song@nxp.com> In-Reply-To: <1453292744-36773-3-git-send-email-wenbin.song@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=wenbin.song@nxp.com; x-originating-ip: [123.151.195.51] x-microsoft-exchange-diagnostics: 1; DB5PR04MB0968; 5:/I3+kAcJX8p0wh4Hf/UwxXL3vWa1cWXCbFwyZv41JINg9m2ArP7QeR7t6md0WvPnte750hUY3hz+UNeKbEYJwyMeq6wXh8u49p6I2rHOqdF/5VaZGg0/DSu+TZMSnLMlu8J4Vc7EoJlGvDogvMwSMg==; 24:CxokFtz+MzfwdVImRDs/8VEnySpu0zazTalizqKoZVTsIDK+LAEr0hWz9AzNXU0MUJjekhlDKtmNO4QXM7mUVYBogcI7C14tdLhVtj8X/T8= x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB5PR04MB0968; x-ms-office365-filtering-correlation-id: 30dfdcda-f27f-41c1-ce6d-08d32196de60 x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(185117386973197)(101931422205132); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(10201501046)(3002001); SRVR:DB5PR04MB0968; BCL:0; PCL:0; RULEID:; SRVR:DB5PR04MB0968; x-forefront-prvs: 0827D7ACB9 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(189002)(199003)(377454003)(13464003)(81156007)(575784001)(5004730100002)(74316001)(10400500002)(189998001)(3846002)(5002640100001)(106116001)(105586002)(87936001)(6116002)(102836003)(586003)(76576001)(106356001)(86362001)(97736004)(40100003)(92566002)(5001770100001)(1220700001)(1096002)(2900100001)(5008740100001)(2950100001)(122556002)(2201001)(101416001)(33656002)(19580395003)(2906002)(5001960100002)(66066001)(5003600100002)(2501003)(19580405001)(107886002)(54356999)(50986999)(76176999)(15975445007)(77096005)(568214009)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR04MB0968; H:DB5PR04MB1319.eurprd04.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) spamdiagnosticoutput: 1:23 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jan 2016 12:40:24.7975 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR04MB0968 X-Mailman-Approved-At: Wed, 20 Jan 2016 13:46:40 +0100 Subject: Re: [U-Boot] [PATCH v2 2/3] armv8/ls1043aqds: Spilt off board device tree X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Hi: all, This patch depends on the series patches(http://patchwork.ozlabs.org/patch/567250/). Regards Wenbin Song -----Original Message----- From: Wenbin Song [mailto:wenbin.song@nxp.com] Sent: Wednesday, January 20, 2016 8:26 PM To: yorksun@freescale.com; Mingkai Hu ; Qianyu Gong ; Shaohui Xie ; Wenbin Song ; u-boot@lists.denx.de; bmeng.cn@gmail.com Subject: [PATCH v2 2/3] armv8/ls1043aqds: Spilt off board device tree Move new /chosen node out of the board device tree. Signed-off-by: Wenbin Song --- arch/arm/dts/Makefile | 2 +- arch/arm/dts/fsl-ls1043a-qds-duart.dts | 20 ++++++ arch/arm/dts/fsl-ls1043a-qds.dts | 124 --------------------------------- arch/arm/dts/fsl-ls1043a-qds.dtsi | 123 ++++++++++++++++++++++++++++++++ configs/ls1043aqds_defconfig | 2 +- 5 files changed, 145 insertions(+), 126 deletions(-) create mode 100644 arch/arm/dts/fsl-ls1043a-qds-duart.dts delete mode 100644 arch/arm/dts/fsl-ls1043a-qds.dts create mode 100644 arch/arm/dts/fsl-ls1043a-qds.dtsi -- 2.1.0.27.g96db324 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 7706b41..302456c 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -96,7 +96,7 @@ dtb-$(CONFIG_LS102XA) += ls1021a-qds.dtb \ ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \ fsl-ls2080a-rdb.dtb -dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds.dtb \ +dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds-duart.dtb \ fsl-ls1043a-rdb.dtb dtb-$(CONFIG_MACH_SUN4I) += \ diff --git a/arch/arm/dts/fsl-ls1043a-qds-duart.dts b/arch/arm/dts/fsl-ls1043a-qds-duart.dts new file mode 100644 index 0000000..2715b3d --- /dev/null +++ b/arch/arm/dts/fsl-ls1043a-qds-duart.dts @@ -0,0 +1,20 @@ +/* + * Device Tree Include file for Freescale Layerscape-1043A family SoC. + * + * Copyright (C) 2015, Freescale Semiconductor + * + * Wenbin Song + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +/dts-v1/; +#include "fsl-ls1043a-qds.dtsi" + +/ { + chosen { + stdout-path = &duart0; + }; +}; diff --git a/arch/arm/dts/fsl-ls1043a-qds.dts b/arch/arm/dts/fsl-ls1043a-qds.dts deleted file mode 100644 index 7435222..0000000 --- a/arch/arm/dts/fsl-ls1043a-qds.dts +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Device Tree Include file for Freescale Layerscape-1043A family SoC. - * - * Copyright (C) 2015, Freescale Semiconductor - * - * Mingkai Hu - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - -/dts-v1/; -/include/ "fsl-ls1043a.dtsi" - -/ { - model = "LS1043A QDS Board"; -}; - -&i2c0 { - status = "okay"; - pca9547@77 { - compatible = "philips,pca9547"; - reg = <0x77>; - #address-cells = <1>; - #size-cells = <0>; - - i2c@0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0x0>; - - rtc@68 { - compatible = "dallas,ds3232"; - reg = <0x68>; - /* IRQ10_B */ - interrupts = <0 150 0x4>; - }; - }; - - i2c@2 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0x2>; - - ina220@40 { - compatible = "ti,ina220"; - reg = <0x40>; - shunt-resistor = <1000>; - }; - - ina220@41 { - compatible = "ti,ina220"; - reg = <0x41>; - shunt-resistor = <1000>; - }; - }; - - i2c@3 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0x3>; - - eeprom@56 { - compatible = "at24,24c512"; - reg = <0x56>; - }; - - eeprom@57 { - compatible = "at24,24c512"; - reg = <0x57>; - }; - - adt7461a@4c { - compatible = "adt7461a"; - reg = <0x4c>; - }; - }; - }; -}; - -&ifc { - #address-cells = <2>; - #size-cells = <1>; - /* NOR, NAND Flashes and FPGA on board */ - ranges = <0x0 0x0 0x0 0x60000000 0x08000000 - 0x2 0x0 0x0 0x7e800000 0x00010000 - 0x3 0x0 0x0 0x7fb00000 0x00000100>; - status = "okay"; - - nor@0,0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "cfi-flash"; - reg = <0x0 0x0 0x8000000>; - bank-width = <2>; - device-width = <1>; - }; - - nand@2,0 { - compatible = "fsl,ifc-nand"; - #address-cells = <1>; - #size-cells = <1>; - reg = <0x1 0x0 0x10000>; - }; - - fpga: board-control@3,0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "simple-bus"; - reg = <0x3 0x0 0x0000100>; - bank-width = <1>; - device-width = <1>; - ranges = <0 3 0 0x100>; - }; -}; - -&duart0 { - status = "okay"; -}; - -&duart1 { - status = "okay"; -}; diff --git a/arch/arm/dts/fsl-ls1043a-qds.dtsi b/arch/arm/dts/fsl-ls1043a-qds.dtsi new file mode 100644 index 0000000..6fa16b8 --- /dev/null +++ b/arch/arm/dts/fsl-ls1043a-qds.dtsi @@ -0,0 +1,123 @@ +/* + * Device Tree Include file for Freescale Layerscape-1043A family SoC. + * + * Copyright (C) 2015, Freescale Semiconductor + * + * Mingkai Hu + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +/include/ "fsl-ls1043a.dtsi" + +/ { + model = "LS1043A QDS Board"; +}; + +&i2c0 { + status = "okay"; + pca9547@77 { + compatible = "philips,pca9547"; + reg = <0x77>; + #address-cells = <1>; + #size-cells = <0>; + + i2c@0 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x0>; + + rtc@68 { + compatible = "dallas,ds3232"; + reg = <0x68>; + /* IRQ10_B */ + interrupts = <0 150 0x4>; + }; + }; + + i2c@2 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x2>; + + ina220@40 { + compatible = "ti,ina220"; + reg = <0x40>; + shunt-resistor = <1000>; + }; + + ina220@41 { + compatible = "ti,ina220"; + reg = <0x41>; + shunt-resistor = <1000>; + }; + }; + + i2c@3 { + #address-cells = <1>; + #size-cells = <0>; + reg = <0x3>; + + eeprom@56 { + compatible = "at24,24c512"; + reg = <0x56>; + }; + + eeprom@57 { + compatible = "at24,24c512"; + reg = <0x57>; + }; + + adt7461a@4c { + compatible = "adt7461a"; + reg = <0x4c>; + }; + }; + }; +}; + +&ifc { + #address-cells = <2>; + #size-cells = <1>; + /* NOR, NAND Flashes and FPGA on board */ + ranges = <0x0 0x0 0x0 0x60000000 0x08000000 + 0x2 0x0 0x0 0x7e800000 0x00010000 + 0x3 0x0 0x0 0x7fb00000 0x00000100>; + status = "okay"; + + nor@0,0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "cfi-flash"; + reg = <0x0 0x0 0x8000000>; + bank-width = <2>; + device-width = <1>; + }; + + nand@2,0 { + compatible = "fsl,ifc-nand"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x1 0x0 0x10000>; + }; + + fpga: board-control@3,0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + reg = <0x3 0x0 0x0000100>; + bank-width = <1>; + device-width = <1>; + ranges = <0 3 0 0x100>; + }; +}; + +&duart0 { + status = "okay"; +}; + +&duart1 { + status = "okay"; +}; diff --git a/configs/ls1043aqds_defconfig b/configs/ls1043aqds_defconfig index 60fb0ad..c294e82 100644 --- a/configs/ls1043aqds_defconfig +++ b/configs/ls1043aqds_defconfig @@ -2,5 +2,5 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4" CONFIG_ARM=y CONFIG_TARGET_LS1043AQDS=y CONFIG_SYS_NS16550=y -CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds" +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds-lpuart" CONFIG_OF_CONTROL=y