提交 6efc3fe0 编写于 作者: P Paul Walmsley 提交者: Tony Lindgren

ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default

Commit c1d1cd59 ("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.
Signed-off-by: NPaul Walmsley <paul@pwsan.com>
Signed-off-by: NTony Lindgren <tony@atomide.com>
上级 c1d1cd59
...@@ -62,8 +62,7 @@ static int __init omap_davinci_emac_dev_init(struct omap_hwmod *oh, ...@@ -62,8 +62,7 @@ static int __init omap_davinci_emac_dev_init(struct omap_hwmod *oh,
{ {
struct platform_device *pdev; struct platform_device *pdev;
pdev = omap_device_build(oh->class->name, 0, oh, pdata, pdata_len, pdev = omap_device_build(oh->class->name, 0, oh, pdata, pdata_len);
false);
if (IS_ERR(pdev)) { if (IS_ERR(pdev)) {
WARN(1, "Can't build omap_device for %s:%s.\n", WARN(1, "Can't build omap_device for %s:%s.\n",
oh->class->name, oh->name); oh->class->name, oh->name);
......
...@@ -382,7 +382,7 @@ static void __init omap_init_hdmi_audio(void) ...@@ -382,7 +382,7 @@ static void __init omap_init_hdmi_audio(void)
return; 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), WARN(IS_ERR(pdev),
"Can't build omap_device for omap-hdmi-audio-dai.\n"); "Can't build omap_device for omap-hdmi-audio-dai.\n");
......
...@@ -152,7 +152,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) ...@@ -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; 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)) if (IS_ERR(pdev))
pr_warning("%s: Could not build omap_device for %s: %s.\n\n", pr_warning("%s: Could not build omap_device for %s: %s.\n\n",
__func__, name, oh->name); __func__, name, oh->name);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册