From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/12] ARM: picoxcell: remove dependency on mach/* headers
Date: Thu, 6 Sep 2012 15:12:51 -0500 [thread overview]
Message-ID: <1346962375-26163-9-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1346962375-26163-1-git-send-email-robherring2@gmail.com>
From: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Jamie Iles <jamie@jamieiles.com>
---
arch/arm/mach-picoxcell/common.c | 6 ++---
arch/arm/mach-picoxcell/include/mach/map.h | 25 --------------------
.../{include/mach => }/picoxcell_soc.h | 0
3 files changed, 3 insertions(+), 28 deletions(-)
delete mode 100644 arch/arm/mach-picoxcell/include/mach/map.h
rename arch/arm/mach-picoxcell/{include/mach => }/picoxcell_soc.h (100%)
diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
index 8f9a0b4..a8b70b5 100644
--- a/arch/arm/mach-picoxcell/common.c
+++ b/arch/arm/mach-picoxcell/common.c
@@ -20,11 +20,11 @@
#include <asm/hardware/vic.h>
#include <asm/mach/map.h>
-#include <mach/map.h>
-#include <mach/picoxcell_soc.h>
-
+#include "picoxcell_soc.h"
#include "common.h"
+#define PHYS_TO_IO(x) (((x) & 0x00ffffff) | 0xfe000000)
+
#define WDT_CTRL_REG_EN_MASK (1 << 0)
#define WDT_CTRL_REG_OFFS (0x00)
#define WDT_TIMEOUT_REG_OFFS (0x04)
diff --git a/arch/arm/mach-picoxcell/include/mach/map.h b/arch/arm/mach-picoxcell/include/mach/map.h
deleted file mode 100644
index c06afad..0000000
--- a/arch/arm/mach-picoxcell/include/mach/map.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2011 Picochip Ltd., Jamie Iles
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-#ifndef __PICOXCELL_MAP_H__
-#define __PICOXCELL_MAP_H__
-
-#define PHYS_TO_IO(x) (((x) & 0x00ffffff) | 0xfe000000)
-
-#ifdef __ASSEMBLY__
-#define IO_ADDRESS(x) PHYS_TO_IO((x))
-#else
-#define IO_ADDRESS(x) (void __iomem __force *)(PHYS_TO_IO((x)))
-#endif
-
-#endif /* __PICOXCELL_MAP_H__ */
diff --git a/arch/arm/mach-picoxcell/include/mach/picoxcell_soc.h b/arch/arm/mach-picoxcell/picoxcell_soc.h
similarity index 100%
rename from arch/arm/mach-picoxcell/include/mach/picoxcell_soc.h
rename to arch/arm/mach-picoxcell/picoxcell_soc.h
--
1.7.9.5
next prev parent reply other threads:[~2012-09-06 20:12 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-06 20:12 [PATCH v3 00/12] Initial multi-platform support Rob Herring
2012-09-06 20:12 ` [PATCH 01/12] ARM: move debug macros to common location Rob Herring
2012-09-06 20:12 ` [PATCH 02/12] ARM: highbank: move debug macros to include/debug Rob Herring
2012-09-06 20:12 ` [PATCH 03/12] ARM: vexpress: " Rob Herring
2012-09-06 20:12 ` [PATCH 04/12] ARM: mvebu: " Rob Herring
2012-09-07 15:08 ` Jason Cooper
2012-09-06 20:12 ` [PATCH 05/12] ARM: socfpga: " Rob Herring
2012-09-06 22:33 ` Dinh Nguyen
2012-09-06 23:35 ` Dinh Nguyen
2012-09-06 20:12 ` [PATCH 06/12] ARM: picoxcell: " Rob Herring
2012-09-13 14:16 ` Shawn Guo
2012-09-13 15:14 ` Rob Herring
2012-09-06 20:12 ` [PATCH 07/12] ARM: move all dtb targets out of Makefile.boot Rob Herring
2012-09-07 2:27 ` Shawn Guo
2012-09-07 2:36 ` Stephen Warren
2012-09-07 2:39 ` Shawn Guo
2012-09-11 12:02 ` Rob Herring
2012-09-11 12:06 ` Shawn Guo
2012-09-07 5:19 ` Andrew Lunn
2012-09-07 12:51 ` Rob Herring
2012-09-07 13:25 ` Arnd Bergmann
2012-09-07 13:46 ` Rob Herring
2012-09-10 15:52 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-10 17:51 ` Rob Herring
2012-09-11 4:49 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-11 5:41 ` Stephen Warren
2012-09-11 13:25 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-11 16:04 ` Rob Herring
2012-09-11 18:51 ` Nicolas Pitre
2012-09-11 18:08 ` [PATCH v2] " Rob Herring
2012-09-11 18:43 ` Stephen Warren
2012-09-06 20:12 ` Rob Herring [this message]
2012-09-06 20:12 ` [PATCH 09/12] ARM: vexpress: remove dependency on mach/* headers Rob Herring
2012-09-06 20:12 ` [PATCH 10/12] ARM: mvebu: move armada-370-xp.h in mach dir Rob Herring
2012-09-07 15:11 ` Jason Cooper
2012-09-06 20:12 ` [PATCH 11/12] ARM: initial multiplatform support Rob Herring
2012-09-12 19:49 ` Arnd Bergmann
2012-09-12 20:20 ` Rob Herring
2012-09-12 20:27 ` Arnd Bergmann
2012-09-13 14:12 ` Shawn Guo
2012-09-06 20:12 ` [PATCH 12/12] ARM: vexpress: convert to multi-platform Rob Herring
2012-09-10 19:07 ` [PATCH v3 00/12] Initial multi-platform support Jamie Iles
2012-09-14 0:58 ` Shawn Guo
2012-09-14 13:00 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346962375-26163-9-git-send-email-robherring2@gmail.com \
--to=robherring2@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).