* [PATCH 00/21] more arm build fixes
@ 2013-04-25 17:28 Arnd Bergmann
2013-04-25 17:28 ` [PATCH 10/21] [SCSI] nsp32: use mdelay instead of large udelay constants Arnd Bergmann
0 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2013-04-25 17:28 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Arnd Bergmann, James E.J. Bottomley,
Benjamin Herrenschmidt, David Airlie, Felipe Balbi, Grant Likely,
Greg Kroah-Hartman, Inki Dae, Jason Cooper, Joerg Roedel,
Nicolas Pitre, Rafael J. Wysocki, Rob Herring, Russell King,
Simon Horman, Thomas Gleixner, Viresh Kumar, Will Deacon,
alsa-devel, dri-devel, linux-atm-general, linux-scsi, linux-usb@
Hi subsystem maintainers,
Here is another set of patches that resulted from build testing on
linux-next. Please apply directly into your trees if you agree,
or let me know if I made a mistake.
I can take whatever remains through the arm-soc tree if you prefer
that or I don't hear back.
Arnd
Arnd Bergmann (21):
ARM: topology: export cpu_topology
ARM: default machine descriptor for multiplatform
ARM: shmobile: don't call irqchip_init unconditionally
ARM: orion5x: include linux/cpu.h
atm: he: use mdelay instead of large udelay constants
ALSA: ali5451: use mdelay instead of large udelay constants
oss/dmabuf: use dma_map_single
drm/nouveau: use mdelay instead of large udelay constants
drm: export drm_vm_open_locked
[SCSI] nsp32: use mdelay instead of large udelay constants
irqdomain: export irq_domain_add_simple
irqchip: s3c24xx: add missing __init annotations
iommu: tegra: print dma_addr_t using %lld
cpufreq: pxa2xx: initialize variables
thermal: cooling: avoid uninitialied used gcc warning
OF: remove #ifdef from linux/of_platform.h
X.509: do not emit any informational output
USB: ehci-msm: USB_MSM_OTG needs USB_PHY
USB: lpc32xx: ISP1301 needs USB_PHY
USB: OMAP: ISP1301 needs USB_PHY
USB: OHCI: avoid conflicting platform drivers
arch/arm/Kconfig | 1 -
arch/arm/configs/lpc32xx_defconfig | 1 +
arch/arm/configs/msm_defconfig | 1 +
arch/arm/configs/omap1_defconfig | 1 +
arch/arm/kernel/devtree.c | 7 ++
arch/arm/kernel/setup.c | 11 +-
arch/arm/kernel/topology.c | 1 +
arch/arm/mach-orion5x/common.c | 1 +
arch/arm/mach-shmobile/intc-r8a7740.c | 13 +-
drivers/atm/he.c | 2 +-
drivers/cpufreq/pxa2xx-cpufreq.c | 5 +-
drivers/gpu/drm/drm_vm.c | 1 +
drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c | 3 +-
drivers/iommu/tegra-gart.c | 3 +-
drivers/iommu/tegra-smmu.c | 2 +-
drivers/irqchip/irq-s3c24xx.c | 4 +-
drivers/scsi/nsp32.c | 2 +-
drivers/thermal/cpu_cooling.c | 17 +--
drivers/usb/gadget/Kconfig | 2 +
drivers/usb/host/Kconfig | 1 +
drivers/usb/host/ohci-hcd.c | 136 ++++++++++++++++++---
drivers/usb/phy/Makefile | 2 +-
include/linux/of_platform.h | 13 +-
kernel/irq/irqdomain.c | 1 +
lib/build_OID_registry | 2 -
sound/oss/dmabuf.c | 3 +-
sound/pci/ali5451/ali5451.c | 8 +-
27 files changed, 187 insertions(+), 57 deletions(-)
--
1.8.1.2
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Airlie <airlied@linux.ie>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Nicolas Pitre <nico@linaro.org>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Rob Herring <robherring2@gmail.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Simon Horman <horms+renesas@verge.net.au>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: alsa-devel@alsa-project.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-atm-general@lists.sourceforge.net
Cc: linux-scsi@vger.kernel.org
Cc: linux-usb@vger.kernel.org
Cc: netdev@vger.kernel.org
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 10/21] [SCSI] nsp32: use mdelay instead of large udelay constants
2013-04-25 17:28 [PATCH 00/21] more arm build fixes Arnd Bergmann
@ 2013-04-25 17:28 ` Arnd Bergmann
2013-04-26 0:42 ` Masanori Goto
0 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2013-04-25 17:28 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, Arnd Bergmann, GOTO Masanori, YOKOTA Hiroshi,
James E.J. Bottomley, linux-scsi
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: GOTO Masanori <gotom@debian.or.jp>
Cc: YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: linux-scsi@vger.kernel.org
---
drivers/scsi/nsp32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 1e3879d..0665f9c 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -2899,7 +2899,7 @@ static void nsp32_do_bus_reset(nsp32_hw_data *data)
* reset SCSI bus
*/
nsp32_write1(base, SCSI_BUS_CONTROL, BUSCTL_RST);
- udelay(RESET_HOLD_TIME);
+ mdelay(RESET_HOLD_TIME / 1000);
nsp32_write1(base, SCSI_BUS_CONTROL, 0);
for(i = 0; i < 5; i++) {
intrdat = nsp32_read2(base, IRQ_STATUS); /* dummy read */
--
1.8.1.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 10/21] [SCSI] nsp32: use mdelay instead of large udelay constants
2013-04-25 17:28 ` [PATCH 10/21] [SCSI] nsp32: use mdelay instead of large udelay constants Arnd Bergmann
@ 2013-04-26 0:42 ` Masanori Goto
2013-04-29 13:21 ` Arnd Bergmann
0 siblings, 1 reply; 6+ messages in thread
From: Masanori Goto @ 2013-04-26 0:42 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, linux-kernel, YOKOTA Hiroshi,
James E.J. Bottomley, linux-scsi
2013/4/25 Arnd Bergmann <arnd@arndb.de>
>
> ARM cannot handle udelay for more than 2 miliseconds, so we
> should use mdelay instead for those.
>
Singed-off-by: GOTO Masanori <gotom@debian.or.jp>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: GOTO Masanori <gotom@debian.or.jp>
> Cc: YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>
> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
> Cc: linux-scsi@vger.kernel.org
> ---
> drivers/scsi/nsp32.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
> index 1e3879d..0665f9c 100644
> --- a/drivers/scsi/nsp32.c
> +++ b/drivers/scsi/nsp32.c
> @@ -2899,7 +2899,7 @@ static void nsp32_do_bus_reset(nsp32_hw_data *data)
> * reset SCSI bus
> */
> nsp32_write1(base, SCSI_BUS_CONTROL, BUSCTL_RST);
> - udelay(RESET_HOLD_TIME);
> + mdelay(RESET_HOLD_TIME / 1000);
> nsp32_write1(base, SCSI_BUS_CONTROL, 0);
> for(i = 0; i < 5; i++) {
> intrdat = nsp32_read2(base, IRQ_STATUS); /* dummy read */
> --
> 1.8.1.2
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 10/21] [SCSI] nsp32: use mdelay instead of large udelay constants
2013-04-26 0:42 ` Masanori Goto
@ 2013-04-29 13:21 ` Arnd Bergmann
2013-04-29 21:41 ` Masanori Goto
2013-05-01 13:55 ` James Bottomley
0 siblings, 2 replies; 6+ messages in thread
From: Arnd Bergmann @ 2013-04-29 13:21 UTC (permalink / raw)
To: Masanori Goto
Cc: YOKOTA Hiroshi, James E.J. Bottomley, linux-kernel,
linux-arm-kernel, linux-scsi
On Friday 26 April 2013, Masanori Goto wrote:
> 2013/4/25 Arnd Bergmann <arnd@arndb.de>
> >
> > ARM cannot handle udelay for more than 2 miliseconds, so we
> > should use mdelay instead for those.
> >
>
> Singed-off-by: GOTO Masanori <gotom@debian.or.jp>
Thanks. I assume you mean "Acked-by", not "Singed-off" as in "burnt"
or "Signed-off" as a notification that you have applied it to your
own git tree.
I'll keep the patch with an your "Acked-by" line in my tree unless
James wants to apply to the scsi tree.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 10/21] [SCSI] nsp32: use mdelay instead of large udelay constants
2013-04-29 13:21 ` Arnd Bergmann
@ 2013-04-29 21:41 ` Masanori Goto
2013-05-01 13:55 ` James Bottomley
1 sibling, 0 replies; 6+ messages in thread
From: Masanori Goto @ 2013-04-29 21:41 UTC (permalink / raw)
To: Arnd Bergmann
Cc: YOKOTA Hiroshi, James E.J. Bottomley, linux-kernel,
linux-arm-kernel, linux-scsi
Oops, you're absolutely correct. Thanks for the follow up! Please
change it as follow as you mentioned:
Acked-by: GOTO Masanori <gotom@debian.or.jp>
Best regrads,
-- gotom
2013/4/29 Arnd Bergmann <arnd@arndb.de>:
> On Friday 26 April 2013, Masanori Goto wrote:
>> 2013/4/25 Arnd Bergmann <arnd@arndb.de>
>> >
>> > ARM cannot handle udelay for more than 2 miliseconds, so we
>> > should use mdelay instead for those.
>> >
>>
>> Singed-off-by: GOTO Masanori <gotom@debian.or.jp>
>
> Thanks. I assume you mean "Acked-by", not "Singed-off" as in "burnt"
> or "Signed-off" as a notification that you have applied it to your
> own git tree.
>
> I'll keep the patch with an your "Acked-by" line in my tree unless
> James wants to apply to the scsi tree.
>
> Arnd
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 10/21] [SCSI] nsp32: use mdelay instead of large udelay constants
2013-04-29 13:21 ` Arnd Bergmann
2013-04-29 21:41 ` Masanori Goto
@ 2013-05-01 13:55 ` James Bottomley
1 sibling, 0 replies; 6+ messages in thread
From: James Bottomley @ 2013-05-01 13:55 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Masanori Goto, linux-arm-kernel, linux-kernel, YOKOTA Hiroshi,
linux-scsi
On Mon, 2013-04-29 at 15:21 +0200, Arnd Bergmann wrote:
> On Friday 26 April 2013, Masanori Goto wrote:
> > 2013/4/25 Arnd Bergmann <arnd@arndb.de>
> > >
> > > ARM cannot handle udelay for more than 2 miliseconds, so we
> > > should use mdelay instead for those.
> > >
> >
> > Singed-off-by: GOTO Masanori <gotom@debian.or.jp>
>
> Thanks. I assume you mean "Acked-by", not "Singed-off" as in "burnt"
> or "Signed-off" as a notification that you have applied it to your
> own git tree.
>
> I'll keep the patch with an your "Acked-by" line in my tree unless
> James wants to apply to the scsi tree.
I can, certainly. I'll be sending the first scsi set today, but I'll be
doing another one for just before the close of the merge window.
Goto-san, while I have your attention, is the nsp_cs driver orphaned? I
know it's not your driver, but you did once work with its author (YOKOTA
Hiroshi <yokota@netlab.is.tsukuba.ac.jp>) and I'm trying to get some
cleanup on the static functions in the header files.
Thanks,
James
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-05-01 13:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-25 17:28 [PATCH 00/21] more arm build fixes Arnd Bergmann
2013-04-25 17:28 ` [PATCH 10/21] [SCSI] nsp32: use mdelay instead of large udelay constants Arnd Bergmann
2013-04-26 0:42 ` Masanori Goto
2013-04-29 13:21 ` Arnd Bergmann
2013-04-29 21:41 ` Masanori Goto
2013-05-01 13:55 ` James Bottomley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox