From: Michael Schmitz <schmitzmic@gmail.com>
To: geert@linux-m68k.org
Cc: linux-m68k@vger.kernel.org, Michael Schmitz <schmitz@debian.org>
Subject: [PATCH 11/12] m68k/atari: USB - add platform devices for EtherNAT/NetUSBee ISP1160 HCD
Date: Sat, 30 Mar 2013 13:27:51 +1300 [thread overview]
Message-ID: <1364603272-8148-12-git-send-email-schmitz@debian.org> (raw)
In-Reply-To: <1364603272-8148-1-git-send-email-schmitz@debian.org>
Add platform devices used by the isp116x-hcd driver for EtherNAT and
NetUSBee. Note that the NetUSBee also contains a RTL8019 Ethernet chip,
so its platform device is used to cover the EtherNEC case, too.
Register definitions thanks to David Galvez <dgalvez75@gmail.com>
Signed-off-by: Michael Schmitz <schmitz@debian.org>
---
arch/m68k/atari/config.c | 131 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 126 insertions(+), 5 deletions(-)
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index fdcd875..29ffc1a 100644
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -32,6 +32,7 @@
#include <linux/delay.h>
#include <linux/ioport.h>
#include <linux/platform_device.h>
+#include <linux/usb/isp116x.h>
#include <linux/vt_kern.h>
#include <linux/module.h>
@@ -690,8 +691,70 @@ static struct platform_device smc91x_device = {
.resource = smc91x_resources,
};
+/*
+ * ISP 1160 - using the isp116x-hcd module
+ */
+
+#define ATARI_USB_PHYS_ADDR 0x80000012
+#define ATARI_USB_IRQ 139
+
+static struct resource isp1160_resources[] = {
+ [0] = {
+ .name = "isp1160-data",
+ .start = ATARI_USB_PHYS_ADDR,
+ .end = ATARI_USB_PHYS_ADDR + 0x1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .name = "isp1160-regs",
+ .start = ATARI_USB_PHYS_ADDR + 0x4,
+ .end = ATARI_USB_PHYS_ADDR + 0x5,
+ .flags = IORESOURCE_MEM,
+ },
+ [2] = {
+ .name = "isp1160-irq",
+ .start = ATARI_USB_IRQ,
+ .end = ATARI_USB_IRQ,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static void isp1160_delay(struct device *dev, int delay)
+{
+ ndelay(delay);
+}
+
+/* (DataBusWidth16|AnalogOCEnable|DREQOutputPolarity|DownstreamPort15KRSel ) */
+static struct isp116x_platform_data isp1160_platform_data = {
+ /* Enable internal resistors on downstream ports */
+ .sel15Kres = 1,
+ /* On-chip overcurrent protection */
+ .oc_enable = 1,
+ /* INT output polarity */
+ .int_act_high = 1,
+ /* INT edge or level triggered */
+ .int_edge_triggered = 0,
+
+ /* WAKEUP pin connected - NOT SUPPORTED */
+ /* .remote_wakeup_connected = 0, */
+ /* Wakeup by devices on usb bus enabled */
+ .remote_wakeup_enable = 0,
+ .delay = isp1160_delay,
+};
+
+static struct platform_device isp1160_device = {
+ .name = "isp116x-hcd",
+ .id = 0,
+ .num_resources = ARRAY_SIZE(isp1160_resources),
+ .resource = isp1160_resources,
+ .dev = {
+ .platform_data = &isp1160_platform_data,
+ },
+};
+
static struct platform_device *atari_ethernat_devices[] __initdata = {
- &smc91x_device
+ &smc91x_device,
+ &isp1160_device
};
/*
@@ -725,8 +788,66 @@ static struct platform_device rtl8019_device = {
.resource = rtl8019_resources,
};
-static struct platform_device *atari_ethernec_devices[] __initdata = {
- &rtl8019_device
+/*
+ * NetUSBee: ISP1160 USB host adapter via ROM-port adapter
+ */
+
+#define ATARI_NETUSBEE_PHYS_ADDR 0xfffa8000
+#define ATARI_NETUSBEE_BASE 0x340
+#define ATARI_NETUSBEE_IRQ IRQ_MFP_TIMER2
+
+static struct resource netusbee_resources[] = {
+ [0] = {
+ .name = "isp1160-data",
+ .start = ATARI_NETUSBEE_BASE,
+ .end = ATARI_NETUSBEE_BASE + 0x1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .name = "isp1160-regs",
+ .start = ATARI_NETUSBEE_BASE + 0x20,
+ .end = ATARI_NETUSBEE_BASE + 0x21,
+ .flags = IORESOURCE_MEM,
+ },
+ [2] = {
+ .name = "isp1160-irq",
+ .start = ATARI_NETUSBEE_IRQ,
+ .end = ATARI_NETUSBEE_IRQ,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+/* (DataBusWidth16|AnalogOCEnable|DREQOutputPolarity|DownstreamPort15KRSel ) */
+static struct isp116x_platform_data netusbee_platform_data = {
+ /* Enable internal resistors on downstream ports */
+ .sel15Kres = 1,
+ /* On-chip overcurrent protection */
+ .oc_enable = 1,
+ /* INT output polarity */
+ .int_act_high = 1,
+ /* INT edge or level triggered */
+ .int_edge_triggered = 0,
+
+ /* WAKEUP pin connected - NOT SUPPORTED */
+ /* .remote_wakeup_connected = 0, */
+ /* Wakeup by devices on usb bus enabled */
+ .remote_wakeup_enable = 0,
+ .delay = isp1160_delay,
+};
+
+static struct platform_device netusbee_device = {
+ .name = "isp116x-hcd",
+ .id = 1,
+ .num_resources = ARRAY_SIZE(netusbee_resources),
+ .resource = netusbee_resources,
+ .dev = {
+ .platform_data = &netusbee_platform_data,
+ },
+};
+
+static struct platform_device *atari_netusbee_devices[] __initdata = {
+ &rtl8019_device,
+ &netusbee_device
};
int __init atari_platform_init(void)
@@ -754,8 +875,8 @@ int __init atari_platform_init(void)
unsigned char *enec_virt;
enec_virt = (unsigned char *)ioremap((ATARI_ETHERNEC_PHYS_ADDR), 0xf);
if (hwreg_present(enec_virt)) {
- error = platform_add_devices(atari_ethernec_devices,
- ARRAY_SIZE(atari_ethernec_devices));
+ error = platform_add_devices(atari_netusbee_devices,
+ ARRAY_SIZE(atari_netusbee_devices));
if (error && !rv)
rv = error;
}
--
1.7.0.4
next prev parent reply other threads:[~2013-03-30 0:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-30 0:27 Atari Ethernet/USB paches for m68k-queue and upstream, refactored timer D interrupt patch Michael Schmitz
2013-03-30 0:27 ` [PATCH 01/12] m68k/atari: ROM port ISA adapter support Michael Schmitz
2013-03-30 0:27 ` [PATCH 02/12] m68k/irq: Add handle_polled_irq() for timer based soft interrupts Michael Schmitz
2013-03-30 0:27 ` [PATCH 03/12] m68k/atari: use dedicated irq_chip for timer D interrupts Michael Schmitz
2013-03-30 0:27 ` [PATCH 04/12] m68k/atari: use polled interrupt handler " Michael Schmitz
2013-03-30 0:27 ` [PATCH 05/12] m68k/atari: EtherNAT - platform device and IRQ support code Michael Schmitz
2013-03-30 0:27 ` [PATCH 06/12] m68k/atari: EtherNEC - add platform device support Michael Schmitz
2013-03-30 0:27 ` [PATCH 07/12] m68k/atari: EtherNAT - ethernet support - new driver (smc91x) Michael Schmitz
2013-03-30 0:27 ` [PATCH 08/12] m68k/atari: EtherNEC - ethernet support - new driver (ne.c) Michael Schmitz
2013-03-30 0:27 ` [PATCH 09/12] m68k/atari: EtherNAT - add interrupt chip definition for CPLD interrupts Michael Schmitz
2013-03-30 0:27 ` [PATCH 10/12] m68k: Implement ndelay() based on the existing udelay() logic Michael Schmitz
2013-03-30 0:27 ` Michael Schmitz [this message]
2013-03-30 0:27 ` [PATCH 12/12] m68k/atari: USB - add ISP1160 USB host controller support Michael Schmitz
-- strict thread matches above, loose matches on Subject: below --
2013-04-06 0:26 [PATCH 0/13] Atari EtherNAT/EtherNEC/NetUSBee support Michael Schmitz
2013-04-06 0:26 ` [PATCH 11/12] m68k/atari: USB - add platform devices for EtherNAT/NetUSBee ISP1160 HCD Michael Schmitz
2013-08-26 10:18 ` Geert Uytterhoeven
2013-09-04 12:26 ` Michael Schmitz
2013-09-04 13:23 ` Geert Uytterhoeven
2013-09-07 11:48 ` Michael Schmitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364603272-8148-12-git-send-email-schmitz@debian.org \
--to=schmitzmic@gmail.com \
--cc=geert@linux-m68k.org \
--cc=linux-m68k@vger.kernel.org \
--cc=schmitz@debian.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox