* [PATCH V3 0/4]: ARM: SAMSUNG: Add SPI clkdev support
From: Padmavathi Venna @ 2011-10-10 8:03 UTC (permalink / raw)
To: linux-arm-kernel
This patchset modifies the existing clkdev to make SPI driver
independent of the clock names send from platform data. This
patches enables the SPI driver to request SPI bus clocks
using generic connection ID.
V1 patch series are:
http://www.spinics.net/lists/arm-kernel/msg141671.html
Changes since V1:
-Add newly introduced CLKDEV_INIT macro for creating clk_lookup
structure as suggested by Russell King
V2 patches series are:
http://www.spinics.net/lists/arm-kernel/msg142733.html
Changes since V2:
-Reworked the patches as per the following link. Patch series in
the following link removed & and , from the macro declaration and added
in the macro defination.
http://www.spinics.net/lists/arm-kernel/msg143663.html
Padmavathi Venna (4):
ARM: S3C64XX: Add SPI clkdev support
ARM: S5PC100: Add SPI clkdev support
ARM: S5P64X0: Add SPI clkdev support
ARM: S5PV210: Add SPI clkdev support
arch/arm/mach-s3c64xx/clock.c | 98 ++++++++++++++++--------
arch/arm/mach-s5p64x0/clock-s5p6440.c | 57 +++++++++-----
arch/arm/mach-s5p64x0/clock-s5p6450.c | 57 +++++++++-----
arch/arm/mach-s5pc100/clock.c | 132 ++++++++++++++++++++-------------
arch/arm/mach-s5pv210/clock.c | 58 ++++++++++-----
5 files changed, 259 insertions(+), 143 deletions(-)
--
1.7.4.4
^ permalink raw reply
* [PATCH v7 3/3] arm/tegra: device tree support for ventana board
From: Peter De Schrijver @ 2011-10-10 8:01 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <74CDBE0F657A3D45AFBB94109FB122FF173B23B2FA@HQMAIL01.nvidia.com>
On Fri, Oct 07, 2011 at 08:04:34PM +0200, Stephen Warren wrote:
> Peter De Schrijver wrote at Monday, October 03, 2011 7:19 AM:
>
> ...
> > diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
> ...
> > + chosen {
> > + bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/ram rdinit=/sbin/init";
>
> It might be nice to make this identical to what Harmony and Seaboard have here.
>
> Still, it doesn't matter a lot, since I (and I imagine most people) have
> to edit this command-line to point at the correct partition for my disks
> anyway; eventually, U-Boot should be providing/re-writing this property
> too.
>
> ...
> > diff --git a/arch/arm/mach-tegra/board-dt.c b/arch/arm/mach-tegra/board-dt.c
> ...
> > - if (of_machine_is_compatible("nvidia,harmony"))
> > - harmony_pinmux_init();
> > - else if (of_machine_is_compatible("nvidia,seaboard"))
> > - seaboard_pinmux_init();
> > + for (i = 0; i < ARRAY_SIZE(pinmux_configs); i++) {
> > + if (of_machine_is_compatible(pinmux_configs[i].machine)) {
> > + pinmux_configs[i].init();
> > + break;
> > + }
> > + }
> > +
> > + if (i == ARRAY_SIZE(pinmux_configs))
> > + printk(KERN_WARNING "Unknown platform! Pinmuxing not initialized\n");
>
> Should that be WARN() instead of printk?
pr_warning() might be better. Or do we want a backtrace and a tainted kernel
in this case?
Cheers,
Peter.
^ permalink raw reply
* [PATCH 5/9] ARM: SPMP8000: Add pinmux driver
From: Barry Song @ 2011-10-10 8:01 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CAKnu2MrXWoOka9D++q3h-KfgyYRhGA81Tcf07y7VdEUszZrU9w@mail.gmail.com>
2011/10/10 Linus Walleij <linus.walleij@linaro.org>:
> 2011/10/9 Zoltan Devai <zoss@devai.org>:
>
>> ?arch/arm/mach-spmp8000/pinmux.c | ?131 +++++++++++++++++++++++++++++++++++++++
>> ?1 files changed, 131 insertions(+), 0 deletions(-)
>> ?create mode 100644 arch/arm/mach-spmp8000/pinmux.c
>
> I'm creating this new pin control and pin mux subsystem,
> set for next merge window. Can you check it out and see
> if it does what you need?
yes. Zoltan, you do need to follow Linus W's new pinmux framework.
And Linus, can you help to take care prima2 pinmux driver v3 i sent
yesterday and make sure it is merged in the window too.
our lots of device drivers depend on it, so i'd like it is ready
before we upstream lots of other drivers.
>
> http://marc.info/?l=linux-kernel&m=131805699106465&w=2
>
> Thanks,
> Linus Walleij
-barry
^ permalink raw reply
* [PATCH] ARM: kprobes: work around build errors
From: Jon Medhurst (Tixy) @ 2011-10-10 7:40 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1318230339.2238.51.camel@computer2>
On Mon, 2011-10-10 at 08:05 +0100, Tixy wrote:
> On Sat, 2011-10-08 at 17:07 +0200, Arnd Bergmann wrote:
> > The errors for the thumb variant are using the same tool
> > chain, but obviously in v7 thumb2 mode. The error I got
> > is
> >
> > /tmp/cczp95OW.s:18721: Error: offset out of range
> >
> > Reducing the amount of padding in the "TEST_BF_X("bpl.w 2f",0x1000)"
> > test case resolves this, and I experimentally found 0xe20 to be the
> > maximum value in this location, but that is different if I change the
> > surrounding code. This one is much harder to reproduce and I can
> > provide the configuration file I used if that helps.
>
> The padding value of 0x1000 was deliberately chosen as it forces a
> different instruction encoding to be used. This encoding was introduced
> in ARMv6T2 so the test case should instead be made conditional on
> __LINUX_ARM_ARCH__ >= 7.
This last bit about adding __LINUX_ARM_ARCH__ >= 7 is obviously rubbish
as the Thumb tests are only ever compiled for v7 CPUs and that is what
you were doing. It seams that the problem may instead lie with the
toolchain or could it be a config issue where Thumb kernels are built
for v6 instruction set?
I believe the Thumb test tests were built OK in Linaro's 11.09 release
and the code compiles when I build for a BeagleBoard with gcc version
"4.5.2 (Ubuntu/Linaro 4.5.2-8ubuntu3)".
--
Tixy
^ permalink raw reply
* [PATCH v3 1/6] iommu/core: split mapping to page sizes as supported by the hardware
From: Ohad Ben-Cohen @ 2011-10-10 7:40 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CAK=WgbbNs5fWHDEputZ=jzU5YN0sn0tf6AETkcsoq_Jbvc2XgQ@mail.gmail.com>
On Sun, Oct 2, 2011 at 5:58 PM, Ohad Ben-Cohen <ohad@wizery.com> wrote:
> Ok, fair enough. I've revised the patches and attached the main one
> below; please tell me if it looks ok, and then I'll resubmit the
> entire patch set.
Ping ?
^ permalink raw reply
* [PATCH] ARM: OMAP: omap_device: Add omap_device_{alloc, delete, register}_ss
From: Ohad Ben-Cohen @ 2011-10-10 7:37 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317833693-21105-1-git-send-email-ohad@wizery.com>
Hi Kevin,
On Wed, Oct 5, 2011 at 6:54 PM, Ohad Ben-Cohen <ohad@wizery.com> wrote:
> Split omap_device_build_ss() into two smaller functions:
...
> This patch is considered an interim solution until DT fully materializes
> for omap; at that point, this functionality will be removed.
Good news: we might not need this after all.
I need the remoteproc devices to exists at ->reserve() time, so I can
assign them a private CMA pool, which means I can't wait for
omap_device_build_ss() and must create the devices beforehand.
... which makes Benoit's alloc/delete methods perfect for me.
So please hold this one off for now. I'd just need a s/static// patch
that will allow me to use Benoit's methods outside of omap_device.c,
but I'll wait for things to settle down a bit before sending it, to
minimize this kind of churn.
Thanks and sorry for the noise,
Ohad.
^ permalink raw reply
* [RFC][PATCH] plat-mxc: iomux-v3.h: implicitly enable pull-up/down when that's desired
From: Paul Fertser @ 2011-10-10 7:19 UTC (permalink / raw)
To: linux-arm-kernel
To configure pads during the initialisation a set of special constants
is used, e.g.
#define MX25_PAD_FEC_MDIO__FEC_MDIO IOMUX_PAD(0x3c4, 0x1cc, 0x10, 0, 0, PAD_CTL_HYS | PAD_CTL_PUS_22K_UP)
The problem is that no pull-up/down is getting activated unless both
PAD_CTL_PUE (pull-up enable) and PAD_CTL_PKE (pull/keeper module
enable) set. This is clearly stated in the i.MX25 datasheet and is
confirmed by the measurements on hardware. This leads to some rather
hard to understand bugs such as misdetecting an absent ethernet PHY (a
real bug i had), unstable data transfer etc. This might affect mx25,
mx35, mx50, mx51 and mx53 SoCs.
It's reasonable to expect that if the pullup value is specified, the
intention was to have it actually active, so we implicitly add the
needed bits.
Cc: stable at kernel.org
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
---
I'm not sure if that's really suitable for -stable so please excuse me
if it's not. The issue looks real though and if you prefer fixing it
any other way, please let me know. Sascha, if you think this's appropriate,
i'll be happy to send the same fix for barebox.
arch/arm/plat-mxc/include/mach/iomux-v3.h | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/plat-mxc/include/mach/iomux-v3.h b/arch/arm/plat-mxc/include/mach/iomux-v3.h
index ebbce33..4509956 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-v3.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-v3.h
@@ -89,11 +89,11 @@ typedef u64 iomux_v3_cfg_t;
#define PAD_CTL_HYS (1 << 8)
#define PAD_CTL_PKE (1 << 7)
-#define PAD_CTL_PUE (1 << 6)
-#define PAD_CTL_PUS_100K_DOWN (0 << 4)
-#define PAD_CTL_PUS_47K_UP (1 << 4)
-#define PAD_CTL_PUS_100K_UP (2 << 4)
-#define PAD_CTL_PUS_22K_UP (3 << 4)
+#define PAD_CTL_PUE (1 << 6 | PAD_CTL_PKE)
+#define PAD_CTL_PUS_100K_DOWN (0 << 4 | PAD_CTL_PUE)
+#define PAD_CTL_PUS_47K_UP (1 << 4 | PAD_CTL_PUE)
+#define PAD_CTL_PUS_100K_UP (2 << 4 | PAD_CTL_PUE)
+#define PAD_CTL_PUS_22K_UP (3 << 4 | PAD_CTL_PUE)
#define PAD_CTL_ODE (1 << 3)
--
1.7.2.3
^ permalink raw reply related
* [PATCH] ARM: kprobes: work around build errors
From: Tixy @ 2011-10-10 7:05 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <2056947.a9vGLIKRYk@wuerfel>
On Sat, 2011-10-08 at 17:07 +0200, Arnd Bergmann wrote:
> I got a few build errors for kprobes playing with randconfig on the
> latest kernel. While this patch manages to avoid these errors, I'm
> pretty sure that it is not the ideal solution.
It's the practical solution and what I did in other places of the code.
I didn't think it was worth the effort to introduce runtime CPU
detection to the test framework, especially as the kprobes
implementation which is tested in these situations is itself not
dependent on CPU version. (Though if we're heading for a 'single zImage'
then I may have to rethink this at some point.)
> The errors I got in arm are while building for ARMv6 with
> the arm-linux-gnueabihf-gcc-4.6 provided by Linaro, which
> results in these messages:
>
> /tmp/ccGpftnj.s: Assembler messages:
> /tmp/ccGpftnj.s:22066: Error: selected processor does not support ARM mode `mls r0,r1,r2,r3'
> /tmp/ccGpftnj.s:22099: Error: selected processor does not support ARM mode `mlshi r7,r8,r9,r10'
> /tmp/ccGpftnj.s:22128: Error: selected processor does not support ARM mode `mls lr,r1,r2,r13'
> /tmp/ccGpftnj.s:23781: Error: selected processor does not support ARM mode `strexd r0,r2,r3,[sp]'
> /tmp/ccGpftnj.s:23802: Error: selected processor does not support ARM mode `ldrexd r2,r3,[sp]'
> /tmp/ccGpftnj.s:23823: Error: selected processor does not support ARM mode `strexb r0,r2,[sp]'
> /tmp/ccGpftnj.s:23844: Error: selected processor does not support ARM mode `ldrexb r2,[sp]'
> /tmp/ccGpftnj.s:23865: Error: selected processor does not support ARM mode `strexh r0,r2,[sp]'
> /tmp/ccGpftnj.s:23886: Error: selected processor does not support ARM mode `ldrexh r2,[sp]'
> /tmp/ccGpftnj.s:25836: Warning: base register written back, and overlaps second transfer register
>
> The errors for the thumb variant are using the same tool
> chain, but obviously in v7 thumb2 mode. The error I got
> is
>
> /tmp/cczp95OW.s:18721: Error: offset out of range
>
> Reducing the amount of padding in the "TEST_BF_X("bpl.w 2f",0x1000)"
> test case resolves this, and I experimentally found 0xe20 to be the
> maximum value in this location, but that is different if I change the
> surrounding code. This one is much harder to reproduce and I can
> provide the configuration file I used if that helps.
The padding value of 0x1000 was deliberately chosen as it forces a
different instruction encoding to be used. This encoding was introduced
in ARMv6T2 so the test case should instead be made conditional on
__LINUX_ARM_ARCH__ >= 7.
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> diff --git a/arch/arm/kernel/kprobes-test-arm.c b/arch/arm/kernel/kprobes-test-arm.c
> index fc82de8..ba9c600 100644
> --- a/arch/arm/kernel/kprobes-test-arm.c
> +++ b/arch/arm/kernel/kprobes-test-arm.c
> @@ -367,9 +367,11 @@ void kprobe_arm_test_cases(void)
> TEST_UNSUPPORTED(".word 0xe0500090 @ undef")
> TEST_UNSUPPORTED(".word 0xe05fff9f @ undef")
>
> +#if __LINUX_ARM_ARCH__ >= 7
> TEST_RRR( "mls r0, r",1, VAL1,", r",2, VAL2,", r",3, VAL3,"")
> TEST_RRR( "mlshi r7, r",8, VAL3,", r",9, VAL1,", r",10, VAL2,"")
> TEST_RR( "mls lr, r",1, VAL2,", r",2, VAL3,", r13")
> +#endif
> TEST_UNSUPPORTED(".word 0xe06f3291 @ mls pc, r1, r2, r3")
> TEST_UNSUPPORTED(".word 0xe060329f @ mls r0, pc, r2, r3")
> TEST_UNSUPPORTED(".word 0xe0603f91 @ mls r0, r1, pc, r3")
> @@ -447,7 +449,7 @@ void kprobe_arm_test_cases(void)
> TEST_UNSUPPORTED(".word 0xe1500090") /* Unallocated space */
> TEST_UNSUPPORTED(".word 0xe1600090") /* Unallocated space */
> TEST_UNSUPPORTED(".word 0xe1700090") /* Unallocated space */
> -#if __LINUX_ARM_ARCH__ >= 6
> +#if __LINUX_ARM_ARCH__ >= 7
> TEST_UNSUPPORTED("ldrex r2, [sp]")
> TEST_UNSUPPORTED("strexd r0, r2, r3, [sp]")
> TEST_UNSUPPORTED("ldrexd r2, r3, [sp]")
As Dave Gilbert pointed out, the "ldrex r2, [sp]" is legal on ARMv6 so
this would be better as...
#if __LINUX_ARM_ARCH__ >= 6
TEST_UNSUPPORTED("ldrex r2, [sp]")
#endif
#if __LINUX_ARM_ARCH__ >= 7
TEST_UNSUPPORTED("strexd r0, r2, r3, [sp]")
TEST_UNSUPPORTED("ldrexd r2, r3, [sp]")
With the changes I suggested: Acked-by: Jon Medhurst <tixy@yxit.co.uk>
Thanks for your randconfig fixes. As you can probably tell, I only
tested the code on v5 and v7 hardware as that was what I had, but I
could still have compile tested it for v6.
--
Tixy
^ permalink raw reply
* [PATCH] PM: HIBERNATION: add resume_delay kernel param as well as resume_delay
From: Borislav Petkov @ 2011-10-10 7:00 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <CAGsJ_4zSUYPrK3Bdo4p5bL25PO7orAJJByRAx2U=OT-JE62uHw@mail.gmail.com>
On Mon, Oct 10, 2011 at 02:34:45PM +0800, Barry Song wrote:
> >> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> >> index b3da53c..f73a00e 100644
> >> --- a/kernel/power/hibernate.c
> >> +++ b/kernel/power/hibernate.c
> >> @@ -33,6 +33,7 @@
> >> ?static int nocompress = 0;
> >> ?static int noresume = 0;
> >> ?static int resume_wait = 0;
> >> +static int resume_delay = 0;
> >
> > These static variables get zeroed needlessly and checkpatch actually
> > warns about that. Maybe fix that up while you're there?
>
> yes. right. i initilized it to 0 to keep consistent coding style with
> the context because there were other variants doing that.
> i'd like to delete all initialization together as a seperate patch. Or
> do you want to do that?
Nah, you go ahead :-).
Thanks.
--
Regards/Gruss,
Boris.
^ permalink raw reply
* [Linaro-mm-sig] [PATCHv16 0/9] Contiguous Memory Allocator
From: Ohad Ben-Cohen @ 2011-10-10 6:58 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <201110071827.06366.arnd@arndb.de>
On Fri, Oct 7, 2011 at 6:27 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> IMHO it would be good to merge the entire series into 3.2, since
> the ARM portion fixes an important bug (double mapping of memory
> ranges with conflicting attributes) that we've lived with for far
> too long, but it really depends on how everyone sees the risk
> for regressions here. If something breaks in unfixable ways before
> the 3.2 release, we can always revert the patches and have another
> try later.
I didn't thoroughly review the patches, but I did try them out (to be
precise, I tried v15) on an OMAP4 PandaBoard, and really liked the
result.
The interfaces seem clean and convenient and things seem to work (I
used a private CMA pool with rpmsg and remoteproc, but also noticed
that several other drivers were utilizing the global pool). And with
this in hand we can finally ditch the old reserve+ioremap approach.
So from a user perspective, I sure do hope this patch set gets into
3.2; hopefully we can just fix anything that would show up during the
3.2 cycle.
Marek, Michal (and everyone involved!), thanks so much for pushing
this! Judging from the history of this patch set and the areas that it
touches (and from the number of LWN articles ;) it looks like a
considerable feat.
FWIW, feel free to add my
Tested-by: Ohad Ben-Cohen <ohad@wizery.com>
(small and optional comment: I think it'd be nice if
dma_declare_contiguous would fail if called too late, otherwise users
of that misconfigured device will end up using the global pool without
easily knowing that something went wrong)
Thanks,
Ohad.
^ permalink raw reply
* [PULL] i.MX
From: Uwe Kleine-König @ 2011-10-10 6:36 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20111004092015.GM31404@pengutronix.de>
Hi Arnd, Sascha,
On Tue, Oct 04, 2011 at 11:20:15AM +0200, Sascha Hauer wrote:
> Arnaud Patard (2):
> Fix pata imx resource
when Sascha was on vacation I already let Arnd pull that commit squashed
into the originating commit (Message-ID:
<20110906192229.GK28816@pengutronix.de>). Now he got it back eventually breaking
bisection :-(
> efika: Configure esdhc cd/wp on efika mx/sb
>
> Fabio Estevam (3):
> ARM: mach-qong: Add watchdog support
> ARM: mach-mxs/mx28evk: Only register devices if their GPIO requests succeeded
> ARM: mxs: Consolidate mm-mx23.c and mm-mx28.c into a single file
>
> Hui Wang (1):
> ARM i.MX avic: convert to use generic irq chip
>
> Jason Liu (4):
> ARM: mx5/mm: move i.MX50 mm stuff into mm.c
> ARM: mx5/mm: Remove MX51_DEBUG related mapping
> ARM: mx5/mm: consolidate TZIC map code
> ARM: mx25: Add the missing IIM base definition
Same here, I squashed that commit into
d27536c (ARM: mx25: Print silicon revision on boot)
If you care I can help you to resolve these issues via irc.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply
* [PATCH] PM: HIBERNATION: add resume_delay kernel param as well as resume_delay
From: Barry Song @ 2011-10-10 6:34 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20111010062653.GB4139@liondog.tnic>
2011/10/10 Borislav Petkov <bp@alien8.de>:
> On Sun, Oct 09, 2011 at 10:44:12PM -0700, Barry Song wrote:
>> From: Barry Song <baohua.song@csr.com>
>>
>> patch "PM: HIBERNATION: add resume_wait param to support MMC-like devices
>> as resume file" add resume_wait param. this patch adds resume_delay so that
>> resume_wait/delay has the same model with root_wait/delay.
>>
>> Signed-off-by: Barry Song <baohua.song@csr.com>
>> ---
>> ?Documentation/kernel-parameters.txt | ? ?3 +++
>> ?kernel/power/hibernate.c ? ? ? ? ? ?| ? 14 ++++++++++++++
>> ?2 files changed, 17 insertions(+), 0 deletions(-)
>>
>> diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
>> index 88a7b19..831bde2 100644
>> --- a/Documentation/kernel-parameters.txt
>> +++ b/Documentation/kernel-parameters.txt
>> @@ -2240,6 +2240,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
>> ? ? ? ? ? ? ? ? ? ? ? in <PAGE_SIZE> units (needed only for swap files).
>> ? ? ? ? ? ? ? ? ? ? ? See ?Documentation/power/swsusp-and-swap-files.txt
>>
>> + ? ? resumedelay= ? ?[HIBERNATION] Delay (in seconds) to pause before attempting to
>> + ? ? ? ? ? ? ? ? ? ? read the resume files
>> +
>> ? ? ? resumewait ? ? ?[HIBERNATION] Wait (indefinitely) for resume device to show up.
>> ? ? ? ? ? ? ? ? ? ? ? Useful for devices that are detected asynchronously
>> ? ? ? ? ? ? ? ? ? ? ? (e.g. USB and MMC devices).
>> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
>> index b3da53c..f73a00e 100644
>> --- a/kernel/power/hibernate.c
>> +++ b/kernel/power/hibernate.c
>> @@ -33,6 +33,7 @@
>> ?static int nocompress = 0;
>> ?static int noresume = 0;
>> ?static int resume_wait = 0;
>> +static int resume_delay = 0;
>
> These static variables get zeroed needlessly and checkpatch actually
> warns about that. Maybe fix that up while you're there?
yes. right. i initilized it to 0 to keep consistent coding style with
the context because there were other variants doing that.
i'd like to delete all initialization together as a seperate patch. Or
do you want to do that?
>
> Thanks.
>
> --
> Regards/Gruss,
> ? ?Boris.
-barry
^ permalink raw reply
* [PATCH] PM: HIBERNATION: add resume_delay kernel param as well as resume_delay
From: Borislav Petkov @ 2011-10-10 6:26 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1318225452-10397-1-git-send-email-Barry.Song@csr.com>
On Sun, Oct 09, 2011 at 10:44:12PM -0700, Barry Song wrote:
> From: Barry Song <baohua.song@csr.com>
>
> patch "PM: HIBERNATION: add resume_wait param to support MMC-like devices
> as resume file" add resume_wait param. this patch adds resume_delay so that
> resume_wait/delay has the same model with root_wait/delay.
>
> Signed-off-by: Barry Song <baohua.song@csr.com>
> ---
> Documentation/kernel-parameters.txt | 3 +++
> kernel/power/hibernate.c | 14 ++++++++++++++
> 2 files changed, 17 insertions(+), 0 deletions(-)
>
> diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
> index 88a7b19..831bde2 100644
> --- a/Documentation/kernel-parameters.txt
> +++ b/Documentation/kernel-parameters.txt
> @@ -2240,6 +2240,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
> in <PAGE_SIZE> units (needed only for swap files).
> See Documentation/power/swsusp-and-swap-files.txt
>
> + resumedelay= [HIBERNATION] Delay (in seconds) to pause before attempting to
> + read the resume files
> +
> resumewait [HIBERNATION] Wait (indefinitely) for resume device to show up.
> Useful for devices that are detected asynchronously
> (e.g. USB and MMC devices).
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index b3da53c..f73a00e 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -33,6 +33,7 @@
> static int nocompress = 0;
> static int noresume = 0;
> static int resume_wait = 0;
> +static int resume_delay = 0;
These static variables get zeroed needlessly and checkpatch actually
warns about that. Maybe fix that up while you're there?
Thanks.
--
Regards/Gruss,
Boris.
^ permalink raw reply
* [PATCH 17/30] usb/musb: allow building USB_MUSB_TUSB6010 as a module
From: Felipe Balbi @ 2011-10-10 6:10 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317566760-25681-18-git-send-email-arnd@arndb.de>
On Sun, Oct 02, 2011 at 04:45:47PM +0200, Arnd Bergmann wrote:
> Commit 1376d92f9 "usb: musb: allow musb and glue layers to be modules"
> made the USB_MUSB_TUSB6010 option modular, but actually building
> the driver as a module does not work, so various randconfig builds
> actually fail. This changes all code that depends on the
> option to also check for modular builds, and exports the necessary
> symbols.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Felipe Balbi <balbi@ti.com>
applied, thanks
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111010/b1e00fb9/attachment.sig>
^ permalink raw reply
* [PATCH 15/30] usb/musb: use a Kconfig choice to pick the right DMA method
From: Felipe Balbi @ 2011-10-10 6:10 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1317566760-25681-16-git-send-email-arnd@arndb.de>
On Sun, Oct 02, 2011 at 04:45:45PM +0200, Arnd Bergmann wrote:
> The logic to allow only one DMA driver in MUSB is currently
> flawed, because it also allows picking no DMA driver at all
> and also not selecting PIO mode.
>
> Using a choice statement makes this foolproof for now and
> also simplifies the Makefile.
>
> Unfortunately, we will have to revisit this when we start
> supporting multiple ARM platforms in a single kernel binary,
> because at that point we will actually need to select
> multiple DMA drivers and pick the right one at run-time.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Felipe Balbi <balbi@ti.com>
applied, thanks
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111010/6dbad263/attachment-0001.sig>
^ permalink raw reply
* [PATCH] PM: HIBERNATION: add resume_delay kernel param as well as resume_delay
From: Barry Song @ 2011-10-10 5:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Barry Song <baohua.song@csr.com>
patch "PM: HIBERNATION: add resume_wait param to support MMC-like devices
as resume file" add resume_wait param. this patch adds resume_delay so that
resume_wait/delay has the same model with root_wait/delay.
Signed-off-by: Barry Song <baohua.song@csr.com>
---
Documentation/kernel-parameters.txt | 3 +++
kernel/power/hibernate.c | 14 ++++++++++++++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 88a7b19..831bde2 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2240,6 +2240,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
in <PAGE_SIZE> units (needed only for swap files).
See Documentation/power/swsusp-and-swap-files.txt
+ resumedelay= [HIBERNATION] Delay (in seconds) to pause before attempting to
+ read the resume files
+
resumewait [HIBERNATION] Wait (indefinitely) for resume device to show up.
Useful for devices that are detected asynchronously
(e.g. USB and MMC devices).
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index b3da53c..f73a00e 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -33,6 +33,7 @@
static int nocompress = 0;
static int noresume = 0;
static int resume_wait = 0;
+static int resume_delay = 0;
static char resume_file[256] = CONFIG_PM_STD_PARTITION;
dev_t swsusp_resume_device;
sector_t swsusp_resume_block;
@@ -726,6 +727,12 @@ static int software_resume(void)
pr_debug("PM: Checking hibernation image partition %s\n", resume_file);
+ if (resume_delay) {
+ printk(KERN_INFO "Waiting %dsec before reading resume device...\n",
+ resume_delay);
+ ssleep(resume_delay);
+ }
+
/* Check if the device is there */
swsusp_resume_device = name_to_dev_t(resume_file);
if (!swsusp_resume_device) {
@@ -1075,8 +1082,15 @@ static int __init resumewait_setup(char *str)
return 1;
}
+static int __init resumedelay_setup(char *str)
+{
+ resume_delay = simple_strtoul(str, NULL, 0);
+ return 1;
+}
+
__setup("noresume", noresume_setup);
__setup("resume_offset=", resume_offset_setup);
__setup("resume=", resume_setup);
__setup("hibernate=", hibernate_setup);
__setup("resumewait", resumewait_setup);
+__setup("resumedelay=", resumedelay_setup);
--
1.7.1
Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
^ permalink raw reply related
* [PATCH 0/2] ARM: OMAP2+: timer fixes / cleanup
From: DebBarma, Tarun Kanti @ 2011-10-10 5:40 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <4E8B7C6A.2050207@ti.com>
On Wed, Oct 5, 2011 at 3:06 AM, Cousson, Benoit <b-cousson@ti.com> wrote:
> Hi Tarun,
>
> On 10/4/2011 11:20 PM, Cousson, Benoit wrote:
>>
>> Hi Tony,
>>
>> Here is the series to fix the warning and remove the redundant
>> latency structure that be removed since the timer runtime PM
>> adaptation was just pulled.
>>
>> I was just able to test that on OMAP4.
>
> It will be nice if you can test that on the other platforms.
> In theory, if they are properly using hwmod that should work fine.
Yes, I will test in other platforms.
--
Tarun
>
> Thanks,
> Benoit
>
>>
>> Patches are based on Kevin's for_3.2/omap_device-2 branch
>> and are available here:
>> git://gitorious.org/omap-pm/linux.git for_3.2/timer_fixes
>>
>> Regards,
>> Benoit
>>
>>
>> Benoit Cousson (2):
>> ? ARM: OMAP2+: clock data: Remove redundant timer clkdev
>> ? ARM: OMAP2+: timer: Remove omap_device_pm_latency
>>
>> ?arch/arm/mach-omap2/clock2420_data.c | ? 12 ------------
>> ?arch/arm/mach-omap2/clock2430_data.c | ? 12 ------------
>> ?arch/arm/mach-omap2/clock3xxx_data.c | ? 12 ------------
>> ?arch/arm/mach-omap2/clock44xx_data.c | ? 11 -----------
>> ?arch/arm/mach-omap2/timer.c ? ? ? ? ?| ? 12 +-----------
>> ?5 files changed, 1 insertions(+), 58 deletions(-)
>>
>
>
^ permalink raw reply
* [PATCH 0/14] Sparse fixes for tegra
From: Olof Johansson @ 2011-10-10 5:32 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1578886.3aVd19SPzO@wuerfel>
Hi,
On Fri, Oct 7, 2011 at 1:54 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Thursday 06 October 2011 19:54:10 Olof Johansson wrote:
>> Some trivial fixes removing sparse warnings on tegra code.
>
> Hi Olof,
>
> That's a very nice series. I had a go at this across platforms before,
> but had not finished it yet.
>
> One thing I would recommend instead of having a type cast in IO_ADDRESS
> is to change the definition of IO_{IRAM,CPU,PPSB,APB}_VIRT to be
> an iomem pointer from the start, so any calculation you do based on
> that automatically gets the right type.
That worked out pretty well but needed asm-conditional defines, since
some of the constants are used from assembly.
I'll post a new series shortly that includes the above change, drops
the first to IO_ADDRESS changes and includes a couple of more fixes
for cpu-tegra.c.
I kept IO_ADDRESS() even though it is now just a 1:1 wrapper to
IO_TO_VIRT(), mostly to not have to churn all drivers just for this --
see below for plans related to that.
Also, the arm-global map_desc uses an unsigned long to hold the
virtual address of the maps so I had to add explicit casts there.
Switching it requires some changes to the mm/map.c code, I'll do that
separately from this series.
> In the long run, I would hope to be able to get rid of basically
> all uses of IO_ADDRESS and IO_TO_VIRT in the tegra code and replace
> that with device tree lookups, but that is clearly a separate issue.
Yes, probably by moving to local ioremaps for most use -- address can
come from platform_device or device tree that way (but the platform
direction is device tree overall).
-Olof
^ permalink raw reply
* [PATCH v2 14/14] ARM: tegra: cpu-tegra: unexport two functions
From: Olof Johansson @ 2011-10-10 5:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1318224484-2090-1-git-send-email-olof@lixom.net>
Two static functions that are not exported:
arch/arm/mach-tegra/cpu-tegra.c:59:5: warning: symbol 'tegra_verify_speed' was not declared. Should it be static?
arch/arm/mach-tegra/cpu-tegra.c:64:14: warning: symbol 'tegra_getspeed' was not declared. Should it be static?
Signed-off-by: Olof Johansson <olof@lixom.net>
---
arch/arm/mach-tegra/cpu-tegra.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-tegra/cpu-tegra.c b/arch/arm/mach-tegra/cpu-tegra.c
index f15b689..b2647ec 100644
--- a/arch/arm/mach-tegra/cpu-tegra.c
+++ b/arch/arm/mach-tegra/cpu-tegra.c
@@ -57,12 +57,12 @@ static unsigned long target_cpu_speed[NUM_CPUS];
static DEFINE_MUTEX(tegra_cpu_lock);
static bool is_suspended;
-int tegra_verify_speed(struct cpufreq_policy *policy)
+static int tegra_verify_speed(struct cpufreq_policy *policy)
{
return cpufreq_frequency_table_verify(policy, freq_table);
}
-unsigned int tegra_getspeed(unsigned int cpu)
+static unsigned int tegra_getspeed(unsigned int cpu)
{
unsigned long rate;
--
1.7.4.1
^ permalink raw reply related
* [PATCH v2 13/14] ARM: tegra: cpu-tegra: sparse type fix
From: Olof Johansson @ 2011-10-10 5:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1318224484-2090-1-git-send-email-olof@lixom.net>
Type fix:
arch/arm/mach-tegra/cpu-tegra.c:144:14: warning: incorrect type in argument 5 (different signedness)
arch/arm/mach-tegra/cpu-tegra.c:144:14: expected unsigned int *index
arch/arm/mach-tegra/cpu-tegra.c:144:14: got int *<noident>
Signed-off-by: Olof Johansson <olof@lixom.net>
---
arch/arm/mach-tegra/cpu-tegra.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-tegra/cpu-tegra.c b/arch/arm/mach-tegra/cpu-tegra.c
index 0e1016a..f15b689 100644
--- a/arch/arm/mach-tegra/cpu-tegra.c
+++ b/arch/arm/mach-tegra/cpu-tegra.c
@@ -130,7 +130,7 @@ static int tegra_target(struct cpufreq_policy *policy,
unsigned int target_freq,
unsigned int relation)
{
- int idx;
+ unsigned int idx;
unsigned int freq;
int ret = 0;
--
1.7.4.1
^ permalink raw reply related
* [PATCH v2 12/14] ARM: tegra: dma: staticify some tables and functions
From: Olof Johansson @ 2011-10-10 5:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1318224484-2090-1-git-send-email-olof@lixom.net>
None of them are used externally.
Signed-off-by: Olof Johansson <olof@lixom.net>
---
arch/arm/mach-tegra/dma.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-tegra/dma.c b/arch/arm/mach-tegra/dma.c
index f4ef5eb..c0cf967 100644
--- a/arch/arm/mach-tegra/dma.c
+++ b/arch/arm/mach-tegra/dma.c
@@ -105,13 +105,17 @@
#define NV_DMA_MAX_TRASFER_SIZE 0x10000
-const unsigned int ahb_addr_wrap_table[8] = {
+static const unsigned int ahb_addr_wrap_table[8] = {
0, 32, 64, 128, 256, 512, 1024, 2048
};
-const unsigned int apb_addr_wrap_table[8] = {0, 1, 2, 4, 8, 16, 32, 64};
+static const unsigned int apb_addr_wrap_table[8] = {
+ 0, 1, 2, 4, 8, 16, 32, 64
+};
-const unsigned int bus_width_table[5] = {8, 16, 32, 64, 128};
+static const unsigned int bus_width_table[5] = {
+ 8, 16, 32, 64, 128
+};
#define TEGRA_DMA_NAME_SIZE 16
struct tegra_dma_channel {
@@ -157,7 +161,7 @@ void tegra_dma_dequeue(struct tegra_dma_channel *ch)
return;
}
-void tegra_dma_stop(struct tegra_dma_channel *ch)
+static void tegra_dma_stop(struct tegra_dma_channel *ch)
{
u32 csr;
u32 status;
@@ -174,7 +178,7 @@ void tegra_dma_stop(struct tegra_dma_channel *ch)
writel(status, ch->addr + APB_DMA_CHAN_STA);
}
-int tegra_dma_cancel(struct tegra_dma_channel *ch)
+static int tegra_dma_cancel(struct tegra_dma_channel *ch)
{
u32 csr;
unsigned long irq_flags;
--
1.7.4.1
^ permalink raw reply related
* [PATCH v2 11/14] ARM: tegra: tegra2_clocks: don't export some tables
From: Olof Johansson @ 2011-10-10 5:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1318224484-2090-1-git-send-email-olof@lixom.net>
Not used externally, and certainly don't need to be exported.
Signed-off-by: Olof Johansson <olof@lixom.net>
---
arch/arm/mach-tegra/tegra2_clocks.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index 6dd5133..371869d 100644
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@ -1885,7 +1885,7 @@ static struct clk tegra_clk_audio_2x = {
},
};
-struct clk_lookup tegra_audio_clk_lookups[] = {
+static struct clk_lookup tegra_audio_clk_lookups[] = {
{ .con_id = "audio", .clk = &tegra_clk_audio },
{ .con_id = "audio_2x", .clk = &tegra_clk_audio_2x }
};
@@ -2125,7 +2125,7 @@ static struct clk tegra_clk_emc = {
.parent = _parent, \
}
-struct clk tegra_list_clks[] = {
+static struct clk tegra_list_clks[] = {
PERIPH_CLK("apbdma", "tegra-dma", NULL, 34, 0, 108000000, mux_pclk, 0),
PERIPH_CLK("rtc", "rtc-tegra", NULL, 4, 0, 32768, mux_clk_32k, PERIPH_NO_RESET),
PERIPH_CLK("timer", "timer", NULL, 5, 0, 26000000, mux_clk_m, 0),
@@ -2221,7 +2221,7 @@ struct clk tegra_list_clks[] = {
* configuration. List those here to register them twice in the clock lookup
* table under two names.
*/
-struct clk_duplicate tegra_clk_duplicates[] = {
+static struct clk_duplicate tegra_clk_duplicates[] = {
CLK_DUPLICATE("uarta", "tegra_uart.0", NULL),
CLK_DUPLICATE("uartb", "tegra_uart.1", NULL),
CLK_DUPLICATE("uartc", "tegra_uart.2", NULL),
@@ -2252,7 +2252,7 @@ struct clk_duplicate tegra_clk_duplicates[] = {
.clk = ck, \
}
-struct clk *tegra_ptr_clks[] = {
+static struct clk *tegra_ptr_clks[] = {
&tegra_clk_32k,
&tegra_pll_s,
&tegra_clk_m,
--
1.7.4.1
^ permalink raw reply related
* [PATCH v2 10/14] ARM: tegra: tegra_powergate_is_powered should be static
From: Olof Johansson @ 2011-10-10 5:28 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1318224484-2090-1-git-send-email-olof@lixom.net>
Not exported and not used externally.
Also, fix return type and change to instead WARN_ON on bad parameters.
Signed-off-by: Olof Johansson <olof@lixom.net>
---
arch/arm/mach-tegra/include/mach/powergate.h | 1 -
arch/arm/mach-tegra/powergate.c | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-tegra/include/mach/powergate.h b/arch/arm/mach-tegra/include/mach/powergate.h
index 401d1b7..39c396d 100644
--- a/arch/arm/mach-tegra/include/mach/powergate.h
+++ b/arch/arm/mach-tegra/include/mach/powergate.h
@@ -31,7 +31,6 @@
int tegra_powergate_power_on(int id);
int tegra_powergate_power_off(int id);
-bool tegra_powergate_is_powered(int id);
int tegra_powergate_remove_clamping(int id);
/* Must be called with clk disabled, and returns with clk enabled */
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c
index 3cee9aa..9483064 100644
--- a/arch/arm/mach-tegra/powergate.c
+++ b/arch/arm/mach-tegra/powergate.c
@@ -89,12 +89,11 @@ int tegra_powergate_power_off(int id)
return tegra_powergate_set(id, false);
}
-bool tegra_powergate_is_powered(int id)
+static bool tegra_powergate_is_powered(int id)
{
u32 status;
- if (id < 0 || id >= TEGRA_NUM_POWERGATE)
- return -EINVAL;
+ WARN_ON(id < 0 || id >= TEGRA_NUM_POWERGATE);
status = pmc_read(PWRGATE_STATUS) & (1 << id);
return !!status;
--
1.7.4.1
^ permalink raw reply related
* [PATCH v2 09/14] ARM: tegra: tegra_rtc_read_ms should be static
From: Olof Johansson @ 2011-10-10 5:27 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1318224484-2090-1-git-send-email-olof@lixom.net>
Not exported and not used externally.
Signed-off-by: Olof Johansson <olof@lixom.net>
---
arch/arm/mach-tegra/timer.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index 4d6759a..e2272d2 100644
--- a/arch/arm/mach-tegra/timer.c
+++ b/arch/arm/mach-tegra/timer.c
@@ -133,7 +133,7 @@ static void notrace tegra_update_sched_clock(void)
* tegra_rtc driver could be executing to avoid race conditions
* on the RTC shadow register
*/
-u64 tegra_rtc_read_ms(void)
+static u64 tegra_rtc_read_ms(void)
{
u32 ms = readl(rtc_base + RTC_MILLISECONDS);
u32 s = readl(rtc_base + RTC_SHADOW_SECONDS);
--
1.7.4.1
^ permalink raw reply related
* [PATCH v2 08/14] ARM: tegra: tegra_init_cache should be static
From: Olof Johansson @ 2011-10-10 5:27 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1318224484-2090-1-git-send-email-olof@lixom.net>
Not exported and not used externally.
Signed-off-by: Olof Johansson <olof@lixom.net>
---
arch/arm/mach-tegra/common.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index d5e3f89..690b888 100644
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -61,7 +61,7 @@ static __initdata struct tegra_clk_init_table common_clk_init_table[] = {
{ NULL, NULL, 0, 0},
};
-void __init tegra_init_cache(void)
+static void __init tegra_init_cache(void)
{
#ifdef CONFIG_CACHE_L2X0
void __iomem *p = IO_ADDRESS(TEGRA_ARM_PERIF_BASE) + 0x3000;
--
1.7.4.1
^ 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