| Message ID | 1359713962-16822-11-git-send-email-pdeschrijver@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Friday 01 February 2013 03:48 PM, Peter De Schrijver wrote: > Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com> > --- Reviewed-by: Prashant Gaikwad <pgaikwad@nvidia.com> > drivers/clk/tegra/clk.c | 1 + > drivers/clk/tegra/clk.h | 7 +++++++ > 2 files changed, 8 insertions(+), 0 deletions(-) > > diff --git a/drivers/clk/tegra/clk.c b/drivers/clk/tegra/clk.c > index a603b9a..a328365 100644 > --- a/drivers/clk/tegra/clk.c > +++ b/drivers/clk/tegra/clk.c > @@ -76,6 +76,7 @@ void __init tegra_init_from_table(struct tegra_clk_init_table *tbl, > static const struct of_device_id tegra_dt_clk_match[] = { > { .compatible = "nvidia,tegra20-car", .data = tegra20_clock_init }, > { .compatible = "nvidia,tegra30-car", .data = tegra30_clock_init }, > + { .compatible = "nvidia,tegra114-car", .data = tegra114_clock_init }, > { } > }; > > diff --git a/drivers/clk/tegra/clk.h b/drivers/clk/tegra/clk.h > index 8756d9f..8097850 100644 > --- a/drivers/clk/tegra/clk.h > +++ b/drivers/clk/tegra/clk.h > @@ -576,4 +576,11 @@ void tegra30_clock_init(struct device_node *np); > static inline void tegra30_clock_init(struct device_node *np) {} > #endif /* CONFIG_ARCH_TEGRA_3x_SOC */ > > +#ifdef CONFIG_ARCH_TEGRA_114_SOC > +void tegra114_clock_init(struct device_node *np); > +#else > +static inline void tegra114_clock_init(struct device_node *np) {} > +#endif /* CONFIG_ARCH_TEGRA114_SOC */ > + > + > #endif /* TEGRA_CLK_H */ >
diff --git a/drivers/clk/tegra/clk.c b/drivers/clk/tegra/clk.c index a603b9a..a328365 100644 --- a/drivers/clk/tegra/clk.c +++ b/drivers/clk/tegra/clk.c @@ -76,6 +76,7 @@ void __init tegra_init_from_table(struct tegra_clk_init_table *tbl, static const struct of_device_id tegra_dt_clk_match[] = { { .compatible = "nvidia,tegra20-car", .data = tegra20_clock_init }, { .compatible = "nvidia,tegra30-car", .data = tegra30_clock_init }, + { .compatible = "nvidia,tegra114-car", .data = tegra114_clock_init }, { } }; diff --git a/drivers/clk/tegra/clk.h b/drivers/clk/tegra/clk.h index 8756d9f..8097850 100644 --- a/drivers/clk/tegra/clk.h +++ b/drivers/clk/tegra/clk.h @@ -576,4 +576,11 @@ void tegra30_clock_init(struct device_node *np); static inline void tegra30_clock_init(struct device_node *np) {} #endif /* CONFIG_ARCH_TEGRA_3x_SOC */ +#ifdef CONFIG_ARCH_TEGRA_114_SOC +void tegra114_clock_init(struct device_node *np); +#else +static inline void tegra114_clock_init(struct device_node *np) {} +#endif /* CONFIG_ARCH_TEGRA114_SOC */ + + #endif /* TEGRA_CLK_H */
Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com> --- drivers/clk/tegra/clk.c | 1 + drivers/clk/tegra/clk.h | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-)