Hi subsystem maintainers,
These are a few patches left over from doing randconfig tests a couple of weeks ago. Please apply them directly into your trees unless you see problems. All patches can theoretically be seen as bug fixes for 3.10, but they are not critical, so applying them for 3.11 is fine as well.
Arnd
Arnd Bergmann (15): irqdomain: export irq_domain_add_simple mtd: omap2: allow bulding as a module drm/nouveau: use mdelay instead of large udelay constants [SCSI] nsp32: use mdelay instead of large udelay constants hwrng: bcm2835: fix MODULE_LICENSE tag cpuidle: calxeda: select ARM_CPU_SUSPEND cpufreq: spear needs cpufreq table thermal: cpu_cooling: fix stub function drm: always provide debugfs function prototypes drm/tilcd: select BACKLIGHT_LCD_SUPPORT iwlegacy: il_pm_ops is only provided for PM_SLEEP [media] davinci: vpfe_capture needs i2c [media] omap3isp: include linux/mm_types.h clk: tegra: provide tegra_periph_reset_assert alternative OF: remove #ifdef from linux/of_platform.h
drivers/char/hw_random/bcm2835-rng.c | 2 +- drivers/cpufreq/Kconfig.arm | 1 + drivers/cpuidle/Kconfig | 1 + drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c | 3 ++- drivers/gpu/drm/tilcdc/Kconfig | 1 + drivers/media/platform/davinci/Kconfig | 3 +++ drivers/media/platform/omap3isp/ispqueue.h | 1 + drivers/mtd/nand/Kconfig | 2 +- drivers/net/wireless/iwlegacy/common.h | 6 +++--- drivers/scsi/nsp32.c | 2 +- include/drm/drmP.h | 3 +-- include/linux/clk/tegra.h | 5 +++++ include/linux/cpu_cooling.h | 4 ++-- include/linux/of_platform.h | 14 +++----------- kernel/irq/irqdomain.c | 1 + 15 files changed, 27 insertions(+), 22 deletions(-)
Cc: "James E.J. Bottomley" JBottomley@parallels.com Cc: Artem Bityutskiy artem.bityutskiy@linux.intel.com Cc: Dave Airlie airlied@redhat.com Cc: David Woodhouse dwmw2@infradead.org Cc: Herbert Xu herbert@gondor.apana.org.au Cc: John W. Linville linville@tuxdriver.com Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Cc: Mauro Carvalho Chehab mchehab@redhat.com Cc: Rafael J. Wysocki rjw@sisk.pl Cc: Rob Clark robdclark@gmail.com Cc: Rob Herring rob.herring@calxeda.com Cc: Russell King rmk+kernel@arm.linux.org.uk Cc: Stephen Warren swarren@wwwdotorg.org Cc: Thomas Gleixner tglx@linutronix.de Cc: Viresh Kumar viresh.kumar@linaro.org Cc: cpufreq@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: linux-media@vger.kernel.org Cc: linux-mtd@lists.infradead.org Cc: linux-pm@vger.kernel.org Cc: linux-rpi-kernel@lists.infradead.org Cc: linux-scsi@vger.kernel.org
ARM cannot handle udelay for more than 2 miliseconds, so we should use mdelay instead for those.
Signed-off-by: Arnd Bergmann arnd@arndb.de Cc: David Airlie airlied@linux.ie Cc: Ben Skeggs bskeggs@redhat.com Cc: dri-devel@lists.freedesktop.org --- drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c index d0817d9..ed7415e 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c @@ -51,7 +51,8 @@ nv50_dac_sense(struct nv50_disp_priv *priv, int or, u32 loadval) const u32 doff = (or * 0x800); int load = -EINVAL; nv_wr32(priv, 0x61a00c + doff, 0x00100000 | loadval); - udelay(9500); + mdelay(9); + udelay(500); nv_wr32(priv, 0x61a00c + doff, 0x80000000); load = (nv_rd32(priv, 0x61a00c + doff) & 0x38000000) >> 27; nv_wr32(priv, 0x61a00c + doff, 0x00000000);
You probably want to patch up mclk_wait in nva3_pm.c as well for now (until this code is ported to HWSQ or PDAEMON), even though it's not used by a lot of people.
Op 01-06-13 00:22, Arnd Bergmann schreef:
ARM cannot handle udelay for more than 2 miliseconds, so we should use mdelay instead for those.
Signed-off-by: Arnd Bergmann arnd@arndb.de Cc: David Airlie airlied@linux.ie Cc: Ben Skeggs bskeggs@redhat.com Cc: dri-devel@lists.freedesktop.org
drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c index d0817d9..ed7415e 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c @@ -51,7 +51,8 @@ nv50_dac_sense(struct nv50_disp_priv *priv, int or, u32 loadval) const u32 doff = (or * 0x800); int load = -EINVAL; nv_wr32(priv, 0x61a00c + doff, 0x00100000 | loadval);
- udelay(9500);
- mdelay(9);
- udelay(500); nv_wr32(priv, 0x61a00c + doff, 0x80000000); load = (nv_rd32(priv, 0x61a00c + doff) & 0x38000000) >> 27; nv_wr32(priv, 0x61a00c + doff, 0x00000000);
Hi,
On Sat, Jun 01, 2013 at 12:22:40AM +0200, Arnd Bergmann wrote:
ARM cannot handle udelay for more than 2 miliseconds, so we
^^^^
There's l missing here.
should use mdelay instead for those.
Could this be handled inside ARM udelay() instead? Probably most of the delay values are compile-time constants.
A.
The dependecies for BACKLIGHT_CLASS_DEVICE are defined a bit strange, but it seems one has to always select both BACKLIGHT_CLASS_DEVICE and BACKLIGHT_LCD_SUPPORT to avoid this error:
drivers/gpu/drm/tilcdc/tilcdc_panel.c:396: undefined reference to `of_find_backlight_by_node'
Cc: Rob Clark robdclark@gmail.com Cc: dri-devel@lists.freedesktop.org Cc: Dave Airlie airlied@redhat.com Signed-off-by: Arnd Bergmann arnd@arndb.de --- drivers/gpu/drm/tilcdc/Kconfig | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/tilcdc/Kconfig b/drivers/gpu/drm/tilcdc/Kconfig index e461e99..7a4d101 100644 --- a/drivers/gpu/drm/tilcdc/Kconfig +++ b/drivers/gpu/drm/tilcdc/Kconfig @@ -6,6 +6,7 @@ config DRM_TILCDC select DRM_GEM_CMA_HELPER select VIDEOMODE_HELPERS select BACKLIGHT_CLASS_DEVICE + select BACKLIGHT_LCD_SUPPORT help Choose this option if you have an TI SoC with LCDC display controller, for example AM33xx in beagle-bone, DA8xx, or
dri-devel@lists.freedesktop.org
-
Aaro Koskinen -
Arnd Bergmann -
Roy Spliet