Skip to content

Commit 53c43c5

Browse files
gregkhgregkh
committed
Revert "Staging: olpc_dcon: Remove obsolete driver"
This reverts commit 82ef33a. It turns out these machines are still out there, and the original patch broke them. So revert it, adding back the driver, so people's machines still work properly. Reported-by: James Cameron <quozl@laptop.org> Cc: Shraddha Barke <shraddha.6596@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6d79b6c commit 53c43c5

File tree

10 files changed

+1351
-0
lines changed

10 files changed

+1351
-0
lines changed

‎MAINTAINERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10583,6 +10583,14 @@ L: linux-tegra@vger.kernel.org
1058310583
S: Maintained
1058410584
F: drivers/staging/nvec/
1058510585

10586+
STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
10587+
M: Jens Frederich <jfrederich@gmail.com>
10588+
M: Daniel Drake <dsd@laptop.org>
10589+
M: Jon Nettleton <jon.nettleton@gmail.com>
10590+
W: http://wiki.laptop.org/go/DCON
10591+
S: Maintained
10592+
F: drivers/staging/olpc_dcon/
10593+
1058610594
STAGING - REALTEK RTL8712U DRIVERS
1058710595
M: Larry Finger <Larry.Finger@lwfinger.net>
1058810596
M: Florian Schilhabel <florian.c.schilhabel@googlemail.com>.

‎drivers/staging/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ source "drivers/staging/wlan-ng/Kconfig"
3030

3131
source "drivers/staging/comedi/Kconfig"
3232

33+
source "drivers/staging/olpc_dcon/Kconfig"
34+
3335
source "drivers/staging/rtl8192u/Kconfig"
3436

3537
source "drivers/staging/rtl8192e/Kconfig"

‎drivers/staging/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ obj-y += media/
44
obj-$(CONFIG_SLICOSS) += slicoss/
55
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
66
obj-$(CONFIG_COMEDI) += comedi/
7+
obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
78
obj-$(CONFIG_RTL8192U) += rtl8192u/
89
obj-$(CONFIG_RTL8192E) += rtl8192e/
910
obj-$(CONFIG_R8712U) += rtl8712/

‎drivers/staging/olpc_dcon/Kconfig

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
config FB_OLPC_DCON
2+
tristate "One Laptop Per Child Display CONtroller support"
3+
depends on OLPC && FB
4+
depends on I2C
5+
depends on (GPIO_CS5535 || GPIO_CS5535=n)
6+
select BACKLIGHT_CLASS_DEVICE
7+
---help---
8+
In order to support very low power operation, the XO laptop uses a
9+
secondary Display CONtroller, or DCON. This secondary controller
10+
is present in the video pipeline between the primary display
11+
controller (integrate into the processor or chipset) and the LCD
12+
panel. It allows the main processor/display controller to be
13+
completely powered off while still retaining an image on the display.
14+
This controller is only available on OLPC platforms. Unless you have
15+
one of these platforms, you will want to say 'N'.
16+
17+
config FB_OLPC_DCON_1
18+
bool "OLPC XO-1 DCON support"
19+
depends on FB_OLPC_DCON && GPIO_CS5535
20+
default y
21+
---help---
22+
Enable support for the DCON in XO-1 model laptops. The kernel
23+
communicates with the DCON using model-specific code. If you
24+
have an XO-1 (or if you're unsure what model you have), you should
25+
say 'Y'.
26+
27+
config FB_OLPC_DCON_1_5
28+
bool "OLPC XO-1.5 DCON support"
29+
depends on FB_OLPC_DCON && ACPI
30+
default y
31+
---help---
32+
Enable support for the DCON in XO-1.5 model laptops. The kernel
33+
communicates with the DCON using model-specific code. If you
34+
have an XO-1.5 (or if you're unsure what model you have), you
35+
should say 'Y'.

‎drivers/staging/olpc_dcon/Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
olpc-dcon-objs += olpc_dcon.o
2+
olpc-dcon-$(CONFIG_FB_OLPC_DCON_1) += olpc_dcon_xo_1.o
3+
olpc-dcon-$(CONFIG_FB_OLPC_DCON_1_5) += olpc_dcon_xo_1_5.o
4+
obj-$(CONFIG_FB_OLPC_DCON) += olpc-dcon.o
5+
6+

‎drivers/staging/olpc_dcon/TODO

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
TODO:
2+
- see if vx855 gpio API can be made similar enough to cs5535 so we can
3+
share more code
4+
- allow simultaneous XO-1 and XO-1.5 support
5+
6+
Please send patches to Greg Kroah-Hartman <greg@kroah.com> and
7+
copy:
8+
Daniel Drake <dsd@laptop.org>
9+
Jens Frederich <jfrederich@gmail.com>

0 commit comments

Comments
 (0)