From patchwork Sat Sep 28 18:21:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 20243 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VPzAF-0004kw-JS; Sat, 28 Sep 2013 20:22:47 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-8) with esmtp id 1VPzAD-00083X-lQ; Sat, 28 Sep 2013 20:22:47 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754951Ab3I1SWZ (ORCPT + 1 other); Sat, 28 Sep 2013 14:22:25 -0400 Received: from mail-ee0-f49.google.com ([74.125.83.49]:54024 "EHLO mail-ee0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754831Ab3I1SWQ (ORCPT ); Sat, 28 Sep 2013 14:22:16 -0400 Received: by mail-ee0-f49.google.com with SMTP id d41so1782998eek.8 for ; Sat, 28 Sep 2013 11:22:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=o00keahZyEVGEBtFrS7a8txXepyox2+jVLsJetqZOTQ=; b=zkftjE3DnGEINJ69SwpmXVAXl97mRLpiZgFzveANI0dJpDS6/oEDZx9CREkkTfiKyS c9Ez1RQ3Dbeg0DuiA9jXkpipuwvlU2kQ5ZyVQeSOgyqindEQ2M6t71RoRE3c1Ug/VUS/ nrFu6edzwNHGhHY22UcpC8v38SW8zfMwr1QImvQoO1TJRKQp6Ui+nW58+/FnKs9h0vwM DyWC2vrUvxNBGs7YCc5UJtRZrjwMBwkeKgWMwrAbQg/Y+K6o2LbGHXFS9YNfK1ZqFL0+ KXOFXLA90T5od9N5ayepH/ZEJb1VzmnDiC5i4WrkYaHuqviqN5ozYsGPCTLdE8v926Cx XrNA== X-Received: by 10.15.93.141 with SMTP id w13mr132929eez.59.1380392534275; Sat, 28 Sep 2013 11:22:14 -0700 (PDT) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPSA id f49sm30405339eec.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 28 Sep 2013 11:22:13 -0700 (PDT) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-media@vger.kernel.org, alsa-devel@alsa-project.org, Kukjin Kim , Arnd Bergmann , Olof Johansson , Russell King - ARM Linux , Ben Dooks , Linus Walleij , Mauro Carvalho Chehab , Sangbeom Kim , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Sylwester Nawrocki , Geert Uytterhoeven , Martin Schwidefsky , Tomasz Figa Subject: [PATCH 4/5] ASoC: samsung: Use CONFIG_ARCH_S3C64XX to check for S3C64xx support Date: Sat, 28 Sep 2013 20:21:36 +0200 Message-Id: <1380392497-27406-4-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1380392497-27406-1-git-send-email-tomasz.figa@gmail.com> References: <1380392497-27406-1-git-send-email-tomasz.figa@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.9.28.181526 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Since CONFIG_PLAT_S3C64XX is going to be removed, this patch modifies the s3c-i2s-v2 driver to use the proper way of checking for S3C64xx support - CONFIG_ARCH_S3C64XX. Signed-off-by: Tomasz Figa Acked-by: Mark Brown --- sound/soc/samsung/s3c-i2s-v2.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c index e5e81b1..fefc561 100644 --- a/sound/soc/samsung/s3c-i2s-v2.c +++ b/sound/soc/samsung/s3c-i2s-v2.c @@ -31,11 +31,7 @@ #undef S3C_IIS_V2_SUPPORTED #if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) \ - || defined(CONFIG_CPU_S5PV210) -#define S3C_IIS_V2_SUPPORTED -#endif - -#ifdef CONFIG_PLAT_S3C64XX + || defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_CPU_S5PV210) #define S3C_IIS_V2_SUPPORTED #endif