Skip to content

Commit

Permalink
platform: add chrome platform directory
Browse files Browse the repository at this point in the history
It makes sense to split out the Chromebook/Chromebox hardware platform
drivers to a separate subdirectory, since some of it will be shared
between ARM and x86.

This moves over the existing chromeos_laptop driver without making
any other changes, and adds appropriate Kconfig entries for the new
directory. It also adds a MAINTAINERS entry for the new subdir.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
  • Loading branch information
Olof Johansson authored and Matthew Garrett committed Nov 20, 2013
1 parent 997daa1 commit ab04310
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 12 deletions.
5 changes: 5 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -2142,6 +2142,11 @@ L: linux-usb@vger.kernel.org
S: Maintained
F: drivers/usb/chipidea/

CHROME HARDWARE PLATFORM SUPPORT
M: Olof Johansson <olof@lixom.net>
S: Maintained
F: drivers/platform/chrome/

CISCO VIC ETHERNET NIC DRIVER
M: Christian Benvenuti <benve@cisco.com>
M: Sujith Sankar <ssujith@cisco.com>
Expand Down
1 change: 1 addition & 0 deletions drivers/platform/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ if GOLDFISH
source "drivers/platform/goldfish/Kconfig"
endif

source "drivers/platform/chrome/Kconfig"
1 change: 1 addition & 0 deletions drivers/platform/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
obj-$(CONFIG_X86) += x86/
obj-$(CONFIG_OLPC) += olpc/
obj-$(CONFIG_GOLDFISH) += goldfish/
obj-$(CONFIG_CHROME_PLATFORMS) += chrome/
28 changes: 28 additions & 0 deletions drivers/platform/chrome/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#
# Platform support for Chrome OS hardware (Chromebooks and Chromeboxes)
#

menuconfig CHROME_PLATFORMS
bool "Platform support for Chrome hardware"
depends on X86
---help---
Say Y here to get to see options for platform support for
various Chromebooks and Chromeboxes. This option alone does
not add any kernel code.

If you say N, all options in this submenu will be skipped and disabled.

if CHROME_PLATFORMS

config CHROMEOS_LAPTOP
tristate "Chrome OS Laptop"
depends on I2C
depends on DMI
---help---
This driver instantiates i2c and smbus devices such as
light sensors and touchpads.

If you have a supported Chromebook, choose Y or M here.
The module will be called chromeos_laptop.

endif # CHROMEOS_PLATFORMS
2 changes: 2 additions & 0 deletions drivers/platform/chrome/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

obj-$(CONFIG_CHROMEOS_LAPTOP) += chromeos_laptop.o
File renamed without changes.
11 changes: 0 additions & 11 deletions drivers/platform/x86/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,6 @@ config ASUS_LAPTOP

If you have an ACPI-compatible ASUS laptop, say Y or M here.

config CHROMEOS_LAPTOP
tristate "Chrome OS Laptop"
depends on I2C
depends on DMI
---help---
This driver instantiates i2c and smbus devices such as
light sensors and touchpads.

If you have a supported Chromebook, choose Y or M here.
The module will be called chromeos_laptop.

config DELL_LAPTOP
tristate "Dell Laptop Extras"
depends on X86
Expand Down
1 change: 0 additions & 1 deletion drivers/platform/x86/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ obj-$(CONFIG_INTEL_MID_POWER_BUTTON) += intel_mid_powerbtn.o
obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o
obj-$(CONFIG_SAMSUNG_Q10) += samsung-q10.o
obj-$(CONFIG_APPLE_GMUX) += apple-gmux.o
obj-$(CONFIG_CHROMEOS_LAPTOP) += chromeos_laptop.o
obj-$(CONFIG_INTEL_RST) += intel-rst.o
obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o

Expand Down

0 comments on commit ab04310

Please sign in to comment.