Merge tag 'tegra-soc-clk-drivers-5.11' into for-v5.11/tegra-mc (7f3cdaf7) · Commits · 戴 / test

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		#include <linux/clk-provider.h>
		#include <linux/clk/tegra.h>
		#include <linux/err.h>
		#include <linux/export.h>
		#include <linux/io.h>
		#include <linux/kernel.h>
		#include <linux/slab.h>
		@@ -235,6 +236,7 @@ void tegra20_clk_set_emc_round_callback(tegra20_clk_emc_round_cb *round_cb,
		emc->cb_arg = cb_arg;
		}
		}
		EXPORT_SYMBOL_GPL(tegra20_clk_set_emc_round_callback);

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

		return 0;
		}
		EXPORT_SYMBOL_GPL(tegra20_clk_prepare_emc_mc_same_freq);

+2 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		* Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
		*/

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

		return straps >> PMC_STRAPPING_OPT_A_RAM_CODE_SHIFT;
		}
		EXPORT_SYMBOL_GPL(tegra_read_ram_code);

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -56,7 +56,11 @@ u32 tegra_read_straps(void);
		u32 tegra_read_ram_code(void);
		int tegra_fuse_readl(unsigned long offset, u32 *value);

		#ifdef CONFIG_ARCH_TEGRA
		extern struct tegra_sku_info tegra_sku_info;
		#else
		static struct tegra_sku_info tegra_sku_info __maybe_unused;
		#endif

		struct device *tegra_soc_device_register(void);