| Message ID | 20231220061013.120173-1-kkartik@nvidia.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | soc/tegra: fuse: Define tegra194_soc_attr_group for Tegra241 | expand |
On 12/19/23 22:10, Kartik wrote: > Tegra241 SoC data uses tegra194_soc_attr_group, which is only defined > if config CONFIG_ARCH_TEGRA_194_SOC or CONFIG_ARCH_TEGRA_234_SOC or > both are enabled. This causes a build failure if both of these configs > are disabled and CONFIG_ARCH_TEGRA_241_SOC is enabled. > > Define tegra194_soc_attr_group if CONFIG_ARCH_TEGRA_241_SOC is enabled. > > Signed-off-by: Kartik <kkartik@nvidia.com> Acked-by: Randy Dunlap <rdunlap@infradead.org> Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested Thanks. > --- > drivers/soc/tegra/fuse/fuse-tegra.c | 3 ++- > drivers/soc/tegra/fuse/fuse.h | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c > index 233b8e7bb41b..c34efa5bf44c 100644 > --- a/drivers/soc/tegra/fuse/fuse-tegra.c > +++ b/drivers/soc/tegra/fuse/fuse-tegra.c > @@ -407,7 +407,8 @@ const struct attribute_group tegra_soc_attr_group = { > }; > > #if IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \ > - IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) > + IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) || \ > + IS_ENABLED(CONFIG_ARCH_TEGRA_241_SOC) > static ssize_t platform_show(struct device *dev, struct device_attribute *attr, > char *buf) > { > diff --git a/drivers/soc/tegra/fuse/fuse.h b/drivers/soc/tegra/fuse/fuse.h > index f3b705327c20..9fee6ad6ad9e 100644 > --- a/drivers/soc/tegra/fuse/fuse.h > +++ b/drivers/soc/tegra/fuse/fuse.h > @@ -124,7 +124,8 @@ extern const struct tegra_fuse_soc tegra186_fuse_soc; > #endif > > #if IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \ > - IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) > + IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) || \ > + IS_ENABLED(CONFIG_ARCH_TEGRA_241_SOC) > extern const struct attribute_group tegra194_soc_attr_group; > #endif >
On Wed, Dec 20, 2023 at 11:40:13AM +0530, Kartik wrote: > Tegra241 SoC data uses tegra194_soc_attr_group, which is only defined > if config CONFIG_ARCH_TEGRA_194_SOC or CONFIG_ARCH_TEGRA_234_SOC or > both are enabled. This causes a build failure if both of these configs > are disabled and CONFIG_ARCH_TEGRA_241_SOC is enabled. > > Define tegra194_soc_attr_group if CONFIG_ARCH_TEGRA_241_SOC is enabled. > > Signed-off-by: Kartik <kkartik@nvidia.com> > --- > drivers/soc/tegra/fuse/fuse-tegra.c | 3 ++- > drivers/soc/tegra/fuse/fuse.h | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) Applied, thanks. Thierry
diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c index 233b8e7bb41b..c34efa5bf44c 100644 --- a/drivers/soc/tegra/fuse/fuse-tegra.c +++ b/drivers/soc/tegra/fuse/fuse-tegra.c @@ -407,7 +407,8 @@ const struct attribute_group tegra_soc_attr_group = { }; #if IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \ - IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) + IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) || \ + IS_ENABLED(CONFIG_ARCH_TEGRA_241_SOC) static ssize_t platform_show(struct device *dev, struct device_attribute *attr, char *buf) { diff --git a/drivers/soc/tegra/fuse/fuse.h b/drivers/soc/tegra/fuse/fuse.h index f3b705327c20..9fee6ad6ad9e 100644 --- a/drivers/soc/tegra/fuse/fuse.h +++ b/drivers/soc/tegra/fuse/fuse.h @@ -124,7 +124,8 @@ extern const struct tegra_fuse_soc tegra186_fuse_soc; #endif #if IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \ - IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) + IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) || \ + IS_ENABLED(CONFIG_ARCH_TEGRA_241_SOC) extern const struct attribute_group tegra194_soc_attr_group; #endif
Tegra241 SoC data uses tegra194_soc_attr_group, which is only defined if config CONFIG_ARCH_TEGRA_194_SOC or CONFIG_ARCH_TEGRA_234_SOC or both are enabled. This causes a build failure if both of these configs are disabled and CONFIG_ARCH_TEGRA_241_SOC is enabled. Define tegra194_soc_attr_group if CONFIG_ARCH_TEGRA_241_SOC is enabled. Signed-off-by: Kartik <kkartik@nvidia.com> --- drivers/soc/tegra/fuse/fuse-tegra.c | 3 ++- drivers/soc/tegra/fuse/fuse.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)