From patchwork Thu Jul 26 10:28:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10259 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 9BC0623E56 for ; Thu, 26 Jul 2012 10:29:35 +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 6580CA18866 for ; Thu, 26 Jul 2012 10:29:35 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id f1so1772698ggn.11 for ; Thu, 26 Jul 2012 03:29:35 -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=zdQ0Hlw0xbPr3g8LbCpr3uVD7RNdi3LEJOtYDuI3iQw=; b=Af7iiRX6jtOz+oY+/UZWcdq+XkSkTBFtx1dp5AfY40KoRrNpevFj2TE2m6LDR0CgZo jnnzWw4plyj5egqwB6e0VFfl/kHxSzG7HsTX6qjn+b/y94TAKK/nRmkhmjSF9v+E1ckF xKm4ictxUiSMPDvh4l/tNAlLG9M/Li37i54NZ7KlclL5/pal7yHARwieGBek/OPdeCTM G1JNp8lQIFQrwJlIeUCzw8KlFaw/HwxrfRCFC9ML6Mbi7YrsUy2fauaPV8S3PNDF97hJ U+EpDAQ2UN9nKf8HSz2uB2D+tPQuMvEKbbYlucxznmQKwB3LjjBpHLntZ3Fx8lcgU5Jt 2kQg== Received: by 10.50.242.73 with SMTP id wo9mr1179038igc.1.1343298575012; Thu, 26 Jul 2012 03:29:35 -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.43.93.3 with SMTP id bs3csp133383icc; Thu, 26 Jul 2012 03:29:34 -0700 (PDT) Received: by 10.180.107.2 with SMTP id gy2mr12347681wib.2.1343298573602; Thu, 26 Jul 2012 03:29:33 -0700 (PDT) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id b4si9830060wiz.1.2012.07.26.03.29.33 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 03:29:33 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.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 mail-wi0-f178.google.com with SMTP id hr14so1342799wib.13 for ; Thu, 26 Jul 2012 03:29:33 -0700 (PDT) Received: by 10.180.94.164 with SMTP id dd4mr12338400wib.1.1343298573135; Thu, 26 Jul 2012 03:29:33 -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 fb20sm11559455wid.1.2012.07.26.03.29.31 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 03:29:32 -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, sameo@linux.intel.com, olalilja@yahoo.se, ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, lrg@ti.com, Lee Jones Subject: [PATCH 13/21] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled Date: Thu, 26 Jul 2012 11:28:46 +0100 Message-Id: <1343298534-13611-14-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343298534-13611-1-git-send-email-lee.jones@linaro.org> References: <1343298534-13611-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnpNNdY3o5P4zbcJmUJw4IgW8LDOhVGnRZMNxYascKC2TBaIXdqM/O3gYLpJp0utXjgZNVg 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 b87393c..6f53a6f 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -793,6 +793,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, @@ -800,6 +801,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 @@ -811,6 +814,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;