[PATCH 0/3] [IrDA] Updates for 2.6.23-rc1

[PATCH 0/3] [IrDA] Updates for 2.6.23-rc1

[samuel]

Hi Dave,

Here go 3 minor IrDA patches that could hopefully make it to the merge window.

Cheers,
Samuel.

[PATCH 1/3] [IrDA] Typo fix in irnetlink.c copyright

[samuel]

[-- Attachment #1: patch_irnetlink_email --]
[-- Type: text/plain, Size: 601 bytes --]

Signed-off-by: Samuel Ortiz <samuel@sortiz.org>

Index: net-2.6-quilt/net/irda/irnetlink.c
===================================================================
--- net-2.6-quilt.orig/net/irda/irnetlink.c	2007-07-21 02:41:24.000000000 +0300
+++ net-2.6-quilt/net/irda/irnetlink.c	2007-07-21 02:43:00.000000000 +0300
@@ -1,7 +1,7 @@
 /*
  * IrDA netlink layer, for stack configuration.
  *
- * Copyright (c) 2007 Samuel Ortiz <samuel@sortiz>
+ * Copyright (c) 2007 Samuel Ortiz <samuel@sortiz.org>
  *
  * Partly based on the 802.11 nelink implementation
  * (see net/wireless/nl80211.c) which is:

-- 

Re: [PATCH 1/3] [IrDA] Typo fix in irnetlink.c copyright

[David Miller]

From: samuel-jcdQHdrhKHMdnm+yROfE0A@public.gmane.org
Date: Sat, 21 Jul 2007 11:13:05 +0300

> Signed-off-by: Samuel Ortiz <samuel-jcdQHdrhKHMdnm+yROfE0A@public.gmane.org>

Applied.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/

[PATCH 2/3] [IrDA] EP7211 IR driver port to the latest SIR API

[samuel-jcdQHdrhKHMdnm+yROfE0A]

[-- Attachment #1: 0001-IrDA-EP7211-IR-driver-port-to-the-latest-SIR-API.patch --]
[-- Type: text/plain, Size: 4782 bytes --]

The EP7211 SIR driver was the only one left without a new SIR API port.

Signed-off-by: Samuel Ortiz <samuel-jcdQHdrhKHMdnm+yROfE0A@public.gmane.org>
---
 drivers/net/irda/Kconfig      |    9 ++++
 drivers/net/irda/Makefile     |    1 +
 drivers/net/irda/ep7211-sir.c |   89 +++++++++++++++++++++++++++++++++++++++++
 include/linux/irda.h          |    1 +
 4 files changed, 100 insertions(+), 0 deletions(-)
 create mode 100644 drivers/net/irda/ep7211-sir.c

Index: net-2.6-quilt/drivers/net/irda/Kconfig
===================================================================
--- net-2.6-quilt.orig/drivers/net/irda/Kconfig	2007-07-21 02:39:53.000000000 +0300
+++ net-2.6-quilt/drivers/net/irda/Kconfig	2007-07-21 02:39:59.000000000 +0300
@@ -155,6 +155,15 @@
 	  To compile it as a module, choose M here: the module will be called
 	  kingsun-sir.
 
+config EP7211_DONGLE
+	tristate "EP7211 I/R support"
+	depends on IRTTY_SIR && ARCH_EP7211 && IRDA && EXPERIMENTAL
+	help
+	  Say Y here if you want to build support for the Cirrus logic
+	  EP7211 chipset's infrared module.
+
+
+
 comment "Old SIR device drivers"
 
 config IRPORT_SIR
Index: net-2.6-quilt/drivers/net/irda/Makefile
===================================================================
--- net-2.6-quilt.orig/drivers/net/irda/Makefile	2007-07-21 02:39:53.000000000 +0300
+++ net-2.6-quilt/drivers/net/irda/Makefile	2007-07-21 02:39:59.000000000 +0300
@@ -45,6 +45,7 @@
 obj-$(CONFIG_ACT200L_DONGLE)	+= act200l-sir.o
 obj-$(CONFIG_MA600_DONGLE)	+= ma600-sir.o
 obj-$(CONFIG_TOIM3232_DONGLE)	+= toim3232-sir.o
+obj-$(CONFIG_EP7211_DONGLE)	+= ep7211-sir.o
 obj-$(CONFIG_KINGSUN_DONGLE)	+= kingsun-sir.o
 
 # The SIR helper module
Index: net-2.6-quilt/drivers/net/irda/ep7211-sir.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ net-2.6-quilt/drivers/net/irda/ep7211-sir.c	2007-07-21 02:39:59.000000000 +0300
@@ -0,0 +1,89 @@
+/*
+ * IR port driver for the Cirrus Logic EP7211 processor.
+ *
+ * Copyright 2001, Blue Mug Inc.  All rights reserved.
+ * Copyright 2007, Samuel Ortiz <samuel-jcdQHdrhKHMdnm+yROfE0A@public.gmane.org>
+ */
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/tty.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+
+#include <net/irda/irda.h>
+#include <net/irda/irda_device.h>
+
+#include <asm/io.h>
+#include <asm/hardware.h>
+
+#include "sir-dev.h"
+
+#define MIN_DELAY 25      /* 15 us, but wait a little more to be sure */
+#define MAX_DELAY 10000   /* 1 ms */
+
+static int ep7211_open(struct sir_dev *dev);
+static int ep7211_close(struct sir_dev *dev);
+static int ep7211_change_speed(struct sir_dev *dev, unsigned speed);
+static int ep7211_reset(struct sir_dev *dev);
+
+static struct dongle_driver ep7211 = {
+	.owner		= THIS_MODULE,
+	.driver_name	= "EP7211 IR driver",
+	.type		= IRDA_EP7211_DONGLE,
+	.open		= ep7211_open,
+	.close		= ep7211_close,
+	.reset		= ep7211_reset,
+	.set_speed	= ep7211_change_speed,
+};
+
+static int __init ep7211_sir_init(void)
+{
+	return irda_register_dongle(&ep7211);
+}
+
+static void __exit ep7211_sir_cleanup(void)
+{
+	irda_unregister_dongle(&ep7211);
+}
+
+static int ep7211_open(struct sir_dev *dev)
+{
+	unsigned int syscon;
+
+	/* Turn on the SIR encoder. */
+	syscon = clps_readl(SYSCON1);
+	syscon |= SYSCON1_SIREN;
+	clps_writel(syscon, SYSCON1);
+
+	return 0;
+}
+
+static int ep7211_close(struct sir_dev *dev)
+{
+	unsigned int syscon;
+
+	/* Turn off the SIR encoder. */
+	syscon = clps_readl(SYSCON1);
+	syscon &= ~SYSCON1_SIREN;
+	clps_writel(syscon, SYSCON1);
+
+	return 0;
+}
+
+static int ep7211_change_speed(struct sir_dev *dev, unsigned speed)
+{
+	return 0;
+}
+
+static int ep7211_reset(struct sir_dev *dev)
+{
+	return 0;
+}
+
+MODULE_AUTHOR("Samuel Ortiz <samuel-jcdQHdrhKHMdnm+yROfE0A@public.gmane.org>");
+MODULE_DESCRIPTION("EP7211 IR dongle driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("irda-dongle-13"); /* IRDA_EP7211_DONGLE */
+
+module_init(ep7211_sir_init);
+module_exit(ep7211_sir_cleanup);
Index: net-2.6-quilt/include/linux/irda.h
===================================================================
--- net-2.6-quilt.orig/include/linux/irda.h	2007-07-21 02:39:53.000000000 +0300
+++ net-2.6-quilt/include/linux/irda.h	2007-07-21 02:39:59.000000000 +0300
@@ -77,6 +77,7 @@
 	IRDA_ACT200L_DONGLE      = 10,
 	IRDA_MA600_DONGLE        = 11,
 	IRDA_TOIM3232_DONGLE     = 12,
+	IRDA_EP7211_DONGLE       = 13,
 } IRDA_DONGLE;
 
 /* Protocol types to be used for SOCK_DGRAM */

-- 


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: [PATCH 2/3] [IrDA] EP7211 IR driver port to the latest SIR API

[David Miller]

From: samuel@sortiz.org
Date: Sat, 21 Jul 2007 11:13:06 +0300

> The EP7211 SIR driver was the only one left without a new SIR API port.
> 
> Signed-off-by: Samuel Ortiz <samuel@sortiz.org>

Applied.

[PATCH 3/3] [IrDA] TOSHIBA_FIR depends on virt_to_bus

[samuel-jcdQHdrhKHMdnm+yROfE0A]

[-- Attachment #1: patch_fir_tosh --]
[-- Type: text/plain, Size: 1316 bytes --]

From: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>

Signed-off-by: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Signed-off-by: Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
Signed-off-by: Samuel Ortiz <samuel-jcdQHdrhKHMdnm+yROfE0A@public.gmane.org>
---
 drivers/net/irda/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-- 
Cheers,
Stephen Rothwell                    sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org

Index: net-2.6-quilt/drivers/net/irda/Kconfig
===================================================================
--- net-2.6-quilt.orig/drivers/net/irda/Kconfig	2007-07-21 02:40:48.000000000 +0300
+++ net-2.6-quilt/drivers/net/irda/Kconfig	2007-07-21 02:40:48.000000000 +0300
@@ -364,7 +364,7 @@
 
 config TOSHIBA_FIR
 	tristate "Toshiba Type-O IR Port"
-	depends on IRDA && PCI && !64BIT
+	depends on IRDA && PCI && !64BIT && VIRT_TO_BUS
 	help
 	  Say Y here if you want to build support for the Toshiba Type-O IR
 	  and Donau oboe chipsets. These chipsets are used by the Toshiba

-- 


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: [PATCH 3/3] [IrDA] TOSHIBA_FIR depends on virt_to_bus

[David Miller]

From: samuel@sortiz.org
Date: Sat, 21 Jul 2007 11:13:07 +0300

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Samuel Ortiz <samuel@sortiz.org>

Also applied, thanks.