[ARM] Update SA1111 core and related drivers for LDM.

This cset updates the SA1111 core, PCMCIA, OHCI and keyboard drivers,
allowing them to take advantage of the Linux device manager code;
this implements initial suspend/resume support for the SA1111 in the
core.  Many existing drivers currently rely on the old PM-based
interface for suspend/resume support.

drivers/pcmcia/Config.in

@@ -20,6 +20,7 @@ if [ "$CONFIG_PCMCIA" != "n" ]; then
    fi
    if [ "$CONFIG_ARM" = "y" ]; then
       dep_tristate '  SA1100 support' CONFIG_PCMCIA_SA1100 $CONFIG_ARCH_SA1100 $CONFIG_PCMCIA
+      dep_tristate '  SA1111 support' CONFIG_PCMCIA_SA1111 $CONFIG_PCMCIA_SA1100 $CONFIG_SA1111 $CONFIG_PCMCIA
    fi
 fi
 

drivers/pcmcia/Makefile

@@ -14,6 +14,7 @@ obj-$(CONFIG_I82092)			+= i82092.o
 obj-$(CONFIG_TCIC)			+= tcic.o
 obj-$(CONFIG_HD64465_PCMCIA)		+= hd64465_ss.o
 obj-$(CONFIG_PCMCIA_SA1100)		+= sa1100_cs.o
+obj-$(CONFIG_PCMCIA_SA1111)		+= sa1111_cs.o
 
 yenta_socket-objs				:= pci_socket.o yenta.o
 
@@ -21,26 +22,29 @@ pcmcia_core-objs-y				:= cistpl.o rsrc_mgr.o bulkmem.o cs.o
 pcmcia_core-objs-$(CONFIG_CARDBUS)		+= cardbus.o
 pcmcia_core-objs				:= $(pcmcia_core-objs-y)
 
+sa1111_cs-objs-y				:= sa1111_generic.o
+sa1111_cs-objs-$(CONFIG_SA1100_ADSBITSY)	+= sa1100_adsbitsy.o
+sa1111_cs-objs-$(CONFIG_ASSABET_NEPONSET)	+= sa1100_neponset.o
+sa1111_cs-objs-$(CONFIG_SA1100_BADGE4)		+= sa1100_badge4.o
+sa1111_cs-objs-$(CONFIG_SA1100_GRAPHICSMASTER)	+= sa1100_graphicsmaster.o
+sa1111_cs-objs-$(CONFIG_SA1100_JORNADA720)	+= sa1100_jornada720.o
+sa1111_cs-objs-$(CONFIG_SA1100_PFS168)		+= sa1100_pfs168.o
+sa1111_cs-objs-$(CONFIG_SA1100_PT_SYSTEM3)	+= sa1100_system3.o
+sa1111_cs-objs-$(CONFIG_SA1100_XP860)		+= sa1100_xp860.o
+sa1111_cs-objs					:= $(sa1111_cs-objs-y)
+
 sa1100_cs-objs-y				:= sa1100_generic.o
-sa1100_cs-objs-$(CONFIG_SA1100_ADSBITSY)	+= sa1100_adsbitsy.o sa1111_generic.o
 sa1100_cs-objs-$(CONFIG_SA1100_ASSABET)		+= sa1100_assabet.o
-sa1100_cs-objs-$(CONFIG_ASSABET_NEPONSET)	+= sa1100_neponset.o sa1111_generic.o
-sa1100_cs-objs-$(CONFIG_SA1100_BADGE4)		+= sa1100_badge4.o sa1111_generic.o
 sa1100_cs-objs-$(CONFIG_SA1100_CERF)		+= sa1100_cerf.o
 sa1100_cs-objs-$(CONFIG_SA1100_FLEXANET)	+= sa1100_flexanet.o
 sa1100_cs-objs-$(CONFIG_SA1100_FREEBIRD)	+= sa1100_freebird.o
-sa1100_cs-objs-$(CONFIG_SA1100_GRAPHICSMASTER)	+= sa1100_graphicsmaster.o sa1111_generic.o
 sa1100_cs-objs-$(CONFIG_SA1100_GRAPHICSCLIENT)	+= sa1100_graphicsclient.o
 sa1100_cs-objs-$(CONFIG_SA1100_H3600)		+= sa1100_h3600.o
-sa1100_cs-objs-$(CONFIG_SA1100_JORNADA720)	+= sa1100_jornada720.o sa1111_generic.o
 sa1100_cs-objs-$(CONFIG_SA1100_PANGOLIN)	+= sa1100_pangolin.o
-sa1100_cs-objs-$(CONFIG_SA1100_PFS168)		+= sa1100_pfs168.o sa1111_generic.o
-sa1100_cs-objs-$(CONFIG_SA1100_PT_SYSTEM3)	+= sa1100_system3.o sa1111_generic.o
 sa1100_cs-objs-$(CONFIG_SA1100_SHANNON)		+= sa1100_shannon.o
 sa1100_cs-objs-$(CONFIG_SA1100_SIMPAD)		+= sa1100_simpad.o
 sa1100_cs-objs-$(CONFIG_SA1100_STORK)		+= sa1100_stork.o
 sa1100_cs-objs-$(CONFIG_SA1100_TRIZEPS) 	+= sa1100_trizeps.o
-sa1100_cs-objs-$(CONFIG_SA1100_XP860)		+= sa1100_xp860.o sa1111_generic.o
 sa1100_cs-objs-$(CONFIG_SA1100_YOPY)		+= sa1100_yopy.o
 sa1100_cs-objs					:= $(sa1100_cs-objs-y)
 

drivers/pcmcia/sa1100_adsbitsy.c

@@ -14,6 +14,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 
 #include "sa1100_generic.h"
 #include "sa1111_generic.h"

drivers/pcmcia/sa1100_badge4.c

@@ -19,6 +19,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/arch/badge4.h>
 #include <asm/hardware/sa1111.h>
 

drivers/pcmcia/sa1100_generic.c

@@ -1135,15 +1135,9 @@ static int __init sa1100_pcmcia_init(void)
 	}
 #endif
 
-#ifdef CONFIG_SA1100_ADSBITSY
-	pcmcia_adsbitsy_init();
-#endif
 #ifdef CONFIG_SA1100_ASSABET
 	pcmcia_assabet_init();
 #endif
-#ifdef CONFIG_SA1100_BADGE4
-	pcmcia_badge4_init();
-#endif
 #ifdef CONFIG_SA1100_CERF
 	pcmcia_cerf_init();
 #endif
@@ -1156,24 +1150,9 @@ static int __init sa1100_pcmcia_init(void)
 #ifdef CONFIG_SA1100_GRAPHICSCLIENT
 	pcmcia_gcplus_init();
 #endif
-#ifdef CONFIG_SA1100_GRAPHICSMASTER
-	pcmcia_graphicsmaster_init();
-#endif
-#ifdef CONFIG_SA1100_JORNADA720
-	pcmcia_jornada720_init();
-#endif
-#ifdef CONFIG_ASSABET_NEPONSET
-	pcmcia_neponset_init();
-#endif
 #ifdef CONFIG_SA1100_PANGOLIN
 	pcmcia_pangolin_init();
 #endif
-#ifdef CONFIG_SA1100_PFS168
-	pcmcia_pfs_init();
-#endif
-#ifdef CONFIG_SA1100_PT_SYSTEM3
-	pcmcia_system3_init();
-#endif
 #ifdef CONFIG_SA1100_SHANNON
 	pcmcia_shannon_init();
 #endif
@@ -1186,9 +1165,6 @@ static int __init sa1100_pcmcia_init(void)
 #ifdef CONFIG_SA1100_TRIZEPS
 	pcmcia_trizeps_init();
 #endif
-#ifdef CONFIG_SA1100_XP860
-	pcmcia_xp860_init();
-#endif
 #ifdef CONFIG_SA1100_YOPY
 	pcmcia_yopy_init();
 #endif
@@ -1203,15 +1179,9 @@ static int __init sa1100_pcmcia_init(void)
  */
 static void __exit sa1100_pcmcia_exit(void)
 {
-#ifdef CONFIG_SA1100_ADSBITSY
-	pcmcia_adsbitsy_exit();
-#endif
 #ifdef CONFIG_SA1100_ASSABET
 	pcmcia_assabet_exit();
 #endif
-#ifdef CONFIG_SA1100_BADGE4
-	pcmcia_badge4_exit();
-#endif
 #ifdef CONFIG_SA1100_CERF
 	pcmcia_cerf_exit();
 #endif
@@ -1224,21 +1194,9 @@ static void __exit sa1100_pcmcia_exit(void)
 #ifdef CONFIG_SA1100_GRAPHICSCLIENT
 	pcmcia_gcplus_exit();
 #endif
-#ifdef CONFIG_SA1100_GRAPHICSMASTER
-	pcmcia_graphicsmaster_exit();
-#endif
-#ifdef CONFIG_SA1100_JORNADA720
-	pcmcia_jornada720_exit();
-#endif
-#ifdef CONFIG_ASSABET_NEPONSET
-	pcmcia_neponset_exit();
-#endif
 #ifdef CONFIG_SA1100_PANGOLIN
 	pcmcia_pangolin_exit();
 #endif
-#ifdef CONFIG_SA1100_PFS168
-	pcmcia_pfs_exit();
-#endif
 #ifdef CONFIG_SA1100_SHANNON
 	pcmcia_shannon_exit();
 #endif
@@ -1248,9 +1206,6 @@ static void __exit sa1100_pcmcia_exit(void)
 #ifdef CONFIG_SA1100_STORK
 	pcmcia_stork_exit();
 #endif
-#ifdef CONFIG_SA1100_XP860
-	pcmcia_xp860_exit();
-#endif
 #ifdef CONFIG_SA1100_YOPY
 	pcmcia_yopy_exit();
 #endif

drivers/pcmcia/sa1100_graphicsmaster.c

@@ -13,6 +13,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 
 #include "sa1100_generic.h"
 #include "sa1111_generic.h"

drivers/pcmcia/sa1100_jornada720.c

@@ -9,6 +9,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 
 #include "sa1100_generic.h"
 #include "sa1111_generic.h"

drivers/pcmcia/sa1100_neponset.c

@@ -10,33 +10,16 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
-#include <asm/arch/assabet.h>
+#include <asm/mach-types.h>
+#include <asm/arch/neponset.h>
 #include <asm/hardware/sa1111.h>
 
 #include "sa1100_generic.h"
 #include "sa1111_generic.h"
 
-static int neponset_pcmcia_init(struct pcmcia_init *init)
-{
-	/* Set GPIO_A<3:0> to be outputs for PCMCIA/CF power controller: */
-	PA_DDR &= ~(GPIO_GPIO0 | GPIO_GPIO1 | GPIO_GPIO2 | GPIO_GPIO3);
-
-	/* MAX1600 to standby mode: */
-	PA_DWR &= ~(GPIO_GPIO0 | GPIO_GPIO1 | GPIO_GPIO2 | GPIO_GPIO3);
-	NCR_0 &= ~(NCR_A0VPP | NCR_A1VPP);
-
-	return sa1111_pcmcia_init(init);
-}
-
-static int
-neponset_pcmcia_configure_socket(const struct pcmcia_configure *conf)
-{
-	unsigned int ncr_mask, pa_dwr_mask;
-	unsigned int ncr_set, pa_dwr_set;
-	int ret;
-
-	/* Neponset uses the Maxim MAX1600, with the following connections:
-
+/*
+ * Neponset uses the Maxim MAX1600, with the following connections:
+ *
  *   MAX1600      Neponset
  *
  *    A0VCC        SA-1111 GPIO A<1>
@@ -58,6 +41,29 @@ neponset_pcmcia_configure_socket(const struct pcmcia_configure *conf)
  * the corresponding truth table.
  */
 
+static int neponset_pcmcia_init(struct pcmcia_init *init)
+{
+	NCR_0 &= ~(NCR_A0VPP | NCR_A1VPP);
+
+	/*
+	 * Set GPIO_A<3:0> to be outputs for the MAX1600,
+	 * and switch to standby mode.
+	 */
+	PA_DDR = 0;
+	PA_SDR = 0;
+	PA_DWR = 0;
+	PA_SSR = 0;
+
+	return sa1111_pcmcia_init(init);
+}
+
+static int
+neponset_pcmcia_configure_socket(const struct pcmcia_configure *conf)
+{
+	unsigned int ncr_mask, pa_dwr_mask;
+	unsigned int ncr_set, pa_dwr_set;
+	int ret;
+
 	switch (conf->sock) {
 	case 0:
 		pa_dwr_mask = GPIO_GPIO0 | GPIO_GPIO1;
@@ -135,13 +141,13 @@ int __init pcmcia_neponset_init(void)
 {
 	int ret = -ENODEV;
 
-	if (machine_is_assabet() && sa1111)
+	if (machine_is_assabet())
 		ret = sa1100_register_pcmcia(&neponset_pcmcia_ops);
 
 	return ret;
 }
 
-void __exit pcmcia_neponset_exit(void)
+void __devexit pcmcia_neponset_exit(void)
 {
 	sa1100_unregister_pcmcia(&neponset_pcmcia_ops);
 }

drivers/pcmcia/sa1100_pfs168.c

@@ -7,10 +7,11 @@
  */
 #include <linux/kernel.h>
 #include <linux/sched.h>
+#include <linux/delay.h>
 #include <linux/init.h>
 
-#include <asm/delay.h>
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/irq.h>
 
 #include "sa1100_generic.h"

drivers/pcmcia/sa1100_system3.c

@@ -31,6 +31,7 @@
 #include <linux/ioport.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/hardware/sa1111.h>
 

drivers/pcmcia/sa1100_xp860.c

@@ -10,6 +10,7 @@
 #include <linux/init.h>
 
 #include <asm/hardware.h>
+#include <asm/mach-types.h>
 #include <asm/irq.h>
 #include "sa1100_generic.h"
 

drivers/pcmcia/sa1111_generic.c

@@ -5,10 +5,12 @@
  * basically means we handle everything except controlling the
  * power.  Power is machine specific...
  */
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/ioport.h>
 #include <linux/device.h>
+#include <linux/init.h>
 
 #include <asm/hardware.h>
 #include <asm/hardware/sa1111.h>
@@ -21,19 +23,18 @@ static struct irqs {
 	int irq;
 	const char *str;
 } irqs[] = {
-	{ S0_CD_VALID,    "SA1111 PCMCIA card detect" },
-	{ S0_BVD1_STSCHG, "SA1111 PCMCIA BVD1"        },
-	{ S1_CD_VALID,    "SA1111 CF card detect"     },
-	{ S1_BVD1_STSCHG, "SA1111 CF BVD1"            },
+	{ IRQ_S0_CD_VALID,    "SA1111 PCMCIA card detect" },
+	{ IRQ_S0_BVD1_STSCHG, "SA1111 PCMCIA BVD1"        },
+	{ IRQ_S1_CD_VALID,    "SA1111 CF card detect"     },
+	{ IRQ_S1_BVD1_STSCHG, "SA1111 CF BVD1"            },
 };
 
+static struct sa1111_dev *pcmcia;
+
 int sa1111_pcmcia_init(struct pcmcia_init *init)
 {
 	int i, ret;
 
-	if (!request_mem_region(_PCCR, 512, "PCMCIA"))
-		return -1;
-
 	for (i = ret = 0; i < ARRAY_SIZE(irqs); i++) {
 		set_irq_type(irqs[i].irq, IRQT_FALLING);
 		ret = request_irq(irqs[i].irq, init->handler, SA_INTERRUPT,
@@ -47,8 +48,6 @@ int sa1111_pcmcia_init(struct pcmcia_init *init)
 			irqs[i].irq, ret);
 		while (i--)
 			free_irq(irqs[i].irq, NULL);
-
-		release_mem_region(_PCCR, 16);
 	}
 
 	return ret ? -1 : 2;
@@ -61,8 +60,6 @@ int sa1111_pcmcia_shutdown(void)
 	for (i = 0; i < ARRAY_SIZE(irqs); i++)
 		free_irq(irqs[i].irq, NULL);
 
-	release_mem_region(_PCCR, 512);
-
 	return 0;
 }
 
@@ -73,7 +70,7 @@ int sa1111_pcmcia_socket_state(struct pcmcia_state_array *state)
 	if (state->size < 2)
 		return -1;
 
-	status = PCSR;
+	status = sa1111_readl(pcmcia->mapbase + SA1111_PCSR);
 
 	state->state[0].detect = status & PCSR_S0_DETECT ? 0 : 1;
 	state->state[0].ready  = status & PCSR_S0_READY  ? 1 : 0;
@@ -99,8 +96,8 @@ int sa1111_pcmcia_get_irq_info(struct pcmcia_irq_info *info)
 	int ret = 0;
 
 	switch (info->sock) {
-	case 0:	info->irq = S0_READY_NINT;	break;
-	case 1: info->irq = S1_READY_NINT;	break;
+	case 0:	info->irq = IRQ_S0_READY_NINT;	break;
+	case 1: info->irq = IRQ_S1_READY_NINT;	break;
 	default: ret = 1;
 	}
 
@@ -109,7 +106,7 @@ int sa1111_pcmcia_get_irq_info(struct pcmcia_irq_info *info)
 
 int sa1111_pcmcia_configure_socket(const struct pcmcia_configure *conf)
 {
-	unsigned int rst, flt, wait, pse, irq, pccr_mask;
+	unsigned int rst, flt, wait, pse, irq, pccr_mask, val;
 	unsigned long flags;
 
 	switch (conf->sock) {
@@ -118,7 +115,7 @@ int sa1111_pcmcia_configure_socket(const struct pcmcia_configure *conf)
 		flt = PCCR_S0_FLT;
 		wait = PCCR_S0_PWAITEN;
 		pse = PCCR_S0_PSE;
-		irq = S0_READY_NINT;
+		irq = IRQ_S0_READY_NINT;
 		break;
 
 	case 1:
@@ -126,7 +123,7 @@ int sa1111_pcmcia_configure_socket(const struct pcmcia_configure *conf)
 		flt = PCCR_S1_FLT;
 		wait = PCCR_S1_PWAITEN;
 		pse = PCCR_S1_PSE;
-		irq = S1_READY_NINT;
+		irq = IRQ_S1_READY_NINT;
 		break;
 
 	default:
@@ -159,7 +156,9 @@ int sa1111_pcmcia_configure_socket(const struct pcmcia_configure *conf)
 		pccr_mask |= flt;
 
 	local_irq_save(flags);
-	PCCR = (PCCR & ~(pse | flt | wait | rst)) | pccr_mask;
+	val = sa1111_readl(pcmcia->mapbase + SA1111_PCCR);
+	val = (val & ~(pse | flt | wait | rst)) | pccr_mask;
+	sa1111_writel(val, pcmcia->mapbase + SA1111_PCCR);
 	local_irq_restore(flags);
 
 	if (conf->irq)
@@ -179,3 +178,130 @@ int sa1111_pcmcia_socket_suspend(int sock)
 {
 	return 0;
 }
+
+static int pcmcia_probe(struct device *dev)
+{
+	struct sa1111_dev *sadev = SA1111_DEV(dev);
+	unsigned long flags;
+	char *base;
+
+	local_irq_save(flags);
+	if (pcmcia) {
+		local_irq_restore(flags);
+		return -EBUSY;
+	}
+
+	pcmcia = sadev;
+	local_irq_restore(flags);
+
+	if (!request_mem_region(sadev->res.start, 512,
+				SA1111_DRIVER_NAME(sadev)))
+		return -EBUSY;
+
+	base = sadev->mapbase;
+
+	/*
+	 * Initialise the suspend state.
+	 */
+	sa1111_writel(PCSSR_S0_SLEEP | PCSSR_S1_SLEEP, base + SA1111_PCSSR);
+	sa1111_writel(PCCR_S0_FLT | PCCR_S1_FLT, base + SA1111_PCCR);
+
+#ifdef CONFIG_SA1100_ADSBITSY
+	pcmcia_adsbitsy_init();
+#endif
+#ifdef CONFIG_SA1100_BADGE4
+	pcmcia_badge4_init();
+#endif
+#ifdef CONFIG_SA1100_GRAPHICSMASTER
+	pcmcia_graphicsmaster_init();
+#endif
+#ifdef CONFIG_SA1100_JORNADA720
+	pcmcia_jornada720_init();
+#endif
+#ifdef CONFIG_ASSABET_NEPONSET
+	pcmcia_neponset_init();
+#endif
+#ifdef CONFIG_SA1100_PFS168
+	pcmcia_pfs_init();
+#endif
+#ifdef CONFIG_SA1100_PT_SYSTEM3
+	pcmcia_system3_init();
+#endif
+#ifdef CONFIG_SA1100_XP860
+	pcmcia_xp860_init();
+#endif
+	return 0;
+}
+
+static int __devexit pcmcia_remove(struct device *dev)
+{
+	struct sa1111_dev *sadev = SA1111_DEV(dev);
+
+#ifdef CONFIG_SA1100_ADSBITSY
+	pcmcia_adsbitsy_exit();
+#endif
+#ifdef CONFIG_SA1100_BADGE4
+	pcmcia_badge4_exit();
+#endif
+#ifdef CONFIG_SA1100_GRAPHICSMASTER
+	pcmcia_graphicsmaster_exit();
+#endif
+#ifdef CONFIG_SA1100_JORNADA720
+	pcmcia_jornada720_exit();
+#endif
+#ifdef CONFIG_ASSABET_NEPONSET
+	pcmcia_neponset_exit();
+#endif
+#ifdef CONFIG_SA1100_PFS168
+	pcmcia_pfs_exit();
+#endif
+#ifdef CONFIG_SA1100_PT_SYSTEM3
+	pcmcia_system3_exit();
+#endif
+#ifdef CONFIG_SA1100_XP860
+	pcmcia_xp860_exit();
+#endif
+
+	release_mem_region(sadev->res.start, 512);
+	pcmcia = NULL;
+
+	return 0;
+}
+
+static int pcmcia_suspend(struct device *dev, u32 state, u32 level)
+{
+	return 0;
+}
+
+static int pcmcia_resume(struct device *dev, u32 level)
+{
+	return 0;
+}
+
+static struct sa1111_driver pcmcia_driver = {
+	.drv = {
+		.name		= "SA1111 PCMCIA",
+		.bus		= &sa1111_bus_type,
+		.probe		= pcmcia_probe,
+		.remove		= __devexit_p(pcmcia_remove),
+		.suspend	= pcmcia_suspend,
+		.resume		= pcmcia_resume,
+	},
+	.devid			= SA1111_DEVID_PCMCIA,
+};
+
+static int __init sa1111_drv_pcmcia_init(void)
+{
+	return driver_register(&pcmcia_driver.drv);
+}
+
+static void __exit sa1111_drv_pcmcia_exit(void)
+{
+	remove_driver(&pcmcia_driver.drv);
+}
+
+module_init(sa1111_drv_pcmcia_init);
+module_exit(sa1111_drv_pcmcia_exit);
+
+MODULE_DESCRIPTION("SA1111 PCMCIA card socket driver");
+MODULE_LICENSE("GPL");

drivers/usb/host/ohci-sa1111.c

@@ -25,7 +25,7 @@
 
 /*-------------------------------------------------------------------------*/
 
-static void sa1111_start_hc(void)
+static void sa1111_start_hc(struct sa1111_dev *dev)
 {
 	unsigned int usb_rst = 0;
 
@@ -48,31 +48,35 @@ static void sa1111_start_hc(void)
 	 * Configure the power sense and control lines.  Place the USB
 	 * host controller in reset.
 	 */
-	USB_RESET = usb_rst | USB_RESET_FORCEIFRESET | USB_RESET_FORCEHCRESET;
+	sa1111_writel(usb_rst | USB_RESET_FORCEIFRESET | USB_RESET_FORCEHCRESET,
+		      dev->mapbase + SA1111_USB_RESET);
 
 	/*
 	 * Now, carefully enable the USB clock, and take
 	 * the USB host controller out of reset.
 	 */
-	SKPCR |= SKPCR_UCLKEN;
+	sa1111_enable_device(dev);
 	udelay(11);
-	USB_RESET = usb_rst;
+	sa1111_writel(usb_rst, dev->mapbase + SA1111_USB_RESET);
 }
 
-static void sa1111_stop_hc(void)
+static void sa1111_stop_hc(struct sa1111_dev *dev)
 {
+	unsigned int usb_rst;
 	printk(KERN_DEBUG __FILE__ 
 	       ": stopping SA-1111 OHCI USB Controller\n");
 
 	/*
 	 * Put the USB host controller into reset.
 	 */
-	USB_RESET |= USB_RESET_FORCEIFRESET | USB_RESET_FORCEHCRESET;
+	usb_rst = sa1111_readl(dev->mapbase + SA1111_USB_RESET);
+	sa1111_writel(usb_rst | USB_RESET_FORCEIFRESET | USB_RESET_FORCEHCRESET,
+		      dev->mapbase + SA1111_USB_RESET);
 
 	/*
 	 * Stop the USB clock.
 	 */
-	SKPCR &= ~SKPCR_UCLKEN;
+	sa1111_disable_device(dev);
 
 #ifdef CONFIG_SA1100_BADGE4
 	if (machine_is_badge4()) {
@@ -86,9 +90,9 @@ static void sa1111_stop_hc(void)
 /*-------------------------------------------------------------------------*/
 
 #if 0
-static void dump_hci_status(const char *label)
+static void dump_hci_status(struct usb_hcd *hcd, const char *label)
 {
-	unsigned long status = USB_STATUS; 
+	unsigned long status = sa1111_readl(hcd->regs + SA1111_USB_STATUS);
 
 	dbg ("%s USB_STATUS = { %s%s%s%s%s}", label,
 	     ((status & USB_STATUS_IRQHCIRMTWKUP) ? "IRQHCIRMTWKUP " : ""),
@@ -101,11 +105,14 @@ static void dump_hci_status(const char *label)
 
 static void usb_hcd_sa1111_hcim_irq (int irq, void *__hcd, struct pt_regs * r)
 {
-	//dump_hci_status("irq");
+	struct usb_hcd *hcd = __hcd;
+//	unsigned long status = sa1111_readl(hcd->regs + SA1111_USB_STATUS);
+
+	//dump_hci_status(hcd, "irq");
 
 #if 0
 	/* may work better this way -- need to investigate further */
-	if (USB_STATUS & USB_STATUS_NIRQHCIM) {
+	if (status & USB_STATUS_NIRQHCIM) {
 		//dbg ("not normal HC interrupt; ignoring");
 		return;
 	}
@@ -116,7 +123,7 @@ static void usb_hcd_sa1111_hcim_irq (int irq, void *__hcd, struct pt_regs * r)
 
 /*-------------------------------------------------------------------------*/
 
-void usb_hcd_sa1111_remove (struct usb_hcd *);
+void usb_hcd_sa1111_remove (struct usb_hcd *, struct sa1111_dev *);
 
 /* configure so an HC device and id are always provided */
 /* always called with process context; sleeping is OK */
@@ -132,21 +139,20 @@ void usb_hcd_sa1111_remove (struct usb_hcd *);
  *
  * Store this function in the HCD's struct pci_driver as probe().
  */
-int usb_hcd_sa1111_probe (const struct hc_driver *driver, struct usb_hcd **hcd_out)
+int usb_hcd_sa1111_probe (const struct hc_driver *driver,
+			  struct usb_hcd **hcd_out,
+			  struct sa1111_dev *dev)
 {
 	int retval;
 	struct usb_hcd *hcd = 0;
 
-	if (!sa1111)
-		return -ENODEV;
-
-	if (!request_mem_region(_USB_OHCI_OP_BASE, 
-				_USB_EXTENT, hcd_name)) {
+	if (!request_mem_region(dev->res.start, 
+				dev->res.end - dev->res.start + 1, hcd_name)) {
 		dbg("request_mem_region failed");
 		return -EBUSY;
 	}
 
-	sa1111_start_hc();
+	sa1111_start_hc(dev);
 
 	hcd = driver->hcd_alloc ();
 	if (hcd == NULL){
@@ -157,9 +163,10 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver, struct usb_hcd **hcd_o
 
 	hcd->driver = (struct hc_driver *) driver;
 	hcd->description = driver->description;
-	hcd->irq = NIRQHCIM;
-	hcd->regs = (void *) &USB_OHCI_OP_BASE;
+	hcd->irq = dev->irq[1];
+	hcd->regs = dev->mapbase;
 	hcd->pdev = SA1111_FAKE_PCIDEV;
+	hcd->parent = &dev->dev;
 
 	retval = hcd_buffer_create (hcd);
 	if (retval != 0) {
@@ -167,8 +174,8 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver, struct usb_hcd **hcd_o
 		goto err1;
 	}
 
-	set_irq_type(NIRQHCIM, IRQT_RISING);
-	retval = request_irq (NIRQHCIM, usb_hcd_sa1111_hcim_irq, SA_INTERRUPT,
+	set_irq_type(hcd->irq, IRQT_RISING);
+	retval = request_irq (hcd->irq, usb_hcd_sa1111_hcim_irq, SA_INTERRUPT,
 			      hcd->description, hcd);
 	if (retval != 0) {
 		dbg("request_irq failed");
@@ -191,7 +198,7 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver, struct usb_hcd **hcd_o
 
 	if ((retval = driver->start (hcd)) < 0) 
 	{
-		usb_hcd_sa1111_remove(hcd);
+		usb_hcd_sa1111_remove(hcd, dev);
 		return retval;
 	}
 
@@ -202,8 +209,8 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver, struct usb_hcd **hcd_o
 	hcd_buffer_destroy (hcd);
 	if (hcd) driver->hcd_free(hcd);
  err1:
-	sa1111_stop_hc();
-	release_mem_region(_USB_OHCI_OP_BASE, _USB_EXTENT);
+	sa1111_stop_hc(dev);
+	release_mem_region(dev->res.start, dev->res.end - dev->res.start + 1);
 	return retval;
 }
 
@@ -221,7 +228,7 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver, struct usb_hcd **hcd_o
  * context, normally "rmmod", "apmd", or something similar.
  *
  */
-void usb_hcd_sa1111_remove (struct usb_hcd *hcd)
+void usb_hcd_sa1111_remove (struct usb_hcd *hcd, struct sa1111_dev *dev)
 {
 	struct usb_device	*hub;
 	void *base;
@@ -244,13 +251,13 @@ void usb_hcd_sa1111_remove (struct usb_hcd *hcd)
 
 	usb_deregister_bus (&hcd->self);
 	if (atomic_read (&hcd->self.refcnt) != 1)
-		err (__FUNCTION__ ": %s, count != 1", hcd->self.bus_name);
+		err ("%s: %s, count != 1", __FUNCTION__, hcd->self.bus_name);
 
 	base = hcd->regs;
 	hcd->driver->hcd_free (hcd);
 
-	sa1111_stop_hc();
-	release_mem_region(_USB_OHCI_OP_BASE, _USB_EXTENT);
+	sa1111_stop_hc(dev);
+	release_mem_region(dev->res.start, dev->res.end - dev->res.start + 1);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -275,7 +282,7 @@ ohci_sa1111_start (struct usb_hcd *hcd)
 	}
 	ohci->regs = hcd->regs;
 
-	ohci->parent_dev = &sa1111->dev;
+	ohci->parent_dev = hcd->parent;
 
 	if (hc_reset (ohci) < 0) {
 		ohci_stop (hcd);
@@ -342,8 +349,53 @@ static const struct hc_driver ohci_sa1111_hc_driver = {
 
 /*-------------------------------------------------------------------------*/
 
-/* Only one SA-1111 ever exists. */
-static struct usb_hcd *the_sa1111_hcd;
+static int ohci_hcd_sa1111_drv_probe(struct device *_dev)
+{
+	struct sa1111_dev *dev = SA1111_DEV(_dev);
+	struct usb_hcd *hcd = NULL;
+	int ret;
+
+	ret = usb_hcd_sa1111_probe(&ohci_sa1111_hc_driver, &hcd, dev);
+
+	if (ret == 0)
+		dev->dev.driver_data = hcd;
+
+	return ret;
+}
+
+static int ohci_hcd_sa1111_drv_remove(struct device *_dev)
+{
+	struct sa1111_dev *dev = SA1111_DEV(_dev);
+	struct usb_hcd *hcd = dev->dev.driver_data;
+
+	usb_hcd_sa1111_remove(hcd, dev);
+
+	dev->dev.driver_data = NULL;
+
+	return 0;
+}
+
+static int ohci_hcd_sa1111_drv_suspend(struct device *dev, u32 state, u32 level)
+{
+	return 0;
+}
+
+static int ohci_hcd_sa1111_drv_resume(struct device *dev, u32 level)
+{
+	return 0;
+}
+
+static struct sa1111_driver ohci_hcd_sa1111_driver = {
+	.drv = {
+		.name		= "SA1111 OHCI",
+		.bus		= &sa1111_bus_type,
+		.probe		= ohci_hcd_sa1111_drv_probe,
+		.remove		= ohci_hcd_sa1111_drv_remove,
+		.suspend	= ohci_hcd_sa1111_drv_suspend,
+		.resume		= ohci_hcd_sa1111_drv_resume,
+	},
+	.devid			= SA1111_DEVID_USB,
+};
 
 static int __init ohci_hcd_sa1111_init (void)
 {
@@ -351,17 +403,13 @@ static int __init ohci_hcd_sa1111_init (void)
 	dbg ("block sizes: ed %d td %d",
 		sizeof (struct ed), sizeof (struct td));
 
-	the_sa1111_hcd = 0;
-	return usb_hcd_sa1111_probe(&ohci_sa1111_hc_driver, &the_sa1111_hcd);
+	return driver_register(&ohci_hcd_sa1111_driver.drv);
 }
-module_init (ohci_hcd_sa1111_init);
-
 
 static void __exit ohci_hcd_sa1111_cleanup (void)
 {
-	if (the_sa1111_hcd) {
-		usb_hcd_sa1111_remove(the_sa1111_hcd);
-		the_sa1111_hcd = 0;
-	}
+	remove_driver(&ohci_hcd_sa1111_driver.drv);
 }
+
+module_init (ohci_hcd_sa1111_init);
 module_exit (ohci_hcd_sa1111_cleanup);

include/asm-arm/hardware/sa1111.h

@@ -64,18 +64,10 @@
 #define SA1111_SMCR	0x0004
 #define SA1111_SKID	0x0008
 
-#define _SBI_SKCR	_SA1111(SA1111_SKCR)
-#define _SBI_SMCR	_SA1111(SA1111_SMCR)
-#define _SBI_SKID	_SA1111(SA1111_SKID)
-
-#if LANGUAGE == C
-
 #define SBI_SKCR	__CCREG(SA1111_SKCR)
 #define SBI_SMCR	__CCREG(SA1111_SMCR)
 #define SBI_SKID	__CCREG(SA1111_SKID)
 
-#endif  /* LANGUAGE == C */
-
 #define SKCR_PLL_BYPASS	(1<<0)
 #define SKCR_RCLKEN	(1<<1)
 #define SKCR_SLEEP	(1<<2)
@@ -135,22 +127,10 @@
 #define SA1111_SKPMC	0x020c
 #define SA1111_SKPTC	0x0210
 #define SA1111_SKPEN0	0x0214
-#define SA1111_SKPWN0	0x0218
+#define SA1111_SKPWM0	0x0218
 #define SA1111_SKPEN1	0x021c
 #define SA1111_SKPWM1	0x0220
 
-#define _SKPCR		_SA1111(SA1111_SKPCR)
-#define _SKCDR		_SA1111(SA1111_SKCDR)
-#define _SKAUD		_SA1111(SA1111_SKAUD)
-#define _SKPMC		_SA1111(SA1111_SKPMC)
-#define _SKPTC		_SA1111(SA1111_SKPTC)
-#define _SKPEN0		_SA1111(SA1111_SKPEN0)
-#define _SKPWM0		_SA1111(SA1111_SKPWM0)
-#define _SKPEN1		_SA1111(SA1111_SKPEN1)
-#define _SKPWM1		_SA1111(SA1111_SKPWM1)
-
-#if LANGUAGE == C
-
 #define SKPCR		__CCREG(SA1111_SKPCR)
 #define SKCDR		__CCREG(SA1111_SKCDR)
 #define SKAUD		__CCREG(SA1111_SKAUD)
@@ -161,8 +141,6 @@
 #define SKPEN1		__CCREG(SA1111_SKPEN1)
 #define SKPWM1		__CCREG(SA1111_SKPWM1)
 
-#endif  /* LANGUAGE == C */
-
 #define SKPCR_UCLKEN	(1<<0)
 #define SKPCR_ACCLKEN	(1<<1)
 #define SKPCR_I2SCLKEN	(1<<2)
@@ -176,21 +154,14 @@
 /*
  * USB Host controller
  */
-#define _USB_OHCI_OP_BASE	_SA1111( 0x400 )
-#define _USB_STATUS		_SA1111( 0x518 )
-#define _USB_RESET		_SA1111( 0x51c )
-#define _USB_INTERRUPTEST	_SA1111( 0x520 )
-
-#define _USB_EXTENT		(_USB_INTERRUPTEST - _USB_OHCI_OP_BASE + 4)
+#define SA1111_USB		0x0400
 
-#if LANGUAGE == C
-
-#define USB_OHCI_OP_BASE	__CCREG(0x0400)
-#define USB_STATUS		__CCREG(0x0518)
-#define USB_RESET		__CCREG(0x051c)
-#define USB_INTERRUPTEST	__CCReG(0x0520)
-
-#endif  /* LANGUAGE == C */
+/*
+ * Offsets from SA1111_USB_BASE
+ */
+#define SA1111_USB_STATUS	0x0118
+#define SA1111_USB_RESET	0x011c
+#define SA1111_USB_IRQTEST	0x0120
 
 #define USB_RESET_FORCEIFRESET	(1 << 0)
 #define USB_RESET_FORCEHCRESET	(1 << 1)
@@ -451,82 +422,56 @@
  *    WAKE_POL0		Wake-up polarity selection 0
  *    WAKE_POL1		Wake-up polarity selection 1
  */
+#define SA1111_INTC		0x1600
 
-#define SA1111_INTTEST0		0x1600
-#define SA1111_INTTEST1		0x1604
-#define SA1111_INTEN0		0x1608
-#define SA1111_INTEN1		0x160c
-#define SA1111_INTPOL0		0x1610
-#define SA1111_INTPOL1		0x1614
-#define SA1111_INTTSTSEL	0x1618
-#define SA1111_INTSTATCLR0	0x161c
-#define SA1111_INTSTATCLR1	0x1620
-#define SA1111_INTSET0		0x1624
-#define SA1111_INTSET1		0x1628
-#define SA1111_WAKE_EN0		0x162c
-#define SA1111_WAKE_EN1		0x1630
-#define SA1111_WAKE_POL0	0x1634
-#define SA1111_WAKE_POL1	0x1638
-
-#define _INTTEST0	_SA1111(SA1111_INTTEST0)
-#define _INTTEST1	_SA1111(SA1111_INTTEST1)
-#define _INTEN0		_SA1111(SA1111_INTEN0)
-#define _INTEN1		_SA1111(SA1111_INTEN1)
-#define _INTPOL0	_SA1111(SA1111_INTPOL0)
-#define _INTPOL1	_SA1111(SA1111_INTPOL1)
-#define _INTTSTSEL	_SA1111(SA1111_INTTSTSEL)
-#define _INTSTATCLR0	_SA1111(SA1111_INTSTATCLR0)
-#define _INTSTATCLR1	_SA1111(SA1111_INTSTATCLR1)
-#define _INTSET0	_SA1111(SA1111_INTSET0)
-#define _INTSET1	_SA1111(SA1111_INTSET1)
-#define _WAKE_EN0	_SA1111(SA1111_WAKE_EN0)
-#define _WAKE_EN1	_SA1111(SA1111_WAKE_EN1)
-#define _WAKE_POL0	_SA1111(SA1111_WAKE_POL0)
-#define _WAKE_POL1	_SA1111(SA1111_WAKE_POL1)
-
-#if LANGUAGE == C
-
-#define INTTEST0	__CCREG(SA1111_INTTEST0)
-#define INTTEST1	__CCREG(SA1111_INTTEST1)
-#define INTEN0		__CCREG(SA1111_INTEN0)
-#define INTEN1		__CCREG(SA1111_INTEN1)
-#define INTPOL0		__CCREG(SA1111_INTPOL0)
-#define INTPOL1		__CCREG(SA1111_INTPOL1)
-#define INTTSTSEL	__CCREG(SA1111_INTTSTSEL)
-#define INTSTATCLR0	__CCREG(SA1111_INTSTATCLR0)
-#define INTSTATCLR1	__CCREG(SA1111_INTSTATCLR1)
-#define INTSET0		__CCREG(SA1111_INTSET0)
-#define INTSET1		__CCREG(SA1111_INTSET1)
-#define WAKE_EN0	__CCREG(SA1111_WAKE_EN0)
-#define WAKE_EN1	__CCREG(SA1111_WAKE_EN1)
-#define WAKE_POL0	__CCREG(SA1111_WAKE_POL0)
-#define WAKE_POL1	__CCREG(SA1111_WAKE_POL1)
-
-#endif  /* LANGUAGE == C */
+/*
+ * These are offsets from the above base.
+ */
+#define SA1111_INTTEST0		0x0000
+#define SA1111_INTTEST1		0x0004
+#define SA1111_INTEN0		0x0008
+#define SA1111_INTEN1		0x000c
+#define SA1111_INTPOL0		0x0010
+#define SA1111_INTPOL1		0x0014
+#define SA1111_INTTSTSEL	0x0018
+#define SA1111_INTSTATCLR0	0x001c
+#define SA1111_INTSTATCLR1	0x0020
+#define SA1111_INTSET0		0x0024
+#define SA1111_INTSET1		0x0028
+#define SA1111_WAKEEN0		0x002c
+#define SA1111_WAKEEN1		0x0030
+#define SA1111_WAKEPOL0		0x0034
+#define SA1111_WAKEPOL1		0x0038
+
+#define INTTEST0	__CCREG(SA1111_INTC + SA1111_INTTEST0)
+#define INTTEST1	__CCREG(SA1111_INTC + SA1111_INTTEST1)
+#define INTEN0		__CCREG(SA1111_INTC + SA1111_INTEN0)
+#define INTEN1		__CCREG(SA1111_INTC + SA1111_INTEN1)
+#define INTPOL0		__CCREG(SA1111_INTC + SA1111_INTPOL0)
+#define INTPOL1		__CCREG(SA1111_INTC + SA1111_INTPOL1)
+#define INTTSTSEL	__CCREG(SA1111_INTC + SA1111_INTTSTSEL)
+#define INTSTATCLR0	__CCREG(SA1111_INTC + SA1111_INTSTATCLR0)
+#define INTSTATCLR1	__CCREG(SA1111_INTC + SA1111_INTSTATCLR1)
+#define INTSET0		__CCREG(SA1111_INTC + SA1111_INTSET0)
+#define INTSET1		__CCREG(SA1111_INTC + SA1111_INTSET1)
+#define WAKE_EN0	__CCREG(SA1111_INTC + SA1111_WAKEEN0)
+#define WAKE_EN1	__CCREG(SA1111_INTC + SA1111_WAKEEN1)
+#define WAKE_POL0	__CCREG(SA1111_INTC + SA1111_WAKEPOL0)
+#define WAKE_POL1	__CCREG(SA1111_INTC + SA1111_WAKEPOL1)
 
 /*
  * PS/2 Trackpad and Mouse Interfaces
  *
- * Registers   (prefix kbd applies to trackpad interface, mse to mouse)
- *    KBDCR     Control Register
- *    KBDSTAT       Status Register
- *    KBDDATA       Transmit/Receive Data register
- *    KBDCLKDIV     Clock Division Register
- *    KBDPRECNT     Clock Precount Register
- *    KBDTEST1      Test register 1
- *    KBDTEST2      Test register 2
- *    KBDTEST3      Test register 3
- *    KBDTEST4      Test register 4
- *    MSECR
- *    MSESTAT
- *    MSEDATA
- *    MSECLKDIV
- *    MSEPRECNT
- *    MSETEST1
- *    MSETEST2
- *    MSETEST3
- *    MSETEST4
- *
+ * Registers
+ *    PS2CR		Control Register
+ *    PS2STAT		Status Register
+ *    PS2DATA		Transmit/Receive Data register
+ *    PS2CLKDIV		Clock Division Register
+ *    PS2PRECNT		Clock Precount Register
+ *    PS2TEST1		Test register 1
+ *    PS2TEST2		Test register 2
+ *    PS2TEST3		Test register 3
+ *    PS2TEST4		Test register 4
  */
 
 #define SA1111_KBD		0x0a00
@@ -564,17 +509,14 @@
  *    PCSSR	Sleep State Register
  */
 
-#define _PCCR		_SA1111( 0x1800 )
-#define _PCSSR		_SA1111( 0x1804 )
-#define _PCSR		_SA1111( 0x1808 )
-
-#if LANGUAGE == C
-
-#define PCCR		__CCREG(0x1800)
-#define PCSSR		__CCREG(0x1804)
-#define PCSR		__CCREG(0x1808)
+#define SA1111_PCMCIA	0x1600
 
-#endif  /* LANGUAGE == C */
+/*
+ * These are offsets from the above base.
+ */
+#define SA1111_PCCR	0x0000
+#define SA1111_PCSSR	0x0004
+#define SA1111_PCSR	0x0008
 
 #define PCSR_S0_READY	(1<<0)
 #define PCSR_S1_READY	(1<<1)
@@ -603,21 +545,56 @@
 #define PCSSR_S0_SLEEP	(1<<0)
 #define PCSSR_S1_SLEEP	(1<<1)
 
-struct sa1111_device {
+
+
+
+extern struct bus_type sa1111_bus_type;
+
+#define SA1111_DEVID_SBI	0
+#define SA1111_DEVID_SK		1
+#define SA1111_DEVID_USB	2
+#define SA1111_DEVID_SAC	3
+#define SA1111_DEVID_SSP	4
+#define SA1111_DEVID_PS2	5
+#define SA1111_DEVID_GPIO	6
+#define SA1111_DEVID_INT	7
+#define SA1111_DEVID_PCMCIA	8
+
+struct sa1111_dev {
 	struct device	dev;
-	struct resource	resource;
-	void		*base;
+	unsigned int	devid;
+	struct resource	res;
+	void		*mapbase;
+	unsigned int	skpcr_mask;
+	unsigned int	irq[6];
 };
 
-extern struct sa1111_device *sa1111;
+#define SA1111_DEV(_d)	container_of((_d), struct sa1111_dev, dev)
 
-int sa1111_check_dma_bug(dma_addr_t addr);
+struct sa1111_driver {
+	struct device_driver	drv;
+	unsigned int		devid;
+};
+
+#define SA1111_DRV(_d)	container_of((_d), struct sa1111_driver, drv)
+
+#define SA1111_DRIVER_NAME(_sadev) ((_sadev)->dev.driver->name)
 
 /*
  * These frob the SKPCR register.
  */
-void sa1111_enable_device(unsigned int mask);
-void sa1111_disable_device(unsigned int mask);
+void sa1111_enable_device(struct sa1111_dev *);
+void sa1111_disable_device(struct sa1111_dev *);
+
+unsigned int sa1111_pll_clock(struct sa1111_dev *);
+
+#define SA1111_AUDIO_ACLINK	0
+#define SA1111_AUDIO_I2S	1
 
+void sa1111_select_audio_mode(struct sa1111_dev *sadev, int mode);
+int sa1111_set_audio_rate(struct sa1111_dev *sadev, int rate);
+int sa1111_get_audio_rate(struct sa1111_dev *sadev);
+
+int sa1111_check_dma_bug(dma_addr_t addr);
 
 #endif  /* _ASM_ARCH_SA1111 */