Commit f00c1d19 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Benson Leung

platform/chrome: chromeos_laptop - use device properties for Pixel

Now that Atmel driver uses generic device properties we can use them
instead of platform data when setting up touchpad on the original
Google Pixel.
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarBenson Leung <bleung@chromium.org>
parent e6215eea
...@@ -8,13 +8,13 @@ ...@@ -8,13 +8,13 @@
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/platform_data/atmel_mxt_ts.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/property.h>
#define ATMEL_TP_I2C_ADDR 0x4b #define ATMEL_TP_I2C_ADDR 0x4b
#define ATMEL_TP_I2C_BL_ADDR 0x25 #define ATMEL_TP_I2C_BL_ADDR 0x25
...@@ -229,9 +229,9 @@ static int chromebook_pixel_tp_keys[] = { ...@@ -229,9 +229,9 @@ static int chromebook_pixel_tp_keys[] = {
BTN_LEFT BTN_LEFT
}; };
static struct mxt_platform_data chromebook_pixel_tp_platform_data = { static const struct property_entry chromebook_pixel_trackpad_props[] = {
.t19_num_keys = ARRAY_SIZE(chromebook_pixel_tp_keys), PROPERTY_ENTRY_U32_ARRAY("linux,gpio-keymap", chromebook_pixel_tp_keys),
.t19_keymap = chromebook_pixel_tp_keys, { }
}; };
static struct chromeos_laptop chromebook_pixel = { static struct chromeos_laptop chromebook_pixel = {
...@@ -253,8 +253,8 @@ static struct chromeos_laptop chromebook_pixel = { ...@@ -253,8 +253,8 @@ static struct chromeos_laptop chromebook_pixel = {
.board_info = { .board_info = {
I2C_BOARD_INFO("atmel_mxt_tp", I2C_BOARD_INFO("atmel_mxt_tp",
ATMEL_TP_I2C_ADDR), ATMEL_TP_I2C_ADDR),
.platform_data = .properties =
&chromebook_pixel_tp_platform_data, chromebook_pixel_trackpad_props,
.flags = I2C_CLIENT_WAKE, .flags = I2C_CLIENT_WAKE,
}, },
.dmi_name = "trackpad", .dmi_name = "trackpad",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment