On Fri, Nov 15, 2013 at 01:54:21PM -0700, Stephen Warren wrote:
> From: Stephen Warren <swarren@xxxxxxxxxx>
>
> 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.
>
> Cc: treding@xxxxxxxxxx
> Cc: pdeschrijver@xxxxxxxxxx
> Cc: linux-tegra@xxxxxxxxxxxxxxx
> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> Cc: Dmitry Torokhov <dtor@xxxxxxx>
> Cc: linux-input@xxxxxxxxxxxxxxx
> Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx>
Acked-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> ---
> This patch is part of a series with strong internal depdendencies. I'm
> looking for an ack so that I can take the entire series through the Tegra
> and arm-soc trees. The series will be part of a stable branch that can be
> merged into other subsystems if needed to avoid/resolve dependencies.
> ---
> drivers/input/keyboard/tegra-kbc.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
> index 8508879f6faf..9757a58bc897 100644
> --- a/drivers/input/keyboard/tegra-kbc.c
> +++ b/drivers/input/keyboard/tegra-kbc.c
> @@ -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
> --
> 1.8.1.5
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
