@@ -774,9 +774,10 @@ config KEYBOARD_BCM
config KEYBOARD_MTK_KPD
tristate "MediaTek Keypad Support"
+ depends on OF && HAVE_CLK
help
- Say Y here if you want to use the keypad.
- If unuse, say N.
+ Say Y here if you want to use the keypad on MediaTek SoCs.
+ If unsure, say N.
To compile this driver as a module, choose M here: the
module will be called mtk-kpd.
@@ -4,16 +4,14 @@
* Author Terry Chang <terry.chang@mediatek.com>
*/
#include <linux/clk.h>
-#include <linux/gpio.h>
-#include <linux/init.h>
#include <linux/input/matrix_keypad.h>
#include <linux/interrupt.h>
-#include <linux/io.h>
#include <linux/module.h>
-#include <linux/of_address.h>
-#include <linux/of_irq.h>
+#include <linux/property.h>
#include <linux/pinctrl/consumer.h>
#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/bitops.h>
#define KPD_NAME "mtk-kpd"
@@ -21,26 +19,30 @@
#define KP_DEBOUNCE 0x0018
#define KPD_DEBOUNCE_MASK GENMASK(13, 0)
-#define KPD_DEBOUNCE_MAX 256000
+#define KPD_DEBOUNCE_MAX_US 256000 /*256ms */
#define KPD_NUM_MEMS 5
#define KPD_NUM_BITS 136 /* 4 * 32 + 8 MEM5 only use 8 BITS */
-#define BITS_TO_U32(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u32))
struct mtk_keypad {
+ struct regmap *regmap;
struct input_dev *input_dev;
struct clk *clk;
void __iomem *base;
- unsigned int irqnr;
bool wakeup;
- u32 key_debounce;
u32 n_rows;
u32 n_cols;
DECLARE_BITMAP(keymap_state, KPD_NUM_BITS);
};
+static const struct regmap_config keypad_regmap_cfg = {
+ .reg_bits = 32,
+ .val_bits = 32,
+ .reg_stride = sizeof(u32),
+ .max_register = 0x0024,
+};
+
static irqreturn_t kpd_irq_handler(int irq, void *dev_id)
{
- /* use _nosync to avoid deadlock */
struct mtk_keypad *keypad = dev_id;
unsigned short *keycode = keypad->input_dev->keycode;
DECLARE_BITMAP(new_state, KPD_NUM_BITS);
@@ -49,16 +51,17 @@ static irqreturn_t kpd_irq_handler(int irq, void *dev_id)
int pressed;
unsigned short code;
- memcpy_fromio(new_state, keypad->base + KP_MEM, KPD_NUM_MEMS);
+ regmap_raw_read(keypad->regmap, KP_MEM, new_state, KPD_NUM_MEMS);
bitmap_xor(change, new_state, keypad->keymap_state, KPD_NUM_BITS);
for_each_set_bit(bit_nr, change, KPD_NUM_BITS) {
- pressed = test_bit(bit_nr, new_state) == 0U;
+ /* 1: not pressed, 0: pressed */
+ pressed = !test_bit(bit_nr, new_state);
dev_dbg(&keypad->input_dev->dev, "%s",
pressed ? "pressed" : "released");
- /* per 32bit register only use low 16bit as keypad mem register */
+ /* 32bit register only use low 16bit as keypad mem register */
code = keycode[bit_nr - 16 * (BITS_TO_U32(bit_nr) - 1)];
input_report_key(keypad->input_dev, code, pressed);
@@ -73,51 +76,29 @@ static irqreturn_t kpd_irq_handler(int irq, void *dev_id)
return IRQ_HANDLED;
}
-static int kpd_get_dts_info(struct mtk_keypad *keypad)
-{
- int ret;
- struct device *dev = keypad->input_dev->dev.parent;
- struct device_node *node = dev->of_node;
-
- ret = matrix_keypad_parse_properties(dev, &keypad->n_rows,
- &keypad->n_cols);
-
- if (ret) {
- dev_err(dev, "Failed to parse keypad params\n");
- return ret;
- }
-
- ret = device_property_read_u32(dev, "mediatek,debounce-us",
- &keypad->key_debounce);
- if (ret) {
- dev_err(dev, "Failed to read mediatek debounce time\n");
- return ret;
- }
-
- if (keypad->key_debounce > KPD_DEBOUNCE_MAX) {
- dev_err(dev, "Debounce time exceeds the maximum allowed time 256ms\n");
- return -EINVAL;
- }
-
- keypad->wakeup = device_property_read_bool(node, "wakeup-source");
-
- dev_dbg(dev, "n_row=%d n_col=%d debounce=%d\n",
- keypad->n_rows, keypad->n_cols,
- keypad->key_debounce);
-
- return 0;
-}
-
static int kpd_pdrv_probe(struct platform_device *pdev)
{
struct mtk_keypad *keypad;
struct pinctrl *keypad_pinctrl;
struct pinctrl_state *kpd_default;
+ unsigned int irqnr;
+ u32 debounce;
int ret;
keypad = devm_kzalloc(&pdev->dev, sizeof(*keypad), GFP_KERNEL);
if (!keypad)
return -ENOMEM;
+ keypad->base = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(keypad->base))
+ return PTR_ERR(keypad->base);
+
+ keypad->regmap = devm_regmap_init_mmio_clk(&pdev->dev, NULL,
+ keypad->base, &keypad_regmap_cfg);
+ if (IS_ERR(keypad->regmap)) {
+ dev_err(&pdev->dev,
+ "regmap init failed:%ld\n", PTR_ERR(keypad->regmap));
+ return PTR_ERR(keypad->regmap);
+ }
bitmap_fill(keypad->keymap_state, KPD_NUM_BITS);
@@ -130,18 +111,35 @@ static int kpd_pdrv_probe(struct platform_device *pdev)
keypad->input_dev->name = KPD_NAME;
keypad->input_dev->id.bustype = BUS_HOST;
- ret = kpd_get_dts_info(keypad);
+ ret = matrix_keypad_parse_properties(&pdev->dev, &keypad->n_rows,
+ &keypad->n_cols);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to parse keypad params\n");
+ return ret;
+ }
+
+ ret = device_property_read_u32(&pdev->dev, "mediatek,debounce-us",
+ &debounce);
if (ret) {
- dev_err(&pdev->dev, "Failed to get dts info\n");
+ dev_err(&pdev->dev, "Failed to read mediatek debounce time\n");
return ret;
}
+ if (debounce > KPD_DEBOUNCE_MAX_US) {
+ dev_err(&pdev->dev, "Debounce time exceeds the maximum allowed time 256ms\n");
+ return -EINVAL;
+ }
+
+ keypad->wakeup = device_property_read_bool(&pdev->dev, "wakeup-source");
+
+ dev_dbg(&pdev->dev, "n_row=%d n_col=%d debounce=%d\n",
+ keypad->n_rows, keypad->n_cols, debounce);
+
ret = matrix_keypad_build_keymap(NULL, NULL,
keypad->n_rows,
keypad->n_cols,
NULL,
keypad->input_dev);
-
if (ret) {
dev_err(&pdev->dev, "Failed to build keymap\n");
return ret;
@@ -149,19 +147,8 @@ static int kpd_pdrv_probe(struct platform_device *pdev)
input_set_drvdata(keypad->input_dev, keypad);
- keypad->base = devm_platform_ioremap_resource(pdev, 0);
- if (IS_ERR(keypad->base)) {
- dev_err(&pdev->dev, "Failed to get resource and iomap keypad\n");
- return PTR_ERR(keypad->base);
- }
-
- if (keypad->key_debounce > KPD_DEBOUNCE_MAX) {
- dev_err(&pdev->dev, "Invalid debounce time value.\n");
- return -EINVAL;
- }
-
- writew(keypad->key_debounce * 32 / 1000 & KPD_DEBOUNCE_MASK,
- keypad->base + KP_DEBOUNCE);
+ regmap_write(keypad->regmap, KP_DEBOUNCE,
+ debounce * 32 / 1000 & KPD_DEBOUNCE_MASK);
keypad->clk = devm_clk_get(&pdev->dev, "kpd");
if (IS_ERR(keypad->clk)) {
@@ -174,57 +161,52 @@ static int kpd_pdrv_probe(struct platform_device *pdev)
return ret;
}
+ devm_add_action_or_reset(&pdev->dev,
+ (void (*)(void *))clk_disable_unprepare,
+ keypad->clk);
+
keypad_pinctrl = devm_pinctrl_get(&pdev->dev);
if (IS_ERR(keypad_pinctrl)) {
- ret = PTR_ERR(keypad_pinctrl);
- goto disable_kpd_clk;
+ return PTR_ERR(keypad_pinctrl);
}
kpd_default = pinctrl_lookup_state(keypad_pinctrl, "default");
if (IS_ERR(kpd_default)) {
dev_err(&pdev->dev, "No default pinctrl state\n");
- ret = PTR_ERR(kpd_default);
- goto disable_kpd_clk;
+ return PTR_ERR(kpd_default);
}
pinctrl_select_state(keypad_pinctrl, kpd_default);
- keypad->irqnr = platform_get_irq(pdev, 0);
- if (keypad->irqnr < 0) {
+ irqnr = platform_get_irq(pdev, 0);
+ if (irqnr < 0) {
dev_err(&pdev->dev, "Failed to get irq\n");
- ret = -keypad->irqnr;
- goto disable_kpd_clk;
+ return -irqnr;
}
- ret = devm_request_irq(&pdev->dev, keypad->irqnr,
- kpd_irq_handler, 0,
+ ret = devm_request_threaded_irq(&pdev->dev, irqnr,
+ NULL, kpd_irq_handler, 0,
KPD_NAME, keypad);
if (ret) {
dev_err(&pdev->dev, "Failed to request IRQ#%d:%d\n",
- keypad->irqnr, ret);
- goto disable_kpd_clk;
+ irqnr, ret);
+ return ret;
}
ret = input_register_device(keypad->input_dev);
if (ret) {
dev_err(&pdev->dev, "Failed to register device\n");
- goto disable_kpd_clk;
+ return ret;
}
device_init_wakeup(&pdev->dev, keypad->wakeup);
- platform_set_drvdata(pdev, keypad);
-
return 0;
-
-disable_kpd_clk:
- clk_disable_unprepare(keypad->clk);
- return ret;
}
static const struct of_device_id kpd_of_match[] = {
{.compatible = "mediatek,kp"},
- {}
+ {/*sentinel*/}
};
static struct platform_driver kpd_pdrv = {
@@ -234,7 +216,6 @@ static struct platform_driver kpd_pdrv = {
.of_match_table = kpd_of_match,
},
};
-
module_platform_driver(kpd_pdrv);
MODULE_AUTHOR("Mediatek Corporation");