Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bf12763 authored by Magnus Damm's avatar Magnus Damm Committed by Dmitry Torokhov
Browse files

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: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 5a9003db

drivers/input/keyboard/sh_keysc.c

+3 −3
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ static const struct { 
	[SH_KEYSC_MODE_1] = { 0, 6, 5 },

	[SH_KEYSC_MODE_2] = { 1, 5, 6 },

	[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 {
@@ -122,8 +124,6 @@ static irqreturn_t sh_keysc_isr(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



#define res_size(res) ((res)->end - (res)->start + 1)



static int __devinit sh_keysc_probe(struct platform_device *pdev)

{

	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));

	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) {

		dev_err(&pdev->dev, "failed to remap I/O memory\n");

		error = -ENXIO;

include/linux/input/sh_keysc.h

+3 −2
Original line number Diff line number Diff line 
#ifndef __SH_KEYSC_H__

#define __SH_KEYSC_H__



#define SH_KEYSC_MAXKEYS 30

#define SH_KEYSC_MAXKEYS 42



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 delay;

	int kycr2_delay;