From patchwork Tue Jul 16 18:06:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Drake X-Patchwork-Id: 2828248 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B87819F9CA for ; Tue, 16 Jul 2013 18:05:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A46DA20177 for ; Tue, 16 Jul 2013 18:05:35 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1D5452015F for ; Tue, 16 Jul 2013 18:05:34 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uz9cg-00087b-Dk; Tue, 16 Jul 2013 18:05:14 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uz9ce-0004JQ-3w; Tue, 16 Jul 2013 18:05:12 +0000 Received: from lists.laptop.org ([18.85.2.166] helo=swan.laptop.org) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uz9cb-0004IV-8Y for linux-arm-kernel@lists.infradead.org; Tue, 16 Jul 2013 18:05:09 +0000 Received: from dev.laptop.org (crank.laptop.org [18.85.2.147]) by swan.laptop.org (Postfix) with ESMTP id 7445D316C85; Tue, 16 Jul 2013 14:04:12 -0400 (EDT) Received: by dev.laptop.org (Postfix, from userid 1230) id A63C7FAAF3; Tue, 16 Jul 2013 14:06:05 -0400 (EDT) From: Daniel Drake To: eric.y.miao@gmail.com, haojian.zhuang@gmail.com, arnd@arndb.de, olof@lixom.net Subject: [PATCH RESEND 1/2] ARM: mmp: Add compatible entries for OLPC XO laptops Message-Id: <20130716180605.A63C7FAAF3@dev.laptop.org> Date: Tue, 16 Jul 2013 14:06:05 -0400 (EDT) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130716_140509_329799_7B55F4BC X-CRM114-Status: GOOD ( 11.13 ) X-Spam-Score: -4.6 (----) Cc: devicetree-discuss@lists.ozlabs.org, pgf@laptop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add compatible entries to enable booting of OLPC XO-1.75 (MMP2) and OLPC XO-4 (MMP3). Signed-off-by: Chris Ball Signed-off-by: Daniel Drake --- Documentation/devicetree/bindings/arm/mrvl/intc.txt | 4 ++-- Documentation/devicetree/bindings/arm/mrvl/mrvl.txt | 8 ++++++++ arch/arm/mach-mmp/irq.c | 1 + arch/arm/mach-mmp/mmp2-dt.c | 2 ++ 4 files changed, 13 insertions(+), 2 deletions(-) Resending after 1 month with no response. diff --git a/Documentation/devicetree/bindings/arm/mrvl/intc.txt b/Documentation/devicetree/bindings/arm/mrvl/intc.txt index 8b53273..3554fb9 100644 --- a/Documentation/devicetree/bindings/arm/mrvl/intc.txt +++ b/Documentation/devicetree/bindings/arm/mrvl/intc.txt @@ -1,8 +1,8 @@ * Marvell MMP Interrupt controller Required properties: -- compatible : Should be "mrvl,mmp-intc", "mrvl,mmp2-intc" or - "mrvl,mmp2-mux-intc" +- compatible : One of: mrvl,mmp-intc mrvl,mmp2-intc mrvl,mmp3-intc + mrvl,mmp2-mux-intc - reg : Address and length of the register set of the interrupt controller. If the interrupt controller is intc, address and length means the range of the whold interrupt controller. If the interrupt controller is mux-intc, diff --git a/Documentation/devicetree/bindings/arm/mrvl/mrvl.txt b/Documentation/devicetree/bindings/arm/mrvl/mrvl.txt index 117d741..236e884 100644 --- a/Documentation/devicetree/bindings/arm/mrvl/mrvl.txt +++ b/Documentation/devicetree/bindings/arm/mrvl/mrvl.txt @@ -12,3 +12,11 @@ Required root node properties: MMP2 Brownstone Board Required root node properties: - compatible = "mrvl,mmp2-brownstone"; + +OLPC XO-1.75 (CL2) based on MMP2 +Required root node properties: + - compatible = "olpc,xo-1.75"; + +OLPC XO-4 (CL4) based on MMP3 +Required root node properties: + - compatible = "olpc,xo-cl4"; diff --git a/arch/arm/mach-mmp/irq.c b/arch/arm/mach-mmp/irq.c index 3c71246..d60b85a 100644 --- a/arch/arm/mach-mmp/irq.c +++ b/arch/arm/mach-mmp/irq.c @@ -329,6 +329,7 @@ void __init mmp2_init_icu(void) static const struct of_device_id intc_ids[] __initconst = { { .compatible = "mrvl,mmp-intc", .data = &mmp_conf }, { .compatible = "mrvl,mmp2-intc", .data = &mmp2_conf }, + { .compatible = "mrvl,mmp3-intc", .data = &mmp2_conf }, {} }; diff --git a/arch/arm/mach-mmp/mmp2-dt.c b/arch/arm/mach-mmp/mmp2-dt.c index 4ac2567..e67bd9f 100644 --- a/arch/arm/mach-mmp/mmp2-dt.c +++ b/arch/arm/mach-mmp/mmp2-dt.c @@ -44,6 +44,8 @@ static void __init mmp2_dt_init(void) static const char *mmp2_dt_board_compat[] __initdata = { "mrvl,mmp2-brownstone", + "olpc,xo-1.75", + "olpc,xo-cl4", NULL, };