lkml.org 
[lkml]   [2018]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 05/17] Platform: OLPC: Move OLPC config symbol out of x86 tree
Date
There are ARM OLPC machines that use mostly the same drivers, including
EC infrastructure, DCON and Battery.

While at that, fix Kconfig to allow building this as a module.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Acked-by: Pavel Machek <pavel@ucw.cz>

---
Changes since v1:
- Use 'depends on OLPC && X86' idiom (thanks Andy Shevchenko)

arch/x86/Kconfig | 11 -----------
drivers/input/mouse/Kconfig | 3 ++-
drivers/platform/Kconfig | 2 ++
drivers/platform/olpc/Kconfig | 11 +++++++++++
drivers/staging/olpc_dcon/Kconfig | 3 ++-
5 files changed, 17 insertions(+), 13 deletions(-)
create mode 100644 drivers/platform/olpc/Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 9d734f3c8234..f98f78e317d4 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2734,17 +2734,6 @@ config SCx200HR_TIMER
processor goes idle (as is done by the scheduler). The
other workaround is idle=poll boot option.

-config OLPC
- bool "One Laptop Per Child support"
- depends on !X86_PAE
- select GPIOLIB
- select OF
- select OF_PROMTREE
- select IRQ_DOMAIN
- ---help---
- Add support for detecting the unique features of the OLPC
- XO hardware.
-
config OLPC_XO1_PM
bool "OLPC XO-1 Power Management"
depends on OLPC && MFD_CS5535=y && PM_SLEEP
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 566a1e3aa504..cf12d0e4fba2 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -165,7 +165,8 @@ config MOUSE_PS2_TOUCHKIT

config MOUSE_PS2_OLPC
bool "OLPC PS/2 mouse protocol extension"
- depends on MOUSE_PS2 && OLPC
+ depends on MOUSE_PS2
+ depends on OLPC && X86
help
Say Y here if you have an OLPC XO-1 laptop (with built-in
PS/2 touchpad/tablet device). The manufacturer calls the
diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig
index d4c2e424a700..4313d73d3618 100644
--- a/drivers/platform/Kconfig
+++ b/drivers/platform/Kconfig
@@ -10,3 +10,5 @@ source "drivers/platform/goldfish/Kconfig"
source "drivers/platform/chrome/Kconfig"

source "drivers/platform/mellanox/Kconfig"
+
+source "drivers/platform/olpc/Kconfig"
diff --git a/drivers/platform/olpc/Kconfig b/drivers/platform/olpc/Kconfig
new file mode 100644
index 000000000000..7b736c9e67ac
--- /dev/null
+++ b/drivers/platform/olpc/Kconfig
@@ -0,0 +1,11 @@
+config OLPC
+ tristate "One Laptop Per Child support"
+ depends on X86 || ARM || COMPILE_TEST
+ depends on !X86_PAE
+ select GPIOLIB
+ select OF
+ select OF_PROMTREE if X86
+ select IRQ_DOMAIN
+ help
+ Add support for detecting the unique features of the OLPC
+ XO hardware.
diff --git a/drivers/staging/olpc_dcon/Kconfig b/drivers/staging/olpc_dcon/Kconfig
index 192cc8d0853f..ff540350f50f 100644
--- a/drivers/staging/olpc_dcon/Kconfig
+++ b/drivers/staging/olpc_dcon/Kconfig
@@ -1,8 +1,9 @@
config FB_OLPC_DCON
tristate "One Laptop Per Child Display CONtroller support"
- depends on OLPC && FB
+ depends on FB
depends on I2C
depends on BACKLIGHT_LCD_SUPPORT
+ depends on OLPC && X86
depends on (GPIO_CS5535 || GPIO_CS5535=n)
select BACKLIGHT_CLASS_DEVICE
help
--
2.19.1
\
 
 \ /
  Last update: 2018-11-16 17:26    [W:0.274 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site