From patchwork Thu Aug 9 15:47:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10622 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 4BA2E23E02 for ; Thu, 9 Aug 2012 15:48:15 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 1488FA18440 for ; Thu, 9 Aug 2012 15:48:14 +0000 (UTC) Received: by ggnf1 with SMTP id f1so585844ggn.11 for ; Thu, 09 Aug 2012 08:48:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=NpMJhlGI+uuMHArT4UxVQyleAGCaCwh3VqSieRl8F5o=; b=LHXskWn97ZO7rjO3TW4aOfboGOOZGnWbHgIHuBABKsLJ0+6sXUNygXGz8ddXhhzLFP LGRahZ7+aMKAegPcfrvKMIsnfEUOmDndn/jelXxhs2InrPqXacpw8gUquSe+lhOur09Z mqSJN8GDGZTaJSPwxvMCX2M4cN6l1hHFlPrnaV/VFMtYSnmgOe+RMconp1BDUN+Ag/VU KfMbKrEzj6968OmOFog7EeuBYZY6GCjkdKKJP/IoddZRDSJbEPFkFp2bN2cdvHJ/DXn6 xHUk0xhnHVcJTPJs3/cfuX4yPyNCOyM3zIC8v4sI2TXKjFovcMEJotmMpQ10WepcfpJh CX3w== Received: by 10.42.189.73 with SMTP id dd9mr3453709icb.49.1344527294279; Thu, 09 Aug 2012 08:48:14 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp15219igc; Thu, 9 Aug 2012 08:48:13 -0700 (PDT) Received: by 10.180.98.200 with SMTP id ek8mr4021557wib.0.1344527292670; Thu, 09 Aug 2012 08:48:12 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id fc10si1121699wib.2.2012.08.09.08.48.12 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 08:48:12 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by weyu7 with SMTP id u7so480939wey.37 for ; Thu, 09 Aug 2012 08:48:12 -0700 (PDT) Received: by 10.216.93.81 with SMTP id k59mr12140077wef.144.1344527292010; Thu, 09 Aug 2012 08:48:12 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id q4sm2278954wix.9.2012.08.09.08.48.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 08:48:11 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, broonie@opensource.wolfsonmicro.com, Lee Jones Subject: [PATCH 02/22] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled Date: Thu, 9 Aug 2012 16:47:28 +0100 Message-Id: <1344527268-5964-3-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344527268-5964-1-git-send-email-lee.jones@linaro.org> References: <1344527268-5964-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnztsF+3qmAwQ5sEWMniyMDTdKXPcQ7/i7ZMf/1Sj8gEN56rN0dZUEo7rPj5cZ+BZDG5NA9 Previous attempts to add platform probing of the Audio related devices only call from non-DT initialisation functions. This patch extends that functionality to the Device Tree related ones too. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index f413587..5d9600b 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -799,6 +799,7 @@ static void __init u8500_init_machine(void) ARRAY_SIZE(mop500_platform_devs)); mop500_sdi_init(parent); + mop500_msp_init(parent); i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); i2c_register_board_info(2, mop500_i2c2_devices, @@ -806,6 +807,8 @@ static void __init u8500_init_machine(void) mop500_uib_init(); + } else if (of_machine_is_compatible("calaosystems,snowball-a9500")) { + mop500_msp_init(parent); } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) { /* * The HREFv60 board removed a GPIO expander and routed @@ -817,6 +820,7 @@ static void __init u8500_init_machine(void) ARRAY_SIZE(mop500_platform_devs)); hrefv60_sdi_init(parent); + mop500_msp_init(parent); i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); i2c0_devs -= NUM_PRE_V60_I2C0_DEVICES;