Update Makefile, sa1110 cpufreq code. Drop static flash mapping from

system3.c

arch/arm/mach-sa1100/Makefile

@@ -14,69 +14,105 @@ obj-y := generic.o irq.o dma.o
 obj-m :=
 obj-n :=
 obj-  :=
+led-y := leds.o
 
-export-objs :=	assabet.o dma.o flexanet.o freebird.o generic.o h3600.o \
-		huw_webpanel.o irq.o pcipool.o sa1111.o sa1111-pcibuf.o \
-		yopy.o usb_ctl.o usb_recv.o usb_send.o
+export-objs :=	dma.o generic.o irq.o pcipool.o sa1111.o sa1111-pcibuf.o \
+		usb_ctl.o usb_recv.o usb_send.o
 
 # This needs to be cleaned up.  We probably need to have SA1100
 # and SA1110 config symbols.
 #
 # We link the CPU support next, so that RAM timings can be tuned.
 ifeq ($(CONFIG_CPU_FREQ),y)
-obj-$(CONFIG_SA1100_ASSABET) += cpu-sa1110.o
-obj-$(CONFIG_SA1100_CERF) += cpu-sa1110.o
-obj-$(CONFIG_SA1100_PT_SYSTEM3) += cpu-sa1110.o
-obj-$(CONFIG_SA1100_LART) += cpu-sa1100.o
+obj-$(CONFIG_SA1100_ASSABET)		+= cpu-sa1110.o
+obj-$(CONFIG_SA1100_CERF)		+= cpu-sa1110.o
+obj-$(CONFIG_SA1100_LART)		+= cpu-sa1100.o
+obj-$(CONFIG_SA1100_PT_SYSTEM3)		+= cpu-sa1110.o
 endif
 
 # Next, the SA1111 stuff.
-obj-$(CONFIG_SA1111) += sa1111.o
-obj-$(CONFIG_USB_OHCI_SA1111) += sa1111-pcibuf.o pcipool.o
+obj-$(CONFIG_SA1111)		+= sa1111.o
+obj-$(CONFIG_USB_OHCI_SA1111)	+= sa1111-pcibuf.o pcipool.o
 
 # Specific board support
-obj-$(CONFIG_SA1100_ADSBITSY) += adsbitsy.o
-obj-$(CONFIG_SA1100_ASSABET) += assabet.o
-obj-$(CONFIG_ASSABET_NEPONSET) += neponset.o
-obj-$(CONFIG_SA1100_BRUTUS) += brutus.o
-obj-$(CONFIG_SA1100_CERF) += cerf.o
-obj-$(CONFIG_SA1100_EMPEG) += empeg.o
-obj-$(CONFIG_SA1100_FLEXANET) += flexanet.o
-obj-$(CONFIG_SA1100_FREEBIRD) += freebird.o
-obj-$(CONFIG_SA1100_GRAPHICSCLIENT) += graphicsclient.o
-obj-$(CONFIG_SA1100_GRAPHICSMASTER) += graphicsmaster.o
-obj-$(CONFIG_SA1100_H3600) += h3600.o
-obj-$(CONFIG_SA1100_HUW_WEBPANEL) += huw_webpanel.o
-obj-$(CONFIG_SA1100_ITSY) += itsy.o
-obj-$(CONFIG_SA1100_JORNADA720) += jornada720.o
-obj-$(CONFIG_SA1100_LART) += lart.o
-obj-$(CONFIG_SA1100_NANOENGINE) += nanoengine.o
-obj-$(CONFIG_SA1100_OMNIMETER) += omnimeter.o
-obj-$(CONFIG_SA1100_PANGOLIN) += pangolin.o
-obj-$(CONFIG_SA1100_PFS168) += pfs168.o
-obj-$(CONFIG_SA1100_PLEB) += pleb.o
-obj-$(CONFIG_SA1100_SHANNON) += shannon.o
-obj-$(CONFIG_SA1100_SHERMAN) += sherman.o
-obj-$(CONFIG_SA1100_PT_SYSTEM3) += system3.o
-obj-$(CONFIG_SA1100_SIMPAD) += simpad.o
-obj-$(CONFIG_SA1100_VICTOR) += victor.o
-obj-$(CONFIG_SA1100_XP860) += xp860.o
-obj-$(CONFIG_SA1100_YOPY) += yopy.o
+obj-$(CONFIG_SA1100_ADSBITSY)		+= adsbitsy.o
+led-$(CONFIG_SA1100_ADSBITSY)		+= leds-adsbitsy.o
+
+obj-$(CONFIG_SA1100_ASSABET)		+= assabet.o
+export-objs				+= assabet.o
+led-$(CONFIG_SA1100_ASSABET)		+= leds-assabet.o
+obj-$(CONFIG_ASSABET_NEPONSET)		+= neponset.o
+
+obj-$(CONFIG_SA1100_BADGE4)		+= badge4.o
+export-objs				+= badge4.o
+
+obj-$(CONFIG_SA1100_BRUTUS)		+= brutus.o
+led-$(CONFIG_SA1100_BRUTUS)		+= leds-brutus.o
+
+obj-$(CONFIG_SA1100_CERF)		+= cerf.o
+led-$(CONFIG_SA1100_CERF)		+= leds-cerf.o
+
+obj-$(CONFIG_SA1100_EMPEG)		+= empeg.o
+
+obj-$(CONFIG_SA1100_FLEXANET)		+= flexanet.o
+export-objs				+= flexanet.o
+led-$(CONFIG_SA1100_FLEXANET)		+= leds-flexanet.o
+
+obj-$(CONFIG_SA1100_FREEBIRD)		+= freebird.o
+export-objs				+= freebird.o
+
+obj-$(CONFIG_SA1100_GRAPHICSCLIENT)	+= graphicsclient.o
+led-$(CONFIG_SA1100_GRAPHICSCLIENT)	+= leds-graphicsclient.o
+
+obj-$(CONFIG_SA1100_GRAPHICSMASTER)	+= graphicsmaster.o
+led-$(CONFIG_SA1100_GRAPHICSMASTER)	+= leds-graphicsmaster.o
+
+obj-$(CONFIG_SA1100_H3600)		+= h3600.o
+export-objs				+= h3600.o
+
+obj-$(CONFIG_SA1100_HUW_WEBPANEL)	+= huw_webpanel.o
+export-objs				+= huw_webpanel.o
+
+obj-$(CONFIG_SA1100_ITSY)		+= itsy.o
+
+obj-$(CONFIG_SA1100_JORNADA720)		+= jornada720.o
+
+obj-$(CONFIG_SA1100_LART)		+= lart.o
+led-$(CONFIG_SA1100_LART)		+= leds-lart.o
+
+obj-$(CONFIG_SA1100_NANOENGINE)		+= nanoengine.o
+
+obj-$(CONFIG_SA1100_OMNIMETER)		+= omnimeter.o
+
+obj-$(CONFIG_SA1100_PANGOLIN)		+= pangolin.o
+
+obj-$(CONFIG_SA1100_PFS168)		+= pfs168.o
+led-$(CONFIG_SA1100_PFS168)		+= leds-pfs168.o
+
+obj-$(CONFIG_SA1100_PLEB)		+= pleb.o
+
+obj-$(CONFIG_SA1100_PT_SYSTEM3)		+= system3.o
+led-$(CONFIG_SA1100_PT_SYSTEM3)		+= leds-system3.o
+
+obj-$(CONFIG_SA1100_SHANNON)		+= shannon.o
+
+obj-$(CONFIG_SA1100_SHERMAN)		+= sherman.o
+
+obj-$(CONFIG_SA1100_SIMPAD)		+= simpad.o
+led-$(CONFIG_SA1100_SIMPAD)		+= leds-simpad.o  
+
+obj-$(CONFIG_SA1100_STORK)		+= stork.o
+export-objs				+= stork.o
+
+obj-$(CONFIG_SA1100_VICTOR)		+= victor.o
+
+obj-$(CONFIG_SA1100_XP860)		+= xp860.o
+
+obj-$(CONFIG_SA1100_YOPY)		+= yopy.o
+export-objs				+= yopy.o
 
 # LEDs support
-leds-y := leds.o
-leds-$(CONFIG_SA1100_ADSBITSY) += leds-adsbitsy.o
-leds-$(CONFIG_SA1100_ASSABET) += leds-assabet.o
-leds-$(CONFIG_SA1100_BRUTUS) += leds-brutus.o
-leds-$(CONFIG_SA1100_CERF) += leds-cerf.o
-leds-$(CONFIG_SA1100_FLEXANET) += leds-flexanet.o
-leds-$(CONFIG_SA1100_GRAPHICSCLIENT) += leds-graphicsclient.o
-leds-$(CONFIG_SA1100_GRAPHICSMASTER) += leds-graphicsmaster.o
-leds-$(CONFIG_SA1100_LART) += leds-lart.o
-leds-$(CONFIG_SA1100_PFS168) += leds-pfs168.o
-leds-$(CONFIG_SA1100_SIMPAD) += leds-simpad.o  
-leds-$(CONFIG_SA1100_PT_SYSTEM3) += leds-system3.o
-obj-$(CONFIG_LEDS) += $(leds-y)
+obj-$(CONFIG_LEDS) += $(led-y)
 
 # SA1110 USB client support
 list-multi += sa1100usb_core.o

arch/arm/mach-sa1100/cpu-sa1110.c

@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2001 Russell King
  *
- *  $Id: cpu-sa1110.c,v 1.6 2001/10/22 11:53:47 rmk Exp $
+ *  $Id: cpu-sa1110.c,v 1.8 2002/01/09 17:13:27 rmk Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -69,13 +69,23 @@ static struct sdram_params tc59sm716_cl3_params __initdata = {
 };
 
 static struct sdram_params samsung_k4s641632d_tc75 __initdata = {
-	rows:		14,
-	tck:		9,
-	trcd:		27,
-	trp:		20,
-	twr:		9,
-	refresh:	64000,
-	cas_latency:	3,
+	rows:		    14,
+	tck:		     9,
+	trcd:		    27,
+	trp:		    20,
+	twr:		     9,
+	refresh:	 64000,
+	cas_latency:	     3,
+};
+
+static struct sdram_params samsung_km416s4030ct __initdata = {
+	rows:		    13,
+	tck:		     8,
+	trcd:		    24,	/* 3 CLKs */
+	trp:		    24,	/* 3 CLKs */
+	twr:		    16,	/* Trdl: 2 CLKs */
+	refresh:	 64000,
+	cas_latency:	     3,
 };
 
 static struct sdram_params sdram_params;
@@ -273,6 +283,8 @@ static int __init sa1110_clk_init(void)
 	if (machine_is_pt_system3())
 		sdram = &samsung_k4s641632d_tc75;
 
+	if (machine_is_h3100())
+		sdram = &samsung_km416s4030ct;
 
 	if (sdram) {
 		printk(KERN_DEBUG "SDRAM: tck: %d trcd: %d trp: %d"

arch/arm/mach-sa1100/system3.c

@@ -99,10 +99,9 @@ extern void convert_to_tag_list(struct param_struct *params, int mem_init);
  */
 
 static struct map_desc system3_io_desc[] __initdata = {
- /* virtual     physical    length      domain     r  w  c  b */
-  { 0xe8000000, 0x00000000,		0x01000000, DOMAIN_IO, 0, 1, 0, 0 }, /* Flash bank 0 */
-  { 0xf3000000, PT_CPLD_BASE,	0x00100000, DOMAIN_IO, 0, 1, 0, 0 }, /* System Registers */
-  { 0xf4000000, PT_SA1111_BASE,	0x00100000, DOMAIN_IO, 0, 1, 0, 0 }, /* SA-1111 */
+ /* virtual     physical        length      domain     r  w  c  b */
+  { 0xf3000000, PT_CPLD_BASE,   0x00100000, DOMAIN_IO, 0, 1, 0, 0 }, /* System Registers */
+  { 0xf4000000, PT_SA1111_BASE, 0x00100000, DOMAIN_IO, 0, 1, 0, 0 }, /* SA-1111 */
   LAST_DESC
 };