ARM/scoop: Add CPR register bit definitions
Subsystems (3)
PATCH 1/2 ARM/scoop: Add CPR register bit definitions
Add bit definitions of the CPR register of the SCOOP chip into scoop.h
--- arch/arm/include/asm/hardware/scoop.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
arch/arm/include/asm/hardware/scoop.h +5 -0
@@ -22,6 +22,11 @@#define SCOOP_GPWR 0x24#define SCOOP_GPRR 0x28 +#define SCOOP_CPR_OUT ( 1 << 7 ) +#define SCOOP_CPR_SD_3V ( 1 << 2 ) +#define SCOOP_CPR_CF_XV ( 1 << 1 ) +#define SCOOP_CPR_CF_3V ( 1 << 0 ) +#define SCOOP_GPCR_PA22 ( 1 << 12 )#define SCOOP_GPCR_PA21 ( 1 << 11 )#define SCOOP_GPCR_PA20 ( 1 << 10 )
Signature · 1 line
1.7.1
PATCH 2/2 pxa/spitz: Rework spitz
This huge patch mostly shuffles code. The spitz.c file contained terrible mess and needed a cleanup, here it is:
1) Made every part modular, components are not built in if not selected.
2) Removed loads of preprocessor goo, mostly "#ifdef MACH_AKITA .... #endif" and similar code. The kernel size will grow by a few kb now, but the file is much more readable.
3) Reworked SD/CF power setting function and made it reentrant.
--- arch/arm/mach-pxa/include/mach/spitz.h | 2 - arch/arm/mach-pxa/spitz.c | 748 ++++++++++++++++++-------------- 2 files changed, 420 insertions(+), 330 deletions(-)
arch/arm/mach-pxa/include/mach/spitz.h +0 -2
@@ -185,7 +185,5 @@/* * Shared data structures */ -extern struct platform_device spitzscoop_device; -extern struct platform_device spitzscoop2_device;extern struct platform_device spitzssp_device;extern struct sharpsl_charger_machinfo spitz_pm_machinfo;
arch/arm/mach-pxa/spitz.c +420 -328
1,103 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH 2/2 pxa/spitz: Rework spitz
Dne P? 11. ?ervna 2010 08:45:40 Marek Vasut napsal(a):
Quoted 9 lines
This huge patch mostly shuffles code. The
spitz.cfile contained terrible mess and needed a cleanup, here it is:1) Made every part modular, components are not built in if not selected.
2) Removed loads of preprocessor goo, mostly "#ifdefMACH_AKITA.... #endif" and similar code. The kernel size will grow by a few kb now, but the file is much more readable.
3) Reworked SD/CF power setting function and made it reentrant.
Quoted 7 lines
Signed-off-by Marek Vasut <[email protected]>--- arch/arm/mach-pxa/include/mach/spitz.h | 2 - arch/arm/mach-pxa/spitz.c | 748++++++++++++++++++-------------- 2 files changed, 420 insertions(+), 330 deletions(-)
Pavel, Eric, I tested this on metan's Z, could you give it a go ? Thanks!
PATCH 2/2 pxa/spitz: Rework spitz
Quoted 18 lines · Marek Vasut
Dne P? 11. ?ervna 2010 08:45:40 Marek Vasut napsal(a):
Quoted 9 lines
This huge patch mostly shuffles code. The
spitz.cfile contained terrible mess and needed a cleanup, here it is:1) Made every part modular, components are not built in if not selected.
2) Removed loads of preprocessor goo, mostly "#ifdefMACH_AKITA.... #endif" and similar code. The kernel size will grow by a few kb now, but the file is much more readable.
3) Reworked SD/CF power setting function and made it reentrant.Quoted 7 lines
Signed-off-by Marek Vasut <[email protected]>--- arch/arm/mach-pxa/include/mach/spitz.h | 2 - arch/arm/mach-pxa/spitz.c | 748++++++++++++++++++-------------- 2 files changed, 420 insertions(+), 330 deletions(-)
Quoted 1 line
Pavel, Eric, I tested this on metan's Z, could you give it a go ?
quick test on 2.6.35-rc2 (of the 2nd version), and all seems well. What should I look for?
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 2/2 pxa/spitz: Rework spitz
Dne P? 11. ?ervna 2010 16:36:00 Pavel Machek napsal(a):
Quoted 17 lines · Marek Vasut
Quoted 16 lines
Dne P? 11. ?ervna 2010 08:45:40 Marek Vasut napsal(a):
Quoted 15 lines
This huge patch mostly shuffles code. The
spitz.cfile contained terrible mess and needed a cleanup, here it is:1) Made every part modular, components are not built in if not selected. 2) Removed loads of preprocessor goo, mostly "#ifdef
MACH_AKITA.... #endif" and similar code. The kernel size will grow by a few kb now, but the file is much more readable.
3) Reworked SD/CF power setting function and made it reentrant.Signed-off-by Marek Vasut <[email protected]>---
arch/arm/mach-pxa/include/mach/spitz.h | 2 - arch/arm/mach-pxa/spitz.c | 748
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
++++++++++++++++++-------------- 2 files changed, 420 insertions(+), 330 deletions(-)
Pavel, Eric, I tested this on metan's Z, could you give it a go ?
quick test on 2.6.35-rc2 (of the 2nd version), and all seems well. What should I look for?
Pavel
Nothing, the functionality should be the same ... I just felt like it needs rework, it was frustrating digging in it in the state it is in now. The way it is now it's much easier to hack on it. There are still open issues:
1) CPUfreq on Zaurus is still broken. (doesn't work on other devices - causes freezes)
2) PCMCIA driver looses interrupts. (pcmcia-sharpsl needs rework)
3) We need driver for the CPU PMIC. (I already wrote it)
4) Weird mess on the LCD when using DMA (also happens on other devices)
So we'll have at least another four following patches sometimes later.
Pavel, can we get this in? Can I get your Ack and get this one applied? Thanks
PATCH 2/2 pxa/spitz: Rework spitz
Hi!
Quoted 20 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
1) Made every part modular, components are not built in if not selected. 2) Removed loads of preprocessor goo, mostly "#ifdef
MACH_AKITA.... #endif" and similar code. The kernel size will grow by a few kb now, but the file is much more readable.
3) Reworked SD/CF power setting function and made it reentrant.Signed-off-by Marek Vasut <[email protected]>---
arch/arm/mach-pxa/include/mach/spitz.h | 2 - arch/arm/mach-pxa/spitz.c | 748Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
++++++++++++++++++-------------- 2 files changed, 420 insertions(+), 330 deletions(-)
Pavel, Eric, I tested this on metan's Z, could you give it a go ?
quick test on 2.6.35-rc2 (of the 2nd version), and all seems well. What should I look for?
Quoted 7 lines
Nothing, the functionality should be the same ... I just felt like it needs rework, it was frustrating digging in it in the state it is in now. The way it is now it's much easier to hack on it. There are still open issues:
1) CPUfreq on Zaurus is still broken. (doesn't work on other devices - causes freezes)
2) PCMCIA driver looses interrupts. (pcmcia-sharpsl needs rework)
hda timeouts?
Quoted 1 line
3) We need driver for the CPU PMIC. (I already wrote it)
Can you cc me on that one? That should fix the random segfaults, right?
Quoted 5 lines
4) Weird mess on the LCD when using DMA (also happens on other devices)
So we'll have at least another four following patches sometimes later.
Pavel, can we get this in? Can I get your Ack and get this one applied? Thanks
Sorry, I was busy... 2) mixes all kinds of things together -- it would be better to split such patches in future, but yes, it looks ok.
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 2/2 pxa/spitz: Rework spitz
Dne P? 9. ?ervence 2010 21:07:41 Pavel Machek napsal(a):
Quoted 29 lines
Hi!
Quoted 27 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
1) Made every part modular, components are not built in if not selected. 2) Removed loads of preprocessor goo, mostly "#ifdef
MACH_AKITA.... #endif" and similar code. The kernel size will grow by a few kb now, but the file is much more readable.
3) Reworked SD/CF power setting function and made it reentrant.Signed-off-by Marek Vasut <[email protected]>---
arch/arm/mach-pxa/include/mach/spitz.h | 2 - arch/arm/mach-pxa/spitz.c | 748Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
++++++++++++++++++-------------- 2 files changed, 420 insertions(+), 330 deletions(-)
Pavel, Eric, I tested this on metan's Z, could you give it a go ?
quick test on 2.6.35-rc2 (of the 2nd version), and all seems well. What should I look for?
Nothing, the functionality should be the same ... I just felt like it needs rework, it was frustrating digging in it in the state it is in now. The way it is now it's much easier to hack on it. There are still open issues:
1) CPUfreq on Zaurus is still broken. (doesn't work on other devices - causes freezes)
This is fixed, was caused by PCMCIA. Fix for that is in Eric's -fix or -devel branch already.
Quoted 3 lines
Quoted 1 line
2) PCMCIA driver looses interrupts. (pcmcia-sharpsl needs rework)
hda timeouts?
Yea ... PCMCIA problem as well.
Quoted 4 lines
Quoted 2 lines
3) We need driver for the CPU PMIC. (I already wrote it)
Can you cc me on that one? That should fix the random segfaults, right?
Segfaults were caused by pcmcia too I think. But the regulator driver is already in regulator tree.
Quoted 10 lines
Quoted 7 lines
4) Weird mess on the LCD when using DMA (also happens on other devices)
So we'll have at least another four following patches sometimes later.
Pavel, can we get this in? Can I get your Ack and get this one applied? Thanks
Sorry, I was busy... 2) mixes all kinds of things together -- it would be better to split such patches in future, but yes, it looks ok.
Yea, I know this patch is kind of big and beefy ... I've been busy as well, that's why this patch is such a crap, but really, we kind of need this in. I believe after we have these two (zaurus-rework) patches in, things will be a little calmer for a while.
That is, until someone starts digging around sharpsl-pm and spitz-pm, which seriously is totally terrible code. The horror it gave me was worse than talking to tired Russell ;-)