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

Commit fe6b0dfa authored by Stephen Warren's avatar Stephen Warren
Browse files

Input: tegra-kbc - use reset framework 



Tegra's clock driver now provides an implementation of the common
reset API (include/linux/reset.h). Use this instead of the old Tegra-
specific API; that will soon be removed.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
parent c2b329f5

drivers/input/keyboard/tegra-kbc.c

+10 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <linux/clk.h>

#include <linux/slab.h>

#include <linux/input/matrix_keypad.h>

#include <linux/clk/tegra.h>

#include <linux/reset.h>

#include <linux/err.h>



#define KBC_MAX_KPENT	8
@@ -116,6 +116,7 @@ struct tegra_kbc { 
	u32 wakeup_key;

	struct timer_list timer;

	struct clk *clk;

	struct reset_control *rst;

	const struct tegra_kbc_hw_support *hw_support;

	int max_keys;

	int num_rows_and_columns;
@@ -373,9 +374,9 @@ static int tegra_kbc_start(struct tegra_kbc *kbc) 
	clk_prepare_enable(kbc->clk);



	/* Reset the KBC controller to clear all previous status.*/

	tegra_periph_reset_assert(kbc->clk);

	reset_control_assert(kbc->rst);

	udelay(100);

	tegra_periph_reset_deassert(kbc->clk);

	reset_control_assert(kbc->rst);

	udelay(100);



	tegra_kbc_config_pins(kbc);
@@ -663,6 +664,12 @@ static int tegra_kbc_probe(struct platform_device *pdev) 
		return PTR_ERR(kbc->clk);

	}



	kbc->rst = devm_reset_control_get(&pdev->dev, "kbc");

	if (IS_ERR(kbc->rst)) {

		dev_err(&pdev->dev, "failed to get keyboard reset\n");

		return PTR_ERR(kbc->rst);

	}



	/*

	 * The time delay between two consecutive reads of the FIFO is

	 * the sum of the repeat time and the time taken for scanning