From patchwork Tue Apr 2 13:21:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 15817 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 664EC23E10 for ; Tue, 2 Apr 2013 13:22:21 +0000 (UTC) Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by fiordland.canonical.com (Postfix) with ESMTP id 0CF26A18EE3 for ; Tue, 2 Apr 2013 13:22:20 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id gf12sf601150vcb.4 for ; Tue, 02 Apr 2013 06:22:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=VezSMYG3BmTrFBYl245nYkEkQwxyEqPNQ78m6LLTEEo=; b=XvhZuGTkyv+q1FIEvjz/6SzYmNbJTDENSXNikGaQw3bmLC6Mh1hynNuWTcaZVC6AFE xCybJeMbTrQWoYmUCt4EahOD/f/+Y/OZJQqp7uxpV07/lE1h/VE2qPAUZ50xDldKV52y hjyevaay4hHhe/rSQqd0jHgJbi86dlJIzU26r/W85o1NXLBo6tpu+hC+64/708VaneHU suaX8XMSFbqZSP6U8Sl6YXrkemoNZDyDzlI5t3zi1vWOhubTnuhYfI/jmHMY0F93OEz5 mhPGx16fK/fubnd5eAUhfpQWjulXfy04JP0LwzwuPieenD3huxgHZL3jf8JqNSljVRxH WBBw== X-Received: by 10.224.157.1 with SMTP id z1mr10518315qaw.8.1364908940296; Tue, 02 Apr 2013 06:22:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.3.162 with SMTP id d2ls272636qed.80.gmail; Tue, 02 Apr 2013 06:22:20 -0700 (PDT) X-Received: by 10.52.67.3 with SMTP id j3mr10445265vdt.108.1364908940111; Tue, 02 Apr 2013 06:22:20 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id o6si1066015vdw.11.2013.04.02.06.22.20 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Apr 2013 06:22:20 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id ia10so389756vcb.8 for ; Tue, 02 Apr 2013 06:22:20 -0700 (PDT) X-Received: by 10.52.31.103 with SMTP id z7mr10622641vdh.56.1364908939825; Tue, 02 Apr 2013 06:22:19 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.4.204 with SMTP id cg12csp125126ved; Tue, 2 Apr 2013 06:22:19 -0700 (PDT) X-Received: by 10.180.76.84 with SMTP id i20mr16071133wiw.9.1364908938958; Tue, 02 Apr 2013 06:22:18 -0700 (PDT) Received: from mail-wi0-x22d.google.com ([2a00:1450:400c:c05::22d]) by mx.google.com with ESMTPS id bh7si537194wjb.221.2013.04.02.06.22.18 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Apr 2013 06:22:18 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::22d is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c05::22d; Received: by mail-wi0-f173.google.com with SMTP id ez12so2532315wid.12 for ; Tue, 02 Apr 2013 06:22:18 -0700 (PDT) X-Received: by 10.180.90.18 with SMTP id bs18mr15731152wib.31.1364908938104; Tue, 02 Apr 2013 06:22:18 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id n2sm18968272wiy.6.2013.04.02.06.22.16 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Apr 2013 06:22:17 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones Subject: [PATCH 6/9] ARM: ux500: Create a new of_dev_auxdata structure for u8540 enablement Date: Tue, 2 Apr 2013 14:21:53 +0100 Message-Id: <1364908916-29803-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1364908916-29803-1-git-send-email-lee.jones@linaro.org> References: <1364908916-29803-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnnEFtwML0hwKtJuiV3M7zoBsU2NZXMUxDEUNZfxh/s0Rv000DW9YT5W80OmHOMNxosLjOF X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , If we attempt to use the existing u8500 of_dev_auxdata struct to boot the u8540, we fail to obtain a console, due to a lack of DMA support on the platform. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu-db8500.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index f1a5818..e027865 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -297,6 +297,16 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { {}, }; +static struct of_dev_auxdata u8540_auxdata_lookup[] __initdata = { + /* Requires DMA bindings. */ + OF_DEV_AUXDATA("arm,pl011", 0x80120000, "uart0", NULL), + OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", NULL), + OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", NULL), + OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", + &db8500_prcmu_pdata), + {}, +}; + static const struct of_device_id u8500_local_bus_nodes[] = { /* only create devices below soc node */ { .compatible = "stericsson,db8500", }, @@ -323,8 +333,13 @@ static void __init u8500_init_machine(void) /* TODO: Export SoC, USB, cpu-freq and DMA40 */ parent = u8500_of_init_devices(); - /* automatically probe child nodes of db8500 device */ - of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); + /* automatically probe child nodes of dbx5x0 devices */ + if (of_machine_is_compatible("st-ericsson,u8540")) + of_platform_populate(NULL, u8500_local_bus_nodes, + u8540_auxdata_lookup, parent); + else + of_platform_populate(NULL, u8500_local_bus_nodes, + u8500_auxdata_lookup, parent); } static const char * stericsson_dt_platform_compat[] = {