mirror of
https://github.com/armbian/linux.git
synced 2026-01-06 10:13:00 -08:00
[ARM] 5184/1: Split ucb1400_ts into core and touchscreen
This patch splits ucb1400_ts into ucb1400_ts and ucb1400_core. Since this chip supports more features than only touchscreen, it was necessary to prepare it for feature addition. The previous functionality is preserved by applying this patch. [Build fixes for non-ARM by Stephen Rothwell and Takashi Iwai] Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Marek Vašut
committed by
Russell King
Russell King
parent
6d341675f8
commit
d9105c2b01
@@ -220,6 +220,7 @@ config TOUCHSCREEN_ATMEL_TSADCC
|
||||
config TOUCHSCREEN_UCB1400
|
||||
tristate "Philips UCB1400 touchscreen"
|
||||
select AC97_BUS
|
||||
depends on UCB1400_CORE
|
||||
help
|
||||
This enables support for the Philips UCB1400 touchscreen interface.
|
||||
The UCB1400 is an AC97 audio codec. The touchscreen interface
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -50,6 +50,15 @@ config HTC_PASIC3
|
||||
HTC Magician devices, respectively. Actual functionality is
|
||||
handled by the leds-pasic3 and ds1wm drivers.
|
||||
|
||||
config UCB1400_CORE
|
||||
tristate "Philips UCB1400 Core driver"
|
||||
help
|
||||
This enables support for the Philips UCB1400 core functions.
|
||||
The UCB1400 is an AC97 audio codec.
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called ucb1400_core.
|
||||
|
||||
config MFD_TC6393XB
|
||||
bool "Support Toshiba TC6393XB"
|
||||
depends on GPIOLIB && ARM
|
||||
|
||||
@@ -20,3 +20,4 @@ obj-$(CONFIG_MCP_UCB1200_TS) += ucb1x00-ts.o
|
||||
ifeq ($(CONFIG_SA1100_ASSABET),y)
|
||||
obj-$(CONFIG_MCP_UCB1200) += ucb1x00-assabet.o
|
||||
endif
|
||||
obj-$(CONFIG_UCB1400_CORE) += ucb1400_core.o
|
||||
|
||||
106
drivers/mfd/ucb1400_core.c
Normal file
106
drivers/mfd/ucb1400_core.c
Normal file
@@ -0,0 +1,106 @@
|
||||
/*
|
||||
* Core functions for:
|
||||
* Philips UCB1400 multifunction chip
|
||||
*
|
||||
* Based on ucb1400_ts.c:
|
||||
* Author: Nicolas Pitre
|
||||
* Created: September 25, 2006
|
||||
* Copyright: MontaVista Software, Inc.
|
||||
*
|
||||
* Spliting done by: Marek Vasut <marek.vasut@gmail.com>
|
||||
* If something doesnt work and it worked before spliting, e-mail me,
|
||||
* dont bother Nicolas please ;-)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is heavily based on ucb1x00-*.c copyrighted by Russell King
|
||||
* covering the UCB1100, UCB1200 and UCB1300.. Support for the UCB1400 has
|
||||
* been made separate from ucb1x00-core/ucb1x00-ts on Russell's request.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/ucb1400.h>
|
||||
|
||||
static int ucb1400_core_probe(struct device *dev)
|
||||
{
|
||||
int err;
|
||||
struct ucb1400 *ucb;
|
||||
struct ucb1400_ts ucb_ts;
|
||||
struct snd_ac97 *ac97;
|
||||
|
||||
memset(&ucb_ts, 0, sizeof(ucb_ts));
|
||||
|
||||
ucb = kzalloc(sizeof(struct ucb1400), GFP_KERNEL);
|
||||
if (!ucb) {
|
||||
err = -ENOMEM;
|
||||
goto err;
|
||||
}
|
||||
|
||||
dev_set_drvdata(dev, ucb);
|
||||
|
||||
ac97 = to_ac97_t(dev);
|
||||
|
||||
ucb_ts.id = ucb1400_reg_read(ac97, UCB_ID);
|
||||
if (ucb_ts.id != UCB_ID_1400) {
|
||||
err = -ENODEV;
|
||||
goto err0;
|
||||
}
|
||||
|
||||
/* TOUCHSCREEN */
|
||||
ucb_ts.ac97 = ac97;
|
||||
ucb->ucb1400_ts = platform_device_alloc("ucb1400_ts", -1);
|
||||
if (!ucb->ucb1400_ts) {
|
||||
err = -ENOMEM;
|
||||
goto err0;
|
||||
}
|
||||
err = platform_device_add_data(ucb->ucb1400_ts, &ucb_ts,
|
||||
sizeof(ucb_ts));
|
||||
if (err)
|
||||
goto err1;
|
||||
err = platform_device_add(ucb->ucb1400_ts);
|
||||
if (err)
|
||||
goto err1;
|
||||
|
||||
return 0;
|
||||
|
||||
err1:
|
||||
platform_device_put(ucb->ucb1400_ts);
|
||||
err0:
|
||||
kfree(ucb);
|
||||
err:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int ucb1400_core_remove(struct device *dev)
|
||||
{
|
||||
struct ucb1400 *ucb = dev_get_drvdata(dev);
|
||||
|
||||
platform_device_unregister(ucb->ucb1400_ts);
|
||||
kfree(ucb);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct device_driver ucb1400_core_driver = {
|
||||
.name = "ucb1400_core",
|
||||
.bus = &ac97_bus_type,
|
||||
.probe = ucb1400_core_probe,
|
||||
.remove = ucb1400_core_remove,
|
||||
};
|
||||
|
||||
static int __init ucb1400_core_init(void)
|
||||
{
|
||||
return driver_register(&ucb1400_core_driver);
|
||||
}
|
||||
|
||||
static void __exit ucb1400_core_exit(void)
|
||||
{
|
||||
driver_unregister(&ucb1400_core_driver);
|
||||
}
|
||||
|
||||
module_init(ucb1400_core_init);
|
||||
module_exit(ucb1400_core_exit);
|
||||
|
||||
MODULE_DESCRIPTION("Philips UCB1400 driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
161
include/linux/ucb1400.h
Normal file
161
include/linux/ucb1400.h
Normal file
@@ -0,0 +1,161 @@
|
||||
/*
|
||||
* Register definitions and functions for:
|
||||
* Philips UCB1400 driver
|
||||
*
|
||||
* Based on ucb1400_ts:
|
||||
* Author: Nicolas Pitre
|
||||
* Created: September 25, 2006
|
||||
* Copyright: MontaVista Software, Inc.
|
||||
*
|
||||
* Spliting done by: Marek Vasut <marek.vasut@gmail.com>
|
||||
* If something doesnt work and it worked before spliting, e-mail me,
|
||||
* dont bother Nicolas please ;-)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is heavily based on ucb1x00-*.c copyrighted by Russell King
|
||||
* covering the UCB1100, UCB1200 and UCB1300.. Support for the UCB1400 has
|
||||
* been made separate from ucb1x00-core/ucb1x00-ts on Russell's request.
|
||||
*/
|
||||
|
||||
#ifndef _LINUX__UCB1400_H
|
||||
#define _LINUX__UCB1400_H
|
||||
|
||||
#include <sound/ac97_codec.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
/*
|
||||
* UCB1400 AC-link registers
|
||||
*/
|
||||
|
||||
#define UCB_IO_DATA 0x5a
|
||||
#define UCB_IO_DIR 0x5c
|
||||
#define UCB_IE_RIS 0x5e
|
||||
#define UCB_IE_FAL 0x60
|
||||
#define UCB_IE_STATUS 0x62
|
||||
#define UCB_IE_CLEAR 0x62
|
||||
#define UCB_IE_ADC (1 << 11)
|
||||
#define UCB_IE_TSPX (1 << 12)
|
||||
|
||||
#define UCB_TS_CR 0x64
|
||||
#define UCB_TS_CR_TSMX_POW (1 << 0)
|
||||
#define UCB_TS_CR_TSPX_POW (1 << 1)
|
||||
#define UCB_TS_CR_TSMY_POW (1 << 2)
|
||||
#define UCB_TS_CR_TSPY_POW (1 << 3)
|
||||
#define UCB_TS_CR_TSMX_GND (1 << 4)
|
||||
#define UCB_TS_CR_TSPX_GND (1 << 5)
|
||||
#define UCB_TS_CR_TSMY_GND (1 << 6)
|
||||
#define UCB_TS_CR_TSPY_GND (1 << 7)
|
||||
#define UCB_TS_CR_MODE_INT (0 << 8)
|
||||
#define UCB_TS_CR_MODE_PRES (1 << 8)
|
||||
#define UCB_TS_CR_MODE_POS (2 << 8)
|
||||
#define UCB_TS_CR_BIAS_ENA (1 << 11)
|
||||
#define UCB_TS_CR_TSPX_LOW (1 << 12)
|
||||
#define UCB_TS_CR_TSMX_LOW (1 << 13)
|
||||
|
||||
#define UCB_ADC_CR 0x66
|
||||
#define UCB_ADC_SYNC_ENA (1 << 0)
|
||||
#define UCB_ADC_VREFBYP_CON (1 << 1)
|
||||
#define UCB_ADC_INP_TSPX (0 << 2)
|
||||
#define UCB_ADC_INP_TSMX (1 << 2)
|
||||
#define UCB_ADC_INP_TSPY (2 << 2)
|
||||
#define UCB_ADC_INP_TSMY (3 << 2)
|
||||
#define UCB_ADC_INP_AD0 (4 << 2)
|
||||
#define UCB_ADC_INP_AD1 (5 << 2)
|
||||
#define UCB_ADC_INP_AD2 (6 << 2)
|
||||
#define UCB_ADC_INP_AD3 (7 << 2)
|
||||
#define UCB_ADC_EXT_REF (1 << 5)
|
||||
#define UCB_ADC_START (1 << 7)
|
||||
#define UCB_ADC_ENA (1 << 15)
|
||||
|
||||
#define UCB_ADC_DATA 0x68
|
||||
#define UCB_ADC_DAT_VALID (1 << 15)
|
||||
#define UCB_ADC_DAT_MASK 0x3ff
|
||||
|
||||
#define UCB_ID 0x7e
|
||||
#define UCB_ID_1400 0x4304
|
||||
|
||||
struct ucb1400_ts {
|
||||
struct input_dev *ts_idev;
|
||||
struct task_struct *ts_task;
|
||||
int id;
|
||||
wait_queue_head_t ts_wait;
|
||||
unsigned int ts_restart:1;
|
||||
int irq;
|
||||
unsigned int irq_pending; /* not bit field shared */
|
||||
struct snd_ac97 *ac97;
|
||||
};
|
||||
|
||||
struct ucb1400 {
|
||||
struct platform_device *ucb1400_ts;
|
||||
};
|
||||
|
||||
static inline u16 ucb1400_reg_read(struct snd_ac97 *ac97, u16 reg)
|
||||
{
|
||||
return ac97->bus->ops->read(ac97, reg);
|
||||
}
|
||||
|
||||
static inline void ucb1400_reg_write(struct snd_ac97 *ac97, u16 reg, u16 val)
|
||||
{
|
||||
ac97->bus->ops->write(ac97, reg, val);
|
||||
}
|
||||
|
||||
static inline u16 ucb1400_gpio_get_value(struct snd_ac97 *ac97, u16 gpio)
|
||||
{
|
||||
return ucb1400_reg_read(ac97, UCB_IO_DATA) & (1 << gpio);
|
||||
}
|
||||
|
||||
static inline void ucb1400_gpio_set_value(struct snd_ac97 *ac97, u16 gpio,
|
||||
u16 val)
|
||||
{
|
||||
ucb1400_reg_write(ac97, UCB_IO_DATA, val ?
|
||||
ucb1400_reg_read(ac97, UCB_IO_DATA) | (1 << gpio) :
|
||||
ucb1400_reg_read(ac97, UCB_IO_DATA) & ~(1 << gpio));
|
||||
}
|
||||
|
||||
static inline u16 ucb1400_gpio_get_direction(struct snd_ac97 *ac97, u16 gpio)
|
||||
{
|
||||
return ucb1400_reg_read(ac97, UCB_IO_DIR) & (1 << gpio);
|
||||
}
|
||||
|
||||
static inline void ucb1400_gpio_set_direction(struct snd_ac97 *ac97, u16 gpio,
|
||||
u16 dir)
|
||||
{
|
||||
ucb1400_reg_write(ac97, UCB_IO_DIR, dir ?
|
||||
ucb1400_reg_read(ac97, UCB_IO_DIR) | (1 << gpio) :
|
||||
ucb1400_reg_read(ac97, UCB_IO_DIR) & ~(1 << gpio));
|
||||
}
|
||||
|
||||
static inline void ucb1400_adc_enable(struct snd_ac97 *ac97)
|
||||
{
|
||||
ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA);
|
||||
}
|
||||
|
||||
static unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel,
|
||||
int adcsync)
|
||||
{
|
||||
unsigned int val;
|
||||
|
||||
if (adcsync)
|
||||
adc_channel |= UCB_ADC_SYNC_ENA;
|
||||
|
||||
ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel);
|
||||
ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel |
|
||||
UCB_ADC_START);
|
||||
|
||||
while (!((val = ucb1400_reg_read(ac97, UCB_ADC_DATA))
|
||||
& UCB_ADC_DAT_VALID))
|
||||
schedule_timeout_uninterruptible(1);
|
||||
|
||||
return val & UCB_ADC_DAT_MASK;
|
||||
}
|
||||
|
||||
static inline void ucb1400_adc_disable(struct snd_ac97 *ac97)
|
||||
{
|
||||
ucb1400_reg_write(ac97, UCB_ADC_CR, 0);
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user