[PATCH RESEND 06/15] ARM: clps711x: autcpu12: Move remaining specific definitions to board file

linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed

From: shc_work@mail.ru (Alexander Shiyan)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH RESEND 06/15] ARM: clps711x: autcpu12: Move remaining specific definitions to board file
Date: Wed,  5 Jun 2013 09:59:14 +0400	[thread overview]
Message-ID: <1370411967-29451-7-git-send-email-shc_work@mail.ru> (raw)
In-Reply-To: <1370411967-29451-1-git-send-email-shc_work@mail.ru>


Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/mach-clps711x/board-autcpu12.c        |  9 +++++-
 arch/arm/mach-clps711x/include/mach/autcpu12.h | 44 --------------------------
 2 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 arch/arm/mach-clps711x/include/mach/autcpu12.h

diff --git a/arch/arm/mach-clps711x/board-autcpu12.c b/arch/arm/mach-clps711x/board-autcpu12.c
index 91a3ab5..cd50314 100644
--- a/arch/arm/mach-clps711x/board-autcpu12.c
+++ b/arch/arm/mach-clps711x/board-autcpu12.c
@@ -42,7 +42,6 @@
 #include <asm/page.h>
 
 #include <asm/mach/map.h>
-#include <mach/autcpu12.h>
 
 #include "common.h"
 #include "devices.h"
@@ -50,6 +49,14 @@
 /* NOR flash */
 #define AUTCPU12_FLASH_BASE	(CS0_PHYS_BASE)
 
+/* Board specific hardware definitions */
+#define AUTCPU12_CHAR_LCD_BASE	(CS1_PHYS_BASE + 0x00000000)
+#define AUTCPU12_CSAUX1_BASE	(CS1_PHYS_BASE + 0x04000000)
+#define AUTCPU12_CAN_BASE	(CS1_PHYS_BASE + 0x08000000)
+#define AUTCPU12_TOUCH_BASE	(CS1_PHYS_BASE + 0x0a000000)
+#define AUTCPU12_IO_BASE	(CS1_PHYS_BASE + 0x0c000000)
+#define AUTCPU12_LPT_BASE	(CS1_PHYS_BASE + 0x0e000000)
+
 /* NVRAM */
 #define AUTCPU12_NVRAM_BASE	(CS1_PHYS_BASE + 0x02000000)
 
diff --git a/arch/arm/mach-clps711x/include/mach/autcpu12.h b/arch/arm/mach-clps711x/include/mach/autcpu12.h
deleted file mode 100644
index 0e00148..0000000
--- a/arch/arm/mach-clps711x/include/mach/autcpu12.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * AUTCPU12 specific defines
- *
- * (c) 2001 Thomas Gleixner, autronix automation <gleixner@autronix.de>
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef __ASM_ARCH_AUTCPU12_H
-#define __ASM_ARCH_AUTCPU12_H
-
-/* offset for device specific information structure */
-#define AUTCPU12_LCDINFO_OFFS		(0x00010000)	
-
-/* Videomemory in the internal SRAM (CS 6) */
-#define AUTCPU12_PHYS_VIDEO		CS6_PHYS_BASE
-
-/*
-* All special IO's are tied to CS1
-*/
-#define AUTCPU12_PHYS_CHAR_LCD         	CS1_PHYS_BASE +0x00000000  /* physical */
-
-#define AUTCPU12_PHYS_CSAUX1           	CS1_PHYS_BASE +0x04000000  /* physical */
-
-#define AUTCPU12_PHYS_CAN              	CS1_PHYS_BASE +0x08000000  /* physical */
-
-#define AUTCPU12_PHYS_TOUCH            	CS1_PHYS_BASE +0x0A000000  /* physical */
-
-#define AUTCPU12_PHYS_IO               	CS1_PHYS_BASE +0x0C000000  /* physical */
-
-#define AUTCPU12_PHYS_LPT              	CS1_PHYS_BASE +0x0E000000  /* physical */
-
-#endif
-- 
1.8.1.5

next prev parent reply	other threads:[~2013-06-05  5:59 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-05  5:59 [PATCH RESEND 01/15] ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND v2 2/3] ARM: clps711x: Re-add GPIO support Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND 02/15] ARM: clps711x: Set PLL clock to zero if we work from 13 mHz source Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND 03/15] ARM: clps711x: autcpu12: Move LCD DPOT definitions to board file Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND 04/15] ARM: clps711x: autcpu12: Add support for NOR flash Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND 05/15] ARM: clps711x: autcpu12: Special driver for handling memory is removed Alexander Shiyan
2013-06-05  5:59 ` Alexander Shiyan [this message]
2013-06-05  5:59 ` [PATCH RESEND 07/15] ARM: clps711x: p720t: Define PLD registers as GPIOs Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND 08/15] ARM: clps711x: Move specific definitions from hardware.h to boards files Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND 09/15] ARM: clps711x: Replace "arch_initcall" in common code with ".init_early" Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND 10/15] ARM: clps711x: Add clocksource framework Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND 11/15] ARM: clps711x: Optimize interrupt handling Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND 12/15] ARM: clps711x: edb7211: Add support for I2C Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND 13/15] ARM: clps711x: edb7211: Control LCD backlight via PWM Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND 14/15] ARM: clps711x: Add support for SYSCON driver Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND 15/15] ARM: clps711x: Update defconfig Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND v2 1/3] GPIO: clps711x: Rewrite driver for using generic GPIO code Alexander Shiyan
2013-06-17  6:24   ` Linus Walleij
2013-06-17  6:29   ` Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND v2 2/3] ARM: clps711x: Re-add GPIO support Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND v2 3/3] GPIO: clps711x: Add DT support Alexander Shiyan
2013-06-05  5:59 ` [PATCH RESEND 07/15] ARM: clps711x: p720t: Define PLD registers as GPIOs Alexander Shiyan
2013-06-19 16:18 ` [PATCH RESEND 01/15] ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency Arnd Bergmann
2013-06-19 16:25   ` Re[2]: " Alexander Shiyan
2013-06-19 17:59     ` Arnd Bergmann

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:91a3ab5 dfblob:cd50314 dfblob:0e00148 )
 OR (
bs:"[PATCH RESEND 06/15] ARM: clps711x: autcpu12: Move remaining specific definitions to board file" )
	(help)

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=1370411967-29451-7-git-send-email-shc_work@mail.ru \
    --to=shc_work@mail.ru \
    --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).