Modified: branches/2008R1/arch/blackfin/mach-bf548/boards/ezkit.c (5788 => 5789)
--- branches/2008R1/arch/blackfin/mach-bf548/boards/ezkit.c 2008-12-02 14:08:58 UTC (rev 5788)
+++ branches/2008R1/arch/blackfin/mach-bf548/boards/ezkit.c 2008-12-02 14:41:07 UTC (rev 5789)
@@ -138,6 +138,37 @@
};
#endif
+#if defined(CONFIG_JOYSTICK_BFIN_ROTARY) || defined(CONFIG_JOYSTICK_BFIN_ROTARY_MODULE)
+#include <asm/bfin_rotary.h>
+
+static struct bfin_rotary_platform_data bfin_rotary_data = {
+ /*.rotary_up_key = KEY_UP,*/
+ /*.rotary_down_key = KEY_DOWN,*/
+ .rotary_rel_code = REL_WHEEL,
+ .rotary_button_key = KEY_ENTER,
+ .debounce = 10, /* 0..17 */
+ .mode = ROT_QUAD_ENC | ROT_DEBE,
+};
+
+static struct resource bfin_rotary_resources[] = {
+ {
+ .start = IRQ_CNT,
+ .end = IRQ_CNT,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device bfin_rotary_device = {
+ .name = "bfin-rotary",
+ .id = -1,
+ .num_resources = ARRAY_SIZE(bfin_rotary_resources),
+ .resource = bfin_rotary_resources,
+ .dev = {
+ .platform_data = &bfin_rotary_data,
+ },
+};
+#endif
+
#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
static struct platform_device rtc_device = {
.name = "rtc-bfin",
@@ -609,6 +640,10 @@
&bf54x_kpad_device,
#endif
+#if defined(CONFIG_JOYSTICK_BFIN_ROTARY) || defined(CONFIG_JOYSTICK_BFIN_ROTARY_MODULE)
+ &bfin_rotary_device,
+#endif
+
#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
/* &i2c_bfin_twi0_device, */
#if !defined(CONFIG_BF542)
Added: branches/2008R1/drivers/input/joystick/bfin_rotary.c (0 => 5789)
--- branches/2008R1/drivers/input/joystick/bfin_rotary.c (rev 0)
+++ branches/2008R1/drivers/input/joystick/bfin_rotary.c 2008-12-02 14:41:07 UTC (rev 5789)
@@ -0,0 +1,308 @@
+/*
+ * File: drivers/input/keyboard/bfin_rotary.c
+ * Author: Michael Hennerich <[EMAIL PROTECTED]>
+ *
+ * Description: Rotary counter driver for Analog Devices Blackfin Processors
+ *
+ * Copyright 2008 Analog Devices Inc.
+ *
+ * Bugs: Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/pm.h>
+#include <linux/platform_device.h>
+#include <linux/input.h>
+
+#include <asm/portmux.h>
+#include <asm/bfin_rotary.h>
+
+static u16 per_cnt[] = {
+ P_CNT_CUD,
+ P_CNT_CDG,
+ P_CNT_CZM,
+ 0
+};
+
+struct bfin_rot {
+ struct input_dev *input;
+ int irq;
+ unsigned int rotary_up_key;
+ unsigned int rotary_down_key;
+ unsigned int rotary_button_key;
+ unsigned int rotary_rel_code;
+ unsigned short cnt_config;
+ unsigned short cnt_imask;
+ unsigned short cnt_debounce;
+};
+
+static inline void report_marker_event(struct bfin_rot *rotary)
+{
+ struct input_dev *input = rotary->input;
+ int keycode = rotary->rotary_button_key;
+
+ input_report_key(input, keycode, 1);
+ input_sync(input);
+ input_report_key(input, keycode, 0);
+ input_sync(input);
+}
+
+static void report_rotary_event(struct bfin_rot *rotary, int delta)
+{
+ struct input_dev *input = rotary->input;
+
+ if (delta == 0)
+ return;
+
+ if (rotary->rotary_up_key && rotary->rotary_down_key) {
+ int keycode = (delta > 0) ? rotary->rotary_up_key:
+ rotary->rotary_down_key;
+
+ /* simulate a press-n-release */
+ input_report_key(input, keycode, 1);
+ input_sync(input);
+ input_report_key(input, keycode, 0);
+ input_sync(input);
+ } else {
+ input_report_rel(input, rotary->rotary_rel_code, delta);
+ input_sync(input);
+ }
+}
+
+static irqreturn_t bfin_rotary_isr(int irq, void *dev_id)
+{
+ struct platform_device *pdev = dev_id;
+ struct bfin_rot *rotary = platform_get_drvdata(pdev);
+ unsigned short status = bfin_read_CNT_STATUS();
+
+ switch (status) {
+ case ICII:
+ break;
+ case UCII:
+ case DCII:
+ report_rotary_event(rotary, bfin_read_CNT_COUNTER());
+ break;
+ case CZMII:
+ report_marker_event(rotary);
+ break;
+ default:
+ break;
+ }
+
+ bfin_write_CNT_COMMAND(W1LCNT_ZERO); /* Clear COUNTER */
+ bfin_write_CNT_STATUS(-1); /* Clear STATUS */
+
+ return IRQ_HANDLED;
+}
+
+static int __devinit bfin_rotary_probe(struct platform_device *pdev)
+{
+ struct bfin_rot *rotary;
+ struct bfin_rotary_platform_data *pdata = pdev->dev.platform_data;
+ struct input_dev *input;
+ int ret;
+
+ rotary = kzalloc(sizeof(struct bfin_rot), GFP_KERNEL);
+ if (!rotary)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, rotary);
+
+ ret = peripheral_request_list(per_cnt, pdev->dev.bus_id);
+ if (ret) {
+ dev_err(&pdev->dev, "requesting peripherals failed\n");
+ goto out1;
+ }
+
+ ret = rotary->irq = platform_get_irq(pdev, 0);
+ if (ret < 0)
+ goto out2;
+
+ ret = request_irq(rotary->irq, bfin_rotary_isr,
+ IRQF_SAMPLE_RANDOM, pdev->dev.bus_id, pdev);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "unable to claim irq %d; error %d\n",
+ rotary->irq, ret);
+ goto out2;
+ }
+
+ input = input_allocate_device();
+ if (!input) {
+ ret = -ENOMEM;
+ goto out3;
+ }
+
+ rotary->input = input;
+
+ input->name = pdev->name;
+ input->phys = "bfin-rotary/inputX";
+ input->dev.parent = &pdev->dev;
+
+ input_set_drvdata(input, rotary);
+
+ input->id.bustype = BUS_HOST;
+ input->id.vendor = 0x0001;
+ input->id.product = 0x0001;
+ input->id.version = 0x0100;
+
+ /* setup input device */
+
+ rotary->rotary_up_key = pdata->rotary_up_key;
+ rotary->rotary_down_key = pdata->rotary_down_key;
+ rotary->rotary_button_key = pdata->rotary_button_key;
+ rotary->rotary_rel_code = pdata->rotary_rel_code;
+
+ if (pdata->rotary_up_key && pdata->rotary_down_key) {
+ __set_bit(EV_KEY, input->evbit);
+ __set_bit(pdata->rotary_up_key, input->keybit);
+ __set_bit(pdata->rotary_down_key, input->keybit);
+ } else if (pdata->rotary_rel_code) {
+ __set_bit(EV_REL, input->evbit);
+ __set_bit(pdata->rotary_rel_code, input->relbit);
+ } else {
+ ret = -EINVAL;
+ goto out4;
+ }
+
+ if (pdata->rotary_button_key) {
+ __set_bit(EV_KEY, input->evbit);
+ __set_bit(pdata->rotary_button_key, input->keybit);
+ bfin_write_CNT_IMASK(CZMIE);
+ }
+
+ if (pdata->mode & ROT_DEBE)
+ bfin_write_CNT_DEBOUNCE(pdata->debounce & DPRESCALE);
+
+ if (pdata->mode)
+ bfin_write_CNT_CONFIG(bfin_read_CNT_CONFIG() |
+ (pdata->mode & ~CNTE));
+
+ ret = input_register_device(input);
+ if (ret) {
+ dev_err(&pdev->dev,
+ "unable to register input device (%d)\n", ret);
+ goto out4;
+ }
+
+ bfin_write_CNT_IMASK(bfin_read_CNT_IMASK() | UCIE | DCIE);
+ bfin_write_CNT_CONFIG(bfin_read_CNT_CONFIG() | CNTE);
+ device_init_wakeup(&pdev->dev, 1);
+
+ dev_info(&pdev->dev,
+ "Blackfin Rotary Driver registered IRQ %d\n", rotary->irq);
+ return 0;
+
+out4:
+ input_free_device(input);
+out3:
+ free_irq(rotary->irq, pdev);
+out2:
+ peripheral_free_list(per_cnt);
+out1:
+ kfree(rotary);
+ platform_set_drvdata(pdev, NULL);
+
+ return ret;
+}
+
+static int __devexit bfin_rotary_remove(struct platform_device *pdev)
+{
+ struct bfin_rot *rotary = platform_get_drvdata(pdev);
+
+ bfin_write_CNT_CONFIG(0);
+ bfin_write_CNT_IMASK(0);
+
+ free_irq(rotary->irq, pdev);
+ input_unregister_device(rotary->input);
+ peripheral_free_list(per_cnt);
+
+ kfree(rotary);
+ platform_set_drvdata(pdev, NULL);
+
+ return 0;
+}
+
+#ifdef CONFIG_PM
+static int bfin_rotary_suspend(struct platform_device *pdev, pm_message_t state)
+{
+ struct bfin_rot *rotary = platform_get_drvdata(pdev);
+
+ rotary->cnt_config = bfin_read_CNT_CONFIG();
+ rotary->cnt_imask = bfin_read_CNT_IMASK();
+ rotary->cnt_debounce = bfin_read_CNT_DEBOUNCE();
+
+ if (device_may_wakeup(&pdev->dev))
+ enable_irq_wake(rotary->irq);
+
+ return 0;
+}
+
+static int bfin_rotary_resume(struct platform_device *pdev)
+{
+ struct bfin_rot *rotary = platform_get_drvdata(pdev);
+
+ bfin_write_CNT_DEBOUNCE(rotary->cnt_debounce);
+ bfin_write_CNT_IMASK(rotary->cnt_imask);
+ bfin_write_CNT_CONFIG(rotary->cnt_config & ~CNTE);
+
+ if (device_may_wakeup(&pdev->dev))
+ disable_irq_wake(rotary->irq);
+
+ if (rotary->cnt_config & CNTE)
+ bfin_write_CNT_CONFIG(rotary->cnt_config);
+
+ return 0;
+}
+#else
+#define bfin_rotary_suspend NULL
+#define bfin_rotary_resume NULL
+#endif
+
+struct platform_driver bfin_rotary_device_driver = {
+ .probe = bfin_rotary_probe,
+ .remove = __devexit_p(bfin_rotary_remove),
+ .suspend = bfin_rotary_suspend,
+ .resume = bfin_rotary_resume,
+ .driver = {
+ .name = "bfin-rotary",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init bfin_rotary_init(void)
+{
+ return platform_driver_register(&bfin_rotary_device_driver);
+}
+
+static void __exit bfin_rotary_exit(void)
+{
+ platform_driver_unregister(&bfin_rotary_device_driver);
+}
+
+module_init(bfin_rotary_init);
+module_exit(bfin_rotary_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Michael Hennerich <[EMAIL PROTECTED]>");
+MODULE_DESCRIPTION("Rotary Counter driver for Blackfin Processors");
+MODULE_ALIAS("platform:bfin-rotary");
