From: Liam McLoughlin Date: Fri, 7 Dec 2012 17:41:31 +0000 (-0500) Subject: CHROMIUM: config: Enable BCM5974 support X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e60bd42eba996ecd4caced84c7a1ff4bbe65da22;p=people%2Faperard%2Flinux-chromebook.git CHROMIUM: config: Enable BCM5974 support This touchpad is found in many laptops with multitouch trackpads. Not enabled for ARM since this isn't found in any ARM device to my knowledge. BUG=none TEST=Build, boot on device with this touchpad, confirm touchpad works Change-Id: I1cc0dd4b48da817ec13bea7a52d40136089ffa29 Signed-off-by: Liam McLoughlin Reviewed-on: https://gerrit.chromium.org/gerrit/39376 Reviewed-by: Olof Johansson Reviewed-by: Benson Leung --- diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config index 39a6f79bd895b..5dbcddfee2197 100644 --- a/chromeos/config/armel/common.config +++ b/chromeos/config/armel/common.config @@ -201,6 +201,7 @@ CONFIG_MMC_SDHCI=y # CONFIG_MMC_SDHCI_PXAV3 is not set CONFIG_MMC_UNSAFE_RESUME=y # CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set # CONFIG_MOUSE_PS2 is not set # CONFIG_MOUSE_SYNAPTICS_USB is not set CONFIG_MULTI_IRQ_HANDLER=y diff --git a/chromeos/config/base.config b/chromeos/config/base.config index c3ae47a6b005e..e694d84d4fa19 100644 --- a/chromeos/config/base.config +++ b/chromeos/config/base.config @@ -977,7 +977,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_MODULE_UNLOAD=y # CONFIG_MODVERSIONS is not set -# CONFIG_MOUSE_BCM5974 is not set CONFIG_MOUSE_CYAPA=y # CONFIG_MOUSE_GPIO is not set # CONFIG_MOUSE_SERIAL is not set diff --git a/chromeos/config/i386/chromeos-pinetrail-i386.flavour.config b/chromeos/config/i386/chromeos-pinetrail-i386.flavour.config index 16f9b29d92ca5..a47735e851d9d 100644 --- a/chromeos/config/i386/chromeos-pinetrail-i386.flavour.config +++ b/chromeos/config/i386/chromeos-pinetrail-i386.flavour.config @@ -27,6 +27,7 @@ CONFIG_IOMMU_API=y # CONFIG_IWL4965 is not set # CONFIG_IWLWIFI is not set # CONFIG_LIBERTAS is not set +# CONFIG_MOUSE_BCM5974 is not set # CONFIG_MOUSE_SYNAPTICS_USB is not set # CONFIG_MWIFIEX is not set # CONFIG_MXM_WMI is not set diff --git a/chromeos/config/i386/chromiumos-i386.flavour.config b/chromeos/config/i386/chromiumos-i386.flavour.config index f428240b9c164..6fc09e4c56f4e 100644 --- a/chromeos/config/i386/chromiumos-i386.flavour.config +++ b/chromeos/config/i386/chromiumos-i386.flavour.config @@ -59,6 +59,7 @@ CONFIG_LIBERTAS=m # CONFIG_LIBERTAS_USB is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set +CONFIG_MOUSE_BCM5974=m CONFIG_MOUSE_SYNAPTICS_USB=m CONFIG_MWIFIEX=m CONFIG_MWIFIEX_PCIE=m diff --git a/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config b/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config index e33bc8c77215b..93a06d6be5a4a 100644 --- a/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config +++ b/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config @@ -5,6 +5,7 @@ # CONFIG_BRCMFMAC is not set # CONFIG_DRM_GMA500 is not set # CONFIG_INTEL_IDLE is not set +# CONFIG_MOUSE_BCM5974 is not set # CONFIG_MOUSE_SYNAPTICS_USB is not set CONFIG_NR_CPUS=4 # CONFIG_RT2800PCI_RT33XX is not set diff --git a/chromeos/config/x86_64/chromiumos-x86_64.flavour.config b/chromeos/config/x86_64/chromiumos-x86_64.flavour.config index 677ac10e7ba58..f98f78bdb0abd 100644 --- a/chromeos/config/x86_64/chromiumos-x86_64.flavour.config +++ b/chromeos/config/x86_64/chromiumos-x86_64.flavour.config @@ -12,6 +12,7 @@ CONFIG_DRM_GMA500=y CONFIG_DRM_GMA600=y CONFIG_DRM_TTM=y CONFIG_INTEL_IDLE=y +CONFIG_MOUSE_BCM5974=m CONFIG_MOUSE_SYNAPTICS_USB=m CONFIG_NR_CPUS=64 CONFIG_RT2800PCI_RT33XX=y