summaryrefslogtreecommitdiffstats
path: root/drivers/staging/olpc_dcon
AgeCommit message (Collapse)AuthorFilesLines
2011-02-18staging: olpc_dcon: drop XO-1.5 prototype supportAndres Salomon1-61/+23
Remove code related to XO-1.5 prototype boards. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18staging: olpc_dcon: Remove _strtoul() function.Marek Belisko1-35/+22
olpc_dcon driver use self invented _strtoul function which make similar check like strict_strtoul just extend for space checking at last string place. Normally access to sys file looks echo 1024 > /sys/... so space could be considered as error character and we could simplify code using just strict_strtoul function instead self invented. Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18staging: olpc_dcon: move fb stuff info dcon_priv, and clean up fb handlingAndres Salomon1-23/+37
- move fbinfo and ignore_fb_events into dcon_priv - add calls to {un,}lock_fb_info before calling fb_blank - fail to load the driver if there are no registered framebuffers That last one fixes a potential oops, where if the dcon driver loads without a framebuffer registered, fb_blank will end up being passed a NULL (and will attempt to dereference it). Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18staging: olpc_dcon: move fb event notifier block into dcon_priv structAndres Salomon1-10/+7
This also fixes a think-o where I was pulling the dcon struct out of thin air in the fb event callback. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-18staging: olpc_dcon: don't specify single bits for bool fieldsAndres Salomon1-5/+5
Just use a regular 'bool foo', rather than 'bool foo:1'. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging: olpc_dcon: actually return the value of i2c_add_driverAndres Salomon1-3/+2
It's nice to actually check for errors. :) Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging: olpc_dcon: move more variables into dcon_privAndres Salomon2-38/+35
Global variables for display mode and the current sleep state can go into dcon_priv as well. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging: olpc_dcon: change sysfs 'output' toggle to be clearer...Andres Salomon2-22/+16
..and store it in dcon_priv. This renames it to 'monochrome', which I think is much clearer. Previously, "echo 1 > output" toggled mono mode, while "echo 0 > output" enabled color. "Echo 1 > monochrome" makes more sense to me. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging: olpc_dcon: get rid of global i2c_client, create a dcon_priv structAndres Salomon1-64/+99
Rather than using the global i2c_client variable, create a dcon_priv struct, store in the drvdata portion of the dev, and pass that around. In order to access dcon struct from various callbacks, include the reboot notifier and source switching work struct in the dcon struct. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-09staging: olpc_dcon: revert strtoul changeAndres Salomon1-1/+1
On Fri, 4 Feb 2011 15:44:43 -0800 From: Andres Salomon <dilinger@queued.net> The s/simple_strtoul/strict_strtoul/ from commit e107e6eb added a build warning, as well as an oops. This reverts that change. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-04staging: olpc_dcon: checkpatch.pl fixes for olpc_dcon.c file.Marek Belisko1-38/+46
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-04staging: oplc_dcon: Fix compilation warning.Marek Belisko1-3/+12
Fix compilation warning: drivers/staging/olpc_dcon/olpc_dcon.c: In function ‘dcon_probe’: drivers/staging/olpc_dcon/olpc_dcon.c:704:21: warning: ignoring return value of ‘device_create_file’, declared with attribute warn_unused_result and add cleaning of created files when creation of one failed. Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-01-26console: rename acquire/release_console_sem() to console_lock/unlock()Torben Hohn1-5/+5
The -rt patches change the console_semaphore to console_mutex. As a result, a quite large chunk of the patches changes all acquire/release_console_sem() to acquire/release_console_mutex() This commit makes things use more neutral function names which dont make implications about the underlying lock. The only real change is the return value of console_trylock which is inverted from try_acquire_console_sem() This patch also paves the way to switching console_sem from a semaphore to a mutex. [akpm@linux-foundation.org: coding-style fixes] [akpm@linux-foundation.org: make console_trylock return 1 on success, per Geert] Signed-off-by: Torben Hohn <torbenh@gmx.de> Cc: Thomas Gleixner <tglx@tglx.de> Cc: Greg KH <gregkh@suse.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-01-13Merge branch 'for-next' of ↵Linus Torvalds1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) Documentation/trace/events.txt: Remove obsolete sched_signal_send. writeback: fix global_dirty_limits comment runtime -> real-time ppc: fix comment typo singal -> signal drivers: fix comment typo diable -> disable. m68k: fix comment typo diable -> disable. wireless: comment typo fix diable -> disable. media: comment typo fix diable -> disable. remove doc for obsolete dynamic-printk kernel-parameter remove extraneous 'is' from Documentation/iostats.txt Fix spelling milisec -> ms in snd_ps3 module parameter description Fix spelling mistakes in comments Revert conflicting V4L changes i7core_edac: fix typos in comments mm/rmap.c: fix comment sound, ca0106: Fix assignment to 'channel'. hrtimer: fix a typo in comment init/Kconfig: fix typo anon_inodes: fix wrong function name in comment fix comment typos concerning "consistent" poll: fix a typo in comment ... Fix up trivial conflicts in: - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c) - fs/ext4/ext4.h Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13drivers/staging/olpc_dcon: convert to new cs5535 gpio APIAndres Salomon5-93/+103
Drop the old geode_gpio crud, as well as the raw outl() calls; instead, use the Linux GPIO API where possible, and the cs5535_gpio API in other places. Note that we don't actually clean up the driver properly yet (once loaded, it always remains loaded). That'll come later.. This patch is necessary for building the driver. Signed-off-by: Andres Salomon <dilinger@queued.net> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-12-22Merge branch 'master' into for-nextJiri Kosina1-4/+0
Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.
2010-11-16backlight: constify backlight_opsLionel Debroux1-1/+1
backlight_device_register has been expecting a const "ops" argument, and using it as such, since 9905a43b2d563e6f89e4c63c4278ada03f2ebb14. Let's make the remaining backlight_ops instances const. Inspired by hunks of the grsecurity patch, updated for newer kernels. Signed-off-by: Lionel Debroux <lionel_debroux@yahoo.fr> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2010-11-15i2c: Drivers shouldn't include <linux/i2c-id.h>Jean Delvare1-1/+0
Drivers don't need to include <linux/i2c-id.h>, especially not when they don't use anything that header file provides. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Michael Hunold <michael@mihu.de> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-11-15i2c: Remove obsolete cleanup for clientdataWolfram Sang1-3/+0
A few new i2c-drivers came into the kernel which clear the clientdata-pointer on exit. This is obsolete meanwhile, so fix it and hope the word will spread. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Alan Cox <alan@linux.intel.com> Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Jean Delvare <khali@linux-fr.org>
2010-10-05Staging: olpc_dcon: mark the driver as CONFIG_BROKEN for nowGreg Kroah-Hartman1-1/+1
It doesn't build yet, as it depends on some changes that are not yet in the tree, so mark it as BROKEN for now until that gets resolved. Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29staging: olpc_dcon: drop old VT switch code, watch for CONBLANK eventAndres Salomon1-20/+6
Eons ago, in a galaxy far far away, Jordan committed code to work around the fact that X might have put the DCON to sleep and then crashed (in that galaxy, X crashed a lot; crazy, right?) This code was based on a custom API. These days, we have code which watches for FB unblanks, and should perform the same function.. Therefore, the older code can be dropped. We should probably be watching for CONBLANK events to, so allow those to turn the DCON back on. Dropping the old code is necessary for building the driver. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29staging: olpc_dcon: add people to the Cc listAndres Salomon1-0/+2
Some additional folks requested to be Cc'd for OLPC-DCON changes; add them to the TODO file. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29staging: olpc_dcon: remove outdated backlight commentAndres Salomon1-6/+0
This comment about killing power to the backlight is ancient, and incorrect (the code that follows actually does the opposite of what the comment says). This was due to hardware changes; the comment was for the original OLPC GX2 boards, but when the OLPC LX boards came out, the code was updated for that hardware. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29staging: olpc_dcon: add TODO fileAndres Salomon1-0/+15
Add and populate a TODO file for the olpc_dcon driver. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29staging: olpc_dcon: drop XO-1.5 support for nowAndres Salomon1-10/+0
The vx855 stuff isn't upstream yet; for now, drop support for XO-1.5. This will come back once the 1.5 code is in place (and will be in a form that allows both 1.0 and 1.5 support to be compiled in at the same time), but for now just remove it. This is necessary to get the driver building. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29staging: olpc_dcon: switch back to using olpc_board(0xXX)Andres Salomon1-2/+2
...Rather than macros that don't exist. Necessary for building the driver. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-09-29staging: olpc_dcon: add OLPC display controller (DCON) supportAndres Salomon6-0/+1374
This adds DCON support for the OLPC XO. The DCON is found in XO-1 and XO-1.5 hardware. The XO-1 has a CS5536 southbridge, while the XO-1.5 has a Via chipset; the GPIO magic that's necessary to communicate with the DCON chip is unfortunately different across both platforms. This driver supports both. This driver is in bad state atm, so I'm requesting its inclusion into staging so it can be cleaned up while staying in the kernel tree. Original driver by Dave Woodhouse, and modified extensively by Jordan Crouse, myself, Deepak Saxena, Paul Fox, Daniel Drake, and probably others that I've missed. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>