From patchwork Fri May 27 20:26:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Jarzmik X-Patchwork-Id: 9138969 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 65B9F607D3 for ; Fri, 27 May 2016 20:29:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 574D428159 for ; Fri, 27 May 2016 20:29:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4BD07282EE; Fri, 27 May 2016 20:29:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.2 required=2.0 tests=BAYES_00,FREEMAIL_FROM, FSL_HELO_HOME,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0FD2728255 for ; Fri, 27 May 2016 20:29:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b6OML-0000AP-DW; Fri, 27 May 2016 20:27:53 +0000 Received: from smtp12.smtpout.orange.fr ([80.12.242.134] helo=smtp.smtpout.orange.fr) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b6OMG-00006Z-RK for linux-arm-kernel@lists.infradead.org; Fri, 27 May 2016 20:27:50 +0000 Received: from belgarion.home ([109.222.221.176]) by mwinf5d23 with ME id zYTJ1s00H3oxeSt03YTUq8; Fri, 27 May 2016 22:27:28 +0200 X-ME-Helo: belgarion.home X-ME-Date: Fri, 27 May 2016 22:27:28 +0200 X-ME-IP: 109.222.221.176 From: Robert Jarzmik To: Robert Jarzmik , Daniel Mack , Haojian Zhuang , Jaroslav Kysela , Takashi Iwai , Liam Girdwood , Mark Brown Subject: [RFC PATCH v2 6/7] ARM: pxa: mioa701 convert to the new AC97 bus Date: Fri, 27 May 2016 22:26:58 +0200 Message-Id: <1464380819-19075-7-git-send-email-robert.jarzmik@free.fr> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1464380819-19075-1-git-send-email-robert.jarzmik@free.fr> References: <1464380819-19075-1-git-send-email-robert.jarzmik@free.fr> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160527_132749_213082_6AA34809 X-CRM114-Status: GOOD ( 11.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This migration implies : - wm9713 device is removed, it will be auto-probed - the AC97 bit clock is added as the pxa internally generated 13MHz clock Signed-off-by: Robert Jarzmik --- arch/arm/mach-pxa/mioa701.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index 38a96a193dc4..e26bace43147 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c @@ -19,6 +19,7 @@ * */ +#include #include #include #include @@ -682,7 +683,6 @@ MIO_SIMPLE_DEV(mioa701_led, "leds-gpio", &gpio_led_info) MIO_SIMPLE_DEV(pxa2xx_pcm, "pxa2xx-pcm", NULL) MIO_SIMPLE_DEV(mioa701_sound, "mioa701-wm9713", NULL) MIO_SIMPLE_DEV(mioa701_board, "mioa701-board", NULL) -MIO_SIMPLE_DEV(wm9713_acodec, "wm9713-codec", NULL); MIO_SIMPLE_DEV(gpio_vbus, "gpio-vbus", &gpio_vbus_data); MIO_SIMPLE_DEV(mioa701_camera, "soc-camera-pdrv",&iclink); @@ -690,7 +690,6 @@ static struct platform_device *devices[] __initdata = { &mioa701_gpio_keys, &mioa701_backlight, &mioa701_led, - &wm9713_acodec, &pxa2xx_pcm, &mioa701_sound, &power_dev, @@ -742,6 +741,15 @@ static void __init mioa701_machine_init(void) __raw_writel(0x0001c391, MCATT0); __raw_writel(0x0001c391, MCIO0); + rc = clk_add_alias("ac97_clk", "pxa2xx-ac97:0", "AC97CONFCLK", + &pxa_device_ac97.dev); + if (rc) + pr_err("PXA2xx AC97 clock1 alias error: %d\n", rc); + + rc = clk_add_alias("ac97_clk", "pxa2xx-ac97:1", "AC97CONFCLK", + &pxa_device_ac97.dev); + if (rc) + pr_err("PXA2xx AC97 clock2 alias error: %d\n", rc); pxa2xx_mfp_config(ARRAY_AND_SIZE(mioa701_pin_config)); pxa_set_ffuart_info(NULL);