From patchwork Mon Nov 30 23:00:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7731021 Return-Path: X-Original-To: patchwork-linux-omap@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 E9090BEEE1 for ; Mon, 30 Nov 2015 23:02:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AE1A120662 for ; Mon, 30 Nov 2015 23:02:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 932CD20664 for ; Mon, 30 Nov 2015 23:02:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755242AbbK3XCI (ORCPT ); Mon, 30 Nov 2015 18:02:08 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:58937 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754990AbbK3XB6 (ORCPT ); Mon, 30 Nov 2015 18:01:58 -0500 Received: from wuerfel.lan. ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue102) with ESMTPSA (Nemesis) id 0MUVwx-1ZvWyC2LH1-00RL13; Tue, 01 Dec 2015 00:01:19 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Tony Lindgren , linux-omap@vger.kernel.org, Greg Ungerer , Sekhar Nori , Kevin Hilman , Wan ZongShun , Jason Cooper , Andrew Lunn , Gregory Clement , Arnd Bergmann Subject: [PATCH 3/7] ARM: davinci: make headers more local Date: Tue, 1 Dec 2015 00:00:54 +0100 Message-Id: <1448924458-3279040-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1448924458-3279040-1-git-send-email-arnd@arndb.de> References: <1448924458-3279040-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:8ohMeCpDmDdiJTWAWkfic8Yc7Gw4e522+2njMxOgDtbWMCJqTP8 +aW5YX8aWtzNJQS+do4de3c49xe0oPdgC6GBSwIEAckMQ7BIloeFT9KCB0JBT4S1q1x+6QY JLViyxIb5INDV1rHoHYtF6uIrdnBsyME5Ga9qWd/MbqJhGETAQArrvHVqkEvfRhe66C+bUv FOxVdYQx03Pj1P7EqD+0g== X-UI-Out-Filterresults: notjunk:1; V01:K0:oOdzIKA5tIE=:9T6QvbFhL36yqlYKTcGJpe gmQ0gijxRJ7JR1UWpWO+IZ+92ZU0zYultHolPyL3Ie8cSyfEx+CaTQ0XD8UF1oWrSZ4WL3CC/ J9Y1KoZRtYLSvquQqrbsdc5c34HUySAPV4Ki9UVLHWtyNcSsKfwHE/wNFpX/Fi6HX/xAp5M8V +/bboWmsLX0WejQ9DP6286ZGPE+ZV6jZ4uyCRt0Cosqmkr2Ji+mjzkHZBDzm31HnzpZ5htyYE Hv8953EDvf1LLEVQbq+lWLhBLNw2qVZkn/yWijJH2AEe8ftXLz5iKYT8MVmDoTsehLO7S4ZcD v5npSVqgY7SG+gjLu+5vULeNbmblrdqHftD6R2RTwda3Ex19bRQOFMeNxEs79UzhovLgAhqSr a2qmO8TESp6S0faEuZC+uhuRbyUEurioLfV0Mkx+DFFBhAaQ/y5mAN6Ro7KO9ERpR5pVwuyL7 y6PaKCp7fYrBs6j5sQCQiGGt63P7vkRv/HHW5bxVViEeS+vpcfobLHb8uCNKDMnESHV2QkW+N FOswuRqRHRVLKmVQ0TXoZfWmgSm5nBNRgwqp4ZvnyW7Hk7pOh+ocOlN2Xymgwz/sOLb5OAEW2 9g9bqK8dF5zteZwstec4XNdaCx/nI5CDAkBs6iDK6qe0/kIlhrG06acSNZlBpAt1ZtjlcxoYe 9OHN/3arbsxmjK2qs79a3SiB5J98CXneFs47mZ3DT+SgmcCe6WWqiYaynJ1NEc4PylUc= Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 Some header files are never included outside of a mach-davinci directory and do not need to be made visible in include/mach, so let's just move them all down one level. Signed-off-by: Arnd Bergmann Acked-by: Sekhar Nori --- arch/arm/mach-davinci/board-da830-evm.c | 2 +- arch/arm/mach-davinci/board-da850-evm.c | 4 ++-- arch/arm/mach-davinci/board-mityomapl138.c | 2 +- arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +- arch/arm/mach-davinci/clock.c | 2 +- arch/arm/mach-davinci/cp_intc.c | 2 +- arch/arm/mach-davinci/{include/mach => }/cp_intc.h | 0 arch/arm/mach-davinci/cpuidle.c | 4 ++-- arch/arm/mach-davinci/{include/mach => }/cpuidle.h | 0 arch/arm/mach-davinci/da830.c | 2 +- arch/arm/mach-davinci/da850.c | 2 +- arch/arm/mach-davinci/da8xx-dt.c | 2 +- arch/arm/mach-davinci/{include/mach => }/ddr2.h | 0 arch/arm/mach-davinci/devices-da8xx.c | 4 ++-- arch/arm/mach-davinci/dm355.c | 2 +- arch/arm/mach-davinci/dm365.c | 2 +- arch/arm/mach-davinci/dm644x.c | 2 +- arch/arm/mach-davinci/dm646x.c | 2 +- arch/arm/mach-davinci/pm.c | 2 +- arch/arm/mach-davinci/psc.c | 2 +- arch/arm/mach-davinci/{include/mach => }/psc.h | 0 arch/arm/mach-davinci/sleep.S | 4 ++-- arch/arm/mach-davinci/sram.c | 2 +- arch/arm/mach-davinci/{include/mach => }/sram.h | 0 24 files changed, 23 insertions(+), 23 deletions(-) rename arch/arm/mach-davinci/{include/mach => }/cp_intc.h (100%) rename arch/arm/mach-davinci/{include/mach => }/cpuidle.h (100%) rename arch/arm/mach-davinci/{include/mach => }/ddr2.h (100%) rename arch/arm/mach-davinci/{include/mach => }/psc.h (100%) rename arch/arm/mach-davinci/{include/mach => }/sram.h (100%) diff --git a/arch/arm/mach-davinci/include/mach/sram.h b/arch/arm/mach-davinci/sram.h similarity index 100% rename from arch/arm/mach-davinci/include/mach/sram.h rename to arch/arm/mach-davinci/sram.h diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index f8f62fbaa915..3d8cf8cbd98a 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -32,7 +32,7 @@ #include #include -#include +#include "cp_intc.h" #include #include diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 9cc7b818fbf6..8e4539f69fdc 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -40,10 +40,10 @@ #include #include -#include +#include "cp_intc.h" #include #include -#include +#include "sram.h" #include #include diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c index 8cfbfe084535..de1316bf643a 100644 --- a/arch/arm/mach-davinci/board-mityomapl138.c +++ b/arch/arm/mach-davinci/board-mityomapl138.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include "cp_intc.h" #include #include #include diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index 2aac51d0e853..ee624861ca66 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -19,7 +19,7 @@ #include #include -#include +#include "cp_intc.h" #include #include diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c index 47281f5c12ea..a23e21aa0d8b 100644 --- a/arch/arm/mach-davinci/clock.c +++ b/arch/arm/mach-davinci/clock.c @@ -23,7 +23,7 @@ #include #include -#include +#include "psc.h" #include #include "clock.h" diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 507aad4b8dd9..1a68d2477de6 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -19,7 +19,7 @@ #include #include -#include +#include "cp_intc.h" static inline unsigned int cp_intc_read(unsigned offset) { diff --git a/arch/arm/mach-davinci/include/mach/cp_intc.h b/arch/arm/mach-davinci/cp_intc.h similarity index 100% rename from arch/arm/mach-davinci/include/mach/cp_intc.h rename to arch/arm/mach-davinci/cp_intc.h diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c index 306ebc51599a..1b8f08532455 100644 --- a/arch/arm/mach-davinci/cpuidle.c +++ b/arch/arm/mach-davinci/cpuidle.c @@ -19,8 +19,8 @@ #include #include -#include -#include +#include "cpuidle.h" +#include "ddr2.h" #define DAVINCI_CPUIDLE_MAX_STATES 2 diff --git a/arch/arm/mach-davinci/include/mach/cpuidle.h b/arch/arm/mach-davinci/cpuidle.h similarity index 100% rename from arch/arm/mach-davinci/include/mach/cpuidle.h rename to arch/arm/mach-davinci/cpuidle.h diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 115d5736da80..7187e7fc2822 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -15,7 +15,7 @@ #include -#include +#include "psc.h" #include #include #include diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 676997895e13..97d8779a9a65 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -22,7 +22,7 @@ #include -#include +#include "psc.h" #include #include #include diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index 06b6451225c1..c4b5808ca7c1 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -15,7 +15,7 @@ #include #include -#include +#include "cp_intc.h" #include #define DA8XX_NUM_UARTS 3 diff --git a/arch/arm/mach-davinci/include/mach/ddr2.h b/arch/arm/mach-davinci/ddr2.h similarity index 100% rename from arch/arm/mach-davinci/include/mach/ddr2.h rename to arch/arm/mach-davinci/ddr2.h diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 28c90bc372bd..e88b7a5cde99 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include "cpuidle.h" +#include "sram.h" #include "clock.h" #include "asp.h" diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 609950b8c191..c7c1458df23c 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c @@ -21,7 +21,7 @@ #include #include -#include +#include "psc.h" #include #include #include diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index 2068cbeaeb03..01843fbcc9ea 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -26,7 +26,7 @@ #include #include -#include +#include "psc.h" #include #include #include diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c index d38f5049d56e..b28071ae3a57 100644 --- a/arch/arm/mach-davinci/dm644x.c +++ b/arch/arm/mach-davinci/dm644x.c @@ -19,7 +19,7 @@ #include #include -#include +#include "psc.h" #include #include #include diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c index 70eb42725eec..cf80786e2471 100644 --- a/arch/arm/mach-davinci/dm646x.c +++ b/arch/arm/mach-davinci/dm646x.c @@ -20,7 +20,7 @@ #include #include -#include +#include "psc.h" #include #include #include diff --git a/arch/arm/mach-davinci/pm.c b/arch/arm/mach-davinci/pm.c index 07e23ba61f3a..8929569b1f8a 100644 --- a/arch/arm/mach-davinci/pm.c +++ b/arch/arm/mach-davinci/pm.c @@ -21,7 +21,7 @@ #include #include -#include +#include "sram.h" #include #include "clock.h" diff --git a/arch/arm/mach-davinci/psc.c b/arch/arm/mach-davinci/psc.c index 82fdc69d5728..e5dc6bfde5f3 100644 --- a/arch/arm/mach-davinci/psc.c +++ b/arch/arm/mach-davinci/psc.c @@ -23,7 +23,7 @@ #include #include -#include +#include "psc.h" #include "clock.h" diff --git a/arch/arm/mach-davinci/include/mach/psc.h b/arch/arm/mach-davinci/psc.h similarity index 100% rename from arch/arm/mach-davinci/include/mach/psc.h rename to arch/arm/mach-davinci/psc.h diff --git a/arch/arm/mach-davinci/sleep.S b/arch/arm/mach-davinci/sleep.S index a5336a5e2739..cd350dee4df3 100644 --- a/arch/arm/mach-davinci/sleep.S +++ b/arch/arm/mach-davinci/sleep.S @@ -21,8 +21,8 @@ #include #include -#include -#include +#include "psc.h" +#include "ddr2.h" #include "clock.h" diff --git a/arch/arm/mach-davinci/sram.c b/arch/arm/mach-davinci/sram.c index 8540dddf1fbd..668b6e749768 100644 --- a/arch/arm/mach-davinci/sram.c +++ b/arch/arm/mach-davinci/sram.c @@ -14,7 +14,7 @@ #include #include -#include +#include "sram.h" static struct gen_pool *sram_pool;