From patchwork Mon Dec 30 10:40:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 22796 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B2C5F218CC for ; Mon, 30 Dec 2013 10:43:48 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id i4sf56999906oah.6 for ; Mon, 30 Dec 2013 02:43:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=5gxGd1N2QWMFywSNO71sOr3bzNmgiQjgRwzAzGFjirs=; b=VXc4nM7glZHDY7fkrcv0vHROC25t5kzZU3ARSeE6xvwTU9I6WbR1VdpDeV+1g42D3E hazpbKYEOUsXPkl9XYSs8P4+zx0Oow+ZGDf6PyMCAXny8xM/OOspP1AM7EenjYgx+q5+ 945kiMXZAilSfTkU3yA5hAWOPHtgIGd8VtIk7eDRAED26XKo7K6/i8OU0cFkXpOfk71B ME75EyJQDsBfq4VcsdX7zzUJJhz8PqdzrXL7Z8zimpg4AwCgsPiaGkEuNn18GRxtYHPH V2lQhbmpgp8AQKv3pnRuc+jAJzz84FbSrg7MmO6l1iK1MIAhPdfPY4ET9jS0i2FhCV+q KeKA== X-Gm-Message-State: ALoCoQlrCQJGLMyFuOuysrQsuY7UNlm5xbJt1/OVPbQyrmQul6nd8UUYPPIbpK/EwHWYHzyzFRRG X-Received: by 10.50.72.37 with SMTP id a5mr12140777igv.1.1388400227530; Mon, 30 Dec 2013 02:43:47 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.121.98 with SMTP id lj2ls3703264qeb.45.gmail; Mon, 30 Dec 2013 02:43:47 -0800 (PST) X-Received: by 10.58.168.205 with SMTP id zy13mr1413523veb.19.1388400227316; Mon, 30 Dec 2013 02:43:47 -0800 (PST) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id mj10si16691316vcb.12.2013.12.30.02.43.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Dec 2013 02:43:47 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id ij19so5799086vcb.31 for ; Mon, 30 Dec 2013 02:43:47 -0800 (PST) X-Received: by 10.58.187.129 with SMTP id fs1mr1215523vec.45.1388400227041; Mon, 30 Dec 2013 02:43:47 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp597715ved; Mon, 30 Dec 2013 02:43:46 -0800 (PST) X-Received: by 10.66.142.170 with SMTP id rx10mr68605158pab.117.1388400225863; Mon, 30 Dec 2013 02:43:45 -0800 (PST) Received: from mail-pd0-f180.google.com (mail-pd0-f180.google.com [209.85.192.180]) by mx.google.com with ESMTPS id o7si21990401pbb.250.2013.12.30.02.43.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Dec 2013 02:43:45 -0800 (PST) Received-SPF: neutral (google.com: 209.85.192.180 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.192.180; Received: by mail-pd0-f180.google.com with SMTP id q10so11163481pdj.25 for ; Mon, 30 Dec 2013 02:43:45 -0800 (PST) X-Received: by 10.66.162.195 with SMTP id yc3mr68348950pab.64.1388400225256; Mon, 30 Dec 2013 02:43:45 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id rx5sm41908562pbc.44.2013.12.30.02.43.42 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Dec 2013 02:43:44 -0800 (PST) From: Sachin Kamat To: linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, sachin.kamat@linaro.org, patches@linaro.org, Heiko Stuebner Subject: [PATCH 1/1] ARM: S3C24XX: Move rtc-core.h from plat to mach Date: Mon, 30 Dec 2013 16:10:08 +0530 Message-Id: <1388400008-9113-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sachin.kamat@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , plat/rtc-core.h is only referenced from mach-s3c24xx. Hence move it there to de-populate the plat directory. While at it also do some cleanup of the header file. Signed-off-by: Sachin Kamat Cc: Heiko Stuebner --- .../plat => mach-s3c24xx/include/mach}/rtc-core.h | 13 ++++++------- arch/arm/mach-s3c24xx/s3c2416.c | 2 +- arch/arm/mach-s3c24xx/s3c2443.c | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx/include/mach}/rtc-core.h (69%) diff --git a/arch/arm/plat-samsung/include/plat/rtc-core.h b/arch/arm/mach-s3c24xx/include/mach/rtc-core.h similarity index 69% rename from arch/arm/plat-samsung/include/plat/rtc-core.h rename to arch/arm/mach-s3c24xx/include/mach/rtc-core.h index 7b542f7b7938..4d5f5768f700 100644 --- a/arch/arm/plat-samsung/include/plat/rtc-core.h +++ b/arch/arm/mach-s3c24xx/include/mach/rtc-core.h @@ -1,5 +1,4 @@ -/* linux/arch/arm/plat-samsung/include/plat/rtc-core.h - * +/* * Copyright (c) 2011 Heiko Stuebner * * Samsung RTC Controller core functions @@ -9,19 +8,19 @@ * published by the Free Software Foundation. */ -#ifndef __ASM_PLAT_RTC_CORE_H -#define __ASM_PLAT_RTC_CORE_H __FILE__ +#ifndef __RTC_CORE_H +#define __RTC_CORE_H __FILE__ /* These functions are only for use with the core support code, such as * the cpu specific initialisation code */ +extern struct platform_device s3c_device_rtc; + /* re-define device name depending on support. */ static inline void s3c_rtc_setname(char *name) { -#if defined(CONFIG_S3C_DEV_RTC) || defined(CONFIG_PLAT_S3C24XX) s3c_device_rtc.name = name; -#endif } -#endif /* __ASM_PLAT_RTC_CORE_H */ +#endif /* __RTC_CORE_H */ diff --git a/arch/arm/mach-s3c24xx/s3c2416.c b/arch/arm/mach-s3c24xx/s3c2416.c index cb77880029f7..a0b787505c02 100644 --- a/arch/arm/mach-s3c24xx/s3c2416.c +++ b/arch/arm/mach-s3c24xx/s3c2416.c @@ -48,6 +48,7 @@ #include #include +#include #include #include @@ -61,7 +62,6 @@ #include #include #include -#include #include #include "common.h" diff --git a/arch/arm/mach-s3c24xx/s3c2443.c b/arch/arm/mach-s3c24xx/s3c2443.c index faa1086924c4..4af858457b2f 100644 --- a/arch/arm/mach-s3c24xx/s3c2443.c +++ b/arch/arm/mach-s3c24xx/s3c2443.c @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -43,7 +44,6 @@ #include #include #include -#include #include static struct map_desc s3c2443_iodesc[] __initdata = {