Merge branch 'synaptics-rmi4' into next

Merge updated Synaptics RMI4 support, including support for SMBus controllers and flashing firmware.
2016-12-15 21:36:09 -08:00
parent f43d3ec3a8 5191d88acc
commit ebfb0184ef
868 changed files with 47823 additions and 51813 deletions
--- a/include/linux/platform_data/media/camera-pxa.h
+++ b/include/linux/platform_data/media/camera-pxa.h
@@ -37,6 +37,8 @@
 struct pxacamera_platform_data {
 	unsigned long flags;
 	unsigned long mclk_10khz;
+	int sensor_i2c_adapter_id;
+	int sensor_i2c_address;
 };

 extern void pxa_set_camera_info(struct pxacamera_platform_data *);