Merge branch 'ti-linux-4.1.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel into ti-lsk-linux-4.1.y

TI-Feature: ti_linux_base_lsk TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git TI-Branch: ti-linux-4.1.y * 'ti-linux-4.1.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel: Revert "crypto: ahash - ensure statesize is non-zero" hwmon: (tmp102) Force wait for conversion time for the first valid data ARM: dts: dra72-evm: fix touchscreen on OSD LCD usb: dwc3: gadget: don't prestart interrupt endpoints ti_config_fragments/baseport: Build thermal into kernel Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>

Merge branch 'ti-linux-4.1.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel into ti-lsk-linux-4.1.y
TI-Feature: ti_linux_base_lsk TI-Tree: git@git.ti.com:ti-linux-kernel/ti-linux-kernel.git TI-Branch: ti-linux-4.1.y * 'ti-linux-4.1.y' of git.ti.com:ti-linux-kernel/ti-linux-kernel: Revert "crypto: ahash - ensure statesize is non-zero" hwmon: (tmp102) Force wait for conversion time for the first valid data ARM: dts: dra72-evm: fix touchscreen on OSD LCD usb: dwc3: gadget: don't prestart interrupt endpoints ti_config_fragments/baseport: Build thermal into kernel Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
LCPD Auto Merger
2 parents c0e00b5c31 d4855d1af6
Showing 7 changed files Side-by-side Diff
arch/arm/boot/dts/dra7-evm-lcd-osd.dts
arch/arm/boot/dts/dra72-evm-lcd-osd.dts
arch/arm/boot/dts/dra7x-evm-lcd-osd.dtsi
crypto/ahash.c
drivers/hwmon/tmp102.c
drivers/usb/dwc3/gadget.c
ti_config_fragments/baseport.cfg
@@ -8,4 +8,9 @@
  
 #include "dra7-evm.dts"
 #include "dra7x-evm-lcd-osd.dtsi"
+
+&touchscreen {
+	interrupt-parent = <&gpio1>;
+	interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
+};
@@ -8,4 +8,9 @@
  
 #include "dra72-evm.dts"
 #include "dra7x-evm-lcd-osd.dtsi"
+
+&touchscreen {
+	interrupt-parent = <&gpio1>;
+	interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
+};
@@ -115,14 +115,11 @@
 		#gpio-cells = <2>;
 	};
  
-	edt-ft5506@38 {
+	touchscreen: edt-ft5506@38 {
 		status = "okay";
 		compatible = "edt,edt-ft5506", "edt,edt-ft5x06";
  
 		reg = <0x38>;
-
-		interrupt-parent = <&gpio1>;
-		interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
  
 		/* GPIO line is inverted before going to touch panel */
 		reset-gpios = <&pcf_display_board 5 GPIO_ACTIVE_HIGH>;
@@ -544,8 +544,7 @@
 	struct crypto_alg *base = &alg->halg.base;
  
 	if (alg->halg.digestsize > PAGE_SIZE / 8 ||
-	    alg->halg.statesize > PAGE_SIZE / 8 ||
-	    alg->halg.statesize == 0)
+	    alg->halg.statesize > PAGE_SIZE / 8)
 		return -EINVAL;
  
 	base->cra_type = &crypto_ahash_type;
@@ -50,6 +50,9 @@
 #define	TMP102_TLOW_REG			0x02
 #define	TMP102_THIGH_REG		0x03
  
+/* TMP102 range is -55 to 150C -> we use -128 as a default invalid value */
+#define TMP102_NOTREADY			-129000
+
 struct tmp102 {
 	struct i2c_client *client;
 	struct device *hwmon_dev;
@@ -102,6 +105,12 @@
 {
 	struct tmp102 *tmp102 = tmp102_update_device(dev);
  
+	/* Is it too early even to return a conversion? */
+	if (tmp102->temp[0] == TMP102_NOTREADY) {
+		dev_dbg(dev, "%s: Conversion not ready yet..\n", __func__);
+		return -EAGAIN;
+	}
+
 	*temp = tmp102->temp[0];
  
 	return 0;
@@ -114,6 +123,10 @@
 	struct sensor_device_attribute *sda = to_sensor_dev_attr(attr);
 	struct tmp102 *tmp102 = tmp102_update_device(dev);
  
+	/* Is it too early even to return a read? */
+	if (tmp102->temp[sda->index] == TMP102_NOTREADY)
+		return -EAGAIN;
+
 	return sprintf(buf, "%d\n", tmp102->temp[sda->index]);
 }
  
@@ -207,7 +220,11 @@
 		status = -ENODEV;
 		goto fail_restore_config;
 	}
-	tmp102->last_update = jiffies - HZ;
+	tmp102->last_update = jiffies;
+	/* Mark that we are not ready with data until conversion is complete */
+	tmp102->temp[0] = TMP102_NOTREADY;
+	tmp102->temp[1] = TMP102_NOTREADY;
+	tmp102->temp[2] = TMP102_NOTREADY;
 	mutex_init(&tmp102->lock);
  
 	hwmon_dev = hwmon_device_register_with_groups(dev, client->name,
@@ -1079,6 +1079,7 @@
 	 * little bit faster.
 	 */
 	if (!usb_endpoint_xfer_isoc(dep->endpoint.desc) &&
+			!usb_endpoint_xfer_int(dep->endpoint.desc) &&
 			!(dep->flags & DWC3_EP_BUSY)) {
 		ret = __dwc3_gadget_kick_transfer(dep, 0, true);
 		goto out;
@@ -77,4 +77,16 @@
  
 # Enable System V IPC
 CONFIG_SYSVIPC=y
+
+# Thermal
+CONFIG_THERMAL=y
+CONFIG_TI_SOC_THERMAL=y
+CONFIG_TI_THERMAL=y
+CONFIG_OMAP4_THERMAL=y
+CONFIG_OMAP5_THERMAL=y
+CONFIG_DRA752_THERMAL=y
+# Since HWMON is needed by Sensors..
+CONFIG_HWMON=y
+CONFIG_SENSORS_TMP102=y
+CONFIG_SENSORS_GPIO_FAN=y
...	...	@@ -8,4 +8,9 @@
8	8
9	9	#include "dra7-evm.dts"
10	10	#include "dra7x-evm-lcd-osd.dtsi"
	11	+
	12	+&touchscreen {
	13	+ interrupt-parent = <&gpio1>;
	14	+ interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
	15	+};
...	...	@@ -8,4 +8,9 @@
8	8
9	9	#include "dra72-evm.dts"
10	10	#include "dra7x-evm-lcd-osd.dtsi"
	11	+
	12	+&touchscreen {
	13	+ interrupt-parent = <&gpio1>;
	14	+ interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
	15	+};
...	...	@@ -115,14 +115,11 @@
115	115	#gpio-cells = <2>;
116	116	};
117	117
118		- edt-ft5506@38 {
	118	+ touchscreen: edt-ft5506@38 {
119	119	status = "okay";
120	120	compatible = "edt,edt-ft5506", "edt,edt-ft5x06";
121	121
122	122	reg = <0x38>;
123		-
124		- interrupt-parent = <&gpio1>;
125		- interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
126	123
127	124	/* GPIO line is inverted before going to touch panel */
128	125	reset-gpios = <&pcf_display_board 5 GPIO_ACTIVE_HIGH>;
...	...	@@ -544,8 +544,7 @@
544	544	struct crypto_alg *base = &alg->halg.base;
545	545
546	546	if (alg->halg.digestsize > PAGE_SIZE / 8 \|\|
547		- alg->halg.statesize > PAGE_SIZE / 8 \|\|
548		- alg->halg.statesize == 0)
	547	+ alg->halg.statesize > PAGE_SIZE / 8)
549	548	return -EINVAL;
550	549
551	550	base->cra_type = &crypto_ahash_type;
...	...	@@ -50,6 +50,9 @@
50	50	#define TMP102_TLOW_REG 0x02
51	51	#define TMP102_THIGH_REG 0x03
52	52
	53	+/* TMP102 range is -55 to 150C -> we use -128 as a default invalid value */
	54	+#define TMP102_NOTREADY -129000
	55	+
53	56	struct tmp102 {
54	57	struct i2c_client *client;
55	58	struct device *hwmon_dev;
...	...	@@ -102,6 +105,12 @@
102	105	{
103	106	struct tmp102 *tmp102 = tmp102_update_device(dev);
104	107
	108	+ /* Is it too early even to return a conversion? */
	109	+ if (tmp102->temp[0] == TMP102_NOTREADY) {
	110	+ dev_dbg(dev, "%s: Conversion not ready yet..\n", __func__);
	111	+ return -EAGAIN;
	112	+ }
	113	+
105	114	*temp = tmp102->temp[0];
106	115
107	116	return 0;
...	...	@@ -114,6 +123,10 @@
114	123	struct sensor_device_attribute *sda = to_sensor_dev_attr(attr);
115	124	struct tmp102 *tmp102 = tmp102_update_device(dev);
116	125
	126	+ /* Is it too early even to return a read? */
	127	+ if (tmp102->temp[sda->index] == TMP102_NOTREADY)
	128	+ return -EAGAIN;
	129	+
117	130	return sprintf(buf, "%d\n", tmp102->temp[sda->index]);
118	131	}
119	132
...	...	@@ -207,7 +220,11 @@
207	220	status = -ENODEV;
208	221	goto fail_restore_config;
209	222	}
210		- tmp102->last_update = jiffies - HZ;
	223	+ tmp102->last_update = jiffies;
	224	+ /* Mark that we are not ready with data until conversion is complete */
	225	+ tmp102->temp[0] = TMP102_NOTREADY;
	226	+ tmp102->temp[1] = TMP102_NOTREADY;
	227	+ tmp102->temp[2] = TMP102_NOTREADY;
211	228	mutex_init(&tmp102->lock);
212	229
213	230	hwmon_dev = hwmon_device_register_with_groups(dev, client->name,
...	...	@@ -1079,6 +1079,7 @@
1079	1079	* little bit faster.
1080	1080	*/
1081	1081	if (!usb_endpoint_xfer_isoc(dep->endpoint.desc) &&
	1082	+ !usb_endpoint_xfer_int(dep->endpoint.desc) &&
1082	1083	!(dep->flags & DWC3_EP_BUSY)) {
1083	1084	ret = __dwc3_gadget_kick_transfer(dep, 0, true);
1084	1085	goto out;
...	...	@@ -77,4 +77,16 @@
77	77
78	78	# Enable System V IPC
79	79	CONFIG_SYSVIPC=y
	80	+
	81	+# Thermal
	82	+CONFIG_THERMAL=y
	83	+CONFIG_TI_SOC_THERMAL=y
	84	+CONFIG_TI_THERMAL=y
	85	+CONFIG_OMAP4_THERMAL=y
	86	+CONFIG_OMAP5_THERMAL=y
	87	+CONFIG_DRA752_THERMAL=y
	88	+# Since HWMON is needed by Sensors..
	89	+CONFIG_HWMON=y
	90	+CONFIG_SENSORS_TMP102=y
	91	+CONFIG_SENSORS_GPIO_FAN=y