* [PATCH] ARM: OMAP: resolve sparse warning concerning debug_card_init()
From: Paul Walmsley @ 2012-10-09 20:29 UTC (permalink / raw)
To: linux-arm-kernel
Commit 801475ccb2b2c1928b22aec4b9e5285d9e347602 ("ARM: OMAP: move
debug_card_init() function") results in the following new sparse
warning:
arch/arm/plat-omap/debug-devices.c:71:12: warning: symbol 'debug_card_init' was not declared. Should it be static?
Fix by implementing Tony's suggestion to add a "sideways include" to the
new location of the debug-devices.h file in arch/arm/mach-omap2/.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tony Lindgren <tony@atomide.com>
---
arch/arm/plat-omap/debug-devices.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/plat-omap/debug-devices.c b/arch/arm/plat-omap/debug-devices.c
index c7a4c09..5a4678e 100644
--- a/arch/arm/plat-omap/debug-devices.c
+++ b/arch/arm/plat-omap/debug-devices.c
@@ -16,6 +16,7 @@
#include <linux/smc91x.h>
#include <mach/hardware.h>
+#include "../mach-omap2/debug-devices.h"
/* Many OMAP development platforms reuse the same "debug board"; these
* platforms include H2, H3, H4, and Perseus2.
--
1.7.10.4
^ permalink raw reply related
* [PATCH v2 v2 v2 8/8] spi/s3c64xx: use correct dma_transfer_direction type
From: Arnd Bergmann @ 2012-10-09 20:13 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349813638-4617-1-git-send-email-arnd@arndb.de>
There is a subtle difference between dma_transfer_direction and
dma_data_direction: the former is used by the dmaengine framework,
while the latter is used by the dma-mapping API. Although the
purpose is comparable, the actual values are different and must
not be mixed. In this case, the driver just wants to use
dma_transfer_direction.
Without this patch, building s3c6400_defconfig results in:
drivers/spi/spi-s3c64xx.c: In function 's3c64xx_spi_dmacb':
drivers/spi/spi-s3c64xx.c:239:21: warning: comparison between
'enum dma_data_direction' and 'enum dma_transfer_direction' [-Wenum-compare]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-samsung-soc at vger.kernel.org
Cc: spi-devel-general at lists.sourceforge.net
---
drivers/spi/spi-s3c64xx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index d1c8441f..2e44dd6 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -132,7 +132,7 @@
struct s3c64xx_spi_dma_data {
unsigned ch;
- enum dma_data_direction direction;
+ enum dma_transfer_direction direction;
enum dma_ch dmach;
struct property *dma_prop;
};
--
1.7.10
^ permalink raw reply related
* [PATCH v2 7/8] video: mark nuc900fb_map_video_memory as __devinit
From: Arnd Bergmann @ 2012-10-09 20:13 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349813638-4617-1-git-send-email-arnd@arndb.de>
nuc900fb_map_video_memory is called by an devinit function
that may be called at run-time, but the function itself is
marked __init and will be discarded after boot.
To avoid calling into a function that may have been overwritten,
mark nuc900fb_map_video_memory itself as __devinit.
Without this patch, building nuc950_defconfig results in:
WARNING: drivers/video/built-in.o(.devinit.text+0x26c): Section mismatch in reference from the function nuc900fb_probe() to the function .init.text:nuc900fb_map_video_memory()
The function __devinit nuc900fb_probe() references
a function __init nuc900fb_map_video_memory().
If nuc900fb_map_video_memory is only used by nuc900fb_probe then
annotate nuc900fb_map_video_memory with a matching annotation.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: linux-fbdev at vger.kernel.org
---
drivers/video/nuc900fb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c
index e10f551..b31b12b 100644
--- a/drivers/video/nuc900fb.c
+++ b/drivers/video/nuc900fb.c
@@ -387,7 +387,7 @@ static int nuc900fb_init_registers(struct fb_info *info)
* The buffer should be a non-cached, non-buffered, memory region
* to allow palette and pixel writes without flushing the cache.
*/
-static int __init nuc900fb_map_video_memory(struct fb_info *info)
+static int __devinit nuc900fb_map_video_memory(struct fb_info *info)
{
struct nuc900fb_info *fbi = info->par;
dma_addr_t map_dma;
--
1.7.10
^ permalink raw reply related
* [PATCH v2 6/8] pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
From: Arnd Bergmann @ 2012-10-09 20:13 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349813638-4617-1-git-send-email-arnd@arndb.de>
The sharpsl_pcmcia_ops structure gets passed into
sa11xx_drv_pcmcia_probe, where it gets accessed at run-time,
unlike all other pcmcia drivers that pass their structures
into platform_device_add_data, which makes a copy.
This means the gcc warning is valid and the structure
must not be marked as __initdata.
Without this patch, building collie_defconfig results in:
drivers/pcmcia/pxa2xx_sharpsl.c:22:31: fatal error: mach-pxa/hardware.h: No such file or directory
compilation terminated.
make[3]: *** [drivers/pcmcia/pxa2xx_sharpsl.o] Error 1
make[2]: *** [drivers/pcmcia] Error 2
make[1]: *** [drivers] Error 2
make: *** [sub-make] Error 2
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Pavel Machek <pavel@suse.cz>
Cc: linux-pcmcia at lists.infradead.org
Cc: Jochen Friedrich <jochen@scram.de>
Cc: stable at vger.kernel.org
---
drivers/pcmcia/pxa2xx_sharpsl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
index b066273..7dd879c 100644
--- a/drivers/pcmcia/pxa2xx_sharpsl.c
+++ b/drivers/pcmcia/pxa2xx_sharpsl.c
@@ -194,7 +194,7 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
sharpsl_pcmcia_init_reset(skt);
}
-static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = {
+static struct pcmcia_low_level sharpsl_pcmcia_ops = {
.owner = THIS_MODULE,
.hw_init = sharpsl_pcmcia_hw_init,
.socket_state = sharpsl_pcmcia_socket_state,
--
1.7.10
^ permalink raw reply related
* [PATCH v2 5/8] clk: don't mark clkdev_add_table as init
From: Arnd Bergmann @ 2012-10-09 20:13 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349813638-4617-1-git-send-email-arnd@arndb.de>
s3c2440_clk_add is a subsys_interface method and calls clkdev_add_table,
which means we might be calling it after the __init section is
discarded.
Without this patch, building mini2440_defconfig results in:
WARNING: vmlinux.o(.text+0x9848): Section mismatch in reference from the function s3c2440_clk_add() to the function .init.text:clkdev_add_table()
The function s3c2440_clk_add() references
the function __init clkdev_add_table().
This is often because s3c2440_clk_add lacks a __init
annotation or the annotation of clkdev_add_table is wrong.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
---
drivers/clk/clkdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 442a313..6956857 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -179,7 +179,7 @@ void clkdev_add(struct clk_lookup *cl)
}
EXPORT_SYMBOL(clkdev_add);
-void __init clkdev_add_table(struct clk_lookup *cl, size_t num)
+void clkdev_add_table(struct clk_lookup *cl, size_t num)
{
mutex_lock(&clocks_mutex);
while (num--) {
--
1.7.10
^ permalink raw reply related
* [PATCH v2 4/8] USB: EHCI: mark ehci_orion_conf_mbus_windows __devinit
From: Arnd Bergmann @ 2012-10-09 20:13 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349813638-4617-1-git-send-email-arnd@arndb.de>
The __devinit section is going away soon, but while it's
still there, we get a correct warning about
ehci_orion_conf_mbus_windows being discarded before
its caller, so it should be marked __devinit rather than
__init.
Without this patch, building dove_defconfig results in:
WARNING: drivers/usb/host/built-in.o(.devinit.text+0x8a4): Section mismatch in reference from the function ehci_orion_drv_probe() to the function .init.text:ehci_orion_conf_mbus_windows()
The function __devinit ehci_orion_drv_probe() references
a function __init ehci_orion_conf_mbus_windows().
If ehci_orion_conf_mbus_windows is only used by ehci_orion_drv_probe then
annotate ehci_orion_conf_mbus_windows with a matching annotation.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb at vger.kernel.org
---
drivers/usb/host/ehci-orion.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index 8892d36..1f5dd5e 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -160,7 +160,7 @@ static const struct hc_driver ehci_orion_hc_driver = {
.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
};
-static void __init
+static void __devinit
ehci_orion_conf_mbus_windows(struct usb_hcd *hcd,
const struct mbus_dram_target_info *dram)
{
--
1.7.10
^ permalink raw reply related
* [PATCH v2 3/8] mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN
From: Arnd Bergmann @ 2012-10-09 20:13 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349813638-4617-1-git-send-email-arnd@arndb.de>
The definition of ARCH_SLAB_MINALIGN is architecture dependent
and can be either of type size_t or int. Comparing that value
with ARCH_KMALLOC_MINALIGN can cause harmless warnings on
platforms where they are different. Since both are always
small positive integer numbers, using the size_t type to compare
them is safe and gets rid of the warning.
Without this patch, building ARM collie_defconfig results in:
mm/slob.c: In function '__kmalloc_node':
mm/slob.c:431:152: warning: comparison of distinct pointer types lacks a cast [enabled by default]
mm/slob.c: In function 'kfree':
mm/slob.c:484:153: warning: comparison of distinct pointer types lacks a cast [enabled by default]
mm/slob.c: In function 'ksize':
mm/slob.c:503:153: warning: comparison of distinct pointer types lacks a cast [enabled by default]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
---
mm/slob.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mm/slob.c b/mm/slob.c
index 45d4ca7..497c55e 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -428,7 +428,7 @@ out:
void *__kmalloc_node(size_t size, gfp_t gfp, int node)
{
unsigned int *m;
- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+ int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
void *ret;
gfp &= gfp_allowed_mask;
@@ -481,7 +481,7 @@ void kfree(const void *block)
sp = virt_to_page(block);
if (PageSlab(sp)) {
- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+ int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
unsigned int *m = (unsigned int *)(block - align);
slob_free(m, *m + align);
} else
@@ -500,7 +500,7 @@ size_t ksize(const void *block)
sp = virt_to_page(block);
if (PageSlab(sp)) {
- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+ int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
unsigned int *m = (unsigned int *)(block - align);
return SLOB_UNITS(*m) * SLOB_UNIT;
} else
--
1.7.10
^ permalink raw reply related
* [PATCH v2 2/8] SCSI: ARM: make fas216_dumpinfo function conditional
From: Arnd Bergmann @ 2012-10-09 20:13 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349813638-4617-1-git-send-email-arnd@arndb.de>
The fas216_dumpinfo function is only used by __fas216_checkmagic,
which is conditionally compiled, so we should put both functions
inside of the same #ifdef.
Without this patch, building rpc_defconfig results in:
drivers/scsi/arm/fas216.c:182:13: warning: 'fas216_dumpinfo' defined but not used [-Wunused-function]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-scsi at vger.kernel.org
---
drivers/scsi/arm/fas216.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 6206a66..737554c 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -179,6 +179,7 @@ static void print_SCp(struct scsi_pointer *SCp, const char *prefix, const char *
SCp->buffers_residual, suffix);
}
+#ifdef CHECK_STRUCTURE
static void fas216_dumpinfo(FAS216_Info *info)
{
static int used = 0;
@@ -223,7 +224,6 @@ static void fas216_dumpinfo(FAS216_Info *info)
info->internal_done, info->magic_end);
}
-#ifdef CHECK_STRUCTURE
static void __fas216_checkmagic(FAS216_Info *info, const char *func)
{
int corruption = 0;
--
1.7.10
^ permalink raw reply related
* [PATCH v2 1/8] SCSI: ARM: ncr5380/oak uses no interrupts
From: Arnd Bergmann @ 2012-10-09 20:13 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1349813638-4617-1-git-send-email-arnd@arndb.de>
The ncr5380 driver is included by multiple board specific
drivers, which may or may not use the interrupt handler.
The oak variant doesn't, and should set the DONT_USE_INTR
macro.
Without this patch, building rpc_defconfig results in:
drivers/scsi/arm/../NCR5380.c:1160:20: warning: 'oakscsi_intr' defined but not used [-Wunused-function]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-scsi at vger.kernel.org
---
drivers/scsi/arm/oak.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index d25f944..fc6a5aa 100644
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -21,6 +21,7 @@
/*#define PSEUDO_DMA*/
#define OAKSCSI_PUBLIC_RELEASE 1
+#define DONT_USE_INTR
#define priv(host) ((struct NCR5380_hostdata *)(host)->hostdata)
#define NCR5380_local_declare() void __iomem *_base
--
1.7.10
^ permalink raw reply related
* [PATCH v2 0/8] ARM: mostly harmless gcc warnings
From: Arnd Bergmann @ 2012-10-09 20:13 UTC (permalink / raw)
To: linux-arm-kernel
Most patches from the first time this was posted have been
adopted by a subsystem maintainer or were show to be obsolete.
Here are the remaining ones again.
I'm planning to submit those patches that are still necessary
by the time we have an -rc1 through the arm-soc tree, but
my preference is still to have them go through the subsystem
maintainers.
Olof: should we add it to for-next?
Arnd
Arnd Bergmann (8):
SCSI: ARM: ncr5380/oak uses no interrupts
SCSI: ARM: make fas216_dumpinfo function conditional
mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN
USB: EHCI: mark ehci_orion_conf_mbus_windows __devinit
clk: don't mark clkdev_add_table as init
pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
video: mark nuc900fb_map_video_memory as __devinit
spi/s3c64xx: use correct dma_transfer_direction type
drivers/clk/clkdev.c | 2 +-
drivers/pcmcia/pxa2xx_sharpsl.c | 2 +-
drivers/scsi/arm/fas216.c | 2 +-
drivers/scsi/arm/oak.c | 1 +
drivers/spi/spi-s3c64xx.c | 2 +-
drivers/usb/host/ehci-orion.c | 2 +-
drivers/video/nuc900fb.c | 2 +-
mm/slob.c | 6 +++---
8 files changed, 10 insertions(+), 9 deletions(-)
--
1.7.10
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jochen Friedrich <jochen@scram.de>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Mike Turquette <mturquette@linaro.org>
Cc: Pavel Machek <pavel@suse.cz>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-fbdev at vger.kernel.org
Cc: linux-pcmcia at lists.infradead.org
Cc: linux-samsung-soc at vger.kernel.org
Cc: linux-scsi at vger.kernel.org
Cc: linux-usb at vger.kernel.org
Cc: spi-devel-general at lists.sourceforge.net
Cc: stable at vger.kernel.org
^ permalink raw reply
* [PATCH] ARM: OMAP: move old debug-devices.c and debug-leds.c to be OMAP2+ only for now
From: Paul Walmsley @ 2012-10-09 20:11 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121008221333.GZ13011@atomide.com>
On Mon, 8 Oct 2012, Tony Lindgren wrote:
> Hmm are you sure that omap1 is not using debug-leds.c?
> At least the initcall seems like it should run on omap1
> if enabled.
You're right, it's probably able to run on OMAP1. Looks like I got
confused by the bogus Kconfig dependency from OMAP_DEBUG_LEDS ->
OMAP_DEBUG_DEVICES, since debug_card_init() is only called from the H4
board init.
> The sideways include here is OK, it does not get exposed to
> the drivers, it seems that plat-omap is still the right location
> for at least debug-leds.c code.
OK if you want to leave it there, it's fine with me. Looks like it
should go into drivers/ at some point though?
Will send a patch to do the sideways include to fix the sparse warning.
- Paul
^ permalink raw reply
* [PATCH 0/3] new ARM-soc warning fixes
From: Arnd Bergmann @ 2012-10-09 20:01 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121009174631.GA19606@quad.lixom.net>
On Tuesday 09 October 2012, Olof Johansson wrote:
> On Tue, Oct 09, 2012 at 05:34:18PM +0200, Arnd Bergmann wrote:
> > Hi Olof,
> >
> > Here are three more fixes that I'd like to merge through the arm-soc
> > as time permits. All of them should be completely harmless and they
> > only fix harmless gcc warnings.
> >
> > I don't know what your plans are for sending the next fixes branch.
> > I've uploaded these into a new "fixes2" branch on top of the patches
> > that are already in "fixes". We can either send them all together,
> > or you send the ones that are already queued first and these ones
> > with the next batch. Feel free to rebase if necessary.
>
> I've pulled it in and will send up with fixes tonight (Tony has OMAP
> fixes coming, others might too).
>
Ok, thanks!
I just noticed that I was missing yet another one, which I now added
directly. It was part of a longer series I sent last week. I wasn't
really sure whether this one would better be included in arm-soc or
Russell's arm tree and then I ended up not putting it in either series :(
Arnd
8<----------
>From bfbad32a63fa6287723961f07bcd043dc9c5965c Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Apr 2012 13:34:13 +0000
Subject: [PATCH] ARM: pxa: armcore: fix PCI PIO warnings
The it8152 PCI host used on the pxa/cm_x2xx machines
uses the old-style I/O window registration. This should
eventually get converted to pci_ioremap_io() but for
now, let's cast the IT8152_IO_BASE constant to an integer
type to get rid of the warnings.
Without this patch, building cm_x2xx_defconfig results in:
arch/arm/common/it8152.c: In function 'it8152_pci_setup':
arch/arm/common/it8152.c:287:18: warning: assignment makes integer from pointer without a cast [enabled by default]
arch/arm/common/it8152.c:288:16: warning: assignment makes integer from pointer without a cast [enabled by default]
arch/arm/common/it8152.c:291:17: warning: assignment makes integer from pointer without a cast [enabled by default]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Mike Rapoport <mike@compulab.co.il>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c
index c4110d1..001f491 100644
--- a/arch/arm/common/it8152.c
+++ b/arch/arm/common/it8152.c
@@ -284,11 +284,17 @@ int dma_set_coherent_mask(struct device *dev, u64 mask)
int __init it8152_pci_setup(int nr, struct pci_sys_data *sys)
{
- it8152_io.start = IT8152_IO_BASE + 0x12000;
- it8152_io.end = IT8152_IO_BASE + 0x12000 + 0x100000;
+ /*
+ * FIXME: use pci_ioremap_io to remap the IO space here and
+ * move over to the generic io.h implementation.
+ * This requires solving the same problem for PXA PCMCIA
+ * support.
+ */
+ it8152_io.start = (unsigned long)IT8152_IO_BASE + 0x12000;
+ it8152_io.end = (unsigned long)IT8152_IO_BASE + 0x12000 + 0x100000;
sys->mem_offset = 0x10000000;
- sys->io_offset = IT8152_IO_BASE;
+ sys->io_offset = (unsigned long)IT8152_IO_BASE;
if (request_resource(&ioport_resource, &it8152_io)) {
printk(KERN_ERR "PCI: unable to allocate IO region\n");
^ permalink raw reply related
* [GIT PULL] Disintegrate UAPI for arm64 [ver #2]
From: David Howells @ 2012-10-09 19:30 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121009172559.GB13922@arm.com>
Catalin Marinas <catalin.marinas@arm.com> wrote:
> It still fails on arm64. The reason is that I had a __SYSCALL_COMPAT
> guard to provide either the 32-bit syscalls or the 64-bit (generic) ones
> via asm/unistd.h. With this change:
Hmmm.
Why does asm/unistd.h get #included for the compat bits at all? Looking in
arch/arm64/kernel/sys32.S could the compat syscall table be generated by a
direct #inclusion of asm/unistd32.h instead?
Is there a reason that asm/unistd32.h needs to declare __NR_ macros? Looking
at signal32.c and sys_compat.c you only need:
__ARM_NR_compat_cacheflush
__ARM_NR_compat_set_tls
and:
__NR_sigreturn
__NR_rt_sigreturn
__NR_restart_syscall
could you define __ARM_NR_ versions of the last three and get rid of all the
__NR_ constant definitions by putting the numbers directly into the __SYSCALL
macros?
> The solution is to either keep the __SYSCALL_COMPAT guard in place or
> rename all the __NR_* macros in unistd32.h to __NR_compat_* and include
> unistd32.h explicitly where needed (kernel-only header anyway). Since
> the arm64 kernel would not export 32-bit headers, I would go with the
> second solution (tried it already).
That sounds workable too... Certainly easier to do with a text editor than
folding the compat __NR_ values into their __SYSCALL() macros.
Either way, you can then blithely always include unistd32.h without having to
wriggle to avoid the duplicate symbols.
> But you need to re-generate the arm64 headers again.
Regeneration is certainly quick and (usually) easy, but I need to change the
base to end up with a different result. Do you want me to rename all the
__NR_* to __NR_compat_* before doing that (if you have a patch to do so, I can
incorporate that on the arm64 branch prior to doing the disintegration).
> BTW, I see the script generated some pretty much empty
> uapi/asm/unistd.h. Is it possible to using something like Kbuild and
> just add "generic-y += ..." to just point it to the
> include/uapi/asm-generic header?
Yes. Note that I was asked not to lose copyright notices if they were
present, which is why you've ended up with that.
At this point, I'd rather not adjust the disintegration script, so fixing it
up after would be simplest.
David
^ permalink raw reply
* [GIT PULL] ARM: OMAP: warnings/hwmod/clock fixes for pre-3.7-rc1
From: Paul Walmsley @ 2012-10-09 19:29 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121009190252.GD12552@atomide.com>
On Tue, 9 Oct 2012, Tony Lindgren wrote:
> * Paul Walmsley <paul@pwsan.com> [121009 09:05]:
> >
> > N800 isn't booting; this is a problem present in the base commit and
> > is due to serial driver breakage:
> >
> > http://www.spinics.net/lists/arm-kernel/msg196034.html
>
> This might be related also to the n800 booting in sys mode
> that causes issues with the recent hyp patches. A fix for
> that has been queued, for more info see the thread
> "v2 2/7] ARM: virt: allow the kernel to be entered in HYP mode".
Thanks for the pointer. That one would break the boot quite early, right?
This one has the same symptoms as the serial issue, where it bombs out
after:
[ 0.948394] Serial: 8250/16550 driver, 4 ports, IRQ sharing enabled
[ 0.974273] omap_uart.0: ttyO0 at MMIO 0x4806a000 (irq = 88) is a OMAP UART0
[ 0.986968] omap_uart.1: ttyO1 at MMIO 0x4806c000 (irq = 89) is a OMAP UART1
(hang)
- Paul
^ permalink raw reply
* [PATCH] ARM: mxc: platform-mxc-mmc: Fix register region size
From: Fabio Estevam @ 2012-10-09 19:25 UTC (permalink / raw)
To: linux-arm-kernel
Do not hardcode the register region to SZ_4K as this is not correct for mx31.
Use data->iosize instead which works for both mx27 and mx31 cases.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
arch/arm/plat-mxc/devices/platform-mxc-mmc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/plat-mxc/devices/platform-mxc-mmc.c b/arch/arm/plat-mxc/devices/platform-mxc-mmc.c
index 540d3a7..e7b920b 100644
--- a/arch/arm/plat-mxc/devices/platform-mxc-mmc.c
+++ b/arch/arm/plat-mxc/devices/platform-mxc-mmc.c
@@ -55,7 +55,7 @@ struct platform_device *__init imx_add_mxc_mmc(
struct resource res[] = {
{
.start = data->iobase,
- .end = data->iobase + SZ_4K - 1,
+ .end = data->iobase + data->iosize - 1,
.flags = IORESOURCE_MEM,
}, {
.start = data->irq,
--
1.7.9.5
^ permalink raw reply related
* [GIT PULL] ARM: OMAP: warnings/hwmod/clock fixes for pre-3.7-rc1
From: Tony Lindgren @ 2012-10-09 19:02 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <alpine.DEB.2.00.1210091602390.5736@utopia.booyaka.com>
* Paul Walmsley <paul@pwsan.com> [121009 09:05]:
>
> N800 isn't booting; this is a problem present in the base commit and
> is due to serial driver breakage:
>
> http://www.spinics.net/lists/arm-kernel/msg196034.html
This might be related also to the n800 booting in sys mode
that causes issues with the recent hyp patches. A fix for
that has been queued, for more info see the thread
"v2 2/7] ARM: virt: allow the kernel to be entered in HYP mode".
Regards,
Tony
^ permalink raw reply
* [RFC PATCH 03/13] ARM: edma: add DT and runtime PM support for AM335x
From: Matt Porter @ 2012-10-09 18:58 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1BAFE6F6C881BF42822005164F1491C33EA8A860@DBDE01.ent.ti.com>
On Fri, Sep 21, 2012 at 08:53:06AM +0000, Hebbar, Gururaja wrote:
> On Thu, Sep 20, 2012 at 20:13:36, Porter, Matt wrote:
> > Adds support for parsing the TI EDMA DT data into the required
> > EDMA private API platform data.
> >
> > Calls runtime PM API only in the DT case in order to unidle the
> > associated hwmods on AM335x.
> >
> > Signed-off-by: Matt Porter <mporter@ti.com>
> > ---
> > arch/arm/common/edma.c | 252 ++++++++++++++++++++++++++++++++++++--
> > arch/arm/include/asm/mach/edma.h | 8 +-
> > 2 files changed, 244 insertions(+), 16 deletions(-)
>
> The binding documentation should be updated along with the driver
> change that does introduce the binding. You could just merged patch #4
> and #5.
Hi Gururaja,
Sorry I missed these comments for this long...
I've been asked by maintainers to keep the binding separate in other
drivers. It is documentation that is independent of the driver in
any case...I'll move the binding before this implementation though.
> > diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
> > index 001d268..f337f81 100644
> > --- a/arch/arm/common/edma.c
> > +++ b/arch/arm/common/edma.c
> > @@ -24,6 +24,13 @@
> > #include <linux/platform_device.h>
> > #include <linux/io.h>
> > #include <linux/slab.h>
> > +#include <linux/edma.h>
> > +#include <linux/err.h>
> > +#include <linux/of_address.h>
> > +#include <linux/of_device.h>
> > +#include <linux/of_dma.h>
> > +#include <linux/of_irq.h>
> > +#include <linux/pm_runtime.h>
> >
> > #include <asm/mach/edma.h>
> >
> > @@ -1366,30 +1373,236 @@ void edma_clear_event(unsigned channel)
> > EXPORT_SYMBOL(edma_clear_event);
> >
> > /*-----------------------------------------------------------------------*/
> > +static int edma_of_read_u32_to_s8_array(const struct device_node *np,
> > + const char *propname, s8 *out_values,
> > + size_t sz)
> > +{
> > + struct property *prop = of_find_property(np, propname, NULL);
> > + const __be32 *val;
> > +
> > + if (!prop)
> > + return -EINVAL;
> > + if (!prop->value)
> > + return -ENODATA;
> > + if ((sz * sizeof(u32)) > prop->length)
> > + return -EOVERFLOW;
> > +
> > + val = prop->value;
> > +
> > + while (sz--)
> > + *out_values++ = (s8)(be32_to_cpup(val++) & 0xff);
> > +
> > + /* Terminate it */
> > + *out_values++ = -1;
> > + *out_values++ = -1;
> > +
> > + return 0;
> > +}
> > +
> > +static int edma_of_read_u32_to_s16_array(const struct device_node *np,
> > + const char *propname, s16 *out_values,
> > + size_t sz)
> > +{
> > + struct property *prop = of_find_property(np, propname, NULL);
> > + const __be32 *val;
> > +
> > + if (!prop)
> > + return -EINVAL;
> > + if (!prop->value)
> > + return -ENODATA;
> > + if ((sz * sizeof(u32)) > prop->length)
> > + return -EOVERFLOW;
> > +
> > + val = prop->value;
> > +
> > + while (sz--)
> > + *out_values++ = (s16)(be32_to_cpup(val++) & 0xffff);
> > +
> > + /* Terminate it */
> > + *out_values++ = -1;
> > + *out_values++ = -1;
> > +
> > + return 0;
> > +}
> > +
> > +static int edma_of_parse_dt(struct device *dev,
> > + struct device_node *node,
> > + struct edma_soc_info *pdata)
> > +{
> > + int ret = 0;
> > + u32 value;
> > + struct property *prop;
> > + size_t sz;
> > + struct edma_rsv_info *rsv_info;
> > + s16 (*rsv_chans)[2], (*rsv_slots)[2];
> > + s8 (*queue_tc_map)[2], (*queue_priority_map)[2];
> > +
> > + ret = of_property_read_u32(node, "dma-channels", &value);
> > + if (ret < 0)
> > + return ret;
> > + pdata->n_channel = value;
> > +
> > + ret = of_property_read_u32(node, "ti,edma-regions", &value);
> > + if (ret < 0)
> > + return ret;
> > + pdata->n_region = value;
> > +
> > + ret = of_property_read_u32(node, "ti,edma-slots", &value);
> > + if (ret < 0)
> > + return ret;
> > + pdata->n_slot = value;
> > +
> > + pdata->n_cc = 1;
> > + /* This is unused */
> > + pdata->n_tc = 3;
> > +
> > + rsv_info =
> > + devm_kzalloc(dev, sizeof(struct edma_rsv_info), GFP_KERNEL);
> > + if (!rsv_info)
> > + return -ENOMEM;
> > + pdata->rsv = rsv_info;
> > +
> > + /* Build the reserved channel/slots arrays */
> > + prop = of_find_property(node, "ti,edma-reserved-channels", &sz);
> > + if (!prop)
> > + return -EINVAL;
> > +
> > + rsv_chans =
> > + devm_kzalloc(dev, sz/sizeof(s16) + 2*sizeof(s16), GFP_KERNEL);
> > + if (!rsv_chans)
> > + return -ENOMEM;
> > + pdata->rsv->rsv_chans = rsv_chans;
> > +
> > + ret = edma_of_read_u32_to_s16_array(node, "ti,edma-reserved-channels",
> > + (s16 *)rsv_chans, sz/sizeof(u32));
> > + if (ret < 0)
> > + return ret;
> > +
> > + prop = of_find_property(node, "ti,edma-reserved-slots", &sz);
> > + if (!prop)
> > + return -EINVAL;
> > +
>
> Binding Documentation mentions edma-reserved-[channels/slots] as optional.
> But here the code returns as error if they are not found. Kindly reconfirm
>
> >From patch-set 5/13
>
> +Optional properties:
> +- ti,edma-reserved-channels: List of reserved channel regions
> +- ti,edma-reserved-slots: List of reserved slot regions
Good catch, the binding documentation is correct and I will fix my
implementation to match.
> > + rsv_slots = devm_kzalloc(dev,
> > + sz/sizeof(s16) + 2*sizeof(s16),
> > + GFP_KERNEL);
> > + if (!rsv_slots)
> > + return -ENOMEM;
> > + pdata->rsv->rsv_slots = rsv_slots;
> > +
> > + ret = edma_of_read_u32_to_s16_array(node,
> > + "ti,edma-reserved-slots",
> > + (s16 *)rsv_slots,
> > + sz/sizeof(u32));
> > + if (ret < 0)
> > + return ret;
> > +
> > + prop = of_find_property(node, "ti,edma-queue-tc-map", &sz);
> > + if (!prop)
> > + return -EINVAL;
> > +
> > + queue_tc_map = devm_kzalloc(dev,
> > + sz/sizeof(s8) + 2*sizeof(s8),
> > + GFP_KERNEL);
> > + if (!rsv_slots)
> > + return -ENOMEM;
> > + pdata->queue_tc_mapping = queue_tc_map;
> > +
> > + ret = edma_of_read_u32_to_s8_array(node,
> > + "ti,edma-queue-tc-map",
> > + (s8 *)queue_tc_map,
> > + sz/sizeof(u32));
> > + if (ret < 0)
> > + return ret;
> > +
> > + prop = of_find_property(node, "ti,edma-queue-priority-map", &sz);
> > + if (!prop)
> > + return -EINVAL;
> > +
> > + queue_priority_map = devm_kzalloc(dev,
> > + sz/sizeof(s8) + 2*sizeof(s8),
> > + GFP_KERNEL);
> > + if (!rsv_slots)
> > + return -ENOMEM;
> > + pdata->queue_priority_mapping = queue_priority_map;
> > +
> > + ret = edma_of_read_u32_to_s8_array(node,
> > + "ti,edma-queue-tc-map",
> > + (s8 *)queue_priority_map,
> > + sz/sizeof(u32));
> > + if (ret < 0)
> > + return ret;
> > +
> > + ret = of_property_read_u32(node, "ti,edma-default-queue", &value);
> > + if (ret < 0)
> > + return ret;
> > + pdata->default_queue = value;
> > +
> > + return ret;
> > +}
> > +
> > +static struct of_dma_filter_info edma_filter_info = {
> > + .filter_fn = edma_filter_fn,
> > +};
> >
> > static int __init edma_probe(struct platform_device *pdev)
> > {
> > struct edma_soc_info **info = pdev->dev.platform_data;
> > - const s8 (*queue_priority_mapping)[2];
> > - const s8 (*queue_tc_mapping)[2];
> > + s8 (*queue_priority_mapping)[2];
> > + s8 (*queue_tc_mapping)[2];
> > int i, j, off, ln, found = 0;
> > int status = -1;
> > - const s16 (*rsv_chans)[2];
> > - const s16 (*rsv_slots)[2];
> > + s16 (*rsv_chans)[2];
> > + s16 (*rsv_slots)[2];
>
> What is the significance of the number "2" in all above members?
Those should all be EDMA_MAX_CC, as that is the significance. I
will address that. Incidentally, this is expected to be short-lived
after Davinci ASoC is fully converted to dmaengine. One of the
big problems in the private EDMA API driver from an implementation
POV is that the driver attempt to encompass all channel controller
instances in a single device match. This results in this legacy
pdata structure that we adopt for compatibility. As part of folding
this into drivers/dma/edma.c, we'll have a device instance per
channel controller that will nicely clean this up. Not to mention
all the unused code we'll remove.
> > int irq[EDMA_MAX_CC] = {0, 0};
> > int err_irq[EDMA_MAX_CC] = {0, 0};
> > struct resource *r[EDMA_MAX_CC] = {NULL};
> > + struct resource res[EDMA_MAX_CC];
> > resource_size_t len[EDMA_MAX_CC];
> > char res_name[10];
> > char irq_name[10];
> > + struct device_node *node = pdev->dev.of_node;
> > + struct device *dev = &pdev->dev;
> > + struct edma_soc_info *pdata;
> > +
> > + if (node) {
> > + int ret;
> > + pdata = devm_kzalloc(dev,
> > + sizeof(struct edma_soc_info),
> > + GFP_KERNEL);
> > + edma_of_parse_dt(dev, node, pdata);
> > + info = &pdata;
> > + dma_cap_set(DMA_SLAVE, edma_filter_info.dma_cap);
> > + of_dma_controller_register(dev->of_node,
> > + of_dma_simple_xlate,
> > + &edma_filter_info);
> > + pm_runtime_enable(dev);
> > + ret = pm_runtime_get_sync(dev);
> > + if (IS_ERR_VALUE(ret)) {
> > + dev_err(dev, "pm_runtime_get_sync() failed\n");
> > + return ret;
> > + }
> > + }
> >
> > if (!info)
> > return -ENODEV;
> >
> > for (j = 0; j < EDMA_MAX_CC; j++) {
> > - sprintf(res_name, "edma_cc%d", j);
> > - r[j] = platform_get_resource_byname(pdev, IORESOURCE_MEM,
> > + if (node) {
> > + int err;
> > + err = of_address_to_resource(node, 0, &res[j]);
> > + if (err) {
> > + dev_err(dev,
> > + "unable to find 'reg' property\n");
> > + return -EIO;
> > + }
> > + r[j] = &res[j];
> > +
> > + } else {
> > + sprintf(res_name, "edma_cc%d", j);
> > + r[j] = platform_get_resource_byname(pdev,
> > + IORESOURCE_MEM,
> > res_name);
> > + }
> > if (!r[j] || !info[j]) {
> > if (found)
> > break;
> > @@ -1465,8 +1678,12 @@ static int __init edma_probe(struct platform_device *pdev)
> > }
> > }
> >
> > - sprintf(irq_name, "edma%d", j);
> > - irq[j] = platform_get_irq_byname(pdev, irq_name);
> > + if (node)
> > + irq[j] = irq_of_parse_and_map(node, 0);
> > + else {
> > + sprintf(irq_name, "edma%d", j);
> > + irq[j] = platform_get_irq_byname(pdev, irq_name);
> > + }
> > edma_cc[j]->irq_res_start = irq[j];
> > status = request_irq(irq[j], dma_irq_handler, 0, "edma",
> > &pdev->dev);
> > @@ -1476,8 +1693,12 @@ static int __init edma_probe(struct platform_device *pdev)
> > goto fail;
> > }
> >
> > - sprintf(irq_name, "edma%d_err", j);
> > - err_irq[j] = platform_get_irq_byname(pdev, irq_name);
> > + if (node)
> > + err_irq[j] = irq_of_parse_and_map(node, 2);
> > + else {
> > + sprintf(irq_name, "edma%d_err", j);
> > + err_irq[j] = platform_get_irq_byname(pdev, irq_name);
> > + }
> > edma_cc[j]->irq_res_end = err_irq[j];
> > status = request_irq(err_irq[j], dma_ccerr_handler, 0,
> > "edma_error", &pdev->dev);
> > @@ -1538,9 +1759,17 @@ fail1:
> > return status;
> > }
> >
> > +static const struct of_device_id edma_of_ids[] = {
> > + { .compatible = "ti,edma3", },
> > + {}
> > +};
> >
> > static struct platform_driver edma_driver = {
> > - .driver.name = "edma",
> > + .driver = {
> > + .name = "edma",
> > + .of_match_table = edma_of_ids,
>
> Won't this fail/warn when CONFIG_OF not selected/enabled?
No. of_match_table is no longer dependent on CONFIG_OF
> > + },
> > + .probe = edma_probe,
> > };
> >
> > static int __init edma_init(void)
> > @@ -1548,4 +1777,3 @@ static int __init edma_init(void)
> > return platform_driver_probe(&edma_driver, edma_probe);
> > }
> > arch_initcall(edma_init);
> > -
>
> Stray change I believe.
checkpatch found that bad whitespace.
> > diff --git a/arch/arm/include/asm/mach/edma.h b/arch/arm/include/asm/mach/edma.h
> > index 7e84c90..ce5f6f8 100644
> > --- a/arch/arm/include/asm/mach/edma.h
> > +++ b/arch/arm/include/asm/mach/edma.h
> > @@ -237,8 +237,8 @@ void edma_resume(unsigned channel);
> >
> > struct edma_rsv_info {
> >
> > - const s16 (*rsv_chans)[2];
> > - const s16 (*rsv_slots)[2];
> > + s16 (*rsv_chans)[2];
> > + s16 (*rsv_slots)[2];
> > };
> >
> > /* platform_data for EDMA driver */
> > @@ -260,8 +260,8 @@ struct edma_soc_info {
> > /* Resource reservation for other cores */
> > struct edma_rsv_info *rsv;
> >
> > - const s8 (*queue_tc_mapping)[2];
> > - const s8 (*queue_priority_mapping)[2];
> > + s8 (*queue_tc_mapping)[2];
> > + s8 (*queue_priority_mapping)[2];
> > };
> >
> > #endif
> > --
> > 1.7.9.5
> >
> > _______________________________________________
> > Davinci-linux-open-source mailing list
> > Davinci-linux-open-source at linux.davincidsp.com
> > http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
> >
>
>
> Regards,
> Gururaja
> _______________________________________________
> Davinci-linux-open-source mailing list
> Davinci-linux-open-source at linux.davincidsp.com
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
^ permalink raw reply
* [GIT PULL 5/5] omap asoc regression fixes for v3.7-rc1
From: Tony Lindgren @ 2012-10-09 18:46 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <pull-1349808387-617119>
The following changes since commit 5e090ed7af10729a396a25df43d69a236e789736:
Merge tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (2012-10-07 20:55:16 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.7-rc1/fixes-asoc-regression-signed
for you to fetch changes up to 8bbacc55ba72368d7fdbad06b63d66bd763a428a:
ARM/dts: omap5-evm: pinmux configuration for audio (2012-10-08 16:06:28 -0700)
----------------------------------------------------------------
This branch contains regression fixes for omap4/5 ASoC
audio that were caused by the fact that u-boot stopped
muxing non essential pins.
As omap audio and dmaengine development happens on
these platforms, let's make sure they are usable.
Of course this should have been fixed earlier and
not during the -rc cycle.
----------------------------------------------------------------
Peter Ujfalusi (9):
ARM: OMAP: board-4430-sdp: Pin mux configuration for audio needs
ARM: OMAP: board-omap4panda: Pin mux configuration for audio needs
ARM/dts: omap4-panda: Disable unused audio IPs
ARM/dts: omap4-sdp: Disable unused McBSP3
ARM/dts: omap5-evm: Disable unused McBSP3
ARM/dts: omap4-sdp: pinmux configuration for audio
ARM/dts: omap4-panda: pinmux configuration for audio
ARM/dts: Add pinctrl driver entries for omap5
ARM/dts: omap5-evm: pinmux configuration for audio
arch/arm/boot/dts/omap4-panda.dts | 47 ++++++++++++++++++++++++++
arch/arm/boot/dts/omap4-sdp.dts | 57 +++++++++++++++++++++++++++++++
arch/arm/boot/dts/omap5-evm.dts | 58 ++++++++++++++++++++++++++++++++
arch/arm/boot/dts/omap5.dtsi | 17 ++++++++++
arch/arm/mach-omap2/board-4430sdp.c | 26 ++++++++++++++
arch/arm/mach-omap2/board-omap4panda.c | 15 +++++++++
6 files changed, 220 insertions(+)
^ permalink raw reply
* [GIT PULL 4/5] omap cpufreq fixes for v3.7-rc1
From: Tony Lindgren @ 2012-10-09 18:46 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <pull-1349808387-617119>
The following changes since commit 5e090ed7af10729a396a25df43d69a236e789736:
Merge tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (2012-10-07 20:55:16 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.7-rc1/fixes-cpufreq-signed
for you to fetch changes up to 37fedb4c423ab78639e65a7c15d2f23cb412aa7e:
Merge tag 'for_3.7-fixes-cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-cpufreq (2012-10-08 15:54:14 -0700)
----------------------------------------------------------------
These were agreed to be merged via arm soc tree as Rafael
is on vacation.
>From Kevin Hilman <khilman@deeprootsystems.com>:
This series a couple bug fixes and a couple fixes that make this
driver support recently added OMAP-based SoCs.
The 'get_cpu_device' patch is needed due to a change in the OMAP
OMAP PM core code which enforces use of get_cpu_device() instead of
a deprecated OMAP-specific API.
The usage of plat/*.h headers breaks single zImage, so platforms are
cleaning up and/or removing plat/*.h so the driver needs to be fixed
accordingly.
This series is based on the merge of Rafael's pm-for-3.7-rc1 tag into
Linus' master branch: commit 16642a2e7be23bbda013fc32d8f6c68982eab603.
----------------------------------------------------------------
Kevin Hilman (4):
cpufreq: OMAP: ensure valid clock rate before scaling
cpufreq: OMAP: remove unused <plat/omap-pm.h>
cpufreq: OMAP: use get_cpu_device() instead of omap_device API
ARM: OMAP2+: PM: MPU DVFS: use generic CPU device for MPU-SS
Paul Walmsley (1):
cpufreq: OMAP: fix clock usage to be SoC independent, remove plat/ includes
Tony Lindgren (1):
Merge tag 'for_3.7-fixes-cpufreq' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-cpufreq
arch/arm/mach-omap2/opp.c | 23 +++++++++++++++++------
arch/arm/mach-omap2/pm.c | 11 ++++++++++-
arch/arm/mach-omap2/twl-common.c | 2 +-
drivers/cpufreq/omap-cpufreq.c | 36 ++++++++++++------------------------
4 files changed, 40 insertions(+), 32 deletions(-)
^ permalink raw reply
* [GIT PULL 3/5] omap pm fixes for v3.7-rc1
From: Tony Lindgren @ 2012-10-09 18:46 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <pull-1349808387-617119>
The following changes since commit 5e090ed7af10729a396a25df43d69a236e789736:
Merge tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (2012-10-07 20:55:16 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.7-rc1/fixes-pm-signed
for you to fetch changes up to fce680e9faaa8acc0ab0a931c5fa823b581cbab0:
Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-pm (2012-10-08 15:57:41 -0700)
----------------------------------------------------------------
>From Kevin Hilman <khilman@deeprootsystems.com>:
OMAP PM related fixes for v3.7-rc
----------------------------------------------------------------
Jean Pihet (2):
ARM: OMAP: SmartReflex: select CONFIG_POWER_SUPPLY in Kconfig
ARM: OMAP: SmartReflex: fix error path in init function
Tony Lindgren (1):
Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.7-rc1/fixes-pm
Wei Yongjun (4):
ARM: OMAP: fix return value check in beagle_opp_init()
ARM: OMAP: omap_device: fix return value check in omap_device_build_ss()
ARM: OMAP2+: SmartReflex: fix return value check in sr_dev_init()
ARM: OMAP2+: PM: fix return value check in omap2_set_init_voltage()
arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
arch/arm/mach-omap2/pm.c | 2 +-
arch/arm/mach-omap2/sr_device.c | 2 +-
arch/arm/plat-omap/Kconfig | 1 +
arch/arm/plat-omap/omap_device.c | 2 +-
drivers/power/avs/smartreflex.c | 8 ++++----
6 files changed, 9 insertions(+), 8 deletions(-)
^ permalink raw reply
* [GIT PULL 2/5] omap hwmod and clock fixes for v3.7-rc1
From: Tony Lindgren @ 2012-10-09 18:46 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <pull-1349808387-617119>
The following changes since commit 0e51793e162ca432fc5f04178cf82b80a92c2659:
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm (2012-10-07 21:20:57 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.7-rc1/fixes-hwmod-clock-signed-v3
for you to fetch changes up to eb20f31f6e7d3ac19738e5a45df9b09b25381e73:
Merge tag 'omap-fixes-a-for-pre3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.7-rc1/fixes-hwmod-clock (2012-10-09 11:07:29 -0700)
----------------------------------------------------------------
>From Paul Walmsley <paul@pwsan.com>:
Some OMAP fixes for the 3.7 merge window, fixing mismerges, branch
integration issues, and bugs after the arm-soc merges.
----------------------------------------------------------------
Jon Hunter (2):
ARM: OMAP2+: hwmod data: Fix PMU interrupt definitions
ARM: OMAP3: fix workaround for EMU clockdomain
Paul Walmsley (2):
ARM: OMAP: omap3evm: fix new sparse warning
ARM: OMAP4/AM335x: hwmod: fix disable_module regression in hardreset handling
Tony Lindgren (1):
Merge tag 'omap-fixes-a-for-pre3.7' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.7-rc1/fixes-hwmod-clock
Vaibhav Hiremath (1):
ARM: am33xx: clk: Update clkdev table to add mcasp alias
arch/arm/mach-omap2/board-omap3evm.c | 3 +-
arch/arm/mach-omap2/clock33xx_data.c | 2 +
arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 44 ++++++++++----------
arch/arm/mach-omap2/omap_hwmod.c | 31 ++++++++++++--
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
6 files changed, 54 insertions(+), 30 deletions(-)
^ permalink raw reply
* [GIT PULL 1/5] omap fixes for v3.7-rc1
From: Tony Lindgren @ 2012-10-09 18:46 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 5e090ed7af10729a396a25df43d69a236e789736:
Merge tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (2012-10-07 20:55:16 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.7-rc1/fixes-signed
for you to fetch changes up to 224cd7115abb5b05a5d665551452c271449ce80b:
arm/omap: Replace board_ref_clock with enum values (2012-10-08 18:09:30 -0700)
----------------------------------------------------------------
This branch contains one counter locking fix and an
alignment fix. Other fixes are warning fixes, fixes
for return value checks.
I've also included removal of some extra semicolons,
dropping of some duplicate includes, and an a change
for wl12xx enumeration that are not strictly fixes
but would be good to get out of the way for -rc1.
----------------------------------------------------------------
Afzal Mohammed (1):
ARM: OMAP2+: gpmc: annotate exit sections properly
Axel Lin (1):
ARM: OMAP: OMAP_DEBUG_LEDS needs to select LEDS_CLASS
Colin Cross (1):
ARM: OMAP: counter: add locking to read_persistent_clock
Peter Senna Tschudin (3):
arch/arm/mach-omap1/devices.c: Remove unecessary semicolon
arch/arm/mach-omap2: Remove unecessary semicolon
arch/arm/plat-omap/omap-pm-noop.c: Remove unecessary semicolon
R Sricharan (1):
ARM: OMAP2+: Round of the carve out memory requested to section_size
Raphael Assenat (1):
AM35xx: Add missing hwmod entry for the HDQ/1-Wire present in AM3505/3517 CPUs.
Shubhrajyoti D (1):
ARM: OMAP: rx51: Fix a section mismatch warn
Vaibhav Hiremath (1):
ARM: OMAP2+: Add am335x evm and bone targets to common Makefile
Vikram Narayanan (1):
arm/omap: Replace board_ref_clock with enum values
Wei Yongjun (4):
OMAPDSS: fix return value check in create_dss_pdev()
ARM: OMAP: hsmmc: fix return value check in omap_hsmmc_init_one()
ARM: OMAP: fix return value check in realtime_counter_init()
ARM: OMAP2+: remove duplicated include from board-omap3stalker.c
Yegor Yefremov (1):
arm: increase FORCE_MAX_ZONEORDER for TI AM33XX
arch/arm/Kconfig | 1 +
arch/arm/boot/dts/Makefile | 4 +++-
arch/arm/mach-omap1/devices.c | 2 +-
arch/arm/mach-omap2/board-flash.c | 2 +-
arch/arm/mach-omap2/board-omap3stalker.c | 5 -----
arch/arm/mach-omap2/board-omap4panda.c | 3 +--
arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
arch/arm/mach-omap2/board-zoom-peripherals.c | 3 +--
arch/arm/mach-omap2/clkt_clksel.c | 2 +-
arch/arm/mach-omap2/display.c | 2 +-
arch/arm/mach-omap2/gpmc.c | 4 ++--
arch/arm/mach-omap2/hsmmc.c | 2 +-
arch/arm/mach-omap2/mux.c | 2 +-
arch/arm/mach-omap2/omap-secure.c | 4 ++--
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 7 ++++---
arch/arm/mach-omap2/pm-debug.c | 2 +-
arch/arm/mach-omap2/timer.c | 2 +-
arch/arm/plat-omap/Kconfig | 1 +
arch/arm/plat-omap/counter_32k.c | 21 ++++++++++++++-------
arch/arm/plat-omap/omap-pm-noop.c | 8 ++++----
20 files changed, 42 insertions(+), 37 deletions(-)
^ permalink raw reply
* [GIT PULL 0/9] ARM architecture fixes for 3.7
From: Arnd Bergmann @ 2012-10-09 18:40 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121009160814.GH4625@n2100.arm.linux.org.uk>
On Tuesday 09 October 2012, Russell King - ARM Linux wrote:
>
> On Tue, Oct 09, 2012 at 05:22:54PM +0200, Arnd Bergmann wrote:
> > Here are some patches that belong into your domain, I hope you can
> > just send the lot to Linus the next time you send other patches.
> >
> > These bug fixes all address problems found with automated build testing.
> > Some of them have been around for a long time, other bugs are
> > regressions since the merge window.
>
> Apart from the sliced off comment in one commit (which XEN people need
> to confirm they're happy with the final version), I think these are
> otherwise fine... I'll hold off pulling them until that can be fixed.
Fixed that now, and I also added the Acks that I got in the meantime,
changed the dependency from Xen on (CPU_v7 && !CPU_V6), and edited the
description for patch 6 as Dave suggested.
Arnd
8<---
The following changes since commit 0e51793e162ca432fc5f04178cf82b80a92c2659:
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm (2012-10-07 21:20:57 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/fixes-for-rmk
for you to fetch changes up to 8e7fc18b5eacc37b6e6fcf486ec4eafbfef91738:
ARM: warnings in arch/arm/include/asm/uaccess.h (2012-10-09 20:29:07 +0200)
----------------------------------------------------------------
These bug fixes all address problems found with automated build testing.
Some of them have been around for a long time, other bugs are
regressions since the merge window.
----------------------------------------------------------------
Arnd Bergmann (9):
ARM: kprobes: make more tests conditional
ARM: export set_irq_flags
ARM: Fix another build warning in arch/arm/mm/alignment.c
ARM: export default read_current_timer
ARM: Xen: fix initial build problems
ARM: pass -marm to gcc by default for both C and assembler
ARM: be really quiet when building with 'make -s'
ARM: binfmt_flat: unused variable 'persistent'
ARM: warnings in arch/arm/include/asm/uaccess.h
arch/arm/Kconfig | 1 +
arch/arm/Makefile | 13 +++++++------
arch/arm/boot/Makefile | 10 +++++-----
arch/arm/include/asm/flat.h | 2 +-
arch/arm/include/asm/uaccess.h | 4 ++--
arch/arm/kernel/irq.c | 2 ++
arch/arm/kernel/kprobes-test-arm.c | 4 ++++
arch/arm/lib/delay.c | 1 +
arch/arm/mm/alignment.c | 4 +++-
arch/arm/tools/Makefile | 2 +-
drivers/xen/Kconfig | 2 ++
drivers/xen/sys-hypervisor.c | 1 +
12 files changed, 30 insertions(+), 16 deletions(-)
^ permalink raw reply
* Booting vanilla kernel on the beaglebone
From: Hiremath, Vaibhav @ 2012-10-09 18:34 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121009182941.GB12235@netboy.at.omicron.at>
On Tue, Oct 09, 2012 at 23:59:42, Richard Cochran wrote:
> On Tue, Oct 09, 2012 at 05:22:15PM +0000, Hiremath, Vaibhav wrote:
>
> > https://patchwork.kernel.org/patch/1499271/
> > https://patchwork.kernel.org/patch/1569231/
> >
> > These patches addresses integration related issues which occurs during merge
> > window.
> >
> > Please note that, these patches are already submitted to list and expected
> > to get merged for rc1.
>
> Okay, so now it is working. It appears that these two are neither in
> linux-next or in mainline.
>
As I mentioned they are expected to get merged for rc1 and result of
integration during merge window.
Thanks
Vaibhav
> Thanks,
> Richard
>
^ permalink raw reply
* Pull request for mainline
From: Roland Stigge @ 2012-10-09 18:30 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <506EA8B4.6050309@antcom.de>
Hi David and Artem!
On 05/10/12 11:30, Roland Stigge wrote:
> just small reminder, just in case: Now would be a good opportunity for a
> pull request for mtd to mainline, if not already done. ;-)
I found two others asking on the mtd list for the same, but also without
a reply.
So I hope you are well and can prepare a pull request in time for this
merge window (closing at the end of this week).
Please tell me if I can do anything to help here. I would volunteer.
Thanks in advance,
Roland
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox