From patchwork Thu Oct 10 21:07:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11184495 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C4E40912 for ; Thu, 10 Oct 2019 21:07:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7BE6420B7C for ; Thu, 10 Oct 2019 21:07:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726755AbfJJVHn (ORCPT ); Thu, 10 Oct 2019 17:07:43 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:41775 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725867AbfJJVHm (ORCPT ); Thu, 10 Oct 2019 17:07:42 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.129]) with ESMTPA (Nemesis) id 1M2Plu-1iEoIr1cti-003rws; Thu, 10 Oct 2019 23:07:19 +0200 From: Arnd Bergmann To: Kukjin Kim , Krzysztof Kozlowski Cc: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org, Arnd Bergmann Subject: [PATCH 36/36] ARM: s3c: make headers local if possible Date: Thu, 10 Oct 2019 23:07:17 +0200 Message-Id: <20191010210717.2459739-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191010202802.1132272-1-arnd@arndb.de> References: <20191010202802.1132272-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:vk0JlrRbZFkpHgA1Sd0JXbVga9nipHzbVLsmIScwVZmuzGjKTm4 BZj8JN/y4iocPXqHijcVMWpeYQPa93cJYqRpXGWAzKtPriT9L8wGILsdFKhm6EMzlopV0ug MprhS0Zvx0ZCVLS6ULSDOxV6h0fMwXAYSkOCtAYzJJNiGjts6vSKc8+BAmifQMfnpSvTmKC EH3IvhRX9wrJ/5UxMV25A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:85Lylhyf7TY=:ku+6ASbxb5jILC22W2YnJw U/9a7RegrhZrciJR8JE4QJ3npTwqOcXQU7xQMSuAUylKrhACeiUPOnaEOQvXRoL8wmf3wGE+8 KCGoT6AnIMl32wc1Lh+zHGnKEN45xFErhwiVBzvheSDNudemvLxwoYNMJ+swPOnz4Q7SvlRgI S+AjI8wfhBybmN4rurO1XJz65SD4oBGXe3ocPutdI9MXK2hk1kOyR5M2+DiKShqy6HGHQeu6p u54EwhQREJZfpOmqYYpSGYfr0evX8OSw/hn0xX9HT77TJoEQciHYRoiUBMlCoqUwvTO7SGJbs C4lyoFqvJtigRCDoDYn7AbT5x7dHeB+djWa54U3S6aK7wXaD5DIeeEQq4LwGD5s4C3Yw83nx0 3eJQrZV4YxzN7mcXpDnxKjySZenMjpYMMx04Apdtjl4cWQov46mmGLp1QraMJ3iR1tUFJvBdI p+uiR/KIi4BVffrRirUV5jl6360d3UmIT4aMsAIZ24HxQuZGu9m2p6GLQHPS7EU/ngdASurbH 7c8yf+OoerTIK1frCl5AMAHiNlIWtCWO8vA1H1/bCSbfCc6GfsZEtWVbjdnT9H9N90xFJTBBp X+Y243cBudlZP+jB1J/qc6s1wYiguC+99M077z1KAVjGOKVVsX5dCU4bYXiImqyQo2urJbzSO Zbtw5IhQFSwSGfekSuK7MVxYP34trD5AbjYubyNjn+hdnM8ZctoSKMiUCLLntfLYo0Gz+V86G xzq5CI+Te6WHJ3XorjJ3XcaGJQfupQMFTj3zbbMyRLpxZAcXt2DRSfsXmLuVTLI/3CvFRgwfR RpgCLndaaAqDEgFWgfuC9vlUB0rnM5jAMn8LvnOItNnigv5q8vN0U/ookwWCSuiSUDpQ1lCRv CqGU+Udrb2FVYGh+HF5A== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org A lot of header files are only used internally now, so they can be moved to mach-s3c, out of the visibility of drivers. Signed-off-by: Arnd Bergmann --- .../mach-s3c/{include/plat => }/adc-core.h | 0 arch/arm/mach-s3c/adc.c | 2 +- arch/arm/mach-s3c/bast-ide.c | 2 +- arch/arm/mach-s3c/bast-irq.c | 3 +-- arch/arm/mach-s3c/common-smdk.c | 11 ++++---- arch/arm/mach-s3c/cpu.c | 4 +-- arch/arm/mach-s3c/{include/plat => }/cpu.h | 0 arch/arm/mach-s3c/cpufreq-utils.c | 4 +-- arch/arm/mach-s3c/cpuidle.c | 4 +-- arch/arm/mach-s3c/crag6410.h | 2 +- arch/arm/mach-s3c/dev-audio.c | 9 +++---- arch/arm/mach-s3c/dev-backlight.c | 4 +-- arch/arm/mach-s3c/dev-uart-s3c64xx.c | 4 +-- arch/arm/mach-s3c/dev-uart.c | 2 +- arch/arm/mach-s3c/devs.c | 23 ++++++++-------- arch/arm/mach-s3c/{include/plat => }/devs.h | 0 .../mach-s3c/{include/mach => }/dma-s3c24xx.h | 0 .../mach-s3c/{include/mach => }/dma-s3c64xx.h | 0 arch/arm/mach-s3c/{include/mach => }/dma.h | 0 arch/arm/mach-s3c/{include/plat => }/fb.h | 0 .../{include/plat => }/gpio-cfg-helpers.h | 0 .../mach-s3c/{include/plat => }/gpio-cfg.h | 0 .../mach-s3c/{include/plat => }/gpio-core.h | 2 +- .../{include/mach => }/gpio-samsung-s3c24xx.h | 2 +- .../{include/mach => }/gpio-samsung-s3c64xx.h | 0 arch/arm/mach-s3c/gpio-samsung.c | 18 ++++++------- .../{include/mach => }/gpio-samsung.h | 0 arch/arm/mach-s3c/gta02.h | 2 +- arch/arm/mach-s3c/h1940-bluetooth.c | 7 +++-- .../mach-s3c/{include/mach => }/hardware.h | 0 .../mach-s3c/{include/plat => }/iic-core.h | 0 arch/arm/mach-s3c/include/mach/io.h | 2 +- .../include/{plat => mach}/map-base.h | 0 arch/arm/mach-s3c/init.c | 4 +-- arch/arm/mach-s3c/iotiming-s3c2410.c | 4 +-- arch/arm/mach-s3c/iotiming-s3c2412.c | 4 +-- arch/arm/mach-s3c/irq-pm-s3c24xx.c | 16 ++++++------ arch/arm/mach-s3c/irq-pm-s3c64xx.c | 8 +++--- arch/arm/mach-s3c/irq-s3c24xx-fiq.S | 4 +-- arch/arm/mach-s3c/irq-s3c24xx.c | 10 +++---- arch/arm/mach-s3c/{include/plat => }/keypad.h | 0 arch/arm/mach-s3c/mach-amlm5900.c | 13 +++++----- arch/arm/mach-s3c/mach-anubis.c | 11 ++++---- arch/arm/mach-s3c/mach-anw6410.c | 14 +++++----- arch/arm/mach-s3c/mach-at2440evb.c | 11 ++++---- arch/arm/mach-s3c/mach-bast.c | 13 +++++----- arch/arm/mach-s3c/mach-crag6410-module.c | 2 +- arch/arm/mach-s3c/mach-crag6410.c | 22 ++++++++-------- arch/arm/mach-s3c/mach-gta02.c | 19 +++++++------- arch/arm/mach-s3c/mach-h1940.c | 22 ++++++++-------- arch/arm/mach-s3c/mach-hmt.c | 12 ++++----- arch/arm/mach-s3c/mach-jive.c | 16 ++++++------ arch/arm/mach-s3c/mach-mini2440.c | 13 +++++----- arch/arm/mach-s3c/mach-mini6410.c | 16 ++++++------ arch/arm/mach-s3c/mach-n30.c | 14 +++++----- arch/arm/mach-s3c/mach-ncp.c | 10 +++---- arch/arm/mach-s3c/mach-nexcoder.c | 13 +++++----- arch/arm/mach-s3c/mach-osiris-dvs.c | 2 +- arch/arm/mach-s3c/mach-osiris.c | 13 +++++----- arch/arm/mach-s3c/mach-otom.c | 15 +++++------ arch/arm/mach-s3c/mach-qt2410.c | 13 +++++----- arch/arm/mach-s3c/mach-real6410.c | 14 +++++----- arch/arm/mach-s3c/mach-rx1950.c | 18 ++++++------- arch/arm/mach-s3c/mach-rx3715.c | 17 ++++++------ arch/arm/mach-s3c/mach-s3c2416-dt.c | 6 ++--- arch/arm/mach-s3c/mach-s3c64xx-dt.c | 4 +-- arch/arm/mach-s3c/mach-smartq.c | 16 ++++++------ arch/arm/mach-s3c/mach-smartq5.c | 18 ++++++------- arch/arm/mach-s3c/mach-smartq7.c | 18 ++++++------- arch/arm/mach-s3c/mach-smdk2410.c | 11 ++++---- arch/arm/mach-s3c/mach-smdk2413.c | 14 +++++----- arch/arm/mach-s3c/mach-smdk2416.c | 20 +++++++------- arch/arm/mach-s3c/mach-smdk2440.c | 13 +++++----- arch/arm/mach-s3c/mach-smdk2443.c | 9 +++---- arch/arm/mach-s3c/mach-smdk6400.c | 10 +++---- arch/arm/mach-s3c/mach-smdk6410.c | 18 ++++++------- arch/arm/mach-s3c/mach-tct_hammer.c | 7 +++-- arch/arm/mach-s3c/mach-vr1000.c | 15 +++++------ arch/arm/mach-s3c/mach-vstms.c | 13 +++++----- .../arm/mach-s3c/{include/plat => }/map-s3c.h | 4 +-- .../mach-s3c/{include/mach => }/map-s3c24xx.h | 4 +-- .../mach-s3c/{include/mach => }/map-s3c64xx.h | 4 +-- .../arm/mach-s3c/{include/plat => }/map-s5p.h | 2 +- arch/arm/mach-s3c/{include/mach => }/map.h | 0 arch/arm/mach-s3c/pl080.c | 4 +-- arch/arm/mach-s3c/platformdata.c | 4 +-- arch/arm/mach-s3c/pm-common.c | 2 +- .../mach-s3c/{include/plat => }/pm-common.h | 0 .../{include/mach => }/pm-core-s3c24xx.h | 0 .../{include/mach => }/pm-core-s3c64xx.h | 6 ++--- .../arm/mach-s3c/{include/mach => }/pm-core.h | 0 arch/arm/mach-s3c/pm-gpio.c | 6 ++--- arch/arm/mach-s3c/pm-h1940.S | 4 +-- arch/arm/mach-s3c/pm-s3c2410.c | 11 ++++---- arch/arm/mach-s3c/pm-s3c2412.c | 9 +++---- arch/arm/mach-s3c/pm-s3c2416.c | 6 ++--- arch/arm/mach-s3c/pm-s3c24xx.c | 12 ++++----- arch/arm/mach-s3c/pm-s3c64xx.c | 16 ++++++------ arch/arm/mach-s3c/pm.c | 12 ++++----- arch/arm/mach-s3c/{include/plat => }/pm.h | 2 +- .../mach-s3c/{include/plat => }/pwm-core.h | 0 .../mach-s3c/{include/plat => }/regs-adc.h | 0 .../{include/mach => }/regs-clock-s3c24xx.h | 2 +- .../{include/mach => }/regs-clock-s3c64xx.h | 0 .../mach-s3c/{include/mach => }/regs-clock.h | 0 .../{include/mach => }/regs-gpio-s3c24xx.h | 2 +- .../{include/mach => }/regs-gpio-s3c64xx.h | 0 .../mach-s3c/{include/mach => }/regs-gpio.h | 0 .../{include/mach => }/regs-irq-s3c24xx.h | 2 +- .../{include/mach => }/regs-irq-s3c64xx.h | 0 .../mach-s3c/{include/mach => }/regs-irq.h | 0 .../{include/plat => }/regs-irqtype.h | 0 arch/arm/mach-s3c/regs-mem.h | 2 +- .../{include/mach => }/regs-s3c2443-clock.h | 2 +- .../mach-s3c/{include/mach => }/rtc-core.h | 0 arch/arm/mach-s3c/s3c2410.c | 18 ++++++------- arch/arm/mach-s3c/s3c2412.c | 12 ++++----- .../arm/mach-s3c/{include/mach => }/s3c2412.h | 2 +- arch/arm/mach-s3c/s3c2416.c | 26 +++++++++---------- arch/arm/mach-s3c/s3c2440.c | 15 +++++------ arch/arm/mach-s3c/s3c2442.c | 15 +++++------ arch/arm/mach-s3c/s3c2443.c | 20 +++++++------- arch/arm/mach-s3c/s3c244x.c | 12 ++++----- arch/arm/mach-s3c/s3c24xx.c | 16 ++++++------ arch/arm/mach-s3c/s3c6400.c | 10 +++---- arch/arm/mach-s3c/s3c6410.c | 12 ++++----- arch/arm/mach-s3c/s3c64xx.c | 21 +++++++-------- .../{include/plat => }/samsung-time.h | 0 arch/arm/mach-s3c/{include/plat => }/sdhci.h | 2 +- arch/arm/mach-s3c/setup-camif.c | 4 +-- arch/arm/mach-s3c/setup-fb-24bpp.c | 6 ++--- arch/arm/mach-s3c/setup-i2c.c | 7 +++-- arch/arm/mach-s3c/setup-i2c0.c | 4 +-- arch/arm/mach-s3c/setup-i2c1.c | 4 +-- arch/arm/mach-s3c/setup-ide.c | 8 +++--- arch/arm/mach-s3c/setup-keypad.c | 6 ++--- arch/arm/mach-s3c/setup-sdhci-gpio-s3c24xx.c | 6 ++--- arch/arm/mach-s3c/setup-sdhci-gpio-s3c64xx.c | 6 ++--- arch/arm/mach-s3c/setup-spi-s3c24xx.c | 6 ++--- arch/arm/mach-s3c/setup-spi-s3c64xx.c | 4 +-- arch/arm/mach-s3c/setup-ts.c | 5 ++-- arch/arm/mach-s3c/setup-usb-phy.c | 6 ++--- arch/arm/mach-s3c/simtec-audio.c | 9 +++---- arch/arm/mach-s3c/simtec-nor.c | 2 +- arch/arm/mach-s3c/simtec-pm.c | 8 +++--- arch/arm/mach-s3c/simtec-usb.c | 5 ++-- arch/arm/mach-s3c/sleep-s3c2410.S | 6 ++--- arch/arm/mach-s3c/sleep-s3c2412.S | 4 +-- arch/arm/mach-s3c/sleep-s3c24xx.S | 6 ++--- arch/arm/mach-s3c/sleep-s3c64xx.S | 4 +-- .../arm/mach-s3c/{include/plat => }/usb-phy.h | 0 arch/arm/mach-s3c/wakeup-mask.c | 4 +-- .../mach-s3c/{include/plat => }/wakeup-mask.h | 0 drivers/mmc/host/s3cmci.c | 3 --- 154 files changed, 524 insertions(+), 560 deletions(-) rename arch/arm/mach-s3c/{include/plat => }/adc-core.h (100%) rename arch/arm/mach-s3c/{include/plat => }/cpu.h (100%) rename arch/arm/mach-s3c/{include/plat => }/devs.h (100%) rename arch/arm/mach-s3c/{include/mach => }/dma-s3c24xx.h (100%) rename arch/arm/mach-s3c/{include/mach => }/dma-s3c64xx.h (100%) rename arch/arm/mach-s3c/{include/mach => }/dma.h (100%) rename arch/arm/mach-s3c/{include/plat => }/fb.h (100%) rename arch/arm/mach-s3c/{include/plat => }/gpio-cfg-helpers.h (100%) rename arch/arm/mach-s3c/{include/plat => }/gpio-cfg.h (100%) rename arch/arm/mach-s3c/{include/plat => }/gpio-core.h (99%) rename arch/arm/mach-s3c/{include/mach => }/gpio-samsung-s3c24xx.h (99%) rename arch/arm/mach-s3c/{include/mach => }/gpio-samsung-s3c64xx.h (100%) rename arch/arm/mach-s3c/{include/mach => }/gpio-samsung.h (100%) rename arch/arm/mach-s3c/{include/mach => }/hardware.h (100%) rename arch/arm/mach-s3c/{include/plat => }/iic-core.h (100%) rename arch/arm/mach-s3c/include/{plat => mach}/map-base.h (100%) rename arch/arm/mach-s3c/{include/plat => }/keypad.h (100%) rename arch/arm/mach-s3c/{include/plat => }/map-s3c.h (97%) rename arch/arm/mach-s3c/{include/mach => }/map-s3c24xx.h (98%) rename arch/arm/mach-s3c/{include/mach => }/map-s3c64xx.h (98%) rename arch/arm/mach-s3c/{include/plat => }/map-s5p.h (94%) rename arch/arm/mach-s3c/{include/mach => }/map.h (100%) rename arch/arm/mach-s3c/{include/plat => }/pm-common.h (100%) rename arch/arm/mach-s3c/{include/mach => }/pm-core-s3c24xx.h (100%) rename arch/arm/mach-s3c/{include/mach => }/pm-core-s3c64xx.h (96%) rename arch/arm/mach-s3c/{include/mach => }/pm-core.h (100%) rename arch/arm/mach-s3c/{include/plat => }/pm.h (98%) rename arch/arm/mach-s3c/{include/plat => }/pwm-core.h (100%) rename arch/arm/mach-s3c/{include/plat => }/regs-adc.h (100%) rename arch/arm/mach-s3c/{include/mach => }/regs-clock-s3c24xx.h (99%) rename arch/arm/mach-s3c/{include/mach => }/regs-clock-s3c64xx.h (100%) rename arch/arm/mach-s3c/{include/mach => }/regs-clock.h (100%) rename arch/arm/mach-s3c/{include/mach => }/regs-gpio-s3c24xx.h (99%) rename arch/arm/mach-s3c/{include/mach => }/regs-gpio-s3c64xx.h (100%) rename arch/arm/mach-s3c/{include/mach => }/regs-gpio.h (100%) rename arch/arm/mach-s3c/{include/mach => }/regs-irq-s3c24xx.h (98%) rename arch/arm/mach-s3c/{include/mach => }/regs-irq-s3c64xx.h (100%) rename arch/arm/mach-s3c/{include/mach => }/regs-irq.h (100%) rename arch/arm/mach-s3c/{include/plat => }/regs-irqtype.h (100%) rename arch/arm/mach-s3c/{include/mach => }/regs-s3c2443-clock.h (99%) rename arch/arm/mach-s3c/{include/mach => }/rtc-core.h (100%) rename arch/arm/mach-s3c/{include/mach => }/s3c2412.h (96%) rename arch/arm/mach-s3c/{include/plat => }/samsung-time.h (100%) rename arch/arm/mach-s3c/{include/plat => }/sdhci.h (99%) rename arch/arm/mach-s3c/{include/plat => }/usb-phy.h (100%) rename arch/arm/mach-s3c/{include/plat => }/wakeup-mask.h (100%) diff --git a/arch/arm/mach-s3c/include/plat/adc-core.h b/arch/arm/mach-s3c/adc-core.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/adc-core.h rename to arch/arm/mach-s3c/adc-core.h diff --git a/arch/arm/mach-s3c/adc.c b/arch/arm/mach-s3c/adc.c index 623a9774cc52..272d2950d432 100644 --- a/arch/arm/mach-s3c/adc.c +++ b/arch/arm/mach-s3c/adc.c @@ -19,7 +19,7 @@ #include #include -#include +#include "regs-adc.h" #include /* This driver is designed to control the usage of the ADC block between diff --git a/arch/arm/mach-s3c/bast-ide.c b/arch/arm/mach-s3c/bast-ide.c index ee6fbb407640..da64db1811d8 100644 --- a/arch/arm/mach-s3c/bast-ide.c +++ b/arch/arm/mach-s3c/bast-ide.c @@ -19,7 +19,7 @@ #include #include -#include +#include "map.h" #include #include "bast.h" diff --git a/arch/arm/mach-s3c/bast-irq.c b/arch/arm/mach-s3c/bast-irq.c index b3083ee3ab33..d299f124e6dc 100644 --- a/arch/arm/mach-s3c/bast-irq.c +++ b/arch/arm/mach-s3c/bast-irq.c @@ -15,8 +15,7 @@ #include #include -#include -#include +#include "regs-irq.h" #include #include "bast.h" diff --git a/arch/arm/mach-s3c/common-smdk.c b/arch/arm/mach-s3c/common-smdk.c index 5392d5106b4b..1ec207159ee2 100644 --- a/arch/arm/mach-s3c/common-smdk.c +++ b/arch/arm/mach-s3c/common-smdk.c @@ -28,17 +28,16 @@ #include #include -#include #include -#include -#include +#include "regs-gpio.h" +#include "gpio-samsung.h" #include #include -#include -#include -#include +#include "gpio-cfg.h" +#include "devs.h" +#include "pm.h" #include "common-smdk.h" diff --git a/arch/arm/mach-s3c/cpu.c b/arch/arm/mach-s3c/cpu.c index 8acba21bbf4b..6e9772555f0d 100644 --- a/arch/arm/mach-s3c/cpu.c +++ b/arch/arm/mach-s3c/cpu.c @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include "cpu.h" unsigned long samsung_cpu_id; diff --git a/arch/arm/mach-s3c/include/plat/cpu.h b/arch/arm/mach-s3c/cpu.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/cpu.h rename to arch/arm/mach-s3c/cpu.h diff --git a/arch/arm/mach-s3c/cpufreq-utils.c b/arch/arm/mach-s3c/cpufreq-utils.c index 75c197d59a75..e4266f271b51 100644 --- a/arch/arm/mach-s3c/cpufreq-utils.c +++ b/arch/arm/mach-s3c/cpufreq-utils.c @@ -12,8 +12,8 @@ #include #include -#include -#include +#include "map.h" +#include "regs-clock.h" #include diff --git a/arch/arm/mach-s3c/cpuidle.c b/arch/arm/mach-s3c/cpuidle.c index 0bac6f6413b0..0e020ee8f78e 100644 --- a/arch/arm/mach-s3c/cpuidle.c +++ b/arch/arm/mach-s3c/cpuidle.c @@ -13,8 +13,8 @@ #include -#include -#include +#include "cpu.h" +#include "map.h" #include "regs-sys.h" #include "regs-syscon-power.h" diff --git a/arch/arm/mach-s3c/crag6410.h b/arch/arm/mach-s3c/crag6410.h index 00d9aa114aa7..f39ea2ca7a75 100644 --- a/arch/arm/mach-s3c/crag6410.h +++ b/arch/arm/mach-s3c/crag6410.h @@ -8,7 +8,7 @@ #ifndef MACH_CRAG6410_H #define MACH_CRAG6410_H -#include +#include "gpio-samsung.h" #define GLENFARCLAS_PMIC_IRQ_BASE IRQ_BOARD_START #define BANFF_PMIC_IRQ_BASE (IRQ_BOARD_START + 64) diff --git a/arch/arm/mach-s3c/dev-audio.c b/arch/arm/mach-s3c/dev-audio.c index e3c49b5d1355..fc2f077afd24 100644 --- a/arch/arm/mach-s3c/dev-audio.c +++ b/arch/arm/mach-s3c/dev-audio.c @@ -11,13 +11,12 @@ #include #include -#include -#include +#include "map.h" -#include +#include "devs.h" #include -#include -#include +#include "gpio-cfg.h" +#include "gpio-samsung.h" static int s3c64xx_i2s_cfg_gpio(struct platform_device *pdev) { diff --git a/arch/arm/mach-s3c/dev-backlight.c b/arch/arm/mach-s3c/dev-backlight.c index 799cfdf0606b..6856b69f78f9 100644 --- a/arch/arm/mach-s3c/dev-backlight.c +++ b/arch/arm/mach-s3c/dev-backlight.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include "devs.h" +#include "gpio-cfg.h" #include "backlight.h" diff --git a/arch/arm/mach-s3c/dev-uart-s3c64xx.c b/arch/arm/mach-s3c/dev-uart-s3c64xx.c index 021a2b7926fa..8288e8d6c092 100644 --- a/arch/arm/mach-s3c/dev-uart-s3c64xx.c +++ b/arch/arm/mach-s3c/dev-uart-s3c64xx.c @@ -15,10 +15,10 @@ #include #include -#include +#include "map.h" #include -#include +#include "devs.h" /* Serial port registrations */ diff --git a/arch/arm/mach-s3c/dev-uart.c b/arch/arm/mach-s3c/dev-uart.c index 7476a5dbae77..3d1f7f2fd7c7 100644 --- a/arch/arm/mach-s3c/dev-uart.c +++ b/arch/arm/mach-s3c/dev-uart.c @@ -10,7 +10,7 @@ #include #include -#include +#include "devs.h" /* uart devices */ diff --git a/arch/arm/mach-s3c/devs.c b/arch/arm/mach-s3c/devs.c index 92b36bc71a06..ef2b1847e287 100644 --- a/arch/arm/mach-s3c/devs.c +++ b/arch/arm/mach-s3c/devs.c @@ -38,30 +38,29 @@ #include #include -#include #include -#include -#include -#include -#include +#include "map.h" +#include "gpio-samsung.h" +#include "gpio-cfg.h" +#include "regs-s3c2443-clock.h" -#include -#include +#include "cpu.h" +#include "devs.h" #include #include -#include +#include "fb.h" #include #include #include -#include +#include "keypad.h" #include #include -#include -#include +#include "pwm-core.h" +#include "sdhci.h" #include #include #include -#include +#include "usb-phy.h" #include #include diff --git a/arch/arm/mach-s3c/include/plat/devs.h b/arch/arm/mach-s3c/devs.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/devs.h rename to arch/arm/mach-s3c/devs.h diff --git a/arch/arm/mach-s3c/include/mach/dma-s3c24xx.h b/arch/arm/mach-s3c/dma-s3c24xx.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/dma-s3c24xx.h rename to arch/arm/mach-s3c/dma-s3c24xx.h diff --git a/arch/arm/mach-s3c/include/mach/dma-s3c64xx.h b/arch/arm/mach-s3c/dma-s3c64xx.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/dma-s3c64xx.h rename to arch/arm/mach-s3c/dma-s3c64xx.h diff --git a/arch/arm/mach-s3c/include/mach/dma.h b/arch/arm/mach-s3c/dma.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/dma.h rename to arch/arm/mach-s3c/dma.h diff --git a/arch/arm/mach-s3c/include/plat/fb.h b/arch/arm/mach-s3c/fb.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/fb.h rename to arch/arm/mach-s3c/fb.h diff --git a/arch/arm/mach-s3c/include/plat/gpio-cfg-helpers.h b/arch/arm/mach-s3c/gpio-cfg-helpers.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/gpio-cfg-helpers.h rename to arch/arm/mach-s3c/gpio-cfg-helpers.h diff --git a/arch/arm/mach-s3c/include/plat/gpio-cfg.h b/arch/arm/mach-s3c/gpio-cfg.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/gpio-cfg.h rename to arch/arm/mach-s3c/gpio-cfg.h diff --git a/arch/arm/mach-s3c/include/plat/gpio-core.h b/arch/arm/mach-s3c/gpio-core.h similarity index 99% rename from arch/arm/mach-s3c/include/plat/gpio-core.h rename to arch/arm/mach-s3c/gpio-core.h index c0bfceb88340..b361c8c0d669 100644 --- a/arch/arm/mach-s3c/include/plat/gpio-core.h +++ b/arch/arm/mach-s3c/gpio-core.h @@ -11,7 +11,7 @@ #define __PLAT_SAMSUNG_GPIO_CORE_H /* Bring in machine-local definitions, especially S3C_GPIO_END */ -#include +#include "gpio-samsung.h" #include #define GPIOCON_OFF (0x00) diff --git a/arch/arm/mach-s3c/include/mach/gpio-samsung-s3c24xx.h b/arch/arm/mach-s3c/gpio-samsung-s3c24xx.h similarity index 99% rename from arch/arm/mach-s3c/include/mach/gpio-samsung-s3c24xx.h rename to arch/arm/mach-s3c/gpio-samsung-s3c24xx.h index f8a114891f16..c29fdc95f883 100644 --- a/arch/arm/mach-s3c/include/mach/gpio-samsung-s3c24xx.h +++ b/arch/arm/mach-s3c/gpio-samsung-s3c24xx.h @@ -14,7 +14,7 @@ #ifndef GPIO_SAMSUNG_S3C24XX_H #define GPIO_SAMSUNG_S3C24XX_H -#include +#include "map.h" /* * GPIO sizes for various SoCs: diff --git a/arch/arm/mach-s3c/include/mach/gpio-samsung-s3c64xx.h b/arch/arm/mach-s3c/gpio-samsung-s3c64xx.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/gpio-samsung-s3c64xx.h rename to arch/arm/mach-s3c/gpio-samsung-s3c64xx.h diff --git a/arch/arm/mach-s3c/gpio-samsung.c b/arch/arm/mach-s3c/gpio-samsung.c index f66c820cd82b..9cc4d7eaf78a 100644 --- a/arch/arm/mach-s3c/gpio-samsung.c +++ b/arch/arm/mach-s3c/gpio-samsung.c @@ -27,15 +27,15 @@ #include #include -#include -#include -#include - -#include -#include -#include -#include -#include +#include "map.h" +#include "regs-gpio.h" +#include "gpio-samsung.h" + +#include "cpu.h" +#include "gpio-core.h" +#include "gpio-cfg.h" +#include "gpio-cfg-helpers.h" +#include "pm.h" int samsung_gpio_setpull_updown(struct samsung_gpio_chip *chip, unsigned int off, samsung_gpio_pull_t pull) diff --git a/arch/arm/mach-s3c/include/mach/gpio-samsung.h b/arch/arm/mach-s3c/gpio-samsung.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/gpio-samsung.h rename to arch/arm/mach-s3c/gpio-samsung.h diff --git a/arch/arm/mach-s3c/gta02.h b/arch/arm/mach-s3c/gta02.h index d5610ba829a4..043ae382bfc5 100644 --- a/arch/arm/mach-s3c/gta02.h +++ b/arch/arm/mach-s3c/gta02.h @@ -6,7 +6,7 @@ #ifndef __MACH_S3C24XX_GTA02_H #define __MACH_S3C24XX_GTA02_H __FILE__ -#include +#include "regs-gpio.h" #define GTA02_GPIO_AUX_LED S3C2410_GPB(2) #define GTA02_GPIO_USB_PULLUP S3C2410_GPB(9) diff --git a/arch/arm/mach-s3c/h1940-bluetooth.c b/arch/arm/mach-s3c/h1940-bluetooth.c index 186b5321658e..59edcf8a620d 100644 --- a/arch/arm/mach-s3c/h1940-bluetooth.c +++ b/arch/arm/mach-s3c/h1940-bluetooth.c @@ -13,10 +13,9 @@ #include #include -#include -#include -#include -#include +#include "gpio-cfg.h" +#include "regs-gpio.h" +#include "gpio-samsung.h" #include "h1940.h" diff --git a/arch/arm/mach-s3c/include/mach/hardware.h b/arch/arm/mach-s3c/hardware.h similarity index 100% rename from arch/arm/mach-s3c/include/mach/hardware.h rename to arch/arm/mach-s3c/hardware.h diff --git a/arch/arm/mach-s3c/include/plat/iic-core.h b/arch/arm/mach-s3c/iic-core.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/iic-core.h rename to arch/arm/mach-s3c/iic-core.h diff --git a/arch/arm/mach-s3c/include/mach/io.h b/arch/arm/mach-s3c/include/mach/io.h index bcddf615adb6..0d0e576f66dc 100644 --- a/arch/arm/mach-s3c/include/mach/io.h +++ b/arch/arm/mach-s3c/include/mach/io.h @@ -10,7 +10,7 @@ #ifndef __ASM_ARM_ARCH_IO_H #define __ASM_ARM_ARCH_IO_H -#include +#include /* * ISA style IO, for each machine to sort out mappings for, diff --git a/arch/arm/mach-s3c/include/plat/map-base.h b/arch/arm/mach-s3c/include/mach/map-base.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/map-base.h rename to arch/arm/mach-s3c/include/mach/map-base.h diff --git a/arch/arm/mach-s3c/init.c b/arch/arm/mach-s3c/init.c index e9acf02ef3c3..9d92f03e9bc1 100644 --- a/arch/arm/mach-s3c/init.c +++ b/arch/arm/mach-s3c/init.c @@ -23,8 +23,8 @@ #include #include -#include -#include +#include "cpu.h" +#include "devs.h" static struct cpu_table *cpu; diff --git a/arch/arm/mach-s3c/iotiming-s3c2410.c b/arch/arm/mach-s3c/iotiming-s3c2410.c index 5d85c259f328..a5c80b7e3d0c 100644 --- a/arch/arm/mach-s3c/iotiming-s3c2410.c +++ b/arch/arm/mach-s3c/iotiming-s3c2410.c @@ -14,8 +14,8 @@ #include #include -#include -#include +#include "map.h" +#include "regs-clock.h" #include diff --git a/arch/arm/mach-s3c/iotiming-s3c2412.c b/arch/arm/mach-s3c/iotiming-s3c2412.c index a22b5611697d..003f89c4dc53 100644 --- a/arch/arm/mach-s3c/iotiming-s3c2412.c +++ b/arch/arm/mach-s3c/iotiming-s3c2412.c @@ -23,10 +23,10 @@ #include #include -#include +#include "cpu.h" #include -#include +#include "s3c2412.h" #define print_ns(x) ((x) / 10), ((x) % 10) diff --git a/arch/arm/mach-s3c/irq-pm-s3c24xx.c b/arch/arm/mach-s3c/irq-pm-s3c24xx.c index e0131b16a4af..4d5e28312d91 100644 --- a/arch/arm/mach-s3c/irq-pm-s3c24xx.c +++ b/arch/arm/mach-s3c/irq-pm-s3c24xx.c @@ -13,14 +13,14 @@ #include #include -#include -#include -#include -#include - -#include -#include -#include +#include "cpu.h" +#include "pm.h" +#include +#include "map-s3c.h" + +#include "regs-irq.h" +#include "regs-gpio.h" +#include "pm-core.h" #include diff --git a/arch/arm/mach-s3c/irq-pm-s3c64xx.c b/arch/arm/mach-s3c/irq-pm-s3c64xx.c index 31b221190479..4a1e935bada1 100644 --- a/arch/arm/mach-s3c/irq-pm-s3c64xx.c +++ b/arch/arm/mach-s3c/irq-pm-s3c64xx.c @@ -20,11 +20,11 @@ #include #include -#include +#include "map.h" -#include -#include -#include +#include "regs-gpio.h" +#include "cpu.h" +#include "pm.h" /* We handled all the IRQ types in this code, to save having to make several * small files to handle each different type separately. Having the EINT_GRP diff --git a/arch/arm/mach-s3c/irq-s3c24xx-fiq.S b/arch/arm/mach-s3c/irq-s3c24xx-fiq.S index 2a84535a14fd..b54cbd012241 100644 --- a/arch/arm/mach-s3c/irq-s3c24xx-fiq.S +++ b/arch/arm/mach-s3c/irq-s3c24xx-fiq.S @@ -10,8 +10,8 @@ #include #include -#include -#include +#include "map.h" +#include "regs-irq.h" #include diff --git a/arch/arm/mach-s3c/irq-s3c24xx.c b/arch/arm/mach-s3c/irq-s3c24xx.c index 3965347cacf0..79b5f19af7a5 100644 --- a/arch/arm/mach-s3c/irq-s3c24xx.c +++ b/arch/arm/mach-s3c/irq-s3c24xx.c @@ -26,12 +26,12 @@ #include #include -#include -#include +#include "regs-irq.h" +#include "regs-gpio.h" -#include -#include -#include +#include "cpu.h" +#include "regs-irqtype.h" +#include "pm.h" #define S3C_IRQTYPE_NONE 0 #define S3C_IRQTYPE_EINT 1 diff --git a/arch/arm/mach-s3c/include/plat/keypad.h b/arch/arm/mach-s3c/keypad.h similarity index 100% rename from arch/arm/mach-s3c/include/plat/keypad.h rename to arch/arm/mach-s3c/keypad.h diff --git a/arch/arm/mach-s3c/mach-amlm5900.c b/arch/arm/mach-s3c/mach-amlm5900.c index f9240081f840..5c67f20e636e 100644 --- a/arch/arm/mach-s3c/mach-amlm5900.c +++ b/arch/arm/mach-s3c/mach-amlm5900.c @@ -27,25 +27,24 @@ #include #include -#include #include #include #include -#include -#include +#include "regs-gpio.h" +#include "gpio-samsung.h" #include -#include -#include -#include +#include "devs.h" +#include "cpu.h" +#include "gpio-cfg.h" #include #include #include #include -#include +#include "samsung-time.h" #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-anubis.c b/arch/arm/mach-s3c/mach-anubis.c index 5cfb7aed9fe7..ef953754a39c 100644 --- a/arch/arm/mach-s3c/mach-anubis.c +++ b/arch/arm/mach-s3c/mach-anubis.c @@ -24,12 +24,11 @@ #include #include -#include #include #include -#include -#include +#include "regs-gpio.h" +#include "gpio-samsung.h" #include #include @@ -40,10 +39,10 @@ #include -#include -#include +#include "devs.h" +#include "cpu.h" #include -#include +#include "samsung-time.h" #include "anubis.h" #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-anw6410.c b/arch/arm/mach-s3c/mach-anw6410.c index 9bf8c8791553..663fb34ded0b 100644 --- a/arch/arm/mach-s3c/mach-anw6410.c +++ b/arch/arm/mach-s3c/mach-anw6410.c @@ -30,20 +30,20 @@ #include #include -#include +#include "map.h" #include #include #include -#include +#include "fb.h" -#include -#include +#include "devs.h" +#include "cpu.h" #include -#include -#include -#include +#include "regs-gpio.h" +#include "gpio-samsung.h" +#include "samsung-time.h" #include "s3c64xx.h" #include "regs-modem.h" diff --git a/arch/arm/mach-s3c/mach-at2440evb.c b/arch/arm/mach-s3c/mach-at2440evb.c index 2103c4c1059a..0e107dde6ded 100644 --- a/arch/arm/mach-s3c/mach-at2440evb.c +++ b/arch/arm/mach-s3c/mach-at2440evb.c @@ -24,13 +24,12 @@ #include #include -#include #include #include #include -#include -#include +#include "regs-gpio.h" +#include "gpio-samsung.h" #include #include @@ -39,10 +38,10 @@ #include #include -#include -#include +#include "devs.h" +#include "cpu.h" #include -#include +#include "samsung-time.h" #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-bast.c b/arch/arm/mach-s3c/mach-bast.c index 6e363afbaab1..8afc6a846dee 100644 --- a/arch/arm/mach-s3c/mach-bast.c +++ b/arch/arm/mach-s3c/mach-bast.c @@ -40,16 +40,15 @@ #include #include -#include #include -#include -#include +#include "regs-gpio.h" +#include "gpio-samsung.h" -#include +#include "cpu.h" #include -#include -#include -#include +#include "devs.h" +#include "gpio-cfg.h" +#include "samsung-time.h" #include "bast.h" #include "s3c24xx.h" diff --git a/arch/arm/mach-s3c/mach-crag6410-module.c b/arch/arm/mach-s3c/mach-crag6410-module.c index 937d0a83f8fd..2dedc025f604 100644 --- a/arch/arm/mach-s3c/mach-crag6410-module.c +++ b/arch/arm/mach-s3c/mach-crag6410-module.c @@ -27,7 +27,7 @@ #include -#include +#include "cpu.h" #include #include "crag6410.h" diff --git a/arch/arm/mach-s3c/mach-crag6410.c b/arch/arm/mach-s3c/mach-crag6410.c index 947f344ac4d4..10cc27e87f32 100644 --- a/arch/arm/mach-s3c/mach-crag6410.c +++ b/arch/arm/mach-s3c/mach-crag6410.c @@ -44,23 +44,23 @@ #include #include