* [PATCH] arm: socfpga: fix build break for allyesconfig
From: Russell King - ARM Linux @ 2012-10-26 22:43 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121026223654.GB2597@elf.ucw.cz>
On Sat, Oct 27, 2012 at 12:36:54AM +0200, Pavel Machek wrote:
> Hi!
>
> > > index 17d6eaf..9031a3c 100644
> > > --- a/arch/arm/mach-socfpga/headsmp.S
> > > +++ b/arch/arm/mach-socfpga/headsmp.S
> > > @@ -15,8 +15,10 @@
> > > #define CPU1_START_ADDR 0xffd08010
> > >
> > > ENTRY(secondary_trampoline)
> > > +#if __LINUX_ARM_ARCH__ >= 7
> > > movw r0, #:lower16:CPU1_START_ADDR
> > > movt r0, #:upper16:CPU1_START_ADDR
> > > +#endif
> >
> > If you do that, then it effectively means you don't need these instructions
> > and you might as well just delete them... but looking at the following one:
> >
> > > ldr r1, [r0]
> >
> > it's clear that you do need it. So you need to find a different solution.
> > If the above assembly file can only run on ARMv7, consider putting
> >
> > .march armv7
> >
> > or similar before it.
>
> My version of gas does not seem to recognize .march
Ah, that's because it's .arch not .march. Please could you check with
.arch instead. If proven successful we should move the existing
AFLAGS_xxx.o Makefile stuff into the assembly files concerned.
^ permalink raw reply
* [GIT PULL] omap plat header removal for v3.8 merge window, part1
From: Tony Lindgren @ 2012-10-26 22:38 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121026175537.GL11908@atomide.com>
* Tony Lindgren <tony@atomide.com> [121026 10:57]:
> * Arnd Bergmann <arnd@arndb.de> [121026 10:30]:
> >
> > Well, once CONFIG_MULTIPLATFORM gets enabled, the mach/*.h files are
> > not visible to drivers any more, but they are still visible to files
> > in plat-omap if you add a line like
> >
> > ccflags-$(CONFIG_ARCH_OMAP2) := -I$(srctree)/arch/arm/mach-omap2/include
> > ccflags-$(CONFIG_ARCH_OMAP1) := -I$(srctree)/arch/arm/mach-omap1/include
> >
> > to arch/arm/plat-omap/Makefile. That is how the other multiplatform
> > Makefiles do it. If a driver writer really wants to cheat, they can of
> > course do the same thing in their directory, but they can also do
> > #include "../../../../arch/arm/mach-omap2/foo.h"
>
> OK thanks for clarifying that. Sounds like that can be used to
> fix up the relative includes for plat-omap. I'll do some patches
> for that after we have the #include <plat/*.h> and #include <mach/*.h>
> issue sorted out.
Here's a patch for that. It's against what I have queued up in
omap-for-v3.8/cleanup-headers. Does that look OK to you?
Regards,
Tony
From: Tony Lindgren <tony@atomide.com>
Date: Fri, 26 Oct 2012 15:06:40 -0700
Subject: [PATCH] ARM: OMAP: Fix relative includes for plat-omap with ccflags
As suggested by Arnd Bergmann <arnd@arndb.de>, we can keep
these headers local to arch/arm/*omap*/ by modifying the
ccflags in plat/omap/Makefile.
Note that eventually even most of these will go away
as things like SRAM and PRCM become just regular device
drivers.
Also note that this will not fix plat/cpu.h, but that
will be removed anyways as soon as the drivers are
fixed.
While at it, also sort the includes the standard way.
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
index cd169c3..03b1e80 100644
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -2,6 +2,8 @@
# Makefile for the linux kernel.
#
+ccflags-$(CONFIG_ARCH_OMAP) := -I$(srctree)/arch/arm
+
# Common support
obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o
obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 931f3f6..031fa3f 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -24,7 +24,7 @@
#include <mach/hardware.h>
-#include "../plat-omap/sram.h"
+#include <plat-omap/sram.h>
#include "soc.h"
#include "iomap.h"
diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c
index 28aea55..96b2fa7d 100644
--- a/arch/arm/mach-omap1/clock_data.c
+++ b/arch/arm/mach-omap1/clock_data.c
@@ -21,14 +21,12 @@
#include <linux/delay.h>
#include <asm/mach-types.h> /* for machine_is_* */
-
-#include "soc.h"
-
#include <mach/hardware.h>
#include <mach/usb.h> /* for OTG_BASE */
-#include "../plat-omap/sram.h"
+#include <plat-omap/sram.h>
+#include "soc.h"
#include "iomap.h"
#include "clock.h"
diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h
index 26e19d3..acd1797 100644
--- a/arch/arm/mach-omap1/common.h
+++ b/arch/arm/mach-omap1/common.h
@@ -26,11 +26,11 @@
#ifndef __ARCH_ARM_MACH_OMAP1_COMMON_H
#define __ARCH_ARM_MACH_OMAP1_COMMON_H
-#include "../plat-omap/common.h"
#include <linux/mtd/mtd.h>
#include <linux/i2c-omap.h>
-#include "../plat-omap/i2c.h"
+#include <plat-omap/common.h>
+#include <plat-omap/i2c.h>
#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
void omap7xx_map_io(void);
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 645668e..07e6065 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -21,12 +21,11 @@
#include <mach/tc.h>
#include <mach/mux.h>
-
#include <mach/omap7xx.h>
#include <mach/camera.h>
#include <mach/hardware.h>
-#include "../plat-omap/sram.h"
+#include <plat-omap/sram.h>
#include "common.h"
#include "clock.h"
diff --git a/arch/arm/mach-omap1/i2c.c b/arch/arm/mach-omap1/i2c.c
index 32bcbb8..8ee5892e 100644
--- a/arch/arm/mach-omap1/i2c.c
+++ b/arch/arm/mach-omap1/i2c.c
@@ -20,10 +20,12 @@
*/
#include <linux/i2c-omap.h>
+
#include <mach/mux.h>
-#include "soc.h"
-#include "../plat-omap/i2c.h"
+#include <plat-omap/i2c.h>
+
+#include "soc.h"
#define OMAP_I2C_SIZE 0x3f
#define OMAP1_I2C_BASE 0xfffb3800
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index b2c2328..d8b0c7d 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -56,7 +56,7 @@
#include <mach/irqs.h>
-#include "../plat-omap/sram.h"
+#include <plat-omap/sram.h>
#include "iomap.h"
#include "clock.h"
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 46d9071..1a9d9b9 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -2,6 +2,8 @@
# Makefile for the linux kernel.
#
+ccflags-$(CONFIG_ARCH_OMAP) := -I$(srctree)/arch/arm
+
# Common support
obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \
common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
@@ -75,7 +77,7 @@ obj-$(CONFIG_POWER_AVS_OMAP) += sr_device.o
obj-$(CONFIG_POWER_AVS_OMAP_CLASS3) += smartreflex-class3.o
AFLAGS_sleep24xx.o :=-Wa,-march=armv6
-AFLAGS_sleep34xx.o :=-Wa,-march=armv7-a$(plus_sec)
+AFLAGS_sleep34xx.o :=-Wa,-march=armv7-a$(plus_sec) -I$(srctree)/arch/arm
ifeq ($(CONFIG_PM_VERBOSE),y)
CFLAGS_pm_bus.o += -DDEBUG
diff --git a/arch/arm/mach-omap2/clkt2xxx_dpllcore.c b/arch/arm/mach-omap2/clkt2xxx_dpllcore.c
index 3432f91..9bd6ff4 100644
--- a/arch/arm/mach-omap2/clkt2xxx_dpllcore.c
+++ b/arch/arm/mach-omap2/clkt2xxx_dpllcore.c
@@ -25,7 +25,7 @@
#include <linux/clk.h>
#include <linux/io.h>
-#include "../plat-omap/sram.h"
+#include <plat-omap/sram.h>
#include "clock.h"
#include "clock2xxx.h"
diff --git a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
index c66276b..ddf2e31 100644
--- a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
+++ b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
@@ -33,7 +33,7 @@
#include <linux/cpufreq.h>
#include <linux/slab.h>
-#include "../plat-omap/sram.h"
+#include <plat-omap/sram.h>
#include "soc.h"
#include "clock.h"
diff --git a/arch/arm/mach-omap2/clkt34xx_dpll3m2.c b/arch/arm/mach-omap2/clkt34xx_dpll3m2.c
index 5510d92..4f6e19e 100644
--- a/arch/arm/mach-omap2/clkt34xx_dpll3m2.c
+++ b/arch/arm/mach-omap2/clkt34xx_dpll3m2.c
@@ -21,7 +21,7 @@
#include <linux/clk.h>
#include <linux/io.h>
-#include "../plat-omap/sram.h"
+#include <plat-omap/sram.h>
#include "clock.h"
#include "clock3xxx.h"
diff --git a/arch/arm/mach-omap2/cm33xx.c b/arch/arm/mach-omap2/cm33xx.c
index b4938ab..b95c766 100644
--- a/arch/arm/mach-omap2/cm33xx.c
+++ b/arch/arm/mach-omap2/cm33xx.c
@@ -22,7 +22,7 @@
#include <linux/err.h>
#include <linux/io.h>
-#include "../plat-omap/common.h"
+#include <plat-omap/common.h>
#include "cm.h"
#include "cm33xx.h"
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index c925c80..0f461d6 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -34,7 +34,7 @@
#include <asm/proc-fns.h>
-#include "../plat-omap/common.h"
+#include <plat-omap/common.h>
#include "i2c.h"
#include "serial.h"
diff --git a/arch/arm/mach-omap2/i2c.h b/arch/arm/mach-omap2/i2c.h
index 81dbb99..e8b3b72 100644
--- a/arch/arm/mach-omap2/i2c.h
+++ b/arch/arm/mach-omap2/i2c.h
@@ -19,7 +19,7 @@
*
*/
-#include "../plat-omap/i2c.h"
+#include <plat-omap/i2c.h>
#ifndef __MACH_OMAP2_I2C_H
#define __MACH_OMAP2_I2C_H
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 4fadc78..629f7af 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -26,8 +26,7 @@
#include <asm/mach/map.h>
#include <plat-omap/dma-omap.h>
-
-#include "../plat-omap/sram.h"
+#include <plat-omap/sram.h>
#include "omap_hwmod.h"
#include "soc.h"
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index d25845c..d1cc30d 100644
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -25,7 +25,7 @@
#include <asm/mach/map.h>
#include <asm/memblock.h>
-#include "../plat-omap/sram.h"
+#include <plat-omap/sram.h>
#include "omap-wakeupgen.h"
#include "soc.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
index 05c6a59..4ecddad 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
@@ -11,8 +11,7 @@
*/
#include <plat-omap/dma-omap.h>
-
-#include "../plat-omap/common.h"
+#include <plat-omap/common.h>
#include "omap_hwmod.h"
#include "hdq1w.h"
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 5b9be73..2446a5e 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -23,14 +23,13 @@
#include <linux/power/smartreflex.h>
#include <linux/i2c-omap.h>
-#include <plat-omap/dma-omap.h>
-
#include <linux/platform_data/spi-omap2-mcspi.h>
#include <linux/platform_data/asoc-ti-mcbsp.h>
#include <plat/dmtimer.h>
#include <plat/iommu.h>
-#include "../plat-omap/common.h"
+#include <plat-omap/common.h>
+#include <plat-omap/dma-omap.h>
#include "omap_hwmod.h"
#include "omap_hwmod_common_data.h"
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index 6d17e044..7ff08f8 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -37,8 +37,7 @@
#include <asm/system_misc.h>
#include <plat-omap/dma-omap.h>
-
-#include "../plat-omap/sram.h"
+#include <plat-omap/sram.h>
#include "soc.h"
#include "common.h"
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 160fa25..541eda1 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -38,9 +38,9 @@
#include "clockdomain.h"
#include "powerdomain.h"
#include <plat/prcm.h>
-#include <plat-omap/dma-omap.h>
-#include "../plat-omap/sram.h"
+#include <plat-omap/dma-omap.h>
+#include <plat-omap/sram.h>
#include "soc.h"
#include "common.h"
diff --git a/arch/arm/mach-omap2/prm33xx.c b/arch/arm/mach-omap2/prm33xx.c
index 624ade5..5df23da 100644
--- a/arch/arm/mach-omap2/prm33xx.c
+++ b/arch/arm/mach-omap2/prm33xx.c
@@ -19,7 +19,7 @@
#include <linux/err.h>
#include <linux/io.h>
-#include "../plat-omap/common.h"
+#include <plat-omap/common.h>
#include "common.h"
#include "prm33xx.h"
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c
index 6fabbd8..6d96d95 100644
--- a/arch/arm/mach-omap2/prm_common.c
+++ b/arch/arm/mach-omap2/prm_common.c
@@ -24,9 +24,10 @@
#include <linux/interrupt.h>
#include <linux/slab.h>
-#include "../plat-omap/common.h"
#include <plat/prcm.h>
+#include <plat-omap/common.h>
+
#include "prm2xxx_3xxx.h"
#include "prm44xx.h"
diff --git a/arch/arm/mach-omap2/sdrc.c b/arch/arm/mach-omap2/sdrc.c
index 94d4082..e6bb257 100644
--- a/arch/arm/mach-omap2/sdrc.c
+++ b/arch/arm/mach-omap2/sdrc.c
@@ -23,7 +23,7 @@
#include <linux/clk.h>
#include <linux/io.h>
-#include "../plat-omap/sram.h"
+#include <plat-omap/sram.h>
#include "common.h"
#include "clock.h"
diff --git a/arch/arm/mach-omap2/sdrc2xxx.c b/arch/arm/mach-omap2/sdrc2xxx.c
index 3b8bfdf..0012cb9 100644
--- a/arch/arm/mach-omap2/sdrc2xxx.c
+++ b/arch/arm/mach-omap2/sdrc2xxx.c
@@ -24,7 +24,7 @@
#include <linux/clk.h>
#include <linux/io.h>
-#include "../plat-omap/sram.h"
+#include <plat-omap/sram.h>
#include "soc.h"
#include "iomap.h"
diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S
index 75afe11..2eeac9f 100644
--- a/arch/arm/mach-omap2/sleep34xx.S
+++ b/arch/arm/mach-omap2/sleep34xx.S
@@ -26,7 +26,7 @@
#include <asm/assembler.h>
-#include "../plat-omap/sram.h"
+#include <plat-omap/sram.h>
#include "omap34xx.h"
#include "iomap.h"
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 4bd0ace..90ffae7 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -2,6 +2,8 @@
# Makefile for the linux kernel.
#
+ccflags-$(CONFIG_ARCH_OMAP) := -I$(srctree)/arch/arm
+
# Common support
obj-y := common.o sram.o dma.o fb.o counter_32k.o
obj-m :=
diff --git a/arch/arm/plat-omap/debug-devices.c b/arch/arm/plat-omap/debug-devices.c
index 5a4678e..a53f09ab0 100644
--- a/arch/arm/plat-omap/debug-devices.c
+++ b/arch/arm/plat-omap/debug-devices.c
@@ -16,7 +16,8 @@
#include <linux/smc91x.h>
#include <mach/hardware.h>
-#include "../mach-omap2/debug-devices.h"
+
+#include <mach-omap2/debug-devices.h>
/* Many OMAP development platforms reuse the same "debug board"; these
* platforms include H2, H3, H4, and Perseus2.
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 49803cc..99f437f 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -38,8 +38,8 @@
#include <plat-omap/dma-omap.h>
-#include "../mach-omap1/soc.h"
-#include "../mach-omap2/soc.h"
+#include <mach-omap1/soc.h>
+#include <mach-omap2/soc.h>
/*
* MAX_LOGICAL_DMA_CH_COUNT: the maximum number of logical DMA
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 4a0b30a..2cd1b0d 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -45,7 +45,7 @@
#include <mach/hardware.h>
-#include "../mach-omap2/omap-pm.h"
+#include <mach-omap2/omap-pm.h>
static u32 omap_reserved_systimers;
static LIST_HEAD(omap_timer_list);
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c
index be6deb7..2c6c266 100644
--- a/arch/arm/plat-omap/i2c.c
+++ b/arch/arm/plat-omap/i2c.c
@@ -33,8 +33,8 @@
#include <mach/irqs.h>
-#include "../mach-omap1/soc.h"
-#include "../mach-omap2/soc.h"
+#include <mach-omap1/soc.h>
+#include <mach-omap2/soc.h>
#include "i2c.h"
diff --git a/arch/arm/plat-omap/omap-pm-noop.c b/arch/arm/plat-omap/omap-pm-noop.c
index 198685b..64e3ebc 100644
--- a/arch/arm/plat-omap/omap-pm-noop.c
+++ b/arch/arm/plat-omap/omap-pm-noop.c
@@ -22,8 +22,8 @@
#include <linux/device.h>
#include <linux/platform_device.h>
-#include "../mach-omap2/omap_device.h"
-#include "../mach-omap2/omap-pm.h"
+#include <mach-omap2/omap_device.h>
+#include <mach-omap2/omap-pm.h>
static bool off_mode_enabled;
static int dummy_context_loss_counter;
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index 70dcc22..e47a033 100644
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -25,16 +25,14 @@
#include <asm/mach/map.h>
-#include "../mach-omap1/soc.h"
-#include "../mach-omap2/soc.h"
+#include <mach-omap1/soc.h>
+#include <mach-omap2/soc.h>
+#include <mach-omap2/iomap.h>
+#include <mach-omap2/prm2xxx_3xxx.h>
+#include <mach-omap2/sdrc.h>
#include "sram.h"
-/* XXX These "sideways" includes will disappear when sram.c becomes a driver */
-#include "../mach-omap2/iomap.h"
-#include "../mach-omap2/prm2xxx_3xxx.h"
-#include "../mach-omap2/sdrc.h"
-
#define OMAP1_SRAM_PA 0x20000000
#define OMAP2_SRAM_PUB_PA (OMAP2_SRAM_PA + 0xf800)
#define OMAP3_SRAM_PUB_PA (OMAP3_SRAM_PA + 0x8000)
^ permalink raw reply related
* [PATCH] arm: socfpga: fix build break for allyesconfig
From: Pavel Machek @ 2012-10-26 22:36 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121026215136.GC21164@n2100.arm.linux.org.uk>
Hi!
> > index 17d6eaf..9031a3c 100644
> > --- a/arch/arm/mach-socfpga/headsmp.S
> > +++ b/arch/arm/mach-socfpga/headsmp.S
> > @@ -15,8 +15,10 @@
> > #define CPU1_START_ADDR 0xffd08010
> >
> > ENTRY(secondary_trampoline)
> > +#if __LINUX_ARM_ARCH__ >= 7
> > movw r0, #:lower16:CPU1_START_ADDR
> > movt r0, #:upper16:CPU1_START_ADDR
> > +#endif
>
> If you do that, then it effectively means you don't need these instructions
> and you might as well just delete them... but looking at the following one:
>
> > ldr r1, [r0]
>
> it's clear that you do need it. So you need to find a different solution.
> If the above assembly file can only run on ARMv7, consider putting
>
> .march armv7
>
> or similar before it.
My version of gas does not seem to recognize .march
( AS arch/arm/mach-socfpga/headsmp.o
arch/arm/mach-socfpga/headsmp.S: Assembler messages:
arch/arm/mach-socfpga/headsmp.S:17: Error: unknown pseudo-op: `.march'
arch/arm/mach-socfpga/headsmp.S:24: Error: selected processor does not
support `movw r0,#:lower16:(0xffd08000+0x10)'
arch/arm/mach-socfpga/headsmp.S:25: Error: selected processor does not
support `movt r0,#:upper16:(0xffd08000+0x10)'
)
This seems to do the trick:
Fix compilation with CPU_V6 option.
Signed-off-by: Pavel Machek <pavel@denx.de>
diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile
index a0fc372..6956e93 100644
--- a/arch/arm/mach-socfpga/Makefile
+++ b/arch/arm/mach-socfpga/Makefile
@@ -4,3 +4,5 @@
obj-y := socfpga.o
obj-$(CONFIG_SMP) += headsmp.o platsmp.o hotplug.o
+
+AFLAGS_headsmp.o := -Wa,-march=armv7-a
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply related
* [PATCH] arm: socfpga: fix build break for allyesconfig
From: dinguyen at altera.com @ 2012-10-26 22:17 UTC (permalink / raw)
To: linux-arm-kernel
From: Dinh Nguyen <dinguyen@altera.com>
Add check for armv7 in headsmp.S.
Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
---
arch/arm/mach-socfpga/headsmp.S | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S
index 17d6eaf..9031a3c 100644
--- a/arch/arm/mach-socfpga/headsmp.S
+++ b/arch/arm/mach-socfpga/headsmp.S
@@ -15,8 +15,10 @@
#define CPU1_START_ADDR 0xffd08010
ENTRY(secondary_trampoline)
+#if __LINUX_ARM_ARCH__ >= 7
movw r0, #:lower16:CPU1_START_ADDR
movt r0, #:upper16:CPU1_START_ADDR
+#endif
ldr r1, [r0]
bx r1
--
1.7.9.5
^ permalink raw reply related
* OMAP baseline test results for v3.7-rc1
From: Paul Walmsley @ 2012-10-26 22:03 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121026201539.GD29548@arwen.pp.htv.fi>
Hi Felipe,
On Fri, 26 Oct 2012, Felipe Balbi wrote:
> On Thu, Oct 25, 2012 at 01:12:12PM +0300, Felipe Balbi wrote:
> > On Tue, Oct 23, 2012 at 09:23:03PM +0200, Jean Pihet wrote:
> > > On Tue, Oct 23, 2012 at 9:19 PM, Paul Walmsley <paul@pwsan.com> wrote:
> > > > On Mon, 22 Oct 2012, Jean Pihet wrote:
> > > >
> > > >> On Mon, Oct 22, 2012 at 6:12 PM, Jean Pihet <jean.pihet@newoldbits.com> wrote:
> > > >>
> > > >> > Do you have CPU_IDLE enabled?
> > > >> FYI the issue is not present with CPU_IDLE enabled.
> > > >
> > > > Hmm, how can you tell? I thought you weren't able to reproduce it with
> > > > CPU_IDLE disabled either?
> > > I could not reproduce the issue, with and without CPU_IDLE enabled.
> > > What puzzles me is that the PM QoS code only has influence on the
> > > states chosen by cpuidle, so the change should not have any impact
> > > with CPU_IDLE enabled. I reallt need to reproduce the issue.
> > > Let me try with the same setup as yours (bootloader images,
> > > omap2pus_defconfig, angstrom roots).
> >
> > I just sent a patch to fix a bug I found on OMAP4 panda but while
> > reading this thread again, I think it could be that it's the same bug
> > which is just easier to reproduce on Paul's setup.
> >
> > Paul, Aaro, can you see if [1] makes the problem go away ? that would be
> > another reason to push [1] during this -rc cycle.
> >
> > [1] http://marc.info/?l=linux-omap&m=135115602407925&w=2
Thanks for mentioning it, but this patch doesn't fix the I2C timeout
problem here. Log fragment below from the 3530ES3 Beagle.
- Paul
Starting portmap daemon: portmap.
Tue Jul 22 00:18:00 UTC 2008
[ 23.476684] omap_i2c omap_i2c.1: timeout waiting for bus ready
[ 24.492309] omap_i2c omap_i2c.1: timeout waiting for bus ready
[ 24.495574] twl: i2c_read failed to transfer all messages
[ 24.498535] twl_rtc: Could not read TWLregister D - error -110
[ 24.501800] twl_rtc twl_rtc: twl_rtc_read_time: reading CTRL_REG, error
-110
INIT: Entering runlevel: 5
^ permalink raw reply
* [PATCH] arm: socfpga: fix build break for allyesconfig
From: Russell King - ARM Linux @ 2012-10-26 21:51 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1351289861-16297-1-git-send-email-dinguyen@altera.com>
On Fri, Oct 26, 2012 at 04:17:41PM -0600, dinguyen at altera.com wrote:
> From: Dinh Nguyen <dinguyen@altera.com>
>
> Add check for armv7 in headsmp.S.
>
> Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
> ---
> arch/arm/mach-socfpga/headsmp.S | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S
> index 17d6eaf..9031a3c 100644
> --- a/arch/arm/mach-socfpga/headsmp.S
> +++ b/arch/arm/mach-socfpga/headsmp.S
> @@ -15,8 +15,10 @@
> #define CPU1_START_ADDR 0xffd08010
>
> ENTRY(secondary_trampoline)
> +#if __LINUX_ARM_ARCH__ >= 7
> movw r0, #:lower16:CPU1_START_ADDR
> movt r0, #:upper16:CPU1_START_ADDR
> +#endif
If you do that, then it effectively means you don't need these instructions
and you might as well just delete them... but looking at the following one:
> ldr r1, [r0]
it's clear that you do need it. So you need to find a different solution.
If the above assembly file can only run on ARMv7, consider putting
.march armv7
or similar before it.
^ permalink raw reply
* [PATCH v5] gpio/omap: fix off-mode bug: clear debounce settings on free/reset
From: Jon Hunter @ 2012-10-26 21:42 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <874nlhhqxt.fsf@deeprootsystems.com>
On 10/26/2012 04:19 PM, Kevin Hilman wrote:
> Jon Hunter <jon-hunter@ti.com> writes:
>
>> This change was originally titled "gpio/omap: fix off-mode bug: clear debounce
>> clock enable mask on free/reset". The title has been updated slightly to
>> reflect (what should be) the final fix.
>
> nit: this kind of thing should typically go after the '---' since it's
> useful reviewers/maintainers but not necessarily in the permanant git
> history.
Thanks for the tip.
Linus, let me know if I should resend.
Cheers
Jon
^ permalink raw reply
* [PATCH v2] ARM: OMAP1: usb: fix sparse warnings
From: Tony Lindgren @ 2012-10-26 21:33 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <alpine.DEB.2.00.1210262128050.11258@utopia.booyaka.com>
* Paul Walmsley <paul@pwsan.com> [121026 14:30]:
>
> Resolve the following sparse warnings:
>
> arch/arm/mach-omap1/usb.c:304:12: warning: symbol 'omap1_usb0_init' was not declared. Should it be static?
> arch/arm/mach-omap1/usb.c:412:12: warning: symbol 'omap1_usb1_init' was not declared. Should it be static?
> arch/arm/mach-omap1/usb.c:478:12: warning: symbol 'omap1_usb2_init' was not declared. Should it be static?
>
> by declaring those functions as static.
>
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Felipe Balbi <balbi@ti.com>
> ---
>
> Applies on linux-omap/omap-for-v3.8/cleanup-headers.
Thanks applied.
Regards,
Tony
^ permalink raw reply
* [PATCH] ARM: OMAP1: usb: fix sparse warnings
From: Paul Walmsley @ 2012-10-26 21:29 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121026212841.GW11908@atomide.com>
On Fri, 26 Oct 2012, Tony Lindgren wrote:
> Looks like it's not urgent for the -rc series, so let's not
> introduce more self-inflicted merge conflicts. If that's OK
> with you, I can apply it to omap-for-v3.8/cleanup-headers
> without the header changes.
Yep that's fine, better to avoid creating unnecessary merge conflicts for
sure. Just sent the version against omap-for-v3.8/cleanup-headers...
- Paul
^ permalink raw reply
* [PATCH v2] ARM: OMAP1: usb: fix sparse warnings
From: Paul Walmsley @ 2012-10-26 21:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121026212059.GV11908@atomide.com>
Resolve the following sparse warnings:
arch/arm/mach-omap1/usb.c:304:12: warning: symbol 'omap1_usb0_init' was not declared. Should it be static?
arch/arm/mach-omap1/usb.c:412:12: warning: symbol 'omap1_usb1_init' was not declared. Should it be static?
arch/arm/mach-omap1/usb.c:478:12: warning: symbol 'omap1_usb2_init' was not declared. Should it be static?
by declaring those functions as static.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Felipe Balbi <balbi@ti.com>
---
Applies on linux-omap/omap-for-v3.8/cleanup-headers.
arch/arm/mach-omap1/usb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
index 84267ed..104fed3 100644
--- a/arch/arm/mach-omap1/usb.c
+++ b/arch/arm/mach-omap1/usb.c
@@ -301,7 +301,7 @@ static inline void otg_device_init(struct omap_usb_config *pdata)
#endif
-u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
+static u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
{
u32 syscon1 = 0;
@@ -409,7 +409,7 @@ u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
return syscon1 << 16;
}
-u32 __init omap1_usb1_init(unsigned nwires)
+static u32 __init omap1_usb1_init(unsigned nwires)
{
u32 syscon1 = 0;
@@ -475,7 +475,7 @@ bad:
return syscon1 << 20;
}
-u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
+static u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
{
u32 syscon1 = 0;
--
1.7.10.4
^ permalink raw reply related
* [PATCH] ARM: OMAP1: usb: fix sparse warnings
From: Tony Lindgren @ 2012-10-26 21:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <alpine.DEB.2.00.1210262125410.11258@utopia.booyaka.com>
* Paul Walmsley <paul@pwsan.com> [121026 14:27]:
> On Fri, 26 Oct 2012, Tony Lindgren wrote:
>
> > * Paul Walmsley <paul@pwsan.com> [121026 13:54]:
> > >
> > > Resolve the following sparse warnings:
> > >
> > > arch/arm/mach-omap1/usb.c:304:12: warning: symbol 'omap1_usb0_init' was not declared. Should it be static?
> > > arch/arm/mach-omap1/usb.c:412:12: warning: symbol 'omap1_usb1_init' was not declared. Should it be static?
> > > arch/arm/mach-omap1/usb.c:478:12: warning: symbol 'omap1_usb2_init' was not declared. Should it be static?
> > >
> > > by declaring those functions as static. Also remove the unneeded
> > > prototypes and related code from the plat/usb.h header file.
> > >
> > > Signed-off-by: Paul Walmsley <paul@pwsan.com>
> > > Cc: Tony Lindgren <tony@atomide.com>
> > > Cc: Felipe Balbi <balbi@ti.com>
> > > ---
> > >
> > > Tony, care to take this one?
> >
> > Let's apply just the usb.c changes on omap-for-v3.8/cleanup-headers
> > as plat/usb.h is now gone?
>
> OK no problem, thought you might want it for the -rc series...
Looks like it's not urgent for the -rc series, so let's not
introduce more self-inflicted merge conflicts. If that's OK
with you, I can apply it to omap-for-v3.8/cleanup-headers
without the header changes.
Regards,
Tony
^ permalink raw reply
* [PATCH] arm: socfpga: fix build break for allyesconfig
From: Arnd Bergmann @ 2012-10-26 21:26 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1351289861-16297-1-git-send-email-dinguyen@altera.com>
On Friday 26 October 2012, dinguyen at altera.com wrote:
> ENTRY(secondary_trampoline)
> +#if __LINUX_ARM_ARCH__ >= 7
> movw r0, #:lower16:CPU1_START_ADDR
> movt r0, #:upper16:CPU1_START_ADDR
> +#endif
I don't think this is the right fix, because it will break
running on SMP socfpga machines if you enable both socfpga
and picoxcell in a multiplatform configuration.
Arnd
^ permalink raw reply
* [PATCH] ARM: OMAP1: usb: fix sparse warnings
From: Paul Walmsley @ 2012-10-26 21:25 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121026212059.GV11908@atomide.com>
On Fri, 26 Oct 2012, Tony Lindgren wrote:
> * Paul Walmsley <paul@pwsan.com> [121026 13:54]:
> >
> > Resolve the following sparse warnings:
> >
> > arch/arm/mach-omap1/usb.c:304:12: warning: symbol 'omap1_usb0_init' was not declared. Should it be static?
> > arch/arm/mach-omap1/usb.c:412:12: warning: symbol 'omap1_usb1_init' was not declared. Should it be static?
> > arch/arm/mach-omap1/usb.c:478:12: warning: symbol 'omap1_usb2_init' was not declared. Should it be static?
> >
> > by declaring those functions as static. Also remove the unneeded
> > prototypes and related code from the plat/usb.h header file.
> >
> > Signed-off-by: Paul Walmsley <paul@pwsan.com>
> > Cc: Tony Lindgren <tony@atomide.com>
> > Cc: Felipe Balbi <balbi@ti.com>
> > ---
> >
> > Tony, care to take this one?
>
> Let's apply just the usb.c changes on omap-for-v3.8/cleanup-headers
> as plat/usb.h is now gone?
OK no problem, thought you might want it for the -rc series...
- Paul
^ permalink raw reply
* [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1
From: Tony Lindgren @ 2012-10-26 21:23 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <pull-1351286620-406688>
The following changes since commit a0212796b58061a9716178d261f318925c246643:
Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers (2012-10-26 13:18:19 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-prcm-part1-take2-signed
for you to fetch changes up to 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33:
Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm (2012-10-26 13:32:22 -0700)
----------------------------------------------------------------
>From Paul Walmsley <paul@pwsan.com>:
The first set of OMAP PRM/CM-related cleanup patches for 3.8.
Prepares for the future move of the PRM/CM code to drivers/. Also
includes some prcm.[ch] cleanup patches from the WDTIMER cleanup
series that don't need external acks.
----------------------------------------------------------------
Paul Walmsley (9):
ARM: OMAP2+: PRM: remove PRM weak functions
ARM: OMAP2+: PRM: split PRM functions into OMAP2, OMAP3-specific files
ARM: OMAP2+: powerdomain/PRM: move the low-level powerdomain functions into PRM
ARM: OMAP2+: CM/hwmod: split CM functions into OMAP2, OMAP3-specific files
ARM: OMAP2/3: clockdomain/PRM/CM: move the low-level clockdomain functions into PRM/CM
ARM: OMAP2+: PRM: prepare for use of prm_ll_data function pointers
ARM: OMAP2+: CM: prepare for use of cm_ll_data function pointers
ARM: OMAP1: create read_reset_sources() function (for initial use by watchdog)
ARM: OMAP2+: PRM: create PRM reset source API for the watchdog timer driver
Tony Lindgren (2):
Merge tag 'omap-cleanup-a-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/cleanup-prcm
Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm
arch/arm/mach-omap1/common.h | 2 +
arch/arm/mach-omap1/reset.c | 38 +++
arch/arm/mach-omap2/Makefile | 110 ++++---
arch/arm/mach-omap2/clkt2xxx_apll.c | 2 +-
arch/arm/mach-omap2/clkt2xxx_dpll.c | 2 +-
arch/arm/mach-omap2/clock.c | 3 +-
arch/arm/mach-omap2/clock2420_data.c | 2 +-
arch/arm/mach-omap2/clock2430.c | 2 +-
arch/arm/mach-omap2/clock2430_data.c | 2 +-
arch/arm/mach-omap2/clock34xx.c | 2 +-
arch/arm/mach-omap2/clock3517.c | 2 +-
arch/arm/mach-omap2/clock3xxx_data.c | 2 +-
arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 341 -------------------
arch/arm/mach-omap2/clockdomain33xx.c | 74 -----
arch/arm/mach-omap2/clockdomain44xx.c | 151 ---------
arch/arm/mach-omap2/cm.h | 12 +
arch/arm/mach-omap2/cm2xxx.c | 255 ++++++++++++++
arch/arm/mach-omap2/cm2xxx.h | 66 ++++
arch/arm/mach-omap2/cm2xxx_3xxx.h | 119 +++----
arch/arm/mach-omap2/cm33xx.c | 56 ++++
arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c} | 307 +++++++++--------
arch/arm/mach-omap2/cm3xxx.h | 86 +++++
arch/arm/mach-omap2/cm_common.c | 71 ++++
arch/arm/mach-omap2/cminst44xx.c | 142 +++++++-
arch/arm/mach-omap2/control.c | 4 +-
arch/arm/mach-omap2/omap_hwmod.c | 51 ++-
arch/arm/mach-omap2/pm24xx.c | 4 +-
arch/arm/mach-omap2/pm34xx.c | 5 +-
arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 242 --------------
arch/arm/mach-omap2/powerdomain33xx.c | 229 -------------
arch/arm/mach-omap2/powerdomain44xx.c | 285 ----------------
arch/arm/mach-omap2/prm-regbits-24xx.h | 6 +-
arch/arm/mach-omap2/prm-regbits-34xx.h | 12 +-
arch/arm/mach-omap2/prm.h | 53 +++
arch/arm/mach-omap2/prm2xxx.c | 126 +++++++
arch/arm/mach-omap2/prm2xxx.h | 132 ++++++++
arch/arm/mach-omap2/prm2xxx_3xxx.c | 332 +++++++------------
arch/arm/mach-omap2/prm2xxx_3xxx.h | 277 ++++------------
arch/arm/mach-omap2/prm33xx.c | 202 ++++++++++++
arch/arm/mach-omap2/prm3xxx.c | 403 +++++++++++++++++++++++
arch/arm/mach-omap2/prm3xxx.h | 160 +++++++++
arch/arm/mach-omap2/prm44xx.c | 355 +++++++++++++++++++-
arch/arm/mach-omap2/prm44xx.h | 2 +
arch/arm/mach-omap2/prm_common.c | 104 +++---
arch/arm/mach-omap2/sdrc2xxx.c | 2 +-
arch/arm/mach-omap2/sleep34xx.S | 4 +-
arch/arm/mach-omap2/sram242x.S | 4 +-
arch/arm/mach-omap2/sram243x.S | 4 +-
arch/arm/mach-omap2/sram34xx.S | 2 +-
49 files changed, 2750 insertions(+), 2099 deletions(-)
delete mode 100644 arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
delete mode 100644 arch/arm/mach-omap2/clockdomain33xx.c
delete mode 100644 arch/arm/mach-omap2/clockdomain44xx.c
create mode 100644 arch/arm/mach-omap2/cm2xxx.c
create mode 100644 arch/arm/mach-omap2/cm2xxx.h
rename arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c} (72%)
create mode 100644 arch/arm/mach-omap2/cm3xxx.h
create mode 100644 arch/arm/mach-omap2/cm_common.c
delete mode 100644 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
delete mode 100644 arch/arm/mach-omap2/powerdomain33xx.c
delete mode 100644 arch/arm/mach-omap2/powerdomain44xx.c
create mode 100644 arch/arm/mach-omap2/prm2xxx.c
create mode 100644 arch/arm/mach-omap2/prm2xxx.h
create mode 100644 arch/arm/mach-omap2/prm3xxx.c
create mode 100644 arch/arm/mach-omap2/prm3xxx.h
^ permalink raw reply
* [GIT PULL 2/3] omap plat header removal for v3.8 merge window, part3
From: Tony Lindgren @ 2012-10-26 21:23 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <pull-1351286620-406688>
The following changes since commit 3d82cbbb3aadb4f8a30e3f614e51be96574a0855:
ARM: OMAP: Split plat/serial.h for omap1 and omap2+ (2012-10-24 13:34:31 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-headers-part3-signed
for you to fetch changes up to a0212796b58061a9716178d261f318925c246643:
Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers (2012-10-26 13:18:19 -0700)
----------------------------------------------------------------
Here is the third set of plat header removal for omap2+.
This is based on the following minimal topic branches
coordinated with the related driver maintainers:
omap-for-v3.8/cleanup-headers-usb
omap-for-v3.8/cleanup-headers-menelaus
In addition to that, there are few fixes to the previously
merged patches that can show up with customized configs.
----------------------------------------------------------------
Felipe Balbi (1):
ARM: OMAP: move OMAP USB platform data to <linux/platform_data/omap-usb.h>
Paul Walmsley (3):
ARM: OMAP2+: fix build breakage introduced by commit b7754452b3e27716347a528b47b0a1083af32520
ARM: OMAP1: fix build breakage introduced by commit 25c7d49ed48b4843da7dea56a81ae7f620211ee0
ARM: OMAP1: fix sparse warning added by commit 4c98dc6b8ef2f73bdbfa78186db9a76507ba9ea3
Tony Lindgren (5):
ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h
ARM: OMAP2+: Introduce local usb.h
Merge branch 'omap-for-v3.8/cleanup-headers-usb' into omap-for-v3.8/cleanup-headers
Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup-headers
Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/cleanup-headers
arch/arm/mach-omap1/clock.c | 4 +-
arch/arm/mach-omap1/fpga.c | 1 +
arch/arm/mach-omap1/pm_bus.c | 2 +
arch/arm/mach-omap2/board-2430sdp.c | 1 -
arch/arm/mach-omap2/board-3430sdp.c | 1 -
arch/arm/mach-omap2/board-3630sdp.c | 1 -
arch/arm/mach-omap2/board-4430sdp.c | 2 +-
arch/arm/mach-omap2/board-am3517crane.c | 1 -
arch/arm/mach-omap2/board-am3517evm.c | 2 +-
arch/arm/mach-omap2/board-cm-t35.c | 5 +-
arch/arm/mach-omap2/board-cm-t3517.c | 1 -
arch/arm/mach-omap2/board-devkit8000.c | 1 -
arch/arm/mach-omap2/board-h4.c | 2 +-
arch/arm/mach-omap2/board-igep0020.c | 6 +-
arch/arm/mach-omap2/board-ldp.c | 3 +-
arch/arm/mach-omap2/board-n8x0.c | 2 +-
arch/arm/mach-omap2/board-omap3beagle.c | 7 +-
arch/arm/mach-omap2/board-omap3evm.c | 2 +-
arch/arm/mach-omap2/board-omap3logic.c | 2 -
arch/arm/mach-omap2/board-omap3pandora.c | 1 -
arch/arm/mach-omap2/board-omap3stalker.c | 1 -
arch/arm/mach-omap2/board-omap3touchbook.c | 1 -
arch/arm/mach-omap2/board-omap4panda.c | 4 +-
arch/arm/mach-omap2/board-overo.c | 4 +-
arch/arm/mach-omap2/board-rm680.c | 4 +-
arch/arm/mach-omap2/board-rx51.c | 2 +-
arch/arm/mach-omap2/board-ti8168evm.c | 3 +-
arch/arm/mach-omap2/board-zoom-peripherals.c | 1 -
arch/arm/mach-omap2/board-zoom.c | 1 -
arch/arm/mach-omap2/common.h | 2 +
arch/arm/mach-omap2/omap_phy_internal.c | 4 +-
arch/arm/mach-omap2/twl-common.c | 2 -
arch/arm/mach-omap2/usb-host.c | 3 +-
arch/arm/mach-omap2/usb-musb.c | 3 +-
arch/arm/mach-omap2/usb-tusb6010.c | 1 +
arch/arm/mach-omap2/usb.h | 82 +++++++++
arch/arm/plat-omap/include/plat/usb.h | 179 --------------------
drivers/mfd/menelaus.c | 2 +-
drivers/mfd/omap-usb-host.c | 5 +-
drivers/mfd/omap-usb-tll.c | 2 +-
drivers/mfd/omap-usb.h | 2 +
drivers/mtd/onenand/omap2.c | 36 ++--
drivers/usb/host/ehci-omap.c | 3 +-
drivers/usb/host/ohci-omap3.c | 1 -
drivers/usb/musb/am35x.c | 3 +-
drivers/usb/musb/musb_dsps.c | 3 +-
drivers/usb/musb/omap2430.h | 2 +-
.../include/plat => include/linux/mfd}/menelaus.h | 2 -
include/linux/platform_data/usb-omap.h | 80 +++++++++
49 files changed, 231 insertions(+), 254 deletions(-)
create mode 100644 arch/arm/mach-omap2/usb.h
delete mode 100644 arch/arm/plat-omap/include/plat/usb.h
create mode 100644 drivers/mfd/omap-usb.h
rename {arch/arm/plat-omap/include/plat => include/linux/mfd}/menelaus.h (96%)
create mode 100644 include/linux/platform_data/usb-omap.h
^ permalink raw reply
* [GIT PULL 1/3] omap plat header removal for v3.8 merge window, part2
From: Tony Lindgren @ 2012-10-26 21:23 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 3e9a6321f9895eac9a3d241d3126e44021e7102b:
Merge tag 'omap-for-v3.8/cleanup-headers-signed' into omap-for-v3.8/cleanup-headers-serial-take2 (2012-10-24 13:25:44 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-headers-serial-take2-signed
for you to fetch changes up to 3d82cbbb3aadb4f8a30e3f614e51be96574a0855:
ARM: OMAP: Split plat/serial.h for omap1 and omap2+ (2012-10-24 13:34:31 -0700)
----------------------------------------------------------------
These changes remove plat/serial.h usage for omap2+.
Note that this branch is based on a tty commit 3e9a6321
(tty/serial/8250: Make omap hardware workarounds local to 8250.h)
merged with omap-for-v3.8/cleanup-headers-signed.
The tty commit is needed to keep things compiling for omaps,
and omap-for-v3.8/cleanup-headers-signed is needed to avoid
multiple merge conflicts with the includes. I've verified
with Greg KH that the tty commit above is immutable and OK
to use as a base.
----------------------------------------------------------------
Tony Lindgren (2):
ARM: OMAP: Split uncompress.h to mach-omap1 and mach-omap2
ARM: OMAP: Split plat/serial.h for omap1 and omap2+
arch/arm/mach-omap1/include/mach/debug-macro.S | 2 +-
arch/arm/mach-omap1/include/mach/hardware.h | 2 +-
arch/arm/mach-omap1/include/mach/serial.h | 53 +++++
arch/arm/mach-omap1/include/mach/uncompress.h | 121 +++++++++++-
arch/arm/mach-omap2/board-rm680.c | 1 -
arch/arm/mach-omap2/common.h | 3 +-
arch/arm/mach-omap2/include/mach/debug-macro.S | 2 +-
arch/arm/mach-omap2/include/mach/uncompress.h | 175 ++++++++++++++++-
arch/arm/mach-omap2/io.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 +
.../omap_hwmod_2xxx_3xxx_interconnect_data.c | 2 -
.../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 1 -
.../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 3 +-
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 1 -
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 3 +-
arch/arm/mach-omap2/serial.c | 2 +-
.../include/plat => mach-omap2}/serial.h | 11 --
arch/arm/plat-omap/include/plat/uncompress.h | 204 --------------------
18 files changed, 354 insertions(+), 235 deletions(-)
create mode 100644 arch/arm/mach-omap1/include/mach/serial.h
rename arch/arm/{plat-omap/include/plat => mach-omap2}/serial.h (91%)
delete mode 100644 arch/arm/plat-omap/include/plat/uncompress.h
^ permalink raw reply
* [PATCH] ARM: OMAP1: usb: fix sparse warnings
From: Tony Lindgren @ 2012-10-26 21:20 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <alpine.DEB.2.00.1210262051290.11258@utopia.booyaka.com>
* Paul Walmsley <paul@pwsan.com> [121026 13:54]:
>
> Resolve the following sparse warnings:
>
> arch/arm/mach-omap1/usb.c:304:12: warning: symbol 'omap1_usb0_init' was not declared. Should it be static?
> arch/arm/mach-omap1/usb.c:412:12: warning: symbol 'omap1_usb1_init' was not declared. Should it be static?
> arch/arm/mach-omap1/usb.c:478:12: warning: symbol 'omap1_usb2_init' was not declared. Should it be static?
>
> by declaring those functions as static. Also remove the unneeded
> prototypes and related code from the plat/usb.h header file.
>
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Felipe Balbi <balbi@ti.com>
> ---
>
> Tony, care to take this one?
Let's apply just the usb.c changes on omap-for-v3.8/cleanup-headers
as plat/usb.h is now gone?
Regards,
Tony
> arch/arm/mach-omap1/usb.c | 6 +++---
> arch/arm/plat-omap/include/plat/usb.h | 20 --------------------
> 2 files changed, 3 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
> index 84267ed..104fed3 100644
> --- a/arch/arm/mach-omap1/usb.c
> +++ b/arch/arm/mach-omap1/usb.c
> @@ -301,7 +301,7 @@ static inline void otg_device_init(struct omap_usb_config *pdata)
>
> #endif
>
> -u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
> +static u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
> {
> u32 syscon1 = 0;
>
> @@ -409,7 +409,7 @@ u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
> return syscon1 << 16;
> }
>
> -u32 __init omap1_usb1_init(unsigned nwires)
> +static u32 __init omap1_usb1_init(unsigned nwires)
> {
> u32 syscon1 = 0;
>
> @@ -475,7 +475,7 @@ bad:
> return syscon1 << 20;
> }
>
> -u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
> +static u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
> {
> u32 syscon1 = 0;
>
> diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
> index 87ee140..669baa1 100644
> --- a/arch/arm/plat-omap/include/plat/usb.h
> +++ b/arch/arm/plat-omap/include/plat/usb.h
> @@ -156,24 +156,4 @@ extern void ti81xx_musb_phy_power(u8 on);
> #define USBPHY_OTGSESSEND_EN (1 << 20)
> #define USBPHY_DATA_POLARITY (1 << 23)
>
> -#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB)
> -u32 omap1_usb0_init(unsigned nwires, unsigned is_device);
> -u32 omap1_usb1_init(unsigned nwires);
> -u32 omap1_usb2_init(unsigned nwires, unsigned alt_pingroup);
> -#else
> -static inline u32 omap1_usb0_init(unsigned nwires, unsigned is_device)
> -{
> - return 0;
> -}
> -static inline u32 omap1_usb1_init(unsigned nwires)
> -{
> - return 0;
> -
> -}
> -static inline u32 omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
> -{
> - return 0;
> -}
> -#endif
> -
> #endif /* __ASM_ARCH_OMAP_USB_H */
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH v5] gpio/omap: fix off-mode bug: clear debounce settings on free/reset
From: Kevin Hilman @ 2012-10-26 21:19 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1351279564-4591-1-git-send-email-jon-hunter@ti.com>
Jon Hunter <jon-hunter@ti.com> writes:
> This change was originally titled "gpio/omap: fix off-mode bug: clear debounce
> clock enable mask on free/reset". The title has been updated slightly to
> reflect (what should be) the final fix.
nit: this kind of thing should typically go after the '---' since it's
useful reviewers/maintainers but not necessarily in the permanant git
history.
Otherwise, thanks for taking this over, and hopefully this can still
get in for v3.7-rc.
Kevin
> When a GPIO is freed or shutdown, we need to ensure that any debounce settings
> are cleared and if the GPIO is the only GPIO in the bank that is currently
> using debounce, then disable the debounce clock as well to save power.
>
> Currently, the debounce settings are not cleared on a GPIO free or shutdown and
> so during a context restore on subsequent off-mode transition, the previous
> debounce values are restored from the shadow copies (bank->context.debounce*)
> leading to mismatch state between driver state and hardware state.
>
> This was discovered when board code was doing
>
> gpio_request_one()
> gpio_set_debounce()
> gpio_free()
>
> which was leaving the GPIO debounce settings in a confused state. If that GPIO
> bank is subsequently used with off-mode enabled, bogus state would be restored,
> leaving GPIO debounce enabled which then prevented the CORE powerdomain from
> transitioning.
>
> To fix this, introduce a new function called _clear_gpio_debounce() to clear
> any debounce settings when the GPIO is freed or shutdown. If this GPIO is the
> last debounce-enabled GPIO in the bank, the debounce will also be cut.
>
> Please note that we cannot use _gpio_dbck_disable() to disable the debounce
> clock because this has been specifically created for the gpio suspend path
> and is intended to shutdown the debounce clock while debounce is enabled.
>
> Special thanks to Kevin Hilman for root causing the bug. This fix is a
> collaborative effort with inputs from Kevin Hilman, Grazvydas Ignotas and
> Santosh Shilimkar.
>
> Testing:
> - This has been unit tested on an OMAP3430 Beagle board, by requesting a gpio,
> enabling debounce and then freeing the gpio and checking the register
> contents, the saved register context and the debounce clock state.
> - Kevin Hilman tested on 37xx/EVM board which configures GPIO debounce for the
> ads7846 touchscreen in its board file using the above sequence, and so was
> failing off-mode tests in dynamic idle. Verified that off-mode tests are
> passing with this patch.
>
> V5 changes:
> - Corrected author
>
> Reported-by: Paul Walmsley <paul@pwsan.com>
> Cc: Igor Grinberg <grinberg@compulab.co.il>
> Cc: Grazvydas Ignotas <notasas@gmail.com>
> Cc: Jon Hunter <jon-hunter@ti.com>
> Signed-off-by: Jon Hunter <jon-hunter@ti.com>
> Reviewed-by: Kevin Hilman <khilman@ti.com>
> Tested-by: Kevin Hilman <khilman@ti.com>
> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> ---
> drivers/gpio/gpio-omap.c | 35 +++++++++++++++++++++++++++++++++++
> 1 file changed, 35 insertions(+)
>
> diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
> index 94cbc84..d335af1 100644
> --- a/drivers/gpio/gpio-omap.c
> +++ b/drivers/gpio/gpio-omap.c
> @@ -251,6 +251,40 @@ static void _set_gpio_debounce(struct gpio_bank *bank, unsigned gpio,
> }
> }
>
> +/**
> + * _clear_gpio_debounce - clear debounce settings for a gpio
> + * @bank: the gpio bank we're acting upon
> + * @gpio: the gpio number on this @gpio
> + *
> + * If a gpio is using debounce, then clear the debounce enable bit and if
> + * this is the only gpio in this bank using debounce, then clear the debounce
> + * time too. The debounce clock will also be disabled when calling this function
> + * if this is the only gpio in the bank using debounce.
> + */
> +static void _clear_gpio_debounce(struct gpio_bank *bank, unsigned gpio)
> +{
> + u32 gpio_bit = GPIO_BIT(bank, gpio);
> +
> + if (!bank->dbck_flag)
> + return;
> +
> + if (!(bank->dbck_enable_mask & gpio_bit))
> + return;
> +
> + bank->dbck_enable_mask &= ~gpio_bit;
> + bank->context.debounce_en &= ~gpio_bit;
> + __raw_writel(bank->context.debounce_en,
> + bank->base + bank->regs->debounce_en);
> +
> + if (!bank->dbck_enable_mask) {
> + bank->context.debounce = 0;
> + __raw_writel(bank->context.debounce, bank->base +
> + bank->regs->debounce);
> + clk_disable(bank->dbck);
> + bank->dbck_enabled = false;
> + }
> +}
> +
> static inline void set_gpio_trigger(struct gpio_bank *bank, int gpio,
> unsigned trigger)
> {
> @@ -539,6 +573,7 @@ static void _reset_gpio(struct gpio_bank *bank, int gpio)
> _set_gpio_irqenable(bank, gpio, 0);
> _clear_gpio_irqstatus(bank, gpio);
> _set_gpio_triggering(bank, GPIO_INDEX(bank, gpio), IRQ_TYPE_NONE);
> + _clear_gpio_debounce(bank, gpio);
> }
>
> /* Use disable_irq_wake() and enable_irq_wake() functions from drivers */
^ permalink raw reply
* [PATCH v4] pwm: vt8500: Update vt8500 PWM driver support
From: Arnd Bergmann @ 2012-10-26 21:11 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <4EE5B48738DDED408878C97C8E050A8B1BD17DD2@SJEXCHMB05.corp.ad.broadcom.com>
On Friday 26 October 2012, Chris Brand wrote:
> > @@ -124,6 +156,12 @@ static int __devinit pwm_probe(struct
> > platform_device *pdev)
> > chip->chip.base = -1;
> > chip->chip.npwm = VT8500_NR_PWMS;
> >
> > + chip->clk = devm_clk_get(&pdev->dev, NULL);
> > + if (IS_ERR_OR_NULL(chip->clk)) {
> > + dev_err(&pdev->dev, "clock source not specified\n");
> > + return PTR_ERR(chip->clk);
> > + }
> > +
>
> Do you want IS_ERR() rather than IS_ERR_OR_NULL() here ?
> Otherwise you may return PTR_ERR(NULL).
>
Right. devm_clk_get() never returns NULL, but as Russell pointed out
recently, this usage of IS_ERR_OR_NULL() is completely bogus.
Arnd
^ permalink raw reply
* [PATCH] ARM: versatile: fix versatile_defconfig
From: Arnd Bergmann @ 2012-10-26 21:09 UTC (permalink / raw)
To: linux-arm-kernel
With the introduction of CONFIG_ARCH_MULTIPLATFORM, versatile is
no longer the default platform, so we need to enable
CONFIG_ARCH_VERSATILE explicitly in order for that to be selected
rather than the multiplatform configuration.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
I've applied this to the arm-soc fixes branch, since it seems obvious
and uncontroversial. I only noticed because of another unrelated bug.
diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig
index cdd4d2b..2ba9e63 100644
--- a/arch/arm/configs/versatile_defconfig
+++ b/arch/arm/configs/versatile_defconfig
@@ -1,3 +1,4 @@
+CONFIG_ARCH_VERSATILE=y
CONFIG_EXPERIMENTAL=y
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SYSVIPC=y
^ permalink raw reply related
* [RFC] Using CMA with devicetree generated devices
From: Laura Abbott @ 2012-10-26 21:02 UTC (permalink / raw)
To: linux-arm-kernel
Is it possible to use the devices generated from device tree for use
with CMA? The API for reserving a CMA region (dma_declare_contiguous)
requires a device pointer to properly associate a region with a device.
By the time the devices from devicetree are actually available
(generally during machine_init), dma_contiguous_remap has already been
called so it's too late to have a properly setup region.
I currently see several options:
1) All CMA devices must be statically declared in the board file
2) Scan the FDT to set up 'dummy' devices early which can later be used
to set up CMA with the 'proper' devices
3) My assumption is completely wrong and the check that I was using is
invalid:
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 8404601..6d37516 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -368,9 +368,11 @@ struct dma_contig_early_reserve {
static struct dma_contig_early_reserve dma_mmu_remap[MAX_CMA_AREAS]
__initdata;
static int dma_mmu_remap_num __initdata;
+static int is_remapped;
void __init dma_contiguous_early_fixup(phys_addr_t base, unsigned long
size)
{
+ BUG_ON(is_remapped);
dma_mmu_remap[dma_mmu_remap_num].base = base;
dma_mmu_remap[dma_mmu_remap_num].size = size;
dma_mmu_remap_num++;
@@ -404,6 +406,7 @@ void __init dma_contiguous_remap(void)
iotable_init(&map, 1);
}
+ is_remapped = 1;
}
static void *
I'm currently leaning towards setting up #2 unless I'm missing something
obvious here. Thanks.
Laura
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply related
* [GIT PULL] i.MX fixes for -rc
From: Arnd Bergmann @ 2012-10-26 21:01 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121024075656.GW27665@pengutronix.de>
On Wednesday 24 October 2012, Sascha Hauer wrote:
> ARM i.MX25: Fix PWM per clock lookups
This patch is now causing build errors in imx_v4_v5_defconfig:
arch/arm/mach-imx/clk-imx25.c: In function 'mx25_clocks_init':
arch/arm/mach-imx/clk-imx25.c:206:26: error: 'pwm_ipg_per' undeclared (first use in this function)
arch/arm/mach-imx/clk-imx25.c:206:26: note: each undeclared identifier is reported only once for each function it appears in
Any idea what went wrong? The symbol doesn't seem to exist anywhere in
v3.7-rc2. Should I revert this patch for now?
Arnd
^ permalink raw reply
* [PATCH] arm: mvebu: update defconfig with 3.7 changes
From: Arnd Bergmann @ 2012-10-26 20:56 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <9cb693c5-b977-423d-b3a1-569775405bcd@email.android.com>
On Friday 26 October 2012, Jason wrote:
>
> Arnd Bergmann <arnd@arndb.de> wrote:
>
> >On Wednesday 24 October 2012, Thomas Petazzoni wrote:
> >> On Wed, 24 Oct 2012 10:39:42 +0200, Gregory CLEMENT wrote:
> >> > On 10/23/2012 10:17 AM, Thomas Petazzoni wrote:
> >> > > The split of 370 and XP into two Kconfig options and the
> >multiplatform
> >> > > kernel support has changed a few Kconfig symbols, so let's update
> >the
> >> > > mvebu_defconfig file with the latest changes.
> >> >
> >> > Indeed this patch fixes the mvebu_defconfig which was broken.
> >> > But as now mvebu is part of multi_v7_defconfig, shouldn't we just
> >> > removed mvebu_defconfig ?
> >>
> >> I think for now, SoC family specific defconfig files are still
> >> accepted, so I'd prefer to keep mvebu_defconfig around. Multiplatform
> >> is nice for users, but I prefer to build a mvebu-only kernel when I'm
> >> doing kernel development.
> >
> >I'd certainly like to see that patch get merged. Should I just apply it
> >to the fixes branch?
> >
> > Arnd
>
> Please do. I have a few other fixes for v3.7 to do this w/e, but iirc they aren't fixing build breakage.
>
Ok, thanks for the quick reply. Applied now.
Arnd
^ permalink raw reply
* [GIT PULL] at91: fixes for 3.7-rc3
From: Arnd Bergmann @ 2012-10-26 20:53 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <5088F131.5040600@atmel.com>
On Thursday 25 October 2012, Nicolas Ferre wrote:
> ARM: at91: fix external interrupts in non-DT case
This patch now leads to build errors with at91x40_defconfig,
which I've fixed up by applying the patch below on top.
Please yell if this is not the right fix.
Arnd
commit 3a8852afde01682083028ee427e0678f9bbddd75
Author: Arnd Bergmann <arnd@arndb.de>
Date: Fri Oct 26 22:49:09 2012 +0200
ARM: at91: fix at91x40 build
patch 738a0fd7 "ARM: at91: fix external interrupts in non-DT case"
fixed a run-time error on some at91 platforms but did not apply
the same change to at91x40, which now doesn't build.
This changes at91x40 in the same way that the other platforms
were changed.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/arch/arm/mach-at91/at91x40.c b/arch/arm/mach-at91/at91x40.c
index 6bd7300..bb7f544 100644
--- a/arch/arm/mach-at91/at91x40.c
+++ b/arch/arm/mach-at91/at91x40.c
@@ -88,6 +88,6 @@ void __init at91x40_init_interrupts(unsigned int priority[NR_AIC_IRQS])
if (!priority)
priority = at91x40_default_irq_priority;
- at91_aic_init(priority);
+ at91_aic_init(priority, at91_extern_irq);
}
^ permalink raw reply related
* [PATCH] ARM: OMAP1: usb: fix sparse warnings
From: Paul Walmsley @ 2012-10-26 20:52 UTC (permalink / raw)
To: linux-arm-kernel
Resolve the following sparse warnings:
arch/arm/mach-omap1/usb.c:304:12: warning: symbol 'omap1_usb0_init' was not declared. Should it be static?
arch/arm/mach-omap1/usb.c:412:12: warning: symbol 'omap1_usb1_init' was not declared. Should it be static?
arch/arm/mach-omap1/usb.c:478:12: warning: symbol 'omap1_usb2_init' was not declared. Should it be static?
by declaring those functions as static. Also remove the unneeded
prototypes and related code from the plat/usb.h header file.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Felipe Balbi <balbi@ti.com>
---
Tony, care to take this one?
arch/arm/mach-omap1/usb.c | 6 +++---
arch/arm/plat-omap/include/plat/usb.h | 20 --------------------
2 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
index 84267ed..104fed3 100644
--- a/arch/arm/mach-omap1/usb.c
+++ b/arch/arm/mach-omap1/usb.c
@@ -301,7 +301,7 @@ static inline void otg_device_init(struct omap_usb_config *pdata)
#endif
-u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
+static u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
{
u32 syscon1 = 0;
@@ -409,7 +409,7 @@ u32 __init omap1_usb0_init(unsigned nwires, unsigned is_device)
return syscon1 << 16;
}
-u32 __init omap1_usb1_init(unsigned nwires)
+static u32 __init omap1_usb1_init(unsigned nwires)
{
u32 syscon1 = 0;
@@ -475,7 +475,7 @@ bad:
return syscon1 << 20;
}
-u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
+static u32 __init omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
{
u32 syscon1 = 0;
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
index 87ee140..669baa1 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/arch/arm/plat-omap/include/plat/usb.h
@@ -156,24 +156,4 @@ extern void ti81xx_musb_phy_power(u8 on);
#define USBPHY_OTGSESSEND_EN (1 << 20)
#define USBPHY_DATA_POLARITY (1 << 23)
-#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB)
-u32 omap1_usb0_init(unsigned nwires, unsigned is_device);
-u32 omap1_usb1_init(unsigned nwires);
-u32 omap1_usb2_init(unsigned nwires, unsigned alt_pingroup);
-#else
-static inline u32 omap1_usb0_init(unsigned nwires, unsigned is_device)
-{
- return 0;
-}
-static inline u32 omap1_usb1_init(unsigned nwires)
-{
- return 0;
-
-}
-static inline u32 omap1_usb2_init(unsigned nwires, unsigned alt_pingroup)
-{
- return 0;
-}
-#endif
-
#endif /* __ASM_ARCH_OMAP_USB_H */
--
1.7.10.4
^ permalink raw reply related
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