diff options
author | Joel Stanley <joel@jms.id.au> | 2022-01-14 07:26:38 +0300 |
---|---|---|
committer | Joel Stanley <joel@jms.id.au> | 2022-01-14 07:26:45 +0300 |
commit | a86c6a512f98e00938183ab1bb4504859a294433 (patch) | |
tree | 4279e934970303f820d3df34af16b9c24b6b5d60 /drivers/soc | |
parent | 2df0c7463236a6e19f020b0879285cac0e60c2f0 (diff) | |
parent | d114b082bef784345bfac1e1d5c17257005284f2 (diff) | |
download | linux-a86c6a512f98e00938183ab1bb4504859a294433.tar.xz |
Merge tag 'v5.15.14' into dev-5.15
This is the 5.15.14 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/soc')
-rw-r--r-- | drivers/soc/imx/soc-imx.c | 4 | ||||
-rw-r--r-- | drivers/soc/tegra/fuse/fuse-tegra.c | 2 | ||||
-rw-r--r-- | drivers/soc/tegra/fuse/fuse.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/drivers/soc/imx/soc-imx.c b/drivers/soc/imx/soc-imx.c index ac6d856ba228..77bc12039c3d 100644 --- a/drivers/soc/imx/soc-imx.c +++ b/drivers/soc/imx/soc-imx.c @@ -36,6 +36,10 @@ static int __init imx_soc_device_init(void) int ret; int i; + /* Return early if this is running on devices with different SoCs */ + if (!__mxc_cpu_type) + return 0; + if (of_machine_is_compatible("fsl,ls1021a")) return 0; diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c index f2151815db58..e714ed3b61bc 100644 --- a/drivers/soc/tegra/fuse/fuse-tegra.c +++ b/drivers/soc/tegra/fuse/fuse-tegra.c @@ -320,7 +320,7 @@ static struct platform_driver tegra_fuse_driver = { }; builtin_platform_driver(tegra_fuse_driver); -bool __init tegra_fuse_read_spare(unsigned int spare) +u32 __init tegra_fuse_read_spare(unsigned int spare) { unsigned int offset = fuse->soc->info->spare + spare * 4; diff --git a/drivers/soc/tegra/fuse/fuse.h b/drivers/soc/tegra/fuse/fuse.h index de58feba0435..ecff0c08e959 100644 --- a/drivers/soc/tegra/fuse/fuse.h +++ b/drivers/soc/tegra/fuse/fuse.h @@ -65,7 +65,7 @@ struct tegra_fuse { void tegra_init_revision(void); void tegra_init_apbmisc(void); -bool __init tegra_fuse_read_spare(unsigned int spare); +u32 __init tegra_fuse_read_spare(unsigned int spare); u32 __init tegra_fuse_read_early(unsigned int offset); u8 tegra_get_major_rev(void); |