Skip to content

Commit afd589c

Browse files
committed
Merge tag 'tegra-soc-clk-drivers-5.11' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into devfreq-next
Tegra SoC and clock controller changes for v5.11 Export symbols and add stubs necessary for upcoming modified Tegra memory controller drivers (touching also devfreq and interconnect).
2 parents 98fd997 + 245157a commit afd589c

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

drivers/clk/tegra/clk-tegra20-emc.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/clk-provider.h>
1414
#include <linux/clk/tegra.h>
1515
#include <linux/err.h>
16+
#include <linux/export.h>
1617
#include <linux/io.h>
1718
#include <linux/kernel.h>
1819
#include <linux/slab.h>
@@ -235,6 +236,7 @@ void tegra20_clk_set_emc_round_callback(tegra20_clk_emc_round_cb *round_cb,
235236
emc->cb_arg = cb_arg;
236237
}
237238
}
239+
EXPORT_SYMBOL_GPL(tegra20_clk_set_emc_round_callback);
238240

239241
bool tegra20_clk_emc_driver_available(struct clk_hw *emc_hw)
240242
{
@@ -291,3 +293,4 @@ int tegra20_clk_prepare_emc_mc_same_freq(struct clk *emc_clk, bool same)
291293

292294
return 0;
293295
}
296+
EXPORT_SYMBOL_GPL(tegra20_clk_prepare_emc_mc_same_freq);

drivers/soc/tegra/fuse/tegra-apbmisc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
44
*/
55

6+
#include <linux/export.h>
67
#include <linux/kernel.h>
78
#include <linux/of.h>
89
#include <linux/of_address.h>
@@ -90,6 +91,7 @@ u32 tegra_read_ram_code(void)
9091

9192
return straps >> PMC_STRAPPING_OPT_A_RAM_CODE_SHIFT;
9293
}
94+
EXPORT_SYMBOL_GPL(tegra_read_ram_code);
9395

9496
static const struct of_device_id apbmisc_match[] __initconst = {
9597
{ .compatible = "nvidia,tegra20-apbmisc", },

include/soc/tegra/fuse.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,11 @@ u32 tegra_read_straps(void);
5656
u32 tegra_read_ram_code(void);
5757
int tegra_fuse_readl(unsigned long offset, u32 *value);
5858

59+
#ifdef CONFIG_ARCH_TEGRA
5960
extern struct tegra_sku_info tegra_sku_info;
61+
#else
62+
static struct tegra_sku_info tegra_sku_info __maybe_unused;
63+
#endif
6064

6165
struct device *tegra_soc_device_register(void);
6266

0 commit comments

Comments
 (0)