From f86b9e03837beafb4b48d53a76ee4b88559226de Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 19 Aug 2014 11:39:09 +1000 Subject: [PATCH 01/10] m68k: move coldfire platform code Move the m68k ColdFire platform support code directory to be with the existing m68k platforms. Although the ColdFire is not a platform as such, we have always kept all its support together. No reason to change that as this time. Signed-off-by: Greg Ungerer Acked-by: Geert Uytterhoeven --- arch/m68k/Makefile | 4 ++-- arch/m68k/{platform => }/coldfire/Makefile | 0 arch/m68k/{platform => }/coldfire/cache.c | 0 arch/m68k/{platform => }/coldfire/clk.c | 0 arch/m68k/{platform => }/coldfire/device.c | 0 arch/m68k/{platform => }/coldfire/dma.c | 0 arch/m68k/{platform => }/coldfire/dma_timer.c | 0 arch/m68k/{platform => }/coldfire/entry.S | 0 arch/m68k/{platform => }/coldfire/firebee.c | 0 arch/m68k/{platform => }/coldfire/gpio.c | 0 arch/m68k/{platform => }/coldfire/head.S | 0 arch/m68k/{platform => }/coldfire/intc-2.c | 0 arch/m68k/{platform => }/coldfire/intc-5249.c | 0 arch/m68k/{platform => }/coldfire/intc-525x.c | 0 arch/m68k/{platform => }/coldfire/intc-5272.c | 0 arch/m68k/{platform => }/coldfire/intc-simr.c | 0 arch/m68k/{platform => }/coldfire/intc.c | 0 arch/m68k/{platform => }/coldfire/m5206.c | 0 arch/m68k/{platform => }/coldfire/m520x.c | 0 arch/m68k/{platform => }/coldfire/m523x.c | 0 arch/m68k/{platform => }/coldfire/m5249.c | 0 arch/m68k/{platform => }/coldfire/m525x.c | 0 arch/m68k/{platform => }/coldfire/m5272.c | 0 arch/m68k/{platform => }/coldfire/m527x.c | 0 arch/m68k/{platform => }/coldfire/m528x.c | 0 arch/m68k/{platform => }/coldfire/m5307.c | 0 arch/m68k/{platform => }/coldfire/m53xx.c | 0 arch/m68k/{platform => }/coldfire/m5407.c | 0 arch/m68k/{platform => }/coldfire/m5441x.c | 0 arch/m68k/{platform => }/coldfire/m54xx.c | 0 arch/m68k/{platform => }/coldfire/mcf8390.c | 0 arch/m68k/{platform => }/coldfire/nettel.c | 0 arch/m68k/{platform => }/coldfire/pci.c | 0 arch/m68k/{platform => }/coldfire/pit.c | 0 arch/m68k/{platform => }/coldfire/reset.c | 0 arch/m68k/{platform => }/coldfire/sltimers.c | 0 arch/m68k/{platform => }/coldfire/timers.c | 0 arch/m68k/{platform => }/coldfire/vectors.c | 0 38 files changed, 2 insertions(+), 2 deletions(-) rename arch/m68k/{platform => }/coldfire/Makefile (100%) rename arch/m68k/{platform => }/coldfire/cache.c (100%) rename arch/m68k/{platform => }/coldfire/clk.c (100%) rename arch/m68k/{platform => }/coldfire/device.c (100%) rename arch/m68k/{platform => }/coldfire/dma.c (100%) rename arch/m68k/{platform => }/coldfire/dma_timer.c (100%) rename arch/m68k/{platform => }/coldfire/entry.S (100%) rename arch/m68k/{platform => }/coldfire/firebee.c (100%) rename arch/m68k/{platform => }/coldfire/gpio.c (100%) rename arch/m68k/{platform => }/coldfire/head.S (100%) rename arch/m68k/{platform => }/coldfire/intc-2.c (100%) rename arch/m68k/{platform => }/coldfire/intc-5249.c (100%) rename arch/m68k/{platform => }/coldfire/intc-525x.c (100%) rename arch/m68k/{platform => }/coldfire/intc-5272.c (100%) rename arch/m68k/{platform => }/coldfire/intc-simr.c (100%) rename arch/m68k/{platform => }/coldfire/intc.c (100%) rename arch/m68k/{platform => }/coldfire/m5206.c (100%) rename arch/m68k/{platform => }/coldfire/m520x.c (100%) rename arch/m68k/{platform => }/coldfire/m523x.c (100%) rename arch/m68k/{platform => }/coldfire/m5249.c (100%) rename arch/m68k/{platform => }/coldfire/m525x.c (100%) rename arch/m68k/{platform => }/coldfire/m5272.c (100%) rename arch/m68k/{platform => }/coldfire/m527x.c (100%) rename arch/m68k/{platform => }/coldfire/m528x.c (100%) rename arch/m68k/{platform => }/coldfire/m5307.c (100%) rename arch/m68k/{platform => }/coldfire/m53xx.c (100%) rename arch/m68k/{platform => }/coldfire/m5407.c (100%) rename arch/m68k/{platform => }/coldfire/m5441x.c (100%) rename arch/m68k/{platform => }/coldfire/m54xx.c (100%) rename arch/m68k/{platform => }/coldfire/mcf8390.c (100%) rename arch/m68k/{platform => }/coldfire/nettel.c (100%) rename arch/m68k/{platform => }/coldfire/pci.c (100%) rename arch/m68k/{platform => }/coldfire/pit.c (100%) rename arch/m68k/{platform => }/coldfire/reset.c (100%) rename arch/m68k/{platform => }/coldfire/sltimers.c (100%) rename arch/m68k/{platform => }/coldfire/timers.c (100%) rename arch/m68k/{platform => }/coldfire/vectors.c (100%) diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index 7f7830f2c5bc..2e2477591fdf 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -94,7 +94,7 @@ 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_COLDFIRE) := arch/m68k/coldfire/head.o core-y += arch/m68k/kernel/ arch/m68k/mm/ libs-y += arch/m68k/lib/ @@ -116,7 +116,7 @@ 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_COLDFIRE) += arch/m68k/coldfire/ all: zImage diff --git a/arch/m68k/platform/coldfire/Makefile b/arch/m68k/coldfire/Makefile similarity index 100% rename from arch/m68k/platform/coldfire/Makefile rename to arch/m68k/coldfire/Makefile diff --git a/arch/m68k/platform/coldfire/cache.c b/arch/m68k/coldfire/cache.c similarity index 100% rename from arch/m68k/platform/coldfire/cache.c rename to arch/m68k/coldfire/cache.c diff --git a/arch/m68k/platform/coldfire/clk.c b/arch/m68k/coldfire/clk.c similarity index 100% rename from arch/m68k/platform/coldfire/clk.c rename to arch/m68k/coldfire/clk.c diff --git a/arch/m68k/platform/coldfire/device.c b/arch/m68k/coldfire/device.c similarity index 100% rename from arch/m68k/platform/coldfire/device.c rename to arch/m68k/coldfire/device.c diff --git a/arch/m68k/platform/coldfire/dma.c b/arch/m68k/coldfire/dma.c similarity index 100% rename from arch/m68k/platform/coldfire/dma.c rename to arch/m68k/coldfire/dma.c diff --git a/arch/m68k/platform/coldfire/dma_timer.c b/arch/m68k/coldfire/dma_timer.c similarity index 100% rename from arch/m68k/platform/coldfire/dma_timer.c rename to arch/m68k/coldfire/dma_timer.c diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/coldfire/entry.S similarity index 100% rename from arch/m68k/platform/coldfire/entry.S rename to arch/m68k/coldfire/entry.S diff --git a/arch/m68k/platform/coldfire/firebee.c b/arch/m68k/coldfire/firebee.c similarity index 100% rename from arch/m68k/platform/coldfire/firebee.c rename to arch/m68k/coldfire/firebee.c diff --git a/arch/m68k/platform/coldfire/gpio.c b/arch/m68k/coldfire/gpio.c similarity index 100% rename from arch/m68k/platform/coldfire/gpio.c rename to arch/m68k/coldfire/gpio.c diff --git a/arch/m68k/platform/coldfire/head.S b/arch/m68k/coldfire/head.S similarity index 100% rename from arch/m68k/platform/coldfire/head.S rename to arch/m68k/coldfire/head.S diff --git a/arch/m68k/platform/coldfire/intc-2.c b/arch/m68k/coldfire/intc-2.c similarity index 100% rename from arch/m68k/platform/coldfire/intc-2.c rename to arch/m68k/coldfire/intc-2.c diff --git a/arch/m68k/platform/coldfire/intc-5249.c b/arch/m68k/coldfire/intc-5249.c similarity index 100% rename from arch/m68k/platform/coldfire/intc-5249.c rename to arch/m68k/coldfire/intc-5249.c diff --git a/arch/m68k/platform/coldfire/intc-525x.c b/arch/m68k/coldfire/intc-525x.c similarity index 100% rename from arch/m68k/platform/coldfire/intc-525x.c rename to arch/m68k/coldfire/intc-525x.c diff --git a/arch/m68k/platform/coldfire/intc-5272.c b/arch/m68k/coldfire/intc-5272.c similarity index 100% rename from arch/m68k/platform/coldfire/intc-5272.c rename to arch/m68k/coldfire/intc-5272.c diff --git a/arch/m68k/platform/coldfire/intc-simr.c b/arch/m68k/coldfire/intc-simr.c similarity index 100% rename from arch/m68k/platform/coldfire/intc-simr.c rename to arch/m68k/coldfire/intc-simr.c diff --git a/arch/m68k/platform/coldfire/intc.c b/arch/m68k/coldfire/intc.c similarity index 100% rename from arch/m68k/platform/coldfire/intc.c rename to arch/m68k/coldfire/intc.c diff --git a/arch/m68k/platform/coldfire/m5206.c b/arch/m68k/coldfire/m5206.c similarity index 100% rename from arch/m68k/platform/coldfire/m5206.c rename to arch/m68k/coldfire/m5206.c diff --git a/arch/m68k/platform/coldfire/m520x.c b/arch/m68k/coldfire/m520x.c similarity index 100% rename from arch/m68k/platform/coldfire/m520x.c rename to arch/m68k/coldfire/m520x.c diff --git a/arch/m68k/platform/coldfire/m523x.c b/arch/m68k/coldfire/m523x.c similarity index 100% rename from arch/m68k/platform/coldfire/m523x.c rename to arch/m68k/coldfire/m523x.c diff --git a/arch/m68k/platform/coldfire/m5249.c b/arch/m68k/coldfire/m5249.c similarity index 100% rename from arch/m68k/platform/coldfire/m5249.c rename to arch/m68k/coldfire/m5249.c diff --git a/arch/m68k/platform/coldfire/m525x.c b/arch/m68k/coldfire/m525x.c similarity index 100% rename from arch/m68k/platform/coldfire/m525x.c rename to arch/m68k/coldfire/m525x.c diff --git a/arch/m68k/platform/coldfire/m5272.c b/arch/m68k/coldfire/m5272.c similarity index 100% rename from arch/m68k/platform/coldfire/m5272.c rename to arch/m68k/coldfire/m5272.c diff --git a/arch/m68k/platform/coldfire/m527x.c b/arch/m68k/coldfire/m527x.c similarity index 100% rename from arch/m68k/platform/coldfire/m527x.c rename to arch/m68k/coldfire/m527x.c diff --git a/arch/m68k/platform/coldfire/m528x.c b/arch/m68k/coldfire/m528x.c similarity index 100% rename from arch/m68k/platform/coldfire/m528x.c rename to arch/m68k/coldfire/m528x.c diff --git a/arch/m68k/platform/coldfire/m5307.c b/arch/m68k/coldfire/m5307.c similarity index 100% rename from arch/m68k/platform/coldfire/m5307.c rename to arch/m68k/coldfire/m5307.c diff --git a/arch/m68k/platform/coldfire/m53xx.c b/arch/m68k/coldfire/m53xx.c similarity index 100% rename from arch/m68k/platform/coldfire/m53xx.c rename to arch/m68k/coldfire/m53xx.c diff --git a/arch/m68k/platform/coldfire/m5407.c b/arch/m68k/coldfire/m5407.c similarity index 100% rename from arch/m68k/platform/coldfire/m5407.c rename to arch/m68k/coldfire/m5407.c diff --git a/arch/m68k/platform/coldfire/m5441x.c b/arch/m68k/coldfire/m5441x.c similarity index 100% rename from arch/m68k/platform/coldfire/m5441x.c rename to arch/m68k/coldfire/m5441x.c diff --git a/arch/m68k/platform/coldfire/m54xx.c b/arch/m68k/coldfire/m54xx.c similarity index 100% rename from arch/m68k/platform/coldfire/m54xx.c rename to arch/m68k/coldfire/m54xx.c diff --git a/arch/m68k/platform/coldfire/mcf8390.c b/arch/m68k/coldfire/mcf8390.c similarity index 100% rename from arch/m68k/platform/coldfire/mcf8390.c rename to arch/m68k/coldfire/mcf8390.c diff --git a/arch/m68k/platform/coldfire/nettel.c b/arch/m68k/coldfire/nettel.c similarity index 100% rename from arch/m68k/platform/coldfire/nettel.c rename to arch/m68k/coldfire/nettel.c diff --git a/arch/m68k/platform/coldfire/pci.c b/arch/m68k/coldfire/pci.c similarity index 100% rename from arch/m68k/platform/coldfire/pci.c rename to arch/m68k/coldfire/pci.c diff --git a/arch/m68k/platform/coldfire/pit.c b/arch/m68k/coldfire/pit.c similarity index 100% rename from arch/m68k/platform/coldfire/pit.c rename to arch/m68k/coldfire/pit.c diff --git a/arch/m68k/platform/coldfire/reset.c b/arch/m68k/coldfire/reset.c similarity index 100% rename from arch/m68k/platform/coldfire/reset.c rename to arch/m68k/coldfire/reset.c diff --git a/arch/m68k/platform/coldfire/sltimers.c b/arch/m68k/coldfire/sltimers.c similarity index 100% rename from arch/m68k/platform/coldfire/sltimers.c rename to arch/m68k/coldfire/sltimers.c diff --git a/arch/m68k/platform/coldfire/timers.c b/arch/m68k/coldfire/timers.c similarity index 100% rename from arch/m68k/platform/coldfire/timers.c rename to arch/m68k/coldfire/timers.c diff --git a/arch/m68k/platform/coldfire/vectors.c b/arch/m68k/coldfire/vectors.c similarity index 100% rename from arch/m68k/platform/coldfire/vectors.c rename to arch/m68k/coldfire/vectors.c From ece9ae6515727d56ca21a8c925965b731a88b43b Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Tue, 19 Aug 2014 11:55:24 +1000 Subject: [PATCH 02/10] m68k: fix crufty ColdFire intro comments Quite a few of the ColdFire specific support files have a pathname in the title comments of the file. These files have moved around a bit over the years, and most are no longer accurate. Remove the pathname and fix the comments to include at least a short description of the files contents. Signed-off-by: Greg Ungerer Acked-by: Geert Uytterhoeven --- arch/m68k/coldfire/entry.S | 2 +- arch/m68k/coldfire/m5206.c | 2 +- arch/m68k/coldfire/m520x.c | 2 +- arch/m68k/coldfire/m523x.c | 2 +- arch/m68k/coldfire/m5249.c | 2 +- arch/m68k/coldfire/m525x.c | 2 +- arch/m68k/coldfire/m5272.c | 2 +- arch/m68k/coldfire/m527x.c | 4 ++-- arch/m68k/coldfire/m528x.c | 2 +- arch/m68k/coldfire/m5307.c | 2 +- arch/m68k/coldfire/m5407.c | 2 +- arch/m68k/coldfire/m54xx.c | 2 +- arch/m68k/coldfire/vectors.c | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/m68k/coldfire/entry.S b/arch/m68k/coldfire/entry.S index 881ab8e379d4..52d312d5b4d4 100644 --- a/arch/m68k/coldfire/entry.S +++ b/arch/m68k/coldfire/entry.S @@ -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 , diff --git a/arch/m68k/coldfire/m5206.c b/arch/m68k/coldfire/m5206.c index 0e55f449a88c..8945f5e7b39c 100644 --- a/arch/m68k/coldfire/m5206.c +++ b/arch/m68k/coldfire/m5206.c @@ -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) diff --git a/arch/m68k/coldfire/m520x.c b/arch/m68k/coldfire/m520x.c index 4040a3c93733..173834f251eb 100644 --- a/arch/m68k/coldfire/m520x.c +++ b/arch/m68k/coldfire/m520x.c @@ -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) diff --git a/arch/m68k/coldfire/m523x.c b/arch/m68k/coldfire/m523x.c index 6b7135e6d5b4..a191a467eff2 100644 --- a/arch/m68k/coldfire/m523x.c +++ b/arch/m68k/coldfire/m523x.c @@ -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. diff --git a/arch/m68k/coldfire/m5249.c b/arch/m68k/coldfire/m5249.c index f6253a3313b3..e48f55adc447 100644 --- a/arch/m68k/coldfire/m5249.c +++ b/arch/m68k/coldfire/m5249.c @@ -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) */ diff --git a/arch/m68k/coldfire/m525x.c b/arch/m68k/coldfire/m525x.c index 1adba3909035..3d8583e2187c 100644 --- a/arch/m68k/coldfire/m525x.c +++ b/arch/m68k/coldfire/m525x.c @@ -1,7 +1,7 @@ /***************************************************************************/ /* - * 525x.c + * 525x.c -- platform support for ColdFire 525x based boards * * Copyright (C) 2012, Steven King */ diff --git a/arch/m68k/coldfire/m5272.c b/arch/m68k/coldfire/m5272.c index 8a4d3cc322c6..b15219ed22bf 100644 --- a/arch/m68k/coldfire/m5272.c +++ b/arch/m68k/coldfire/m5272.c @@ -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) diff --git a/arch/m68k/coldfire/m527x.c b/arch/m68k/coldfire/m527x.c index 62d81ef016f1..2ba470735bed 100644 --- a/arch/m68k/coldfire/m527x.c +++ b/arch/m68k/coldfire/m527x.c @@ -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) diff --git a/arch/m68k/coldfire/m528x.c b/arch/m68k/coldfire/m528x.c index 21cd161d36f1..45e947aeade4 100644 --- a/arch/m68k/coldfire/m528x.c +++ b/arch/m68k/coldfire/m528x.c @@ -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. diff --git a/arch/m68k/coldfire/m5307.c b/arch/m68k/coldfire/m5307.c index 887435361386..2da1d146e344 100644 --- a/arch/m68k/coldfire/m5307.c +++ b/arch/m68k/coldfire/m5307.c @@ -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) diff --git a/arch/m68k/coldfire/m5407.c b/arch/m68k/coldfire/m5407.c index 2fb3cdbfde30..738eba6be40e 100644 --- a/arch/m68k/coldfire/m5407.c +++ b/arch/m68k/coldfire/m5407.c @@ -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) diff --git a/arch/m68k/coldfire/m54xx.c b/arch/m68k/coldfire/m54xx.c index 952da53aa0bc..eec7f71af19e 100644 --- a/arch/m68k/coldfire/m54xx.c +++ b/arch/m68k/coldfire/m54xx.c @@ -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 */ diff --git a/arch/m68k/coldfire/vectors.c b/arch/m68k/coldfire/vectors.c index a4dbdecbec7a..08923fe600e0 100644 --- a/arch/m68k/coldfire/vectors.c +++ b/arch/m68k/coldfire/vectors.c @@ -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 */ From 18cb3faf6fc72ccfc2965aeec9e04fa7b0047c4c Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Thu, 21 Aug 2014 21:53:51 +1000 Subject: [PATCH 03/10] m68k: move non-mmu 68000 platform code The non-mmu 68000 specific code is inconsistently placed under a directory named "platform". Move it to arch/m68k/ along with the other platform and machine directories. Signed-off-by: Greg Ungerer Acked-by: Geert Uytterhoeven --- arch/m68k/{platform => }/68000/Makefile | 0 arch/m68k/{platform => }/68000/bootlogo-vz.h | 0 arch/m68k/{platform => }/68000/bootlogo.h | 0 arch/m68k/{platform => }/68000/entry.S | 0 arch/m68k/{platform => }/68000/head.S | 0 arch/m68k/{platform => }/68000/ints.c | 0 arch/m68k/{platform => }/68000/m68328.c | 0 arch/m68k/{platform => }/68000/m68EZ328.c | 0 arch/m68k/{platform => }/68000/m68VZ328.c | 0 arch/m68k/{platform => }/68000/romvec.S | 0 arch/m68k/{platform => }/68000/timers.c | 0 arch/m68k/Makefile | 4 ++-- 12 files changed, 2 insertions(+), 2 deletions(-) rename arch/m68k/{platform => }/68000/Makefile (100%) rename arch/m68k/{platform => }/68000/bootlogo-vz.h (100%) rename arch/m68k/{platform => }/68000/bootlogo.h (100%) rename arch/m68k/{platform => }/68000/entry.S (100%) rename arch/m68k/{platform => }/68000/head.S (100%) rename arch/m68k/{platform => }/68000/ints.c (100%) rename arch/m68k/{platform => }/68000/m68328.c (100%) rename arch/m68k/{platform => }/68000/m68EZ328.c (100%) rename arch/m68k/{platform => }/68000/m68VZ328.c (100%) rename arch/m68k/{platform => }/68000/romvec.S (100%) rename arch/m68k/{platform => }/68000/timers.c (100%) diff --git a/arch/m68k/platform/68000/Makefile b/arch/m68k/68000/Makefile similarity index 100% rename from arch/m68k/platform/68000/Makefile rename to arch/m68k/68000/Makefile diff --git a/arch/m68k/platform/68000/bootlogo-vz.h b/arch/m68k/68000/bootlogo-vz.h similarity index 100% rename from arch/m68k/platform/68000/bootlogo-vz.h rename to arch/m68k/68000/bootlogo-vz.h diff --git a/arch/m68k/platform/68000/bootlogo.h b/arch/m68k/68000/bootlogo.h similarity index 100% rename from arch/m68k/platform/68000/bootlogo.h rename to arch/m68k/68000/bootlogo.h diff --git a/arch/m68k/platform/68000/entry.S b/arch/m68k/68000/entry.S similarity index 100% rename from arch/m68k/platform/68000/entry.S rename to arch/m68k/68000/entry.S diff --git a/arch/m68k/platform/68000/head.S b/arch/m68k/68000/head.S similarity index 100% rename from arch/m68k/platform/68000/head.S rename to arch/m68k/68000/head.S diff --git a/arch/m68k/platform/68000/ints.c b/arch/m68k/68000/ints.c similarity index 100% rename from arch/m68k/platform/68000/ints.c rename to arch/m68k/68000/ints.c diff --git a/arch/m68k/platform/68000/m68328.c b/arch/m68k/68000/m68328.c similarity index 100% rename from arch/m68k/platform/68000/m68328.c rename to arch/m68k/68000/m68328.c diff --git a/arch/m68k/platform/68000/m68EZ328.c b/arch/m68k/68000/m68EZ328.c similarity index 100% rename from arch/m68k/platform/68000/m68EZ328.c rename to arch/m68k/68000/m68EZ328.c diff --git a/arch/m68k/platform/68000/m68VZ328.c b/arch/m68k/68000/m68VZ328.c similarity index 100% rename from arch/m68k/platform/68000/m68VZ328.c rename to arch/m68k/68000/m68VZ328.c diff --git a/arch/m68k/platform/68000/romvec.S b/arch/m68k/68000/romvec.S similarity index 100% rename from arch/m68k/platform/68000/romvec.S rename to arch/m68k/68000/romvec.S diff --git a/arch/m68k/platform/68000/timers.c b/arch/m68k/68000/timers.c similarity index 100% rename from arch/m68k/platform/68000/timers.c rename to arch/m68k/68000/timers.c diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index 2e2477591fdf..dd96fc270ea1 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -93,7 +93,7 @@ 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_M68000) := arch/m68k/68000/head.o head-$(CONFIG_COLDFIRE) := arch/m68k/coldfire/head.o core-y += arch/m68k/kernel/ arch/m68k/mm/ @@ -115,7 +115,7 @@ 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_M68000) += arch/m68k/68000/ core-$(CONFIG_COLDFIRE) += arch/m68k/coldfire/ From 3ba885f524b9cca1f0975e7bf00eddb275407b74 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Thu, 21 Aug 2014 22:02:10 +1000 Subject: [PATCH 04/10] m68k: move non-mmu 68360 platform code The non-mmu 68360 specific code is inconsistently placed under a directory named "platform". Move it to arch/m68k/ along with the other platform and board directories. Signed-off-by: Greg Ungerer Acked-by: Geert Uytterhoeven --- arch/m68k/{platform => }/68360/Makefile | 0 arch/m68k/{platform => }/68360/commproc.c | 0 arch/m68k/{platform => }/68360/config.c | 0 arch/m68k/{platform => }/68360/entry.S | 0 arch/m68k/{platform => }/68360/head-ram.S | 0 arch/m68k/{platform => }/68360/head-rom.S | 0 arch/m68k/{platform => }/68360/ints.c | 0 arch/m68k/Makefile | 4 ++-- 8 files changed, 2 insertions(+), 2 deletions(-) rename arch/m68k/{platform => }/68360/Makefile (100%) rename arch/m68k/{platform => }/68360/commproc.c (100%) rename arch/m68k/{platform => }/68360/config.c (100%) rename arch/m68k/{platform => }/68360/entry.S (100%) rename arch/m68k/{platform => }/68360/head-ram.S (100%) rename arch/m68k/{platform => }/68360/head-rom.S (100%) rename arch/m68k/{platform => }/68360/ints.c (100%) diff --git a/arch/m68k/platform/68360/Makefile b/arch/m68k/68360/Makefile similarity index 100% rename from arch/m68k/platform/68360/Makefile rename to arch/m68k/68360/Makefile diff --git a/arch/m68k/platform/68360/commproc.c b/arch/m68k/68360/commproc.c similarity index 100% rename from arch/m68k/platform/68360/commproc.c rename to arch/m68k/68360/commproc.c diff --git a/arch/m68k/platform/68360/config.c b/arch/m68k/68360/config.c similarity index 100% rename from arch/m68k/platform/68360/config.c rename to arch/m68k/68360/config.c diff --git a/arch/m68k/platform/68360/entry.S b/arch/m68k/68360/entry.S similarity index 100% rename from arch/m68k/platform/68360/entry.S rename to arch/m68k/68360/entry.S diff --git a/arch/m68k/platform/68360/head-ram.S b/arch/m68k/68360/head-ram.S similarity index 100% rename from arch/m68k/platform/68360/head-ram.S rename to arch/m68k/68360/head-ram.S diff --git a/arch/m68k/platform/68360/head-rom.S b/arch/m68k/68360/head-rom.S similarity index 100% rename from arch/m68k/platform/68360/head-rom.S rename to arch/m68k/68360/head-rom.S diff --git a/arch/m68k/platform/68360/ints.c b/arch/m68k/68360/ints.c similarity index 100% rename from arch/m68k/platform/68360/ints.c rename to arch/m68k/68360/ints.c diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index dd96fc270ea1..0b29dcfef69f 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -92,7 +92,7 @@ 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_M68360) := arch/m68k/68360/head.o head-$(CONFIG_M68000) := arch/m68k/68000/head.o head-$(CONFIG_COLDFIRE) := arch/m68k/coldfire/head.o @@ -114,7 +114,7 @@ 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_M68360) += arch/m68k/68360/ core-$(CONFIG_M68000) += arch/m68k/68000/ core-$(CONFIG_COLDFIRE) += arch/m68k/coldfire/ From d3a887ccba63694bb3f5a7083ccc85c7ad116a08 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Thu, 21 Aug 2014 22:03:35 +1000 Subject: [PATCH 05/10] m68k: remove the unused arch/m68k/platform directory The non-mmu platform/machine directories have been move up one level. We no longer need arch/m68k/platform, or its Makefile, so remove them. Signed-off-by: Greg Ungerer Acked-by: Geert Uytterhoeven --- arch/m68k/platform/Makefile | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 arch/m68k/platform/Makefile diff --git a/arch/m68k/platform/Makefile b/arch/m68k/platform/Makefile deleted file mode 100644 index fc932bf65d34..000000000000 --- a/arch/m68k/platform/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# -# Makefile for the arch/m68knommu/platform. -# From 6f4a8856e084fbeae226ef52de1fc4f8d2c68765 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Thu, 21 Aug 2014 22:10:31 +1000 Subject: [PATCH 06/10] m68k: fix crufty 68000 and 68360 intro comments Quite a few of the non-mmu specific support files have a pathname in the title comments of the file. These files have moved around a bit over the years, and most are no longer accurate. Remove the pathname and fix the comments to include at least a short description of the files contents. Signed-off-by: Greg Ungerer Acked-by: Geert Uytterhoeven --- arch/m68k/68000/entry.S | 2 +- arch/m68k/68360/Makefile | 2 +- arch/m68k/68360/config.c | 2 +- arch/m68k/68360/entry.S | 2 +- arch/m68k/68360/head-ram.S | 5 ++--- arch/m68k/68360/head-rom.S | 5 ++--- arch/m68k/68360/ints.c | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/arch/m68k/68000/entry.S b/arch/m68k/68000/entry.S index 23ac054c6e1a..259b3661b614 100644 --- a/arch/m68k/68000/entry.S +++ b/arch/m68k/68000/entry.S @@ -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 * diff --git a/arch/m68k/68360/Makefile b/arch/m68k/68360/Makefile index f6f434383049..591ce42df3de 100644 --- a/arch/m68k/68360/Makefile +++ b/arch/m68k/68360/Makefile @@ -1,5 +1,5 @@ # -# Makefile for arch/m68knommu/platform/68360. +# Makefile for 68360 machines. # model-y := ram model-$(CONFIG_ROMKERNEL) := rom diff --git a/arch/m68k/68360/config.c b/arch/m68k/68360/config.c index d493ac43fe3f..17ec416fed9d 100644 --- a/arch/m68k/68360/config.c +++ b/arch/m68k/68360/config.c @@ -1,5 +1,5 @@ /* - * linux/arch/m68knommu/platform/68360/config.c + * config.c - non-mmu 68360 platform initialization code * * Copyright (c) 2000 Michael Leslie * Copyright (C) 1993 Hamish Macdonald diff --git a/arch/m68k/68360/entry.S b/arch/m68k/68360/entry.S index 447c33ef37fd..22eb3022f9ee 100644 --- a/arch/m68k/68360/entry.S +++ b/arch/m68k/68360/entry.S @@ -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. diff --git a/arch/m68k/68360/head-ram.S b/arch/m68k/68360/head-ram.S index acd213170d80..62bc56f41d57 100644 --- a/arch/m68k/68360/head-ram.S +++ b/arch/m68k/68360/head-ram.S @@ -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 diff --git a/arch/m68k/68360/head-rom.S b/arch/m68k/68360/head-rom.S index dfc756d99886..b3a7e40f35e1 100644 --- a/arch/m68k/68360/head-rom.S +++ b/arch/m68k/68360/head-rom.S @@ -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 diff --git a/arch/m68k/68360/ints.c b/arch/m68k/68360/ints.c index 8cd42692331b..2360fc046681 100644 --- a/arch/m68k/68360/ints.c +++ b/arch/m68k/68360/ints.c @@ -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 From ecb6bdcde2474c8c954179b74fd3df3ad84fba75 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Thu, 28 Aug 2014 14:39:45 +1000 Subject: [PATCH 07/10] m68knommu: fix size of address field for 5272 interrupt controller Picked up by the 0-day buidler: All warnings: >> arch/m68k/coldfire/intc-5272.c:46:20: warning: large integer implicitly truncated to unsigned type [-Woverflow] /*MCF_IRQ_EINT1*/ { .icr = MCFSIM_ICR1, .index = 28, .ack = 1, }, ... The problem stems from the changes to make all ColdFire register addresses absolute, in commit d72a5abb ("make remaining ColdFire 5272 register definitions absolute"). That change did not take into account that the addresses were stored as offsets in the irqmap of the intc-5272.c code. Make the field that now stores register addresses big enough to hold addresses. Signed-off-by: Greg Ungerer --- arch/m68k/coldfire/intc-5272.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/coldfire/intc-5272.c b/arch/m68k/coldfire/intc-5272.c index d7b695629a7e..d1e2fbad327c 100644 --- a/arch/m68k/coldfire/intc-5272.c +++ b/arch/m68k/coldfire/intc-5272.c @@ -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; }; From 1089c552fb50a4693bddb6ec00e58d4e7998ce55 Mon Sep 17 00:00:00 2001 From: Fabian Frederick Date: Tue, 16 Sep 2014 20:43:33 +0200 Subject: [PATCH 08/10] m68k/coldfire: remove second asm/mcfclk.h inclusion in m54xx.c asm/mcfclk.h was included twice. Signed-off-by: Fabian Frederick Signed-off-by: Greg Ungerer --- arch/m68k/coldfire/m54xx.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/m68k/coldfire/m54xx.c b/arch/m68k/coldfire/m54xx.c index eec7f71af19e..075aaabd1360 100644 --- a/arch/m68k/coldfire/m54xx.c +++ b/arch/m68k/coldfire/m54xx.c @@ -23,7 +23,6 @@ #include #include #include -#include #ifdef CONFIG_MMU #include #endif From f89487adce94b18e6f570ffbdf6c46f69525ebeb Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Thu, 18 Sep 2014 15:16:01 +1000 Subject: [PATCH 09/10] m68knommu: add missing ioport_map() and ioport_unmap() Add the missing ioport_map() and ioport_unmap() functions for the non-MMU platforms. Signed-off-by: Greg Ungerer --- arch/m68k/include/asm/io_no.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h index 52f7e8499172..be4b5a813ad4 100644 --- a/arch/m68k/include/asm/io_no.h +++ b/arch/m68k/include/asm/io_no.h @@ -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 */ From e803d4bd31184b301a54352bb2c1a3fa93f80154 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Fri, 26 Sep 2014 19:40:16 +0200 Subject: [PATCH 10/10] m68k: Fix typo 'COFNIG_MBAR' Signed-off-by: Paul Bolle Signed-off-by: Greg Ungerer --- arch/m68k/include/asm/m54xxpci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/include/asm/m54xxpci.h b/arch/m68k/include/asm/m54xxpci.h index 6fbf54f72f2e..4687f5aa3741 100644 --- a/arch/m68k/include/asm/m54xxpci.h +++ b/arch/m68k/include/asm/m54xxpci.h @@ -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.