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: 1301681 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 29957DFF7B for ; Thu, 9 Aug 2012 15:52:22 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SzUyZ-0002Hj-Oi; Thu, 09 Aug 2012 15:48:43 +0000 Received: from mail-wi0-f177.google.com ([209.85.212.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SzUy5-0002CX-7g for linux-arm-kernel@lists.infradead.org; Thu, 09 Aug 2012 15:48:13 +0000 Received: by wibhm11 with SMTP id hm11so374672wib.0 for ; Thu, 09 Aug 2012 08:48:12 -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=NpMJhlGI+uuMHArT4UxVQyleAGCaCwh3VqSieRl8F5o=; b=lyABBycUGd9McpQ5dfzb4dPWTQHMOATGGtZH/3JGijXeW+muio6LUrRFZFAfmnN+wE ybvk8eIywgCIK0d4/+60igkjpJ0iXoSZbeJACQYKL/0SSP5JMxrVPiYSIw5IO0JoNOAB h88NXGsQ1XNuPqWPCQ8/6/ygAfrDdk9b01E9CCL9DlPL/wZY+9Puhue659Duxfcq3T5f hPum02z5uG54drEZevzI6LOgSSfYnZNr9BEDH6/rVETlUYRW/WbpHy6BtY8WAxmSQSsI qkc6+sT0seTBilfUAxMGSKP5Yn+/vkRZ7BTViIoWved2u4LfuxdTwLhwlakmJJlZTm+4 zKtQ== 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 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: ALoCoQkdAjoGRZQ0ZwlES7K7pO3hSWZfc1pWj1qmFugQi5O/kSlSIJO7hdjLuv9tQH6RxJZn6qFx X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: STEricsson_nomadik_linux@list.st.com, broonie@opensource.wolfsonmicro.com, Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de 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 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;