From 065f8f9a1f861a12f8276b3c891aef3d239ab948 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Tue, 25 Dec 2007 12:18:42 +0000
Subject: make ifxmips gpio a platform device
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9922 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
.../linux/ifxmips/files/arch/mips/ifxmips/board.c | 9 ++++
.../ifxmips/files/drivers/char/ifxmips_gpio.c | 51 +++++++++++++++++-----
2 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/board.c b/target/linux/ifxmips/files/arch/mips/ifxmips/board.c
index 017a8a62b7..8f3e166eb2 100644
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/board.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/board.c
@@ -46,6 +46,14 @@ static struct platform_device ifxmips_led[] =
},
};
+static struct platform_device ifxmips_gpio[] =
+{
+ {
+ .id = 0,
+ .name = "ifxmips_gpio",
+ },
+};
+
int __init ifxmips_init_devices(void)
{
/*
@@ -61,6 +69,7 @@ int __init ifxmips_init_devices(void)
/* the following devices are generic for all targets */
ifxmips_devs[dev++] = ifxmips_led;
+ ifxmips_devs[dev++] = ifxmips_gpio;
return platform_add_devices(ifxmips_devs, dev);
}
diff --git a/target/linux/ifxmips/files/drivers/char/ifxmips_gpio.c b/target/linux/ifxmips/files/drivers/char/ifxmips_gpio.c
index 3d0e8036cb..df0a5cd20b 100644
--- a/target/linux/ifxmips/files/drivers/char/ifxmips_gpio.c
+++ b/target/linux/ifxmips/files/drivers/char/ifxmips_gpio.c
@@ -32,6 +32,7 @@
#include <linux/workqueue.h>
#include <linux/skbuff.h>
#include <linux/netlink.h>
+#include <linux/platform_device.h>
#include <net/sock.h>
#include <asm/uaccess.h>
#include <asm/semaphore.h>
@@ -42,6 +43,8 @@
#define MAX_PORTS 2
#define PINS_PER_PORT 16
+#define DRVNAME "ifxmips_gpio"
+
static unsigned int ifxmips_gpio_major = 0;
#ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
@@ -513,23 +516,22 @@ static struct file_operations port_fops = {
.ioctl = ifxmips_port_ioctl
};
-int __init
-ifxmips_gpio_init (void)
+static int
+ifxmips_gpio_probe (struct platform_device *dev)
{
int retval = 0;
sema_init (&port_sem, 1);
- ifxmips_gpio_major = register_chrdev(0, "ifxmips_gpio", &port_fops);
+ ifxmips_gpio_major = register_chrdev(0, DRVNAME, &port_fops);
if (!ifxmips_gpio_major)
{
- printk("ifxmips-port: Error! Could not register port device. #%d\n", ifxmips_gpio_major);
+ printk(KERN_INFO DRVNAME ": Error! Could not register port device. #%d\n", ifxmips_gpio_major);
retval = -EINVAL;
goto out;
}
- create_proc_read_entry("ifxmips_gpio", 0, NULL,
- ifxmips_port_read_procmem, NULL);
+ create_proc_read_entry(DRVNAME, 0, NULL, ifxmips_port_read_procmem, NULL);
#ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
ifxmips_port_set_open_drain(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN);
@@ -545,20 +547,47 @@ ifxmips_gpio_init (void)
add_timer(&rst_button_timer);
#endif
- printk("registered ifxmips gpio driver\n");
+ printk(KERN_INFO DRVNAME ": device successfully initialized #%d.\n", ifxmips_gpio_major);
out:
return retval;
}
-void __exit
-ifxmips_gpio_exit (void)
+static int
+ifxmips_gpio_remove (struct platform_device *pdev)
{
#ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
del_timer_sync(&rst_button_timer);
#endif
- unregister_chrdev(ifxmips_gpio_major, "ifxmips_gpio");
- remove_proc_entry("ifxmips_gpio", NULL);
+ unregister_chrdev(ifxmips_gpio_major, DRVNAME);
+ remove_proc_entry(DRVNAME, NULL);
+
+ return 0;
+}
+
+static struct
+platform_driver ifxmips_gpio_driver = {
+ .probe = ifxmips_gpio_probe,
+ .remove = ifxmips_gpio_remove,
+ .driver = {
+ .name = DRVNAME,
+ .owner = THIS_MODULE,
+ },
+};
+
+int __init
+ifxmips_gpio_init (void)
+{
+ int ret = platform_driver_register(&ifxmips_gpio_driver);
+ if (ret)
+ printk(KERN_INFO DRVNAME ": Error registering platfom driver!");
+ return ret;
+}
+
+void __exit
+ifxmips_gpio_exit (void)
+{
+ platform_driver_unregister(&ifxmips_gpio_driver);
}
module_init(ifxmips_gpio_init);
--
cgit v1.2.3