Input: sh_keysc - add mode 4 and mode 5 support
Add Mode 4 and Mode 5 support to the SH_KEYSC driver. These modes allow slightly larger key pad matrixes. While at it, make use of resource_size(). Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
parent
5a9003db1f
commit
3bf127637e
2 changed files with 6 additions and 5 deletions
|
@ -36,6 +36,8 @@ static const struct {
|
||||||
[SH_KEYSC_MODE_1] = { 0, 6, 5 },
|
[SH_KEYSC_MODE_1] = { 0, 6, 5 },
|
||||||
[SH_KEYSC_MODE_2] = { 1, 5, 6 },
|
[SH_KEYSC_MODE_2] = { 1, 5, 6 },
|
||||||
[SH_KEYSC_MODE_3] = { 2, 4, 7 },
|
[SH_KEYSC_MODE_3] = { 2, 4, 7 },
|
||||||
|
[SH_KEYSC_MODE_4] = { 3, 6, 6 },
|
||||||
|
[SH_KEYSC_MODE_5] = { 4, 6, 7 },
|
||||||
};
|
};
|
||||||
|
|
||||||
struct sh_keysc_priv {
|
struct sh_keysc_priv {
|
||||||
|
@ -122,8 +124,6 @@ static irqreturn_t sh_keysc_isr(int irq, void *dev_id)
|
||||||
return IRQ_HANDLED;
|
return IRQ_HANDLED;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define res_size(res) ((res)->end - (res)->start + 1)
|
|
||||||
|
|
||||||
static int __devinit sh_keysc_probe(struct platform_device *pdev)
|
static int __devinit sh_keysc_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct sh_keysc_priv *priv;
|
struct sh_keysc_priv *priv;
|
||||||
|
@ -164,7 +164,7 @@ static int __devinit sh_keysc_probe(struct platform_device *pdev)
|
||||||
memcpy(&priv->pdata, pdev->dev.platform_data, sizeof(priv->pdata));
|
memcpy(&priv->pdata, pdev->dev.platform_data, sizeof(priv->pdata));
|
||||||
pdata = &priv->pdata;
|
pdata = &priv->pdata;
|
||||||
|
|
||||||
priv->iomem_base = ioremap_nocache(res->start, res_size(res));
|
priv->iomem_base = ioremap_nocache(res->start, resource_size(res));
|
||||||
if (priv->iomem_base == NULL) {
|
if (priv->iomem_base == NULL) {
|
||||||
dev_err(&pdev->dev, "failed to remap I/O memory\n");
|
dev_err(&pdev->dev, "failed to remap I/O memory\n");
|
||||||
error = -ENXIO;
|
error = -ENXIO;
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
#ifndef __SH_KEYSC_H__
|
#ifndef __SH_KEYSC_H__
|
||||||
#define __SH_KEYSC_H__
|
#define __SH_KEYSC_H__
|
||||||
|
|
||||||
#define SH_KEYSC_MAXKEYS 30
|
#define SH_KEYSC_MAXKEYS 42
|
||||||
|
|
||||||
struct sh_keysc_info {
|
struct sh_keysc_info {
|
||||||
enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3 } mode;
|
enum { SH_KEYSC_MODE_1, SH_KEYSC_MODE_2, SH_KEYSC_MODE_3,
|
||||||
|
SH_KEYSC_MODE_4, SH_KEYSC_MODE_5 } mode;
|
||||||
int scan_timing; /* 0 -> 7, see KYCR1, SCN[2:0] */
|
int scan_timing; /* 0 -> 7, see KYCR1, SCN[2:0] */
|
||||||
int delay;
|
int delay;
|
||||||
int kycr2_delay;
|
int kycr2_delay;
|
||||||
|
|
Reference in a new issue