From patchwork Sat Jul 25 02:28:30 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: 6863461 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 685C9C05AC for ; Sat, 25 Jul 2015 02:28:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 68427205C1 for ; Sat, 25 Jul 2015 02:28:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3540D205BA for ; Sat, 25 Jul 2015 02:28:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753390AbbGYC2d (ORCPT ); Fri, 24 Jul 2015 22:28:33 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:41516 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753030AbbGYC2c (ORCPT ); Fri, 24 Jul 2015 22:28:32 -0400 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NS0033PKUVJ8G20@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Sat, 25 Jul 2015 11:28:31 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.50]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 5F.52.28411.F44F2B55; Sat, 25 Jul 2015 11:28:31 +0900 (KST) X-AuditID: cbfee68e-f79c56d000006efb-68-55b2f44f047f Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 07.25.25346.E44F2B55; Sat, 25 Jul 2015 11:28:31 +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 <0NS0002QXUVILD90@mmp2.samsung.com>; Sat, 25 Jul 2015 11:28:30 +0900 (KST) From: Kukjin Kim To: linux-samsung-soc@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 3/3] ARM: SAMSUNG: make local s5p-dev-mfc in mach-exynos Date: Sat, 25 Jul 2015 11:28:30 +0900 Message-id: <065001d0c681$98b6ebf0$ca24c3d0$@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: AdDGgY3zBijsh4CqQWKzptop7dFlYw== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRmVeSWpSXmKPExsVy+t8zI13/L5tCDfr+sVm8fmFoMeP8PiYH Jo++LasYPT5vkgtgiuKySUnNySxLLdK3S+DKOHl/PVPBCeGKI09dGhgnCXQxcnJICJhIvNj5 jAnCFpO4cG89WxcjF4eQwDJGiXVf37HBFF1dfpEJIjGdUaJ3Zyc7hPOeUeJQ506gDAcHm4Cy RGOTPkiDsICWxMItTSwgtoiAqsTntgXsIDazgKHEz3d/2CFqPCRen9gHtoAFqObmtEesIDav gIXEh/ebGSFsQYkfk++xQPRqSazfeZwJwpaX2LzmLTPEcQoSO86+ZoTYpSfxZ+NhqHoRiX0v 3jGC3CkhMJ1d4vyCfawQywQkvk0+xAJys4SArMSmA1BzJCUOrrjBMoFRfBaS1bOQrJ6FZPUs JCsWMLKsYhRNLUguKE5KLzLSK07MLS7NS9dLzs/dxAiJqb4djDcPWB9iFOBgVOLhzZiwMVSI NbGsuDL3EKMp0EUTmaVEk/OBkZtXEm9obGZkYWpiamxkbmmmJM6bIPUzWEggPbEkNTs1tSC1 KL6oNCe1+BAjEwenVAMjdz5/S+WbKUyXHLorVDPnZWfuDPxaN+HWk6UX/q/bbLOxRTSwc/3i 1Hn69yR9c+fu1FOYVmW759HUDR1PjO16phmcFrvJbnagQnD7amHFR/Pk4lj0gx/6/s4VXX15 xTPjKQmXz0sx77Hfvnv9gaVT6vwm9Fx6lhrsLc384J2LcJP2JYe9+xY3KLEUZyQaajEXFScC ALmWpEakAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNIsWRmVeSWpSXmKPExsVy+t9jQV3/L5tCDdreM1m8fmFoMeP8PiYH Jo++LasYPT5vkgtgimpgtMlITUxJLVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21 VXLxCdB1y8wBGq+kUJaYUwoUCkgsLlbSt8M0ITTETdcCpjFC1zckCK7HyAANJKxjzDh5fz1T wQnhiiNPXRoYJwl0MXJySAiYSFxdfpEJwhaTuHBvPVsXIxeHkMB0RonenZ3sEM57RolDnTuB qjg42ASUJRqb9EEahAW0JBZuaWIBsUUEVCU+ty1gB7GZBQwlfr77ww5R4yHx+sQ+NhCbBajm 5rRHrCA2r4CFxIf3mxkhbEGJH5PvsUD0akms33mcCcKWl9i85i0zxHEKEjvOvmaE2KUn8Wfj Yah6EYl9L94xTmAUnIVk1Cwko2YhGTULScsCRpZVjKKpBckFxUnpuYZ6xYm5xaV56XrJ+bmb GMER+0xqB+PKBotDjAIcjEo8vAcmbQwVYk0sK67MPcQowcGsJMIr+WBTqBBvSmJlVWpRfnxR aU5q8SFGU6BPJzJLiSbnA5NJXkm8obGJmZGlkZmFkYm5uZI478l8n1AhgfTEktTs1NSC1CKY PiYOTqkGxuhyrc3zPijr9zM9LdzMUqo+l++O4w1t9yUOKfdvTXpoqvx9rvQ80bnV0rcKPZxq JU+Gn2+a2tPo+Ozh2+5Ixp1Sn/R8PHX/tTD9WXVI3/klT32X3sSo+Wyd573LgmZUPk+xjvIz EOX9GFWfHWpdE3fhSFCMD/uKo88CGvlCtQp/Mqwzu52hxFKckWioxVxUnAgAPp/Pg+4CAAA= 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.1 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 s5p-dev-mfc from plat-samsung into mach-exynos because it is used for only exynos no other platforms. Signed-off-by: Kukjin Kim Cc: Krzysztof Kozlowski --- arch/arm/mach-exynos/Kconfig | 5 +++++ arch/arm/mach-exynos/Makefile | 2 ++ arch/arm/{plat-samsung => mach-exynos}/s5p-dev-mfc.c | 0 arch/arm/plat-samsung/Kconfig | 5 ----- arch/arm/plat-samsung/Makefile | 1 - 5 files changed, 7 insertions(+), 6 deletions(-) rename arch/arm/{plat-samsung => mach-exynos}/s5p-dev-mfc.c (100%) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 81064cd..4c4858c 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -30,6 +30,11 @@ menuconfig ARCH_EXYNOS if ARCH_EXYNOS +config S5P_DEV_MFC + bool + help + Compile in setup memory (init) code for MFC + config ARCH_EXYNOS3 bool "SAMSUNG EXYNOS3" select ARM_CPU_SUSPEND if PM diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index bcefb54..2f30676 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -23,3 +23,5 @@ AFLAGS_sleep.o :=-Wa,-march=armv7-a$(plus_sec) obj-$(CONFIG_EXYNOS5420_MCPM) += mcpm-exynos.o CFLAGS_mcpm-exynos.o += -march=armv7-a + +obj-$(CONFIG_S5P_DEV_MFC) += s5p-dev-mfc.o diff --git a/arch/arm/plat-samsung/s5p-dev-mfc.c b/arch/arm/mach-exynos/s5p-dev-mfc.c similarity index 100% rename from arch/arm/plat-samsung/s5p-dev-mfc.c rename to arch/arm/mach-exynos/s5p-dev-mfc.c diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 0e1874c..57729b9 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -233,11 +233,6 @@ config SAMSUNG_PM_GPIO pinctrl-samsung driver. endif -config S5P_DEV_MFC - bool - help - Compile in setup memory (init) code for MFC - comment "Power management" config SAMSUNG_PM_DEBUG diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 624f5db..8c91176 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile @@ -20,7 +20,6 @@ obj-$(CONFIG_SAMSUNG_ATAGS) += platformdata.o obj-$(CONFIG_SAMSUNG_ATAGS) += devs.o obj-$(CONFIG_SAMSUNG_ATAGS) += dev-uart.o -obj-$(CONFIG_S5P_DEV_MFC) += s5p-dev-mfc.o # PM support