* current next-samsung
@ 2010-05-12 8:52 ` Ben Dooks
0 siblings, 0 replies; 9+ messages in thread
From: Ben Dooks @ 2010-05-12 8:52 UTC (permalink / raw)
To: linux-samsung-soc, linux-arm-kernel
Current contents of next-samsung:
Arnaud Patard (3):
ARM: h1940: fix touchscreen support
ARM: S3C24XX: fix s3c2410fb platdata passing
ARM: S3C24XX: s3c24xx_mci_set_platdata should be marked __init
Ben Dooks (44):
ARM: S3C24XX: Add initial s3c_gpio configuration code
ARM: S3C24XX: Add the gpio pull configuration for pull-up
ARM: S3C24XX: Add extended GPIO used on S3C2443 and beyond
ARM: H1940: Change h1940-bluetooth to use gpiolib API
ARM: JIVE: Update mach-jive to use gpiolib API
ARM: H1940: Change mach-h1940 to use gpiolib API
ARM: QT2410: Update mach-qt2410 to use gpiolib API
ARM: n30: Update mach-n30 to use gpiolib API
ARM: BAST: Update mach-bast to use gpiolib API
ARM: VR1000: Update mach-vr1000.c to use gpiolib API
ARM: S3C2410: Change s3c2410_gpio_pullupl(x, 1) to use s3c_gpio_cfgpull()
ARM: S3C24XX: Change s3c2410_gpio_pullupl(x, 1) to use s3c_gpio_cfgpull()
ARM: S3C24XX: Drop s3c2410 specific s3c2410_gpio_cfgpin()
ARM: S3C24XX: Remove s3c2410_gpio_setcfg()
ARM: S3C24XX: Remove s3c2410_gpio_getpull()
ARM: S3C24XX: Remove s3c2410_gpio_getirq()
ARM: SAMSUNG: Add GPIO configuration read calls
ARM: S3C24XX: Remove s3c2410_gpio_getcfg(), implement s3c_gpio_getcfg()
ARM: mini2440: Move to using gpiolib API and s3c_gpio functions
ARM: S3C2410: Remove the users of s3c2410_gpio_pullup()
ARM: S3C24XX: Wrapper s3c2410_gpio_setpin and s3c2410_gpio_pullup()
ARM: S3C24XX: Remove S3C2410_GPJ numbering
ARM: S3C24XX: Remove _INP macros in <mach/regs-gpioj.h>
ARM: Merge for-2635/s3c24xx-gpio
ARM: Merge for-2635/s3c64xx-general
ARM: Merge for-2635/s3c64xx-ts
ARM: SAMSUNG: Move S3C6400 PLL code to <plat/pll.h> for re-use
ARM: SAMSUNG: Add s3c_disable_clocks() and tidy init+disable usage
ARM: S3C24XX: Identify S3C2416 if S3C2412/S3C2413 built in
ARM: S3C2443: Move parts of the clock code to common clock file
ARM: S3C2416: Add basic clock support
ARM: S3C2416: Add support for second HSMMC channel
ARM: S3C2416: Add support for OHCI on SMDK2416
ARM: S3C2416: Use s3c2440 style i2c controller
ARM: S3C2413: Update GPIO pull-up support
ARM: SAMSUNG: Update S3C2416 entry with S3C2450
ARM: Merge $1
ARM: Merge $1
ARM: Merge $1
ARM: Merge for-2635/rx1950
ARM: SAMSUNG: Remove old email address for ben-linux@fluff.org
ARM: Merge for-2635/s3c24xx-general
ARM: Merge for-2635/s5p-general
ARM: Merge for-2635/samsung-hwmon
Jassi Brar (1):
ARM: S3C6410: Declare IISv4 audio-bus clock
Jongpill Lee (3):
ARM: S5P6440: Bug fix on PWM Timer
ARM: S5P6442: Bug fix on PWM Timer
ARM: S5PV210: Bug fix on PWM Timer
Kukjin Kim (1):
ARM: SAMSUNG: Remove static of S5P SoCs sysclass
Mark Brown (1):
ARM: SMDK6410: Register AC97 controller
Maurus Cuelenaere (3):
ARM: SAMSUNG: Move mach/ts.h to plat/ts.h
ARM: S3C64XX: Add touchscreen platform device definition
ARM: SAMSUNG: Move HWMON from plat-s3c24xx to plat-samsung
Thomas Abraham (1):
ARM: S5P: Add USB External Crystal clock definition
Vasily Khoruzhick (4):
ARM: S3C2440: Add HP iPAQ RX1950 machine support
ARM: S3C24XX: Locate kernel at 0x30108000 if PM_H1940 is enabled
ARM: RX1950: Add suspend/resume support for RX1950
ARM: RX1950: configure GPG13-15 as input before suspend
Yauhen Kharuzhy (5):
ARM: S3C: Add S3C2416 detection to uncompress code
serial: Use s3c2440 driver for S3C2416 SoC
ARM: S3C2416: Add S3C2416-specific registers definitions
ARM: S3C2416: Add arch support
ARM: S3C2416: Add initial support of SMDK2416
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
^ permalink raw reply [flat|nested] 9+ messages in thread* current next-samsung
@ 2010-05-12 8:52 ` Ben Dooks
0 siblings, 0 replies; 9+ messages in thread
From: Ben Dooks @ 2010-05-12 8:52 UTC (permalink / raw)
To: linux-arm-kernel
Current contents of next-samsung:
Arnaud Patard (3):
ARM: h1940: fix touchscreen support
ARM: S3C24XX: fix s3c2410fb platdata passing
ARM: S3C24XX: s3c24xx_mci_set_platdata should be marked __init
Ben Dooks (44):
ARM: S3C24XX: Add initial s3c_gpio configuration code
ARM: S3C24XX: Add the gpio pull configuration for pull-up
ARM: S3C24XX: Add extended GPIO used on S3C2443 and beyond
ARM: H1940: Change h1940-bluetooth to use gpiolib API
ARM: JIVE: Update mach-jive to use gpiolib API
ARM: H1940: Change mach-h1940 to use gpiolib API
ARM: QT2410: Update mach-qt2410 to use gpiolib API
ARM: n30: Update mach-n30 to use gpiolib API
ARM: BAST: Update mach-bast to use gpiolib API
ARM: VR1000: Update mach-vr1000.c to use gpiolib API
ARM: S3C2410: Change s3c2410_gpio_pullupl(x, 1) to use s3c_gpio_cfgpull()
ARM: S3C24XX: Change s3c2410_gpio_pullupl(x, 1) to use s3c_gpio_cfgpull()
ARM: S3C24XX: Drop s3c2410 specific s3c2410_gpio_cfgpin()
ARM: S3C24XX: Remove s3c2410_gpio_setcfg()
ARM: S3C24XX: Remove s3c2410_gpio_getpull()
ARM: S3C24XX: Remove s3c2410_gpio_getirq()
ARM: SAMSUNG: Add GPIO configuration read calls
ARM: S3C24XX: Remove s3c2410_gpio_getcfg(), implement s3c_gpio_getcfg()
ARM: mini2440: Move to using gpiolib API and s3c_gpio functions
ARM: S3C2410: Remove the users of s3c2410_gpio_pullup()
ARM: S3C24XX: Wrapper s3c2410_gpio_setpin and s3c2410_gpio_pullup()
ARM: S3C24XX: Remove S3C2410_GPJ numbering
ARM: S3C24XX: Remove _INP macros in <mach/regs-gpioj.h>
ARM: Merge for-2635/s3c24xx-gpio
ARM: Merge for-2635/s3c64xx-general
ARM: Merge for-2635/s3c64xx-ts
ARM: SAMSUNG: Move S3C6400 PLL code to <plat/pll.h> for re-use
ARM: SAMSUNG: Add s3c_disable_clocks() and tidy init+disable usage
ARM: S3C24XX: Identify S3C2416 if S3C2412/S3C2413 built in
ARM: S3C2443: Move parts of the clock code to common clock file
ARM: S3C2416: Add basic clock support
ARM: S3C2416: Add support for second HSMMC channel
ARM: S3C2416: Add support for OHCI on SMDK2416
ARM: S3C2416: Use s3c2440 style i2c controller
ARM: S3C2413: Update GPIO pull-up support
ARM: SAMSUNG: Update S3C2416 entry with S3C2450
ARM: Merge $1
ARM: Merge $1
ARM: Merge $1
ARM: Merge for-2635/rx1950
ARM: SAMSUNG: Remove old email address for ben-linux at fluff.org
ARM: Merge for-2635/s3c24xx-general
ARM: Merge for-2635/s5p-general
ARM: Merge for-2635/samsung-hwmon
Jassi Brar (1):
ARM: S3C6410: Declare IISv4 audio-bus clock
Jongpill Lee (3):
ARM: S5P6440: Bug fix on PWM Timer
ARM: S5P6442: Bug fix on PWM Timer
ARM: S5PV210: Bug fix on PWM Timer
Kukjin Kim (1):
ARM: SAMSUNG: Remove static of S5P SoCs sysclass
Mark Brown (1):
ARM: SMDK6410: Register AC97 controller
Maurus Cuelenaere (3):
ARM: SAMSUNG: Move mach/ts.h to plat/ts.h
ARM: S3C64XX: Add touchscreen platform device definition
ARM: SAMSUNG: Move HWMON from plat-s3c24xx to plat-samsung
Thomas Abraham (1):
ARM: S5P: Add USB External Crystal clock definition
Vasily Khoruzhick (4):
ARM: S3C2440: Add HP iPAQ RX1950 machine support
ARM: S3C24XX: Locate kernel at 0x30108000 if PM_H1940 is enabled
ARM: RX1950: Add suspend/resume support for RX1950
ARM: RX1950: configure GPG13-15 as input before suspend
Yauhen Kharuzhy (5):
ARM: S3C: Add S3C2416 detection to uncompress code
serial: Use s3c2440 driver for S3C2416 SoC
ARM: S3C2416: Add S3C2416-specific registers definitions
ARM: S3C2416: Add arch support
ARM: S3C2416: Add initial support of SMDK2416
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: current next-samsung
2010-05-12 8:52 ` Ben Dooks
@ 2010-05-12 9:11 ` Russell King - ARM Linux
-1 siblings, 0 replies; 9+ messages in thread
From: Russell King - ARM Linux @ 2010-05-12 9:11 UTC (permalink / raw)
To: Ben Dooks; +Cc: linux-samsung-soc, linux-arm-kernel
On Wed, May 12, 2010 at 09:52:02AM +0100, Ben Dooks wrote:
> ARM: Merge $1
> ARM: Merge $1
> ARM: Merge $1
This looks like a script went wrong.
^ permalink raw reply [flat|nested] 9+ messages in thread
* current next-samsung
@ 2010-05-12 9:11 ` Russell King - ARM Linux
0 siblings, 0 replies; 9+ messages in thread
From: Russell King - ARM Linux @ 2010-05-12 9:11 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, May 12, 2010 at 09:52:02AM +0100, Ben Dooks wrote:
> ARM: Merge $1
> ARM: Merge $1
> ARM: Merge $1
This looks like a script went wrong.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: current next-samsung
2010-05-12 9:11 ` Russell King - ARM Linux
@ 2010-05-12 11:40 ` Ben Dooks
-1 siblings, 0 replies; 9+ messages in thread
From: Ben Dooks @ 2010-05-12 11:40 UTC (permalink / raw)
To: Russell King - ARM Linux; +Cc: Ben Dooks, linux-samsung-soc, linux-arm-kernel
On Wed, May 12, 2010 at 10:11:20AM +0100, Russell King - ARM Linux wrote:
> On Wed, May 12, 2010 at 09:52:02AM +0100, Ben Dooks wrote:
> > ARM: Merge $1
> > ARM: Merge $1
> > ARM: Merge $1
>
> This looks like a script went wrong.
yes. i'll probably rebuild before sending to linus, not had any reason
to rebase next-samsung yet to fix it.
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
^ permalink raw reply [flat|nested] 9+ messages in thread
* current next-samsung
@ 2010-05-12 11:40 ` Ben Dooks
0 siblings, 0 replies; 9+ messages in thread
From: Ben Dooks @ 2010-05-12 11:40 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, May 12, 2010 at 10:11:20AM +0100, Russell King - ARM Linux wrote:
> On Wed, May 12, 2010 at 09:52:02AM +0100, Ben Dooks wrote:
> > ARM: Merge $1
> > ARM: Merge $1
> > ARM: Merge $1
>
> This looks like a script went wrong.
yes. i'll probably rebuild before sending to linus, not had any reason
to rebase next-samsung yet to fix it.
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: current next-samsung
2010-05-12 8:52 ` Ben Dooks
@ 2010-05-12 19:06 ` Mike Solovyev
-1 siblings, 0 replies; 9+ messages in thread
From: Mike Solovyev @ 2010-05-12 19:06 UTC (permalink / raw)
To: Ben Dooks; +Cc: linux-samsung-soc, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 475 bytes --]
On Wed, 12 May 2010 09:52:02 +0100
Ben Dooks <ben-linux@fluff.org> wrote:
> Current contents of next-samsung:
>
> Arnaud Patard (3):
> ARM: h1940: fix touchscreen support
> ARM: S3C24XX: fix s3c2410fb platdata passing
> ARM: S3C24XX: s3c24xx_mci_set_platdata should be marked __init
It will be cool to merge my "h1940: framebuffer configuration fix" too. This
problem stays annoying for a long time...
--
ms -- http://sk.2-ch.org/gpg.pub
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Current next-samsung
@ 2010-05-06 23:06 Ben Dooks
0 siblings, 0 replies; 9+ messages in thread
From: Ben Dooks @ 2010-05-06 23:06 UTC (permalink / raw)
To: linux-arm-kernel, linux-samsung-soc
The following changes since commit 7ebd467551ed6ae200d7835a84bbda0dcadaa511:
Linus Torvalds (1):
Merge branch 'drm-linus' of git://git.kernel.org/.../airlied/drm-2.6
are available in the git repository at:
git://git.fluff.org/bjdooks/linux.git next-samsung
Arnaud Patard (3):
ARM: h1940: fix touchscreen support
ARM: S3C24XX: fix s3c2410fb platdata passing
ARM: S3C24XX: s3c24xx_mci_set_platdata should be marked __init
Ben Dooks (26):
ARM: S3C24XX: Add initial s3c_gpio configuration code
ARM: S3C24XX: Add the gpio pull configuration for pull-up
ARM: S3C24XX: Add extended GPIO used on S3C2443 and beyond
ARM: H1940: Change h1940-bluetooth to use gpiolib API
ARM: JIVE: Update mach-jive to use gpiolib API
ARM: H1940: Change mach-h1940 to use gpiolib API
ARM: QT2410: Update mach-qt2410 to use gpiolib API
ARM: n30: Update mach-n30 to use gpiolib API
ARM: BAST: Update mach-bast to use gpiolib API
ARM: VR1000: Update mach-vr1000.c to use gpiolib API
ARM: S3C2410: Change s3c2410_gpio_pullupl(x, 1) to use s3c_gpio_cfgpull()
ARM: S3C24XX: Change s3c2410_gpio_pullupl(x, 1) to use s3c_gpio_cfgpull()
ARM: S3C24XX: Drop s3c2410 specific s3c2410_gpio_cfgpin()
ARM: S3C24XX: Remove s3c2410_gpio_setcfg()
ARM: S3C24XX: Remove s3c2410_gpio_getpull()
ARM: S3C24XX: Remove s3c2410_gpio_getirq()
ARM: SAMSUNG: Add GPIO configuration read calls
ARM: S3C24XX: Remove s3c2410_gpio_getcfg(), implement s3c_gpio_getcfg()
ARM: mini2440: Move to using gpiolib API and s3c_gpio functions
ARM: S3C2410: Remove the users of s3c2410_gpio_pullup()
ARM: S3C24XX: Wrapper s3c2410_gpio_setpin and s3c2410_gpio_pullup()
ARM: S3C24XX: Remove S3C2410_GPJ numbering
ARM: S3C24XX: Remove _INP macros in <mach/regs-gpioj.h>
ARM: Merge for-2635/s3c24xx-gpio
ARM: Merge for-2635/s3c64xx-general
ARM: Merge for-2635/s3c64xx-ts
Mark Brown (1):
ARM: SMDK6410: Register AC97 controller
Maurus Cuelenaere (2):
ARM: SAMSUNG: Move mach/ts.h to plat/ts.h
ARM: S3C64XX: Add touchscreen platform device definition
arch/arm/mach-s3c2410/Kconfig | 1 +
arch/arm/mach-s3c2410/h1940-bluetooth.c | 32 +++--
arch/arm/mach-s3c2410/include/mach/gpio-fns.h | 47 ++++---
arch/arm/mach-s3c2410/include/mach/gpio-nrs.h | 12 ++
arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 17 +++
arch/arm/mach-s3c2410/include/mach/regs-gpioj.h | 36 -----
arch/arm/mach-s3c2410/mach-amlm5900.c | 5 +-
arch/arm/mach-s3c2410/mach-bast.c | 9 +-
arch/arm/mach-s3c2410/mach-h1940.c | 25 ++--
arch/arm/mach-s3c2410/mach-n30.c | 7 +-
arch/arm/mach-s3c2410/mach-qt2410.c | 10 +-
arch/arm/mach-s3c2410/mach-vr1000.c | 5 +-
arch/arm/mach-s3c2410/s3c2410.c | 8 +
arch/arm/mach-s3c2412/mach-jive.c | 26 ++--
arch/arm/mach-s3c2412/mach-smdk2413.c | 8 +-
arch/arm/mach-s3c2440/Kconfig | 1 +
arch/arm/mach-s3c2440/mach-mini2440.c | 23 ++--
arch/arm/mach-s3c2440/mach-nexcoder.c | 9 +-
arch/arm/mach-s3c2440/mach-osiris.c | 5 +-
arch/arm/mach-s3c2440/s3c2440.c | 8 +
arch/arm/mach-s3c64xx/Makefile | 1 +
arch/arm/mach-s3c64xx/dev-ts.c | 61 ++++++++
arch/arm/mach-s3c64xx/gpiolib.c | 6 +
arch/arm/mach-s3c64xx/mach-smdk6410.c | 5 +
arch/arm/mach-s5p6440/gpio.c | 5 +
arch/arm/plat-s3c24xx/Kconfig | 1 +
arch/arm/plat-s3c24xx/common-smdk.c | 9 +-
arch/arm/plat-s3c24xx/devs.c | 14 ++-
arch/arm/plat-s3c24xx/gpio.c | 144 +++-----------------
arch/arm/plat-s3c24xx/gpiolib.c | 60 ++++++++-
arch/arm/plat-s3c24xx/pm.c | 9 +-
arch/arm/plat-s3c24xx/setup-i2c.c | 5 +-
arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c | 16 +-
arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c | 16 +-
arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c | 16 +-
arch/arm/plat-samsung/Kconfig | 6 +
arch/arm/plat-samsung/gpio-config.c | 103 ++++++++++++++-
.../plat-samsung/include/plat/gpio-cfg-helpers.h | 58 ++++++++
arch/arm/plat-samsung/include/plat/gpio-cfg.h | 11 ++
arch/arm/plat-samsung/include/plat/gpio-core.h | 3 +
.../mach => plat-samsung/include/plat}/ts.h | 2 +-
drivers/input/touchscreen/s3c2410_ts.c | 2 +-
42 files changed, 545 insertions(+), 302 deletions(-)
create mode 100644 arch/arm/mach-s3c64xx/dev-ts.c
rename arch/arm/{mach-s3c2410/include/mach => plat-samsung/include/plat}/ts.h (92%)
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-05-12 19:06 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-12 8:52 current next-samsung Ben Dooks
2010-05-12 8:52 ` Ben Dooks
2010-05-12 9:11 ` Russell King - ARM Linux
2010-05-12 9:11 ` Russell King - ARM Linux
2010-05-12 11:40 ` Ben Dooks
2010-05-12 11:40 ` Ben Dooks
2010-05-12 19:06 ` Mike Solovyev
2010-05-12 19:06 ` Mike Solovyev
-- strict thread matches above, loose matches on Subject: below --
2010-05-06 23:06 Current next-samsung Ben Dooks
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.