From patchwork Tue Jul 31 13:31: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: 10401 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 C0AF923E56 for ; Tue, 31 Jul 2012 13:32:04 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 9111DA18880 for ; Tue, 31 Jul 2012 13:32:04 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id q6so5912027yen.11 for ; Tue, 31 Jul 2012 06:32:04 -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=OFxxSEnNqALFsCQE5iqWEeDxmOgZdFCVtIaS/gwpmo7tr+74HIS5vU1JILIzF9uXG5 M4HqHvEJ+jez1xCgxfwpVN7dF0Djc8PeH7OLtFiDRYSHA3I5EKWABQdl+ALdR6ml7YP+ fZTwB/IhPLsoBnjO4sgId4Klu81YsdmPfgK8v83RgRTXTXQX9cL86CEbTl22rc904eOL YGzHhGtNXzQMhoDTVZ1G79PS1KyvvEEnXtPSeBbZNOULj7DxwiLqHl069hXkSYULDN// nPXYfEsL4tINworSBMCDg63pkOnDE37zrZ5IGEBhfb/9kqdPVg3Xj2mO4dgaxk7ddISF Fd+A== Received: by 10.50.219.194 with SMTP id pq2mr670043igc.25.1343741524026; Tue, 31 Jul 2012 06:32:04 -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 u8csp143099igz; Tue, 31 Jul 2012 06:31:55 -0700 (PDT) Received: by 10.216.238.134 with SMTP id a6mr7136461wer.172.1343741515290; Tue, 31 Jul 2012 06:31:55 -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 w46si80337wew.122.2012.07.31.06.31.54 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jul 2012 06:31:55 -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 hr14so2229089wib.13 for ; Tue, 31 Jul 2012 06:31:54 -0700 (PDT) Received: by 10.180.76.135 with SMTP id k7mr2370341wiw.7.1343741513628; Tue, 31 Jul 2012 06:31:53 -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 ex20sm263310wid.7.2012.07.31.06.31.52 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jul 2012 06:31:53 -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, lrg@ti.com, Lee Jones Subject: [PATCH 4/6] ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled Date: Tue, 31 Jul 2012 14:31:28 +0100 Message-Id: <1343741493-17671-8-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343741493-17671-1-git-send-email-lee.jones@linaro.org> References: <1343741493-17671-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkxrbcahDY1zh+AYEWhEKeKJ4cCjewN/BHufYOaWRV57nLVJbE9FEm0ZwQuieShOUqS+EqO 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;