From patchwork Tue Jul 31 14:45:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10428 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 582CF24027 for ; Tue, 31 Jul 2012 14:52:07 +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 1E963A18D22 for ; Tue, 31 Jul 2012 14:52:07 +0000 (UTC) Received: by ggnf1 with SMTP id f1so6017553ggn.11 for ; Tue, 31 Jul 2012 07:52:06 -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=gt3+CcpAAngTtaTzLhrylrsZJA6XlOOXzPpYuNEBkX4=; b=JIqK60dqsbSFuD4QJ9mPk8a598Jv16h3B+4u/bI+NQ5aywHUffmEgoksqBX5FcWl5g SrD7jOXN3LVOWnnXSrRnjqcpni6u+G/WHHsiztS+pRr8zQv7sSRpUu1zYeRc7zr9gX4J hnjHx8sPd44QMN971GTzyWQfzlVjAdtCYc29S4OZD9loCWpFudiPO+72KRYqAN5ZDJeH 6S8aCNqMIj8QCwAF3Bw3/Bz8YLrIRsSnzZKvNwa0Qbso5Z8YP61pY8Hpaw+Rc/DHHQvI szCwS854Af+Cuq5tuD03k4IQXty4ZEb2jTD9LSU80TrRylhEpEFj2SYAZOH/T74JmGj9 ndDw== Received: by 10.50.219.194 with SMTP id pq2mr919763igc.25.1343746326108; Tue, 31 Jul 2012 07:52:06 -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.87.40 with SMTP id u8csp148269igz; Tue, 31 Jul 2012 07:52:05 -0700 (PDT) Received: by 10.14.194.198 with SMTP id m46mr9352228een.13.1343745969397; Tue, 31 Jul 2012 07:46:09 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id m1si310634wee.128.2012.07.31.07.46.08 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jul 2012 07:46:09 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wg0-f50.google.com with SMTP id ds11so5685678wgb.31 for ; Tue, 31 Jul 2012 07:46:08 -0700 (PDT) Received: by 10.180.78.2 with SMTP id x2mr7504800wiw.10.1343745968710; Tue, 31 Jul 2012 07:46:08 -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 j6sm695412wiy.4.2012.07.31.07.46.07 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jul 2012 07:46:08 -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, olalilja@yahoo.se, ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, broonie@opensource.wolfsonmicro.com, Lee Jones Subject: [PATCH 5/5] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled Date: Tue, 31 Jul 2012 15:45:44 +0100 Message-Id: <1343745944-18418-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343745944-18418-1-git-send-email-lee.jones@linaro.org> References: <1343745944-18418-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQk01BLMJPHhm1uaxmN3VCRFRN+Y+4KUM/vtxpUBVDDPgjVccyrUY7Kb4ag9E3WX4raCLjFT 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 e641003..87a5cd7 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -794,6 +794,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, @@ -801,6 +802,8 @@ static void __init u8500_init_machine(void) mop500_uib_init(); + } else if (of_machine_is_compatible("calaosystems,snowball-a9500")) { + mop500_of_msp_init(parent); } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) { /* * The HREFv60 board removed a GPIO expander and routed @@ -812,6 +815,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;