From patchwork Mon Nov 26 15:40:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 1802741 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 2CB2C40AF9 for ; Mon, 26 Nov 2012 15:43:16 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Td0nQ-0007Ud-Nq; Mon, 26 Nov 2012 15:40:32 +0000 Received: from opensource.wolfsonmicro.com ([80.75.67.52]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Td0nN-0007U5-QM for linux-arm-kernel@lists.infradead.org; Mon, 26 Nov 2012 15:40:30 +0000 Received: from finisterre.wolfsonmicro.main (cpc1-sgyl4-0-0-cust247.18-2.cable.virginmedia.com [82.41.24.248]) by opensource.wolfsonmicro.com (Postfix) with ESMTPSA id 7D332750006; Mon, 26 Nov 2012 15:40:28 +0000 (GMT) Received: from broonie by finisterre.wolfsonmicro.main with local (Exim 4.80) (envelope-from ) id 1Td0nL-00012c-9I; Mon, 26 Nov 2012 15:40:27 +0000 From: Mark Brown To: Sangbeom Kim , Kukjin Kim , Padmavathi Venna Subject: [PATCH] ARM: SAMSUNG: Fix build of I2S driver Date: Mon, 26 Nov 2012 15:40:20 +0000 Message-Id: <1353944420-3972-1-git-send-email-broonie@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121126_104030_042809_464F39BD X-CRM114-Status: GOOD ( 13.03 ) 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 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mark Brown 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 Commit 48a2050d36f0da5a7d22e3bd7dbf3bf8a5a538bc (ARM: SAMSUNG: Delete the unnecessary variable) removed the src_clk field from the platform data header for the I2S driver without a corresponding change having been made in the I2S driver to stop using the field, causing build breaks. This change should not be being made independently of removal of the uses of the field since it will cause build failures in any tree where it has been merged but the removals have not been merged. Currently the removal of the users in the ASoC driver has not been merged. Signed-off-by: Mark Brown --- include/linux/platform_data/asoc-s3c.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h index 8827259..aa9875f 100644 --- a/include/linux/platform_data/asoc-s3c.h +++ b/include/linux/platform_data/asoc-s3c.h @@ -38,6 +38,12 @@ struct samsung_i2s { #define QUIRK_NEED_RSTCLR (1 << 3) /* Quirks of the I2S controller */ u32 quirks; + + /* + * Array of clock names that can be used to generate I2S signals. + * Also corresponds to clocks of I2SMOD[10] + */ + const char **src_clk; dma_addr_t idma_addr; };