Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2014 01:51:22 +0000 (03:51 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2014 01:51:22 +0000 (03:51 +0200)
Pull m68knommu update from Greg Ungerer:
 "The major change is to remove the arch/m68k/platform directory.  The
  coldfire (and other non-mmu m68k platform) code is moved to the
  arch/m68k level, making them consistent with the traditional m68k
  platforms.

  A couple of other minor miscellaneous fixes as well"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: Fix typo 'COFNIG_MBAR'
  m68knommu: add missing ioport_map() and ioport_unmap()
  m68k/coldfire: remove second asm/mcfclk.h inclusion in m54xx.c
  m68knommu: fix size of address field for 5272 interrupt controller
  m68k: fix crufty 68000 and 68360 intro comments
  m68k: remove the unused arch/m68k/platform directory
  m68k: move non-mmu 68360 platform code
  m68k: move non-mmu 68000 platform code
  m68k: fix crufty ColdFire intro comments
  m68k: move coldfire platform code

59 files changed:
arch/m68k/68000/Makefile [moved from arch/m68k/platform/68000/Makefile with 100% similarity]
arch/m68k/68000/bootlogo-vz.h [moved from arch/m68k/platform/68000/bootlogo-vz.h with 100% similarity]
arch/m68k/68000/bootlogo.h [moved from arch/m68k/platform/68000/bootlogo.h with 100% similarity]
arch/m68k/68000/entry.S [moved from arch/m68k/platform/68000/entry.S with 98% similarity]
arch/m68k/68000/head.S [moved from arch/m68k/platform/68000/head.S with 100% similarity]
arch/m68k/68000/ints.c [moved from arch/m68k/platform/68000/ints.c with 100% similarity]
arch/m68k/68000/m68328.c [moved from arch/m68k/platform/68000/m68328.c with 100% similarity]
arch/m68k/68000/m68EZ328.c [moved from arch/m68k/platform/68000/m68EZ328.c with 100% similarity]
arch/m68k/68000/m68VZ328.c [moved from arch/m68k/platform/68000/m68VZ328.c with 100% similarity]
arch/m68k/68000/romvec.S [moved from arch/m68k/platform/68000/romvec.S with 100% similarity]
arch/m68k/68000/timers.c [moved from arch/m68k/platform/68000/timers.c with 100% similarity]
arch/m68k/68360/Makefile [moved from arch/m68k/platform/68360/Makefile with 81% similarity]
arch/m68k/68360/commproc.c [moved from arch/m68k/platform/68360/commproc.c with 100% similarity]
arch/m68k/68360/config.c [moved from arch/m68k/platform/68360/config.c with 98% similarity]
arch/m68k/68360/entry.S [moved from arch/m68k/platform/68360/entry.S with 98% similarity]
arch/m68k/68360/head-ram.S [moved from arch/m68k/platform/68360/head-ram.S with 99% similarity]
arch/m68k/68360/head-rom.S [moved from arch/m68k/platform/68360/head-rom.S with 99% similarity]
arch/m68k/68360/ints.c [moved from arch/m68k/platform/68360/ints.c with 98% similarity]
arch/m68k/Makefile
arch/m68k/coldfire/Makefile [moved from arch/m68k/platform/coldfire/Makefile with 100% similarity]
arch/m68k/coldfire/cache.c [moved from arch/m68k/platform/coldfire/cache.c with 100% similarity]
arch/m68k/coldfire/clk.c [moved from arch/m68k/platform/coldfire/clk.c with 100% similarity]
arch/m68k/coldfire/device.c [moved from arch/m68k/platform/coldfire/device.c with 100% similarity]
arch/m68k/coldfire/dma.c [moved from arch/m68k/platform/coldfire/dma.c with 100% similarity]
arch/m68k/coldfire/dma_timer.c [moved from arch/m68k/platform/coldfire/dma_timer.c with 100% similarity]
arch/m68k/coldfire/entry.S [moved from arch/m68k/platform/coldfire/entry.S with 98% similarity]
arch/m68k/coldfire/firebee.c [moved from arch/m68k/platform/coldfire/firebee.c with 100% similarity]
arch/m68k/coldfire/gpio.c [moved from arch/m68k/platform/coldfire/gpio.c with 100% similarity]
arch/m68k/coldfire/head.S [moved from arch/m68k/platform/coldfire/head.S with 100% similarity]
arch/m68k/coldfire/intc-2.c [moved from arch/m68k/platform/coldfire/intc-2.c with 100% similarity]
arch/m68k/coldfire/intc-5249.c [moved from arch/m68k/platform/coldfire/intc-5249.c with 100% similarity]
arch/m68k/coldfire/intc-525x.c [moved from arch/m68k/platform/coldfire/intc-525x.c with 100% similarity]
arch/m68k/coldfire/intc-5272.c [moved from arch/m68k/platform/coldfire/intc-5272.c with 99% similarity]
arch/m68k/coldfire/intc-simr.c [moved from arch/m68k/platform/coldfire/intc-simr.c with 100% similarity]
arch/m68k/coldfire/intc.c [moved from arch/m68k/platform/coldfire/intc.c with 100% similarity]
arch/m68k/coldfire/m5206.c [moved from arch/m68k/platform/coldfire/m5206.c with 96% similarity]
arch/m68k/coldfire/m520x.c [moved from arch/m68k/platform/coldfire/m520x.c with 98% similarity]
arch/m68k/coldfire/m523x.c [moved from arch/m68k/platform/coldfire/m523x.c with 97% similarity]
arch/m68k/coldfire/m5249.c [moved from arch/m68k/platform/coldfire/m5249.c with 97% similarity]
arch/m68k/coldfire/m525x.c [moved from arch/m68k/platform/coldfire/m525x.c with 97% similarity]
arch/m68k/coldfire/m5272.c [moved from arch/m68k/platform/coldfire/m5272.c with 98% similarity]
arch/m68k/coldfire/m527x.c [moved from arch/m68k/platform/coldfire/m527x.c with 97% similarity]
arch/m68k/coldfire/m528x.c [moved from arch/m68k/platform/coldfire/m528x.c with 98% similarity]
arch/m68k/coldfire/m5307.c [moved from arch/m68k/platform/coldfire/m5307.c with 97% similarity]
arch/m68k/coldfire/m53xx.c [moved from arch/m68k/platform/coldfire/m53xx.c with 100% similarity]
arch/m68k/coldfire/m5407.c [moved from arch/m68k/platform/coldfire/m5407.c with 95% similarity]
arch/m68k/coldfire/m5441x.c [moved from arch/m68k/platform/coldfire/m5441x.c with 100% similarity]
arch/m68k/coldfire/m54xx.c [moved from arch/m68k/platform/coldfire/m54xx.c with 97% similarity]
arch/m68k/coldfire/mcf8390.c [moved from arch/m68k/platform/coldfire/mcf8390.c with 100% similarity]
arch/m68k/coldfire/nettel.c [moved from arch/m68k/platform/coldfire/nettel.c with 100% similarity]
arch/m68k/coldfire/pci.c [moved from arch/m68k/platform/coldfire/pci.c with 100% similarity]
arch/m68k/coldfire/pit.c [moved from arch/m68k/platform/coldfire/pit.c with 100% similarity]
arch/m68k/coldfire/reset.c [moved from arch/m68k/platform/coldfire/reset.c with 100% similarity]
arch/m68k/coldfire/sltimers.c [moved from arch/m68k/platform/coldfire/sltimers.c with 100% similarity]
arch/m68k/coldfire/timers.c [moved from arch/m68k/platform/coldfire/timers.c with 100% similarity]
arch/m68k/coldfire/vectors.c [moved from arch/m68k/platform/coldfire/vectors.c with 96% similarity]
arch/m68k/include/asm/io_no.h
arch/m68k/include/asm/m54xxpci.h
arch/m68k/platform/Makefile [deleted file]

similarity index 98%
rename from arch/m68k/platform/68000/entry.S
rename to arch/m68k/68000/entry.S
index 23ac054c6e1ad929fa40e8aa033e51251c96538d..259b3661b614168ff8ab377587c66b1478222218 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m68knommu/platform/68328/entry.S
+ *  entry.S -- non-mmu 68000 interrupt and exception entry points
  *
  *  Copyright (C) 1991, 1992  Linus Torvalds
  *
similarity index 81%
rename from arch/m68k/platform/68360/Makefile
rename to arch/m68k/68360/Makefile
index f6f43438304935908f59705dfa24ae7f174e29cb..591ce42df3def52cf03b27d3e3e5794fe6a6d16a 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Makefile for arch/m68knommu/platform/68360.
+# Makefile for 68360 machines.
 #
 model-y                          := ram
 model-$(CONFIG_ROMKERNEL) := rom
similarity index 98%
rename from arch/m68k/platform/68360/config.c
rename to arch/m68k/68360/config.c
index d493ac43fe3f900fe1b6ecd999e3452e96bdbfd3..17ec416fed9db5e8380d710f4d3b821599ca5da2 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m68knommu/platform/68360/config.c
+ *  config.c - non-mmu 68360 platform initialization code
  *
  *  Copyright (c) 2000 Michael Leslie <mleslie@lineo.com>
  *  Copyright (C) 1993 Hamish Macdonald
similarity index 98%
rename from arch/m68k/platform/68360/entry.S
rename to arch/m68k/68360/entry.S
index 447c33ef37fda3456b5fad22d705f123c91b4f84..22eb3022f9ee83f449e313a7715845df8b52bdad 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m68knommu/platform/68360/entry.S
+ *  entry.S - non-mmu 68360 interrupt and exceptions entry points
  *
  *  Copyright (C) 1991, 1992  Linus Torvalds
  *  Copyright (C) 2001 SED Systems, a Division of Calian Ltd.
similarity index 99%
rename from arch/m68k/platform/68360/head-ram.S
rename to arch/m68k/68360/head-ram.S
index acd213170d80fe6ae1e74cddd2fcbd90c7b65115..62bc56f41d572311e4846aa28ed374f64631bba8 100644 (file)
@@ -1,6 +1,5 @@
-/* arch/m68knommu/platform/68360/head-ram.S
- *
- * Startup code for Motorola 68360
+/*
+ * head-ram.S - startup code for Motorola 68360
  *
  * Copyright 2001 (C) SED Systems, a Division of Calian Ltd.
  * Based on: arch/m68knommu/platform/68328/pilot/crt0_rom.S
similarity index 99%
rename from arch/m68k/platform/68360/head-rom.S
rename to arch/m68k/68360/head-rom.S
index dfc756d998861823e48ac2b87a291ea7d04cbbb2..b3a7e40f35e1eecfd17b641a29e042bb15f5a5e8 100644 (file)
@@ -1,6 +1,5 @@
-/* arch/m68knommu/platform/68360/head-rom.S
- *
- * Startup code for Motorola 68360
+/*
+ * head-rom.S - startup code for Motorola 68360
  *
  * Copyright (C) SED Systems, a Division of Calian Ltd.
  * Based on: arch/m68knommu/platform/68328/pilot/crt0_rom.S
similarity index 98%
rename from arch/m68k/platform/68360/ints.c
rename to arch/m68k/68360/ints.c
index 8cd42692331b8d3b6f1f2052dc3f563181917cd4..2360fc046681d72caf89114720ec92b53db351e1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * linux/arch/$(ARCH)/platform/$(PLATFORM)/ints.c
+ * ints.c - first level interrupt handlers
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file COPYING in the main directory of this archive
index 7f7830f2c5bcb488745c0326e36a1889a733e04b..0b29dcfef69f339407880ac42d42d5d873d2e032 100644 (file)
@@ -92,9 +92,9 @@ endif
 #
 head-y                         := arch/m68k/kernel/head.o
 head-$(CONFIG_SUN3)            := arch/m68k/kernel/sun3-head.o
-head-$(CONFIG_M68360)          := arch/m68k/platform/68360/head.o
-head-$(CONFIG_M68000)          := arch/m68k/platform/68000/head.o
-head-$(CONFIG_COLDFIRE)                := arch/m68k/platform/coldfire/head.o
+head-$(CONFIG_M68360)          := arch/m68k/68360/head.o
+head-$(CONFIG_M68000)          := arch/m68k/68000/head.o
+head-$(CONFIG_COLDFIRE)                := arch/m68k/coldfire/head.o
 
 core-y                         += arch/m68k/kernel/    arch/m68k/mm/
 libs-y                         += arch/m68k/lib/
@@ -114,9 +114,9 @@ core-$(CONFIG_NATFEAT)              += arch/m68k/emu/
 core-$(CONFIG_M68040)          += arch/m68k/fpsp040/
 core-$(CONFIG_M68060)          += arch/m68k/ifpsp060/
 core-$(CONFIG_M68KFPU_EMU)     += arch/m68k/math-emu/
-core-$(CONFIG_M68360)          += arch/m68k/platform/68360/
-core-$(CONFIG_M68000)          += arch/m68k/platform/68000/
-core-$(CONFIG_COLDFIRE)                += arch/m68k/platform/coldfire/
+core-$(CONFIG_M68360)          += arch/m68k/68360/
+core-$(CONFIG_M68000)          += arch/m68k/68000/
+core-$(CONFIG_COLDFIRE)                += arch/m68k/coldfire/
 
 
 all:   zImage
similarity index 98%
rename from arch/m68k/platform/coldfire/entry.S
rename to arch/m68k/coldfire/entry.S
index 881ab8e379d4c68a42854b372fb906ef8f32d07c..52d312d5b4d4f68337aa8f9b711f50b1a1ad9eda 100644 (file)
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/m68knommu/platform/5307/entry.S
+ *  entry.S  -- interrupt and exception processing for ColdFire
  *
  *  Copyright (C) 1999-2007, Greg Ungerer (gerg@snapgear.com)
  *  Copyright (C) 1998  D. Jeff Dionne <jeff@lineo.ca>,
similarity index 99%
rename from arch/m68k/platform/coldfire/intc-5272.c
rename to arch/m68k/coldfire/intc-5272.c
index d7b695629a7e3e2014a38189bf71d7bc403bcc1e..d1e2fbad327cecaa4c785e4b270177a6c030cbb5 100644 (file)
@@ -36,7 +36,7 @@
  * they also need acknowledging via acknowledge bits.
  */
 struct irqmap {
-       unsigned char   icr;
+       unsigned int    icr;
        unsigned char   index;
        unsigned char   ack;
 };
similarity index 96%
rename from arch/m68k/platform/coldfire/m5206.c
rename to arch/m68k/coldfire/m5206.c
index 0e55f449a88c445f47d51e289599ad76349e5648..8945f5e7b39c6dc05224beca10135440c684e1a4 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *     linux/arch/m68knommu/platform/5206/config.c
+ *     m5206.c  -- platform support for ColdFire 5206 based boards
  *
  *     Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
  *     Copyright (C) 2000-2001, Lineo Inc. (www.lineo.com) 
similarity index 98%
rename from arch/m68k/platform/coldfire/m520x.c
rename to arch/m68k/coldfire/m520x.c
index 4040a3c93733272465a015b1a1fff422983972f7..173834f251ebe96ea6ab9316bd31ce4054a476a6 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *  linux/arch/m68knommu/platform/520x/config.c
+ *  m520x.c  -- platform support for ColdFire 520x based boards
  *
  *  Copyright (C) 2005,      Freescale (www.freescale.com)
  *  Copyright (C) 2005,      Intec Automation (mike@steroidmicros.com)
similarity index 97%
rename from arch/m68k/platform/coldfire/m523x.c
rename to arch/m68k/coldfire/m523x.c
index 6b7135e6d5b42ffa08411becd33b7c451ce305aa..a191a467eff276a3f2a4a8027592f0c2e09fc9c3 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *     linux/arch/m68knommu/platform/523x/config.c
+ *     m523x.c  -- platform support for ColdFire 523x based boards
  *
  *     Sub-architcture dependent initialization code for the Freescale
  *     523x CPUs.
similarity index 97%
rename from arch/m68k/platform/coldfire/m5249.c
rename to arch/m68k/coldfire/m5249.c
index f6253a3313b3861681308c41f3a069c882ceb7f8..e48f55adc44777bcd6b7c6df456173064e7395b8 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *     linux/arch/m68knommu/platform/5249/config.c
+ *     m5249.c  -- platform support for ColdFire 5249 based boards
  *
  *     Copyright (C) 2002, Greg Ungerer (gerg@snapgear.com)
  */
similarity index 97%
rename from arch/m68k/platform/coldfire/m525x.c
rename to arch/m68k/coldfire/m525x.c
index 1adba3909035170b6f57be9a7d5b4589ae83f099..3d8583e2187c5bf135685cf5a325852e721823e1 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *     525x.c
+ *     525x.c  -- platform support for ColdFire 525x based boards
  *
  *     Copyright (C) 2012, Steven King <sfking@fdwdc.com>
  */
similarity index 98%
rename from arch/m68k/platform/coldfire/m5272.c
rename to arch/m68k/coldfire/m5272.c
index 8a4d3cc322c60126a5f92b9fa337e58ba38f45fe..b15219ed22bf5d61ab34392040826fc6823cab6e 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *     linux/arch/m68knommu/platform/5272/config.c
+ *     m5272.c  -- platform support for ColdFire 5272 based boards
  *
  *     Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
  *     Copyright (C) 2001-2002, SnapGear Inc. (www.snapgear.com)
similarity index 97%
rename from arch/m68k/platform/coldfire/m527x.c
rename to arch/m68k/coldfire/m527x.c
index 62d81ef016f1742081b35d2ce534a9b2eabcfa09..2ba470735bed0bc20486adaba2546853b0d9c344 100644 (file)
@@ -1,10 +1,10 @@
 /***************************************************************************/
 
 /*
- *     linux/arch/m68knommu/platform/527x/config.c
+ *     m527x.c  -- platform support for ColdFire 527x based boards
  *
  *     Sub-architcture dependent initialization code for the Freescale
- *     5270/5271 CPUs.
+ *     5270/5271 and 5274/5275 CPUs.
  *
  *     Copyright (C) 1999-2004, Greg Ungerer (gerg@snapgear.com)
  *     Copyright (C) 2001-2004, SnapGear Inc. (www.snapgear.com)
similarity index 98%
rename from arch/m68k/platform/coldfire/m528x.c
rename to arch/m68k/coldfire/m528x.c
index 21cd161d36f19d570a693bb6d315d56846416f6d..45e947aeade4a3f0e01807c9b4fb4d5ac64dfe75 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *     linux/arch/m68knommu/platform/528x/config.c
+ *     m528x.c  -- platform support for ColdFire 528x based boards
  *
  *     Sub-architcture dependent initialization code for the Freescale
  *     5280, 5281 and 5282 CPUs.
similarity index 97%
rename from arch/m68k/platform/coldfire/m5307.c
rename to arch/m68k/coldfire/m5307.c
index 887435361386fb7e4cd5d831de2816bcd0948e45..2da1d146e344aee94a712eb624efd40c5cc1952c 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *     linux/arch/m68knommu/platform/5307/config.c
+ *     m5307.c  -- platform support for ColdFire 5307 based boards
  *
  *     Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
  *     Copyright (C) 2000, Lineo (www.lineo.com)
similarity index 95%
rename from arch/m68k/platform/coldfire/m5407.c
rename to arch/m68k/coldfire/m5407.c
index 2fb3cdbfde30164e11bf7aa5341b48309681621f..738eba6be40ecadb0f0238b752c00d9415c8228a 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *     linux/arch/m68knommu/platform/5407/config.c
+ *     m5407.c  -- platform support for ColdFire 5407 based boards
  *
  *     Copyright (C) 1999-2002, Greg Ungerer (gerg@snapgear.com)
  *     Copyright (C) 2000, Lineo (www.lineo.com)
similarity index 97%
rename from arch/m68k/platform/coldfire/m54xx.c
rename to arch/m68k/coldfire/m54xx.c
index 952da53aa0bcd166f1c6fc7c972bb12b46c5f39b..075aaabd136026a408ee4560ee4870127c6b1b9d 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *     linux/arch/m68knommu/platform/54xx/config.c
+ *     m54xx.c  -- platform support for ColdFire 54xx based boards
  *
  *     Copyright (C) 2010, Philippe De Muyter <phdm@macqel.be>
  */
@@ -23,7 +23,6 @@
 #include <asm/mcfuart.h>
 #include <asm/mcfclk.h>
 #include <asm/m54xxgpt.h>
-#include <asm/mcfclk.h>
 #ifdef CONFIG_MMU
 #include <asm/mmu_context.h>
 #endif
similarity index 96%
rename from arch/m68k/platform/coldfire/vectors.c
rename to arch/m68k/coldfire/vectors.c
index a4dbdecbec7a0a6266e664839aeb3b118720a1e1..08923fe600e013d95610376959016e77064f3f91 100644 (file)
@@ -1,7 +1,7 @@
 /***************************************************************************/
 
 /*
- *     linux/arch/m68knommu/platform/coldfire/vectors.c
+ *     vectors.c  -- high level trap setup for ColdFire
  *
  *     Copyright (C) 1999-2007, Greg Ungerer <gerg@snapgear.com>
  */
index 52f7e8499172e101b5ba3d925c9d9d9694c325c1..be4b5a813ad401972624886802f5f69aa047e7dc 100644 (file)
@@ -179,6 +179,15 @@ static inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size
  */
 #define xlate_dev_kmem_ptr(p)  p
 
+static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
+{
+       return (void __iomem *) port;
+}
+
+static inline void ioport_unmap(void __iomem *p)
+{
+}
+
 #endif /* __KERNEL__ */
 
 #endif /* _M68KNOMMU_IO_H */
index 6fbf54f72f2e0a5cc27b7b29207e68e2d702826c..4687f5aa374170c5780fb1f817e08770654f303d 100644 (file)
@@ -72,7 +72,7 @@
 #define        PCIRFWPR        (CONFIG_MBAR + 0x84d4)  /* RX FIFO write pointer */
 
 #define        PACR            (CONFIG_MBAR + 0xc00)   /* PCI arbiter control */
-#define        PASR            (COFNIG_MBAR + 0xc04)   /* PCI arbiter status */
+#define        PASR            (CONFIG_MBAR + 0xc04)   /* PCI arbiter status */
 
 /*
  *     Definitions for the Global status and control register.
diff --git a/arch/m68k/platform/Makefile b/arch/m68k/platform/Makefile
deleted file mode 100644 (file)
index fc932bf..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Makefile for the arch/m68knommu/platform.
-#