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: 1260761 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id DED403FC1A for ; Tue, 31 Jul 2012 15:13:37 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SwE3y-0006Uv-AT; Tue, 31 Jul 2012 15:08:46 +0000 Received: from mail-wi0-f171.google.com ([209.85.212.171]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SwDiF-0007T1-5H for linux-arm-kernel@lists.infradead.org; Tue, 31 Jul 2012 14:46:19 +0000 Received: by wibhq4 with SMTP id hq4so2268302wib.0 for ; Tue, 31 Jul 2012 07:46:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=gt3+CcpAAngTtaTzLhrylrsZJA6XlOOXzPpYuNEBkX4=; b=O2jVQUTOX6uFqRt6v5osCv8Md+/1+1pbQJ5p1E6yv9bjrXpr1aoDt4zaRIDnMEIKtj 17dfjGIYnkLK4KL+Hm7sChsBnc6ARAYZkPWJp96rPbBSZerbtcIQWIEjJZl7bvobDC9E sdQoPEdU9IU8hF+a3aewYCgSLv8gN4nPW3rLUymKjQGLASFkZUt+K8a8vh6uuPxveGsP 4JcFez5SIh95s+mJ2mw5KzpfJViDA4F60KZ6cnN/4+GInuLXTFwArm9MKJJtSvW/+QCn 3vyEQJ9sdWF9KCjOPpzLI7GI2JBGodHJch6h9J+ZlmsNG3h0fAmVemnqnUPX5Y+NZyan Wc3A== 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 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: ALoCoQm3KfJwHVGfUl9oCB7/SMNBIjdFXSQMJSUSlo8OvV6gT5s1RH29A/J+dYwtoXydkPbBw6U7 X-Spam-Note: CRM114 invocation failed X-Spam-Note: SpamAssassin invocation failed Cc: ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, linus.walleij@stericsson.com, arnd@arndb.de, broonie@opensource.wolfsonmicro.com, olalilja@yahoo.se, STEricsson_nomadik_linux@list.st.com, Lee Jones X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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;