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: 3418861 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F414BC02DC for ; Mon, 30 Dec 2013 10:43:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3BB39200E5 for ; Mon, 30 Dec 2013 10:43:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D96A7200DC for ; Mon, 30 Dec 2013 10:43:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755500Ab3L3Knq (ORCPT ); Mon, 30 Dec 2013 05:43:46 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:60377 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754645Ab3L3Knp (ORCPT ); Mon, 30 Dec 2013 05:43:45 -0500 Received: by mail-pa0-f50.google.com with SMTP id kp14so9587134pab.23 for ; Mon, 30 Dec 2013 02:43:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=5gxGd1N2QWMFywSNO71sOr3bzNmgiQjgRwzAzGFjirs=; b=LzVjPHT1ecf8MsYa6TORWBE3R0mdtOw6R9dtPXxJ18EjmeCu6FfcIqEwI+9r6ryOke VkhbqVsVGZNR8aKUSfrX4L6V1EPBk6ouVdzy194RD3dzJDqGf6kUtLLyxZq3tW/BYzO3 TgNE97x2pnnAIxmEk+h8/ndYQ01JfgaBww75bz05nl47/fkKTdOsCvcl9Z/MZAGEe+gw /Ej+WsQuEaGSldg+Tt1Lxbwbo/QYXltegi+uzU0lI49NhlvXlIsvrUAM3GWs/Xb6ln// lVQHhAym+3gmkHGvlYJckaXS+wNvgGb6osxFXQ4L06DwW8RawMB/EJeXiBOGZdu3dm9/ leow== X-Gm-Message-State: ALoCoQmHhebGCnGje8Sq0+7bQE0hhTs/pZPCflVYz+wBjgF0JnXJ27H8dYDHLoZKcMPO5zSqIXoZ 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 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: 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 = {