ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default
Subsystems (3)
PATCH 1/1 ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default
Commit c1d1cd597fc77af3086470f8627d77f52f7f8b6c ("ARM: OMAP2+:omap_device: remove obsolete pm_lats and early_device code") missed a few omap_device_build() calls that aren't included as part of the default OMAP2+ Kconfig, omap2plus_defconfig.
Ideally, all devices that are present on the SoC should be created by default, and only the corresponding device driver should be configured or deconfigured in Kconfig. This allows drivers to be built as modules and loaded later, even if they weren't part of the original kernel build. Unfortunately, we're not quite there yet.
Thanks to Tony Lindgren for reporting this, found during his randconfig tests.
--- arch/arm/mach-omap2/am35xx-emac.c | 3 +-- arch/arm/mach-omap2/devices.c | 2 +- arch/arm/mach-omap2/sr_device.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/am35xx-emac.c +1 -2
@@ -62,8 +62,7 @@ static int __init omap_davinci_emac_dev_init(struct omap_hwmod *oh, {struct platform_device *pdev; - pdev =omap_device_build (oh->class->name,0 , oh, pdata, pdata_len, - false); + pdev =omap_device_build (oh->class->name,0 , oh, pdata, pdata_len);if (IS_ERR (pdev)) {WARN (1 ,"Can't build omap_device for %s:%s.\n" , oh->class->name, oh->name);
arch/arm/mach-omap2/devices.c +1 -1
@@ -382,7 +382,7 @@ static void __init omap_init_hdmi_audio(void)return ; } - pdev =omap_device_build ("omap-hdmi-audio-dai" ,-1 , oh,NULL ,0 ,0 ); + pdev =omap_device_build ("omap-hdmi-audio-dai" ,-1 , oh,NULL ,0 );WARN (IS_ERR (pdev),"Can't build omap_device for omap-hdmi-audio-dai.\n" );
arch/arm/mach-omap2/sr_device.c +1 -1
@@ -152,7 +152,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) sr_data->enable_on_init = sr_enable_on_init; - pdev =omap_device_build (name, i, oh, sr_data,sizeof (*sr_data),0 ); + pdev =omap_device_build (name, i, oh, sr_data,sizeof (*sr_data));if (IS_ERR (pdev))pr_warning ("%s: Could not build omap_device for %s: %s.\n\n" , __func__, name, oh->name);
Signature · 1 line
1.7.10.4
Tony Lindgren
maintainerPATCH 1/1 ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default
Quoted 6 lines · Paul Walmsley
Commit
c1d1cd597fc77af3086470f8627d77f52f7f8b6c("ARM: OMAP2+:omap_device: remove obsoletepm_latsandearly_devicecode") missed a fewomap_device_build()calls that aren't included as part of the default OMAP2+Kconfig,omap2plus_defconfig.
Quoted 8 lines
Ideally, all devices that are present on the SoC should be created by default, and only the corresponding device driver should be configured or deconfigured in
Kconfig. This allows drivers to be built as modules and loaded later, even if they weren't part of the original kernel build. Unfortunately, we're not quite there yet.Thanks to Tony Lindgren for reporting this, found during his randconfig tests.
Thanks, I'll apply this into omap-for-v3.9/pm-wfi as the breaking commit is already in arm-soc/for-next.
Tony
PATCH 1/1 ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default
Quoted 2 lines · Tony Lindgren
Thanks, I'll apply this into omap-for-v3.9/pm-wfi as the breaking commit is already in arm-soc/for-next.
OK thanks. Looks like I'll have one more fix for one of the commits in arm-soc/for-next; working on it now.
- Paul