summaryrefslogtreecommitdiffstats
path: root/include/soc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-14 22:22:31 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-08-14 22:22:31 +0200
commitbbb9e06d2c6435af9c62074ad7048910eeb2e7bc (patch)
tree17d152543a602d65c749efaaaaafde24d5fec46c /include/soc
parent55c3e571d2a0aabef4f1354604443f1c415d2e85 (diff)
parent2ccdd1b13c591d306f0401d98dedc4bdcd02b421 (diff)
downloadlinux-bbb9e06d2c6435af9c62074ad7048910eeb2e7bc.tar.gz
linux-bbb9e06d2c6435af9c62074ad7048910eeb2e7bc.zip
Merge 6.5-rc6 into usb-next
We need the USB and Thunderbolt fixes in here to build on. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/soc')
-rw-r--r--include/soc/tegra/mc.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h
index fc3001483e62..a5ef84944a06 100644
--- a/include/soc/tegra/mc.h
+++ b/include/soc/tegra/mc.h
@@ -175,6 +175,9 @@ struct tegra_mc_icc_ops {
int (*get_bw)(struct icc_node *node, u32 *avg, u32 *peak);
};
+struct icc_node *tegra_mc_icc_xlate(struct of_phandle_args *spec, void *data);
+extern const struct tegra_mc_icc_ops tegra_mc_icc_ops;
+
struct tegra_mc_ops {
/*
* @probe: Callback to set up SoC-specific bits of the memory controller. This is called