aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-10-24Merge branch 's3c-touchscreen-2.6.31' into om-gta01-2.6.31Lars-Peter Clausen
2009-10-24Fix resume conversionsVasily Khoruzhick
This patch fixes a bug where the TS might stop working after suspend/resume. This patch is under upstream review and it seems it will change a lot. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
2009-10-24Add s3c2410tsNelson Castillo
Add the ts and the relevant files. Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
2009-10-24Add touchscreen filtersNelson Castillo
Add filter source code and add it to the defconfig. Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
2009-10-24s3c24xx: introduce s3c-adc delayVasily Khoruzhick
Without this patch we cannot make the s3c2410/s3c2440 touchscreen driver work. This will be done in a different way in upstream kernel. We specify the delay value (S3C2410_ADCDLY). Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net>
2009-10-23Merge branch 'pcf50606-2.6.31' into om-gta01-2.6.31Lars-Peter Clausen
2009-10-23pcf50606-adc: Some minor cleanupsLars-Peter Clausen
2009-10-23rtc-pcf50606: Minor cleanupsLars-Peter Clausen
2009-10-23pcf50606-core: Some minor cleanups.Lars-Peter Clausen
2009-10-23pcf50606-regulator: Remove obsolete testsLars-Peter Clausen
If the regulator id is out of range something else has been terrible gone wrong and it does not make sense to catch it here in a soft way.
2009-10-23pcf50606-regulator: Minor cleanupsLars-Peter Clausen
2009-10-23pcf50606-charger: serveral minor cleanups.Lars-Peter Clausen
2009-10-22pcf50606: remove gpo driverLars-Peter Clausen
Since it is not use and probably never will be it's safe to remove it.
2009-10-20Merge branch 'gta01-machine-2.6.31' into om-gta01-2.6.31Lars-Peter Clausen
2009-10-20Mark pmu probe callback __devinitLars-Peter Clausen
2009-10-17Merge branch 'gta01-machine-2.6.31' into om-gta01-2.6.31Lars-Peter Clausen
2009-10-17gta01: Add default configLars-Peter Clausen
2009-10-17Merge branch 'gta01-machine-2.6.31' into om-gta01-2.6.31Lars-Peter Clausen
2009-10-17gta01: Disable battery driver for now.Lars-Peter Clausen
2009-10-17Merge branches 'om-s3c-2.6.31', 'wm8753-2.6.31', 'jbt6k74-2.6.31', ↵Lars-Peter Clausen
'gta01-machine-2.6.31' and 'pcf50606-2.6.31' into om-gta01-2.6.31
2009-10-17Merge gta01 and gta02 sound soc driver.Lars-Peter Clausen
2009-10-17Add gta01 machine support.Lars-Peter Clausen
2009-10-17pcf50606: Add newline to error message.Lars-Peter Clausen
2009-10-17pcf50606: Use disable_irq_nosync to prevent deadlock.Lars-Peter Clausen
2009-10-17mtd: s3c2410_nand: Add config option to disable hw ecc at runtimeHolger Freyther
This patch adds a flag to the s3c2410_nand platform data, which configures whether hardware ecc is used for that chip. Currently hardware ecc is used if it was compiled into the kernel. But if you want to build a kernel which runs on multiple devices you might have a configuration where you have devices which require hw ecc as well as devices which want software ecc. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2009-10-17Fix pcf50606-regulator drvdata usagePaul Fertser
Ported from 01f61025cee418405880d653f33ce179873a3610
2009-10-17Use platform_device_add_data to set regulator platform dataPaul Fertser
Ported from 0231c22f5955bbe72c88815f119198c734149e00
2009-10-17Cleanup pcf50606_probe error handlingPaul Fertser
Ported from f9745d7f9cca30230a827f2170cf038a368f9992
2009-10-17Fix memleak in pcf50633_client_dev_registePaul Fertser
Ported from 207ec43e8c5a54dfc82a0e65af5b8f2765e3cbb8
2009-10-17make suspend/resume belong to i2c_driverPaul Fertser
Ported from 804ed578713f259c23e6e98e4740588f4aa00519
2009-10-17Inital pcf50606 supportLars-Peter Clausen
2009-10-11s3c24xx: Add number of board irqs for the gta02Lars-Peter Clausen
The gta02 uses the glamo mfd driver which requires 9 board irqs. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2009-10-11s3c24xx: Add support for board IRQsLars-Peter Clausen
Some boards have a need for a set of extra IRQ numbers, for example some multifunction devices which do irq demultiplexing require them. This patch adds S3C2410_BOARD_NR_IRQS which specifies the number of extra board IRQs. Board specific code would use S3C2410_BOARD_IRQ_START to get the number of it's first irq. Since it is possible to support a multiple boards with a single kernel and there is no easy way to set a CONFIG option to multiple values and only use the maximum each board which needs board IRQs has do be explicitly added to irqs.h Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2009-10-05ASoC: neo1973_gta02_wm8753: Get rid of lm4853_{set,get}_state and some minorLars-Peter Clausen
cleanups
2009-10-05ARM: S3C24XX: Introduce S3C2442B CPULars-Peter Clausen
Add the S3C2442B CPU ID to aid support the Openmoko GTA02 / Freerunner. Signed-off-by: Harald Welte <laforge@gnumonks.org> Signed-off-by: Andy Green <andy@warmcat.com> Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net> [ben-linux@fluff.org: edit description for clarity and S3C2442B as uppercase] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2009-10-05Add s3c24xx_serial_console_set_silenceLars-Peter Clausen
2009-10-05Add s3c pwm device driver.Lars-Peter Clausen
2009-10-05Add c fiq handler.Lars-Peter Clausen
2009-10-04Add jbt6k74 display driver.Lars-Peter Clausen
2009-09-09Linux 2.6.31Linus Torvalds
2009-09-09aoe: allocate unused request_queue for sysfsEd Cashin
Andy Whitcroft reported an oops in aoe triggered by use of an incorrectly initialised request_queue object: [ 2645.959090] kobject '<NULL>' (ffff880059ca22c0): tried to add an uninitialized object, something is seriously wrong. [ 2645.959104] Pid: 6, comm: events/0 Not tainted 2.6.31-5-generic #24-Ubuntu [ 2645.959107] Call Trace: [ 2645.959139] [<ffffffff8126ca2f>] kobject_add+0x5f/0x70 [ 2645.959151] [<ffffffff8125b4ab>] blk_register_queue+0x8b/0xf0 [ 2645.959155] [<ffffffff8126043f>] add_disk+0x8f/0x160 [ 2645.959161] [<ffffffffa01673c4>] aoeblk_gdalloc+0x164/0x1c0 [aoe] The request queue of an aoe device is not used but can be allocated in code that does not sleep. Bruno bisected this regression down to cd43e26f071524647e660706b784ebcbefbd2e44 block: Expose stacked device queues in sysfs "This seems to generate /sys/block/$device/queue and its contents for everyone who is using queues, not just for those queues that have a non-NULL queue->request_fn." Addresses http://bugs.launchpad.net/bugs/410198 Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13942 Note that embedding a queue inside another object has always been an illegal construct, since the queues are reference counted and must persist until the last reference is dropped. So aoe was always buggy in this respect (Jens). Signed-off-by: Ed Cashin <ecashin@coraid.com> Cc: Andy Whitcroft <apw@canonical.com> Cc: "Rafael J. Wysocki" <rjw@sisk.pl> Cc: Bruno Premont <bonbons@linux-vserver.org> Cc: Martin K. Petersen <martin.petersen@oracle.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
2009-09-08i915: disable interrupts before tearing down GEM stateLinus Torvalds
Reinette Chatre reports a frozen system (with blinking keyboard LEDs) when switching from graphics mode to the text console, or when suspending (which does the same thing). With netconsole, the oops turned out to be BUG: unable to handle kernel NULL pointer dereference at 0000000000000084 IP: [<ffffffffa03ecaab>] i915_driver_irq_handler+0x26b/0xd20 [i915] and it's due to the i915_gem.c code doing drm_irq_uninstall() after having done i915_gem_idle(). And the i915_gem_idle() path will do i915_gem_idle() -> i915_gem_cleanup_ringbuffer() -> i915_gem_cleanup_hws() -> dev_priv->hw_status_page = NULL; but if an i915 interrupt comes in after this stage, it may want to access that hw_status_page, and gets the above NULL pointer dereference. And since the NULL pointer dereference happens from within an interrupt, and with the screen still in graphics mode, the common end result is simply a silently hung machine. Fix it by simply uninstalling the irq handler before idling rather than after. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=13819 Reported-and-tested-by: Reinette Chatre <reinette.chatre@intel.com> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-09-08drm/i915: fix mask bits settingZhenyu Wang
eDP is exclusive connector too, and add missing crtc_mask setting for TV. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=14139 Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Reported-and-tested-by: Carlos R. Mafra <crmafra2@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-09-07Merge branch 'drm-fixes' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms: add LTE/GTE discard + rv515 two sided stencil register.
2009-09-07Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: IMA: update ima_counts_put
2009-09-07Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: gianfar: Fix build.
2009-09-07Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6Linus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: pcmcia: add CNF-CDROM-ID for ide
2009-09-07Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: agp/intel: support for new chip variant of IGDNG mobile drm/i915: Unref old_obj on get_fence_reg() error path drm/i915: increase default latency constant (v2 w/comment)
2009-09-07drm/radeon/kms: add LTE/GTE discard + rv515 two sided stencil register.Dave Airlie
This adds some rv350+ register for LTE/GTE discard, and enables the rv515 two sided stencil register. It also disables the DEPTHXY_OFFSET register which can be used to workaround the CS checker. Moves rs690 to proper place in rs600 and uses correct table on rs600. Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-09-07IMA: update ima_counts_putMimi Zohar
- As ima_counts_put() may be called after the inode has been freed, verify that the inode is not NULL, before dereferencing it. - Maintain the IMA file counters in may_open() properly, decrementing any counter increments on subsequent errors. Reported-by: Ciprian Docan <docan@eden.rutgers.edu> Reported-by: J.R. Okajima <hooanon05@yahoo.co.jp> Signed-off-by: Mimi Zohar <zohar@us.ibm.com> Acked-by: Eric Paris <eparis@redhat.com Signed-off-by: James Morris <jmorris@namei.org>