Commit 291fde31 authored by Joseph Lo's avatar Joseph Lo Committed by Stephen Warren

ARM: tegra: pmc: convert PMC driver to support DT only

The Tegra kernel only support boot from DT now. Clean up the PMC driver
to support DT only, that includes:

* remove the ifdef of CONFIG_OF
* replace the static mapping of PMC addr to map from DT
Signed-off-by: default avatarJoseph Lo <josephl@nvidia.com>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 2b84e53b
/* /*
* Copyright (C) 2012 NVIDIA CORPORATION. All rights reserved. * Copyright (C) 2012,2013 NVIDIA CORPORATION. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
...@@ -18,59 +18,52 @@ ...@@ -18,59 +18,52 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_address.h>
#include "iomap.h"
#define PMC_CTRL 0x0 #define PMC_CTRL 0x0
#define PMC_CTRL_INTR_LOW (1 << 17) #define PMC_CTRL_INTR_LOW (1 << 17)
static void __iomem *tegra_pmc_base;
static bool tegra_pmc_invert_interrupt;
static inline u32 tegra_pmc_readl(u32 reg) static inline u32 tegra_pmc_readl(u32 reg)
{ {
return readl(IO_ADDRESS(TEGRA_PMC_BASE + reg)); return readl(tegra_pmc_base + reg);
} }
static inline void tegra_pmc_writel(u32 val, u32 reg) static inline void tegra_pmc_writel(u32 val, u32 reg)
{ {
writel(val, IO_ADDRESS(TEGRA_PMC_BASE + reg)); writel(val, tegra_pmc_base + reg);
} }
#ifdef CONFIG_OF
static const struct of_device_id matches[] __initconst = { static const struct of_device_id matches[] __initconst = {
{ .compatible = "nvidia,tegra114-pmc" }, { .compatible = "nvidia,tegra114-pmc" },
{ .compatible = "nvidia,tegra30-pmc" }, { .compatible = "nvidia,tegra30-pmc" },
{ .compatible = "nvidia,tegra20-pmc" }, { .compatible = "nvidia,tegra20-pmc" },
{ } { }
}; };
#endif
void __init tegra_pmc_init(void) static void tegra_pmc_parse_dt(void)
{ {
/*
* For now, Harmony is the only board that uses the PMC, and it wants
* the signal inverted. Seaboard would too if it used the PMC.
* Hopefully by the time other boards want to use the PMC, everything
* will be device-tree, or they also want it inverted.
*/
bool invert_interrupt = true;
u32 val;
#ifdef CONFIG_OF
if (of_have_populated_dt()) {
struct device_node *np; struct device_node *np;
invert_interrupt = false;
np = of_find_matching_node(NULL, matches); np = of_find_matching_node(NULL, matches);
if (np) { BUG_ON(!np);
if (of_find_property(np, "nvidia,invert-interrupt",
NULL)) tegra_pmc_base = of_iomap(np, 0);
invert_interrupt = true;
} tegra_pmc_invert_interrupt = of_property_read_bool(np,
} "nvidia,invert-interrupt");
#endif }
void __init tegra_pmc_init(void)
{
u32 val;
tegra_pmc_parse_dt();
val = tegra_pmc_readl(PMC_CTRL); val = tegra_pmc_readl(PMC_CTRL);
if (invert_interrupt) if (tegra_pmc_invert_interrupt)
val |= PMC_CTRL_INTR_LOW; val |= PMC_CTRL_INTR_LOW;
else else
val &= ~PMC_CTRL_INTR_LOW; val &= ~PMC_CTRL_INTR_LOW;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment