09 Dec, 2011
3 commits
-
As Dan mentioned, dcon_write() will only write u16 values. The
appropriate parts have been changed. As a result of module_param()
not accepting u16 as a valid data type, ushort is used.Signed-off-by: Valentin Rothberg
Signed-off-by: Greg Kroah-Hartman -
As noted by the checkpatch script, strict_strtoul is obsolete. Unsigned
longs are used, so it seems good to take kstrtoul.Signed-off-by: Valentin Rothberg
Signed-off-by: Greg Kroah-Hartman -
Change ->read_status() by separating the error handling and the
status bits. This also fixes a signedness bug in dcon_interrupt()
that would break the error handling.Signed-off-by: Xi Wang
Acked-by: Andres Salomon
Cc: Dan Carpenter
Signed-off-by: Greg Kroah-Hartman
26 Aug, 2011
1 commit
-
Lots of people expect module.h to just "be there" without
any #include effort. But we are crushing that. So fix those
files in staging relying on implicit module.h presence.Signed-off-by: Paul Gortmaker
Signed-off-by: Greg Kroah-Hartman
25 Aug, 2011
1 commit
-
A few new i2c-drivers came into the kernel which clear the clientdata-pointer
on exit or error. This is obsolete meanwhile, the core will do it.Signed-off-by: Wolfram Sang
Acked-by: Andres Salomon
Cc: Andrew Morton
Cc: Marek Belisko
Acked-by: Jean Delvare
Signed-off-by: Greg Kroah-Hartman
24 Aug, 2011
3 commits
-
Use dcon_read and dcon_write; shorter, and understands the dcon_priv
struct. This transition was started long ago. This converts the
last few i2c_smbus_* callers.Signed-off-by: Andres Salomon
Signed-off-by: Greg Kroah-Hartman -
The v1 DCONs only existed for XO-1 prototypes (and even then, very very
early prototypes). Drop support for v1 DCON.Signed-off-by: Andres Salomon
Signed-off-by: Greg Kroah-Hartman -
This came from Jordan's original 2007 gxfb_dcon commit. I've never
seen or heard of it actually being used. Presumably it was once
useful for skipping hardware initialization when reloading the module
over and over during driver development..Signed-off-by: Andres Salomon
Signed-off-by: Greg Kroah-Hartman
08 Jun, 2011
1 commit
-
Fix olpc_dcon.c build by selecting the needed kconfig symbol
BACKLIGHT_CLASS_DEVICE.olpc_dcon.c:(.text+0x11588b): undefined reference to `backlight_device_register'
Signed-off-by: Randy Dunlap
Cc: Andres Salomon
Cc: Chris Ball
Cc: Jon Nettleton
Signed-off-by: Greg Kroah-Hartman
24 May, 2011
1 commit
-
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (970 commits)
staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_
staging:iio: Trivial kconfig reorganization and uniformity improvements.
staging:iio:documenation partial update.
staging:iio: use pollfunc allocation helpers in remaining drivers.
staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify event code spitting out.
staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev.
staging:iio:meter:ade7758: Use private data space from iio_allocate_device
staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value.
staging:iio: ring core cleanups + check if read_last available in lis3l02dq
staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name.
staging:iio: poll func allocation clean up.
staging:iio:ad7780 trivial unused header cleanup.
staging:iio:adc: AD7780: Use private data space from iio_allocate_device + trivial fixes
staging:iio:adc:AD7780: Convert to new channel registration method
staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv()
staging:iio:adc: AD7606: Consitently use indio_dev
staging:iio: Rip out helper for software rings.
staging:iio:adc:AD7298: Use private data space from iio_allocate_device
staging:iio: rationalization of different buffer implementation hooks.
staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from iio_dev.
...Fix up trivial conflicts in
- drivers/staging/intel_sst/intelmid.c: patches applied in both branches
- drivers/staging/rt2860/common/cmm_data_{pci,usb}.c: removed vs spelling
- drivers/staging/usbip/vhci_sysfs.c: trivial header file inclusion
26 Apr, 2011
2 commits
-
The olpc dcon xo1 driver uses udelay() without including .
This patch adds it.
Signed-off-by: Jeff Mahoney
Signed-off-by: Randy Dunlap
Cc: Andres Salomon
Signed-off-by: Greg Kroah-Hartman -
Fix the whitespace and coding style issues in olpc_dcon metioned by
checkpatch.Signed-off-by: Stefan Brähler
Acked-by: Andres Salomon
Signed-off-by: Greg Kroah-Hartman
08 Apr, 2011
1 commit
-
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (28 commits)
staging: usbip: bugfix for isochronous packets and optimization
staging: usbip: bugfix add number of packets for isochronous frames
staging: usbip: bugfixes related to kthread conversion
staging: usbip: fix shutdown problems.
staging: hv: Fix GARP not sent after Quick Migration
staging: IIO: IMU: ADIS16400: Avoid using printk facility directly
staging: IIO: IMU: ADIS16400: Fix product ID check, skip embedded revision number
staging: IIO: IMU: ADIS16400: Make sure only enabled scan_elements are pushed into the ring
staging: IIO: IMU: ADIS16400: Fix addresses of GYRO and ACCEL calibration offset
staging: IIO: IMU: ADIS16400: Add delay after self test
staging: IIO: IMU: ADIS16400: Fix up SPI messages cs_change behavior
staging/rtl81*: build as loadable modules only
staging: brcm80211: removed 'is_amsdu causing toss' log spam
staging: brcm80211: fix for 'Short CCK' log spam
staging: brcm80211: fix for 'AC_BE txop..' logs spammed problem
staging: memrar: remove driver from tree
staging: sep: remove last memrar remnants
staging: fix hv_mouse build, needs delay.h
staging: fix olpc_dcon build errors
staging: sm7xx: fixed defines
...Fix up trivial conflict in drivers/staging/memrar/memrar_handler.c
(deleted vs trivial spelling fixes)
05 Apr, 2011
1 commit
-
drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c: In function ‘dcon_wiggle_xo_1_5’:
drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c:155: error: implicit declaration of function ‘udelay’
drivers/built-in.o: In function `dcon_read_status_xo_1':
olpc_dcon_xo_1.c:(.text+0x13472e): undefined reference to `cs5535_gpio_set'Signed-off-by: Sascha Silbe
Signed-off-by: Greg Kroah-Hartman
31 Mar, 2011
1 commit
-
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi
23 Mar, 2011
1 commit
-
There may be multiple ways of controlling the backlight on a given
machine. Allow drivers to expose the type of interface they are
providing, making it possible for userspace to make appropriate policy
decisions.Signed-off-by: Matthew Garrett
Cc: Richard Purdie
Cc: Chris Wilson
Cc: David Airlie
Cc: Alex Deucher
Cc: Ben Skeggs
Cc: Zhang Rui
Cc: Len Brown
Cc: Jesse Barnes
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
24 Feb, 2011
1 commit
-
drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c:106: error: 'acpi_gbl_FADT' undeclared (first use in this function)
Fixing that one gives:
ERROR: "backlight_device_register" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined!
ERROR: "registered_fb" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined!
ERROR: "lock_fb_info" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined!
ERROR: "backlight_device_unregister" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined!
ERROR: "num_registered_fb" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined!
ERROR: "fb_blank" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined!Signed-off-by: Randy Dunlap
Cc: Chris Ball
Cc: Jon Nettleton
Acked-By: Andres Salomon
Signed-off-by: Greg Kroah-Hartman
19 Feb, 2011
10 commits
-
DCON builds properly now; we can drop the config dep on
CONFIG_BROKEN.Signed-off-by: Andres Salomon
Signed-off-by: Greg Kroah-Hartman -
- Move bl_val and bl_dev into dcon_priv struct....
- The only time we ever read the backlight val from the dcon is
at probe time. Rather than calling dcon_get_backlight for that, just
read from the register.
- Drop dcon_get_backlight; it's just returning dcon->bl_val.
- Rename dcon_set_backlight_hw to dcon_set_backlight, and drop the
old dcon_set_backlight function. Move contents of old dcon_set_backlight
function into dconbl_set.
- Shuffle backlight_ops callbacks around to be closer to struct, and
rename them.
- Make use of new backlight_properties arg to backlight_device_register,
drop old code that set this manually.Signed-off-by: Andres Salomon
Signed-off-by: Greg Kroah-Hartman -
Global variables dcon_switched, dcon_irq_time, and dcon_load_time can all be moved
into the dcon_priv struct now that dcon_interrupt has access to dcon_priv.Signed-off-by: Greg Kroah-Hartman
-
This moves dcon_source and dcon_pending into the dcon_priv struct.
Because these variables are used by the IRQ handler (which is
registered in the model-specific callbacks), we end up needing
to move dcon_priv into olpc_dcon.h. This also changes the IRQ
registration to use the dcon_priv pointer as dev_id, instead of
dcon_driver.Signed-off-by: Andres Salomon
Signed-off-by: Greg Kroah-Hartman -
This adds CONFIG_FB_OLPC_DCON_1 and CONFIG_FB_OLPC_DCON_1_5 options for
allowing selection of XO-1 and/or XO-1.5 DCON support. In the process,
it also forces the xo_1.c and xo_1_5.c files to build as separate units,
correctly selects between XO-1 and XO-1.5 at runtime, and adds some
hacks to allow xo_1_5.c to build.This isn't the cleanest patch, but it'll get better as more global
variables are dropped.Signed-off-by: Andres Salomon
Signed-off-by: Greg Kroah-Hartman -
Remove code related to XO-1.5 prototype boards.
Signed-off-by: Andres Salomon
Signed-off-by: Greg Kroah-Hartman -
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
Signed-off-by: Andres Salomon
Signed-off-by: Greg Kroah-Hartman -
- 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 framebuffersThat 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
Signed-off-by: Greg Kroah-Hartman -
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
Signed-off-by: Greg Kroah-Hartman -
Just use a regular 'bool foo', rather than 'bool foo:1'.
Signed-off-by: Andres Salomon
Signed-off-by: Greg Kroah-Hartman
10 Feb, 2011
5 commits
-
It's nice to actually check for errors. :)
Signed-off-by: Andres Salomon
Signed-off-by: Greg Kroah-Hartman -
Global variables for display mode and the current sleep state
can go into dcon_priv as well.Signed-off-by: Andres Salomon
Signed-off-by: Greg Kroah-Hartman -
..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
Signed-off-by: Greg Kroah-Hartman -
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
Signed-off-by: Greg Kroah-Hartman -
On Fri, 4 Feb 2011 15:44:43 -0800
From: Andres Salomon
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
Signed-off-by: Greg Kroah-Hartman
05 Feb, 2011
2 commits
-
Signed-off-by: Marek Belisko
Signed-off-by: Greg Kroah-Hartman -
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_resultand add cleaning of created files when creation of one failed.
Signed-off-by: Marek Belisko
Signed-off-by: Greg Kroah-Hartman
26 Jan, 2011
1 commit
-
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
Cc: Thomas Gleixner
Cc: Greg KH
Cc: Ingo Molnar
Cc: Geert Uytterhoeven
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
14 Jan, 2011
2 commits
-
* '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.hAlso fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
-
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
Cc: Greg KH
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
23 Dec, 2010
1 commit
-
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.cNeeded to update to apply fixes for which the old branch was too
outdated.
16 Nov, 2010
2 commits
-
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
Acked-by: Ingo Molnar
Signed-off-by: Jiri Kosina -
Drivers don't need to include , especially not when
they don't use anything that header file provides.Signed-off-by: Jean Delvare
Cc: Michael Hunold
Acked-by: Mauro Carvalho Chehab
