From patchwork Sat Jul 25 02:27:59 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: 6863441 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 390789F38B for ; Sat, 25 Jul 2015 02:28:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4F06520573 for ; Sat, 25 Jul 2015 02:28:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C394B20552 for ; Sat, 25 Jul 2015 02:28:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753083AbbGYC2E (ORCPT ); Fri, 24 Jul 2015 22:28:04 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:53981 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753030AbbGYC2C (ORCPT ); Fri, 24 Jul 2015 22:28:02 -0400 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NS002J7FUUOLY70@mailout3.samsung.com> for linux-samsung-soc@vger.kernel.org; Sat, 25 Jul 2015 11:28:00 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.134]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id DB.E0.17770.F24F2B55; Sat, 25 Jul 2015 11:28:00 +0900 (KST) X-AuditID: cbfee691-f79ca6d00000456a-4d-55b2f42f07b5 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 51.4A.05312.F24F2B55; Sat, 25 Jul 2015 11:27:59 +0900 (KST) Received: from DOKGENEKIM04 ([12.36.165.190]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NS000JKGUUNIA70@mmp1.samsung.com>; Sat, 25 Jul 2015 11:27:59 +0900 (KST) From: Kukjin Kim To: linux-samsung-soc@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [[PATCH 1/3] ARM: SAMSUNG: make local setup-camif in mach-s3c24xx Date: Sat, 25 Jul 2015 11:27:59 +0900 Message-id: <064e01d0c681$862e3380$928a9a80$@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: AdDGgXIBviN6sN2/QxqDVy8dGAR62Q== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRmVeSWpSXmKPExsWyRsSkTdfgy6ZQgxmbGC1evzC0mHF+H5MD k0ffllWMHp83yQUwRXHZpKTmZJalFunbJXBlPF/3jqWgVbyi4/UZlgbGz0JdjJwcEgImEm8m v2aDsMUkLtxbD2YLCSxllLjeWghTs/DyMpYuRi6g+CJGiXXtC5khnPeMElMW3mDsYuTgYBNQ lmhs0gdpEBbQkli4pYkFxBYRUJX43LaAHcRmFjCU+PnuDztEjZdEa8dXRhCbBahm7fnpYPW8 AhYSb5e0sULYghI/Jt9jgejVkli/8zgThC0vsXnNW2aI4xQkdpx9zQixS0/iZfcpVogaEYl9 L94xgtwpITCPXWLC5nZmiGUCEt8mH2IBuVlCQFZi0wGoOZISB1fcYJnAKD4LyepZSFbPQrJ6 FpIVCxhZVjGKphYkFxQnpReZ6hUn5haX5qXrJefnbmIExtTpf88m7mC8f8D6EKMAB6MSD2/G hI2hQqyJZcWVuYcYTYEumsgsJZqcD4zcvJJ4Q2MzIwtTE1NjI3NLMyVxXh3pn8FCAumJJanZ qakFqUXxRaU5qcWHGJk4OKUaGKe9/3nwL3cq28Z78u1Zd8s/9M4ryH0esu6GeN7EkzP38vWw 9BfdTzCZ266tk74tiIffqri4t2vxur8rGyxPNXo3NhofPnb99s4XqXbmNR93sk2YvPf8lInn HnL/PrPsY/afWack+b+HtzjbRRs9VV5gOF/cfnHvB8MK3aC9LKL/KraWmd+OEFFiKc5INNRi LipOBACJDw1ApAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDIsWRmVeSWpSXmKPExsVy+t9jAV39L5tCDU5st7J4/cLQYsb5fUwO TB59W1YxenzeJBfAFNXAaJORmpiSWqSQmpecn5KZl26r5B0c7xxvamZgqGtoaWGupJCXmJtq q+TiE6DrlpkDNF5JoSwxpxQoFJBYXKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjHmPF83TuW glbxio7XZ1gaGD8LdTFyckgImEgsvLyMBcIWk7hwbz1bFyMXh5DAIkaJde0LmSGc94wSUxbe YOxi5OBgE1CWaGzSB2kQFtCSWLilCaxZREBV4nPbAnYQm1nAUOLnuz/sEDVeEq0dXxlBbBag mrXnp4PV8wpYSLxd0sYKYQtK/Jh8jwWiV0ti/c7jTBC2vMTmNW+ZIY5TkNhx9jUjxC49iZfd p1ghakQk9r14xziBUXAWklGzkIyahWTULCQtCxhZVjGKphYkFxQnpeca6RUn5haX5qXrJefn bmIEx+wz6R2MqxosDjEKcDAq8fBmTNgYKsSaWFZcmXuIUYKDWUmEV/LBplAh3pTEyqrUovz4 otKc1OJDjKZAn05klhJNzgemk7ySeENjEzMjSyMzCyMTc3Mlcd6T+T6hQgLpiSWp2ampBalF MH1MHJxSDYwORfseTLoaqhLtwz63q1TX5vakZUeZe/KfTFFj25BRqrk1SH3mZIsW2TW3b1wX ulDgv33KoYe9JVfDJVe76q8/JnQ2IXBnoeijixMznuU/e7tRd8f0O7/3BC4P/1CUE3B0/ZsF UyX/6Nqrb7FiqAiXqt3vaPXmmcbX92YebzxDmc7VaW3awXZBiaU4I9FQi7moOBEA1kcxGu8C AAA= 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 setup-camif from plat-samsung into mach-s3c24xx because it can be used only for s3c24xx no other platforms. Signed-off-by: Kukjin Kim Cc: Krzysztof Kozlowski --- arch/arm/mach-s3c24xx/Kconfig | 5 +++++ arch/arm/mach-s3c24xx/Makefile | 1 + arch/arm/{plat-samsung => mach-s3c24xx}/setup-camif.c | 0 arch/arm/plat-samsung/Kconfig | 6 ------ arch/arm/plat-samsung/Makefile | 2 -- 5 files changed, 6 insertions(+), 8 deletions(-) rename arch/arm/{plat-samsung => mach-s3c24xx}/setup-camif.c (100%) diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index 23bec3a..ef68ecb 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig @@ -124,6 +124,11 @@ config S3C24XX_PLL This also means that the PLL tables for the selected CPU(s) will be built which may increase the size of the kernel image. +config S3C_SETUP_CAMIF + bool + help + Compile in common setup code for S3C CAMIF devices + # cpu frequency items common between s3c2410 and s3c2440/s3c2442 config S3C2410_IOTIMING diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile index 05920c8..8ac2f58 100644 --- a/arch/arm/mach-s3c24xx/Makefile +++ b/arch/arm/mach-s3c24xx/Makefile @@ -99,3 +99,4 @@ obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o obj-$(CONFIG_S3C2443_SETUP_SPI) += setup-spi.o obj-$(CONFIG_ARCH_S3C24XX) += setup-i2c.o obj-$(CONFIG_S3C24XX_SETUP_TS) += setup-ts.o +obj-$(CONFIG_S3C_SETUP_CAMIF) += setup-camif.o diff --git a/arch/arm/plat-samsung/setup-camif.c b/arch/arm/mach-s3c24xx/setup-camif.c similarity index 100% rename from arch/arm/plat-samsung/setup-camif.c rename to arch/arm/mach-s3c24xx/setup-camif.c diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index cb8e3d6..f115c81 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -231,18 +231,12 @@ config S3C24XX_PWM Support for exporting the PWM timer blocks via the pwm device system -config S3C_SETUP_CAMIF - bool - help - Compile in common setup code for S3C CAMIF devices - config SAMSUNG_PM_GPIO bool default y if GPIO_SAMSUNG && PM help Include legacy GPIO power management code for platforms not using pinctrl-samsung driver. - endif config S5P_DEV_MFC diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index 1a29ab1..c48a2cc 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile @@ -24,8 +24,6 @@ obj-$(CONFIG_S5P_DEV_MFC) += s5p-dev-mfc.o obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT) += dev-backlight.o -obj-$(CONFIG_S3C_SETUP_CAMIF) += setup-camif.o - # PM support obj-$(CONFIG_PM_SLEEP) += pm-common.o