From: Matt Porter <mporter@kernel.crashing.org>

Support ochi-ppc-soc.c on IBM stb04xxx platforms

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/ppc/platforms/4xx/ibmstb4.c  |   52 +++++++++++++++++++++++++++++++++-----
 arch/ppc/platforms/4xx/ibmstb4.h  |    4 +-
 arch/ppc/platforms/4xx/redwood5.c |   13 +++++++++
 3 files changed, 61 insertions(+), 8 deletions(-)

diff -puN arch/ppc/platforms/4xx/ibmstb4.c~ppc32-add-usb-support-to-ibm-stb04xxx-platforms arch/ppc/platforms/4xx/ibmstb4.c
--- devel/arch/ppc/platforms/4xx/ibmstb4.c~ppc32-add-usb-support-to-ibm-stb04xxx-platforms	2005-08-09 14:48:31.000000000 -0700
+++ devel-akpm/arch/ppc/platforms/4xx/ibmstb4.c	2005-08-09 14:48:31.000000000 -0700
@@ -11,6 +11,7 @@
 
 #include <linux/init.h>
 #include <asm/ocp.h>
+#include <asm/ppc4xx_pic.h>
 #include <platforms/4xx/ibmstb4.h>
 
 static struct ocp_func_iic_data ibmstb4_iic0_def = {
@@ -72,12 +73,51 @@ struct ocp_def core_ocp[] __initdata = {
 	  .irq		= IDE0_IRQ,
 	  .pm		= OCP_CPM_NA,
 	},
-	{ .vendor	= OCP_VENDOR_IBM,
-	  .function	= OCP_FUNC_USB,
-	  .paddr	= USB0_BASE,
-	  .irq		= USB0_IRQ,
-	  .pm		= OCP_CPM_NA,
-	},
 	{ .vendor	= OCP_VENDOR_INVALID,
 	}
 };
+
+/* Polarity and triggering settings for internal interrupt sources */
+struct ppc4xx_uic_settings ppc4xx_core_uic_cfg[] __initdata = {
+	{ .polarity 	= 0x7fffff01,
+	  .triggering	= 0x00000000,
+	  .ext_irq_mask	= 0x0000007e,	/* IRQ0 - IRQ5 */
+	}
+};
+
+static struct resource ohci_usb_resources[] = {
+	[0] = {
+		.start	= USB0_BASE,
+		.end	= USB0_BASE + USB0_SIZE - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		.start	= USB0_IRQ,
+		.end	= USB0_IRQ,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+static u64 dma_mask = 0xffffffffULL;
+
+static struct platform_device ohci_usb_device = {
+	.name		= "ppc-soc-ohci",
+	.id		= 0,
+	.num_resources	= ARRAY_SIZE(ohci_usb_resources),
+	.resource	= ohci_usb_resources,
+	.dev		= {
+		.dma_mask = &dma_mask,
+		.coherent_dma_mask = 0xffffffffULL,
+	}
+};
+
+static struct platform_device *ibmstb4_devs[] __initdata = {
+	&ohci_usb_device,
+};
+
+static int __init
+ibmstb4_platform_add_devices(void)
+{
+	return platform_add_devices(ibmstb4_devs, ARRAY_SIZE(ibmstb4_devs));
+}
+arch_initcall(ibmstb4_platform_add_devices);
diff -puN arch/ppc/platforms/4xx/ibmstb4.h~ppc32-add-usb-support-to-ibm-stb04xxx-platforms arch/ppc/platforms/4xx/ibmstb4.h
--- devel/arch/ppc/platforms/4xx/ibmstb4.h~ppc32-add-usb-support-to-ibm-stb04xxx-platforms	2005-08-09 14:48:31.000000000 -0700
+++ devel-akpm/arch/ppc/platforms/4xx/ibmstb4.h	2005-08-09 14:48:31.000000000 -0700
@@ -73,9 +73,9 @@
 #define OPB0_BASE	0x40000000
 #define GPIO0_BASE	0x40060000
 
+#define USB0_BASE	0x40010000
+#define USB0_SIZE	0xA0
 #define USB0_IRQ	18
-#define USB0_BASE	STB04xxx_MAP_IO_ADDR(0x40010000)
-#define USB0_EXTENT 4096
 
 #define IIC_NUMS 2
 #define UART_NUMS	3
diff -puN arch/ppc/platforms/4xx/redwood5.c~ppc32-add-usb-support-to-ibm-stb04xxx-platforms arch/ppc/platforms/4xx/redwood5.c
--- devel/arch/ppc/platforms/4xx/redwood5.c~ppc32-add-usb-support-to-ibm-stb04xxx-platforms	2005-08-09 14:48:31.000000000 -0700
+++ devel-akpm/arch/ppc/platforms/4xx/redwood5.c	2005-08-09 14:48:31.000000000 -0700
@@ -18,6 +18,19 @@
 #include <linux/ioport.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
+#include <asm/ppc4xx_pic.h>
+
+/*
+ * Define external IRQ senses and polarities.
+ */
+unsigned char ppc4xx_uic_ext_irq_cfg[] __initdata = {
+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* Ext Int 0 */
+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* Ext Int 1 */
+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* Ext Int 2 */
+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* Ext Int 3 */
+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* Ext Int 4 */
+	(IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),	/* Ext Int 5 */
+};
 
 static struct resource smc91x_resources[] = {
 	[0] = {
_