From patchwork Mon Jul 27 14:58:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kgene@kernel.org X-Patchwork-Id: 6874791 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F2EA69F358 for ; Mon, 27 Jul 2015 14:59:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 246BD20561 for ; Mon, 27 Jul 2015 14:59:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE4A72051C for ; Mon, 27 Jul 2015 14:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752831AbbG0O7A (ORCPT ); Mon, 27 Jul 2015 10:59:00 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:39313 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751308AbbG0O67 (ORCPT ); Mon, 27 Jul 2015 10:58:59 -0400 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NS501F3DIYAW3A0@mailout2.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 27 Jul 2015 23:58:58 +0900 (KST) Received: from epcpsbgm1new.samsung.com ( [172.20.52.132]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id E9.8B.28411.23746B55; Mon, 27 Jul 2015 23:58:58 +0900 (KST) X-AuditID: cbfee68e-f79c56d000006efb-70-55b647327ecd Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 4F.44.23663.13746B55; Mon, 27 Jul 2015 23:58:58 +0900 (KST) Received: from DOKGENEKIM04 ([12.36.165.190]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NS5008O6IY93460@mmp2.samsung.com>; Mon, 27 Jul 2015 23:58:57 +0900 (KST) From: Kukjin Kim To: linux-samsung-soc@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 11/12] ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx Date: Mon, 27 Jul 2015 23:58:57 +0900 Message-id: <014401d0c87c$c3c37190$4b4a54b0$@kernel.org> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: AdDIfMJYujeyx3W4QOm1xEo6AISWQw== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRmVeSWpSXmKPExsWyRsSkRdfIfVuowcI3nBavXxhazDi/j8mB yaNvyypGj8+b5AKYorhsUlJzMstSi/TtErgyju37zVSwTKDi17qPbA2MN3i7GDk5JARMJG4t uMcCYYtJXLi3nq2LkYtDSGAFo8SZ/7uZYIp+/DnKCJGYxSjx4d5VqKr3jBKXll4Ecjg42ASU JRqb9EEahAW0JBZuaQKbKiKgKvG5bQE7iM0sYCjx890fdpByYYEAibNPUkHCLEAlFx7NB5vC K2Ahcf4FG0iYV0BQ4sdkiNuYgSau33mcCcKWl9i85i0zxGkKEjvOvmaE2KQncePjUqgaEYl9 L96BnSwhsIhdoq3pKyPELgGJb5MPsYDskhCQldh0AGqOpMTBFTdYJjCKz0KyehaS1bOQrJ6F ZMUCRpZVjKKpBckFxUnpRUZ6xYm5xaV56XrJ+bmbGIERdfrfs74djDcPWB9iFOBgVOLh1VDf GirEmlhWXJl7iNEU6KKJzFKiyfnAuM0riTc0NjOyMDUxNTYytzRTEudNkPoZLCSQnliSmp2a WpBaFF9UmpNafIiRiYNTqoEx8If7xo8rg99JL5Pgy2S02ttSYPt5gluY1xxOwUNH/rNrn1S9 O327xnYni8da61XkEjiXxu1jUgv+Fui4p2FT4P6ruvwrC9zc1+zdcF9p/Zymly58lsWamWtd dqxZ+y3v/taEkJsfNt5z0Lv8YJevyo3LuxPXqdX8TgoXeRMya5vQzU6JL8/vK7EUZyQaajEX FScCABl/rHajAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrLIsWRmVeSWpSXmKPExsVy+t9jQV0j922hBncmsFm8fmFoMeP8PiYH Jo++LasYPT5vkgtgimpgtMlITUxJLVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21 VXLxCdB1y8wBGq+kUJaYUwoUCkgsLlbSt8M0ITTETdcCpjFC1zckCK7HyAANJKxjzDi27zdT wTKBil/rPrI1MN7g7WLk5JAQMJH48ecoI4QtJnHh3nq2LkYuDiGBWYwSH+5dhXLeM0pcWnoR yOHgYBNQlmhs0gdpEBbQkli4pYkFxBYRUJX43LaAHcRmFjCU+PnuDztIubBAgMTZJ6kgYRag kguP5oNN4RWwkDj/gg0kzCsgKPFj8j0WiE4tifU7jzNB2PISm9e8ZYY4TUFix9nXjBCb9CRu fFwKVSMise/FO8YJjIKzkIyahWTULCSjZiFpWcDIsopRIrUguaA4KT3XMC+1XK84Mbe4NC9d Lzk/dxMjOGqfSe1gPLjL/RCjAAejEg/vBZWtoUKsiWXFlbmHGCU4mJVEeE3ttoUK8aYkVlal FuXHF5XmpBYfYjQF+nUis5Rocj4woeSVxBsam5gZWRqZWRiZmJsrifPKbtgcKiSQnliSmp2a WpBaBNPHxMEp1cAoXr5hcq+D6Cn2JOf9r187/WL9KuXirPrxDa+WKKucYkTt0dv6v9IVAks1 pfeKtXc5L2YsMiy/fuTa/K3+bA+mLOYTVzo788/7LyY91g+ySj3/nTFgOioecb5RfK7iR5Zk h9xJ549MadtRlcVqmlHcxPp0xf2Vx3S0Y85VF7cJn3rVf397R4USS3FGoqEWc1FxIgBzy4K3 8AIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected 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=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 This patch moves watchdog-reset header file into mach-s3c64xx. Cc: Krzysztof Kozlowski Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c64xx/common.c | 2 +- arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 3 +-- arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/watchdog-reset.h | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/watchdog-reset.h (91%) diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c index 316df5a..4a9621b 100644 --- a/arch/arm/mach-s3c64xx/common.c +++ b/arch/arm/mach-s3c64xx/common.c @@ -50,10 +50,10 @@ #include #include #include -#include #include "common.h" #include "irq-uart.h" +#include "watchdog-reset.h" /* External clock frequency */ static unsigned long xtal_f = 12000000, xusbxti_f = 48000000; diff --git a/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c b/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c index 2fddf38..ead3766 100644 --- a/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c +++ b/arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c @@ -15,11 +15,10 @@ #include #include -#include - #include #include "common.h" +#include "watchdog-reset.h" /* * IO mapping for shared system controller IP. diff --git a/arch/arm/plat-samsung/include/plat/watchdog-reset.h b/arch/arm/mach-s3c64xx/watchdog-reset.h similarity index 91% rename from arch/arm/plat-samsung/include/plat/watchdog-reset.h rename to arch/arm/mach-s3c64xx/watchdog-reset.h index 0386b8f..42707df 100644 --- a/arch/arm/plat-samsung/include/plat/watchdog-reset.h +++ b/arch/arm/mach-s3c64xx/watchdog-reset.h @@ -1,5 +1,4 @@ -/* arch/arm/plat-s3c/include/plat/watchdog-reset.h - * +/* * Copyright (c) 2008 Simtec Electronics * Ben Dooks *