From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 31 Jan 2013 14:02:36 +0100 (CET) Received: from mail-we0-f174.google.com ([74.125.82.174]:53362 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S6824788Ab3AaNCfnsmMC (ORCPT ); Thu, 31 Jan 2013 14:02:35 +0100 Received: by mail-we0-f174.google.com with SMTP id r6so2035467wey.33 for ; Thu, 31 Jan 2013 05:02:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:message-id:date:from:organization:user-agent :mime-version:to:cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=hCu7epBjZyty9RfQE7UeBIkSisueG4xKiDHAXqs/zZw=; b=mQO8L2DpHOwhk/U7DannnAqIu2OBo3VpqMvXUF2E14EfTGLBpxjOa9IMibos5GqTFa Rb5df3PSGcTPDNsMx2r8S2o3UK6DG6WH9dMUo0pEoFBDY0R8pNo9UtJIKywBfrAvkMFW LSdTeH40vjiEdyMtHFnxhtZFP7SmhJbF8MVl61W1QhcmfiHSgz4pGgFdoagWfaS2v2e/ 8A0QhixTTyYw2UlffnEleTv+KcRbm9KFuXrTuQNPBTZWNCgOLnj8NQUNYkv7lOYnDVU6 VQwni48F0DJyxaFcPK7VpE9Fqc8mdthn1b6PbKI5k8nrX7Ylls/WFfq8QIKDulElStxJ rJag== X-Received: by 10.180.73.80 with SMTP id j16mr14907267wiv.5.1359637350110; Thu, 31 Jan 2013 05:02:30 -0800 (PST) Received: from [192.168.108.37] (freebox.vlq16.iliad.fr. [213.36.7.13]) by mx.google.com with ESMTPS id eo10sm9147058wib.9.2013.01.31.05.02.29 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Jan 2013 05:02:29 -0800 (PST) Message-ID: <510A6ABB.2090800@openwrt.org> Date: Thu, 31 Jan 2013 13:59:39 +0100 From: Florian Fainelli Organization: OpenWrt User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 To: John Crispin CC: Ralf Baechle , linux-mips@linux-mips.org Subject: Re: [PATCH V3 09/10] MIPS: ralink: adds rt305x devicetree References: <1359633561-4980-1-git-send-email-blogic@openwrt.org> <1359633561-4980-10-git-send-email-blogic@openwrt.org> In-Reply-To: <1359633561-4980-10-git-send-email-blogic@openwrt.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-archive-position: 35656 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: florian@openwrt.org Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips Return-Path: Hey John, On 01/31/2013 12:59 PM, John Crispin wrote: > This adds the devicetree file that describes the rt305x evaluation kit. > > Signed-off-by: John Crispin > --- > arch/mips/ralink/dts/rt305x.dts | 151 +++++++++++++++++++++++++++++++++++++++ > arch/mips/ralink/rt305x.c | 4 +- > 2 files changed, 153 insertions(+), 2 deletions(-) > create mode 100644 arch/mips/ralink/dts/rt305x.dts > > diff --git a/arch/mips/ralink/dts/rt305x.dts b/arch/mips/ralink/dts/rt305x.dts > new file mode 100644 > index 0000000..c7298f3 > --- /dev/null > +++ b/arch/mips/ralink/dts/rt305x.dts > @@ -0,0 +1,151 @@ > +/dts-v1/; > + > +/ { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "ralink,rt305x"; Should not this file actually be a rt305x.dtsi? And you should then create a rt305x-eval.dts file including that one and adding a proper model and compatible property? Most devices should be marked with status = "disabled" by default in dtsi files. > + > + cpus { > + cpu@0 { > + compatible = "mips,mips24KEc"; > + }; > + }; > + > + memory@0 { > + reg = <0x0 0x2000000>; > + }; > + > + chosen { > + bootargs = "console=ttyS0,57600 init=/init"; > + }; > + > + palmbus@10000000 { > + compatible = "palmbus"; > + reg = <0x10000000 0x200000>; > + ranges = <0x0 0x10000000 0x1FFFFF>; > + > + #address-cells = <1>; > + #size-cells = <1>; > + > + sysc@0 { > + compatible = "ralink,rt3052-sysc"; > + reg = <0x0 0x100>; > + > + ralink,pinmmux = "uartlite", "spi"; > + ralink,uartmux = "gpio"; > + ralink,wdtmux = <0>; > + }; > + > + timer@100 { > + compatible = "ralink,rt2880-wdt"; > + reg = <0x100 0x100>; > + }; > + > + intc: intc@200 { > + compatible = "ralink,rt2880-intc"; > + reg = <0x200 0x100>; > + > + interrupt-controller; > + #interrupt-cells = <1>; > + }; > + > + memc@300 { > + compatible = "ralink,rt3052-memc"; > + reg = <0x300 0x100>; > + }; > + > + gpio0: gpio@600 { > + compatible = "ralink,rt2880-gpio"; > + reg = <0x600 0x34>; > + > + gpio-controller; > + #gpio-cells = <2>; > + > + ralink,ngpio = <24>; > + ralink,regs = [ 00 04 08 0c > + 20 24 28 2c > + 30 34 ]; > + }; > + > + gpio1: gpio@638 { > + compatible = "ralink,rt2880-gpio"; > + reg = <0x638 0x24>; > + > + gpio-controller; > + #gpio-cells = <2>; > + > + ralink,ngpio = <16>; > + ralink,regs = [ 00 04 08 0c > + 10 14 18 1c > + 20 24 ]; > + }; > + > + gpio2: gpio@660 { > + compatible = "ralink,rt2880-gpio"; > + reg = <0x660 0x24>; > + > + gpio-controller; > + #gpio-cells = <2>; > + > + ralink,ngpio = <12>; > + ralink,regs = [ 00 04 08 0c > + 10 14 18 1c > + 20 24 ]; > + }; > + > + spi@b00 { > + compatible = "ralink,rt2880-spi"; > + reg = <0xb00 0x100>; > + }; > + > + uartlite@c00 { > + compatible = "ns16550a"; > + reg = <0xc00 0x100>; > + > + interrupt-parent = <&intc>; > + interrupts = <12>; > + > + reg-shift = <2>; > + }; > + > + fe@100000 { > + compatible = "ralink,rt3052-fe"; > + reg = <0x100000 0x10000>; > + }; > + > + esw@110000 { > + compatible = "ralink,rt3052-esw"; > + reg = <0x110000 0x8000>; > + }; > + }; > + > + cfi@1f000000 { > + compatible = "cfi-flash"; > + reg = <0x1f000000 0x800000>; > + > + bank-width = <2>; > + device-width = <2>; > + #address-cells = <1>; > + #size-cells = <1>; > + > + partition@0 { > + label = "uboot"; > + reg = <0x0 0x30000>; > + read-only; > + }; > + partition@30000 { > + label = "uboot-env"; > + reg = <0x30000 0x10000>; > + read-only; > + }; > + partition@40000 { > + label = "calibration"; > + reg = <0x40000 0x10000>; > + read-only; > + }; > + partition@50000 { > + label = "linux"; > + reg = <0x50000 0x7b0000>; > + }; > + }; The specific partition mapping definitively belongs to a rt305x-eval.dts file and not a dtsi you would create. > +}; > diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c > index 1e24439..f4b2e4d 100644 > --- a/arch/mips/ralink/rt305x.c > +++ b/arch/mips/ralink/rt305x.c > @@ -185,8 +185,8 @@ void __init ralink_clk_init(void) > > void __init ralink_of_remap(void) > { > - rt_sysc_membase = plat_of_remap_node("ralink,rt305x-sysc"); > - rt_memc_membase = plat_of_remap_node("ralink,rt305x-memc"); > + rt_sysc_membase = plat_of_remap_node("ralink,rt3052-sysc"); > + rt_memc_membase = plat_of_remap_node("ralink,rt3052-memc"); Why are you doing this? If you specify multiple compatible properties, such as: compatible = "ralink,rt3052-sysc", "ralink,rt305x-sysc" you should be good in any case no? -- Florian