Merge branch 'android-omap-minnow-3.10-lollipop-wear-release' of https://android.googlesource.com/kernel/omap into mattis_devmattis_dev

Change-Id: I46165dd7747b9b6289eb44cb96cbef2de46c10ba

1 files changed, 87 insertions, 6 deletions

diff --git a/arch/arm/boot/dts/omap3-minnow.dtsi b/arch/arm/boot/dts/omap3-minnow.dtsi
index aaadebb253b..efdb2d53f9a 100644
--- a/arch/arm/boot/dts/omap3-minnow.dtsi
+++ b/arch/arm/boot/dts/omap3-minnow.dtsi
@@ -7,6 +7,8 @@
  */
 /* reserve memory for ram_console */
 /memreserve/ 0x83000000 0x20000; /* IMAGE_DOWN_LOAD_ADDR */
+/memreserve/ 0x83020000 0x16000; /* OMAP_SECURE_RAM_STORAGE_ADDR */
+/memreserve/ 0x83036000 0x9000;  /* OMAP3_SECURE_RAM_CTX_ADDR */
 
 /include/ "omap36xx.dtsi"
 
@@ -93,6 +95,8 @@
 		//pixel_format = <1>;
 		//hs_clk = <90000000 150000000>;        /* min max*/
 		//lp_clk = <7000000 9000000>;   /* min max*/
+		/* panel dimensions (width and height) in um */
+		panel_size_um = <39744 36020>;
 		pinctrl-names = "viopulldown", "viooutput";
 		pinctrl-0 = <&display_vddio_pulldown>;
 		pinctrl-1 = <&display_vddio_output>;
@@ -200,17 +204,21 @@
 		mot,mic_bias3_en = <&gpio3 20 0>; /* gpio-084 */
 	};
 
-	omap_pimic {
+	regulators {
+		compatible = "simple-bus";
+
 		omap_tps65912_dcdc1: omap_vdd1 {
 			compatible = "ti,omap-tps65912-dcdc1";
 			ti,boot-voltage-micro-volts = <1275000>;
 			ti,vp = <&vp_mpu>;
+			regulator-name = "omap_vdd1";
 		};
 
 		omap_tps65912_dcdc4: omap_vdd2 {
 			compatible = "ti,omap-tps65912-dcdc4";
 			ti,boot-voltage-micro-volts = <1200000>;
 			ti,vp = <&vp_core>;
+			regulator-name = "omap_vdd2";
 		};
 	};
 
@@ -272,10 +280,6 @@
 	vc_mpu{
 		ti,master-channel;
 	};
-
-	vc_core{
-		ti,use-master-slave-addr;
-	};
 };
 
 &glbl_prm {
@@ -309,6 +313,8 @@
 };
 
 &i2c2 {
+
+	clock-frequency = <400000>;
 	m4sensorhub@39 {
 		compatible = "mot,m4sensorhub";
 		status = "ok";
@@ -346,11 +352,52 @@
 		interrupts = <12 0>;		/* gpio-140 IRQ */
 		maxim,malicious_supply = "ac";
 		maxim,enable_por_init;
+
+		/* This is the default battery profile attributes used by max17xxxx driver */
+		/* It is used when batt-id isn't defined in /chosen as batt-id.  The       */
+		/* Value is originally used under the assumption that this is an LG battery*/
+		/* Otherwise, the driver will either pick SNN5951A or SNN5950A as defined  */
+		/* Right below it.  */
 		maxim,configuration {
 			/* Required properties */
+			version		= /bits/ 16 <0x0001>;
+			config		= /bits/ 16 <0x6254>;	/* Tex = 0, Ss = Aen = TS = Ten = ETHRM = 1 */
+			full_soc_thresh	= /bits/ 16 <0x5F00>;	/* app note constant */
+			design_cap	= /bits/ 16 <606>;	/* in 5uVh/Rsns = 0.5 mAh */
+			ichgt_term	= /bits/ 16 <0x0066>;	/* battery attribute */
+			learn_cfg	= /bits/ 16 <0x2606>;	/* app note constant */
+			filter_cfg	= /bits/ 16 <0x87A4>;	/* app note constant */
+			relax_cfg	= /bits/ 16 <0x043B>;	/* Load = 5 mA, dV = 3.7 mV, dT = 6 mins */
+			fullcap		= /bits/ 16 <662>;	/* in 5uVh/Rsns = 0.5 mAh */
+			fullcapnom	= /bits/ 16 <662>;	/* in 5uVh/Rsns = 0.5 mAh */
+			qrtbl00		= /bits/ 16 <0x1B94>;	/* battery attribute */
+			qrtbl10		= /bits/ 16 <0x0E94>;	/* battery attribute */
+			qrtbl20		= /bits/ 16 <0x0594>;	/* battery attribute */
+			qrtbl30		= /bits/ 16 <0x0294>;	/* battery attribute */
+			rcomp0 		= /bits/ 16 <0x0052>;	/* battery attribute */
+			tcompc0		= /bits/ 16 <0x333A>;	/* battery attribute */
+			maxim,cell-char-tbl = /bits/ 16 <	/* battery attribute */
+				0x9cf0 0xa310 0xb180 0xb360 0xb6a0 0xb6e0
+				0xba10 0xbb10 0xbbd0 0xbc10 0xc200 0xc250
+				0xc7c0 0xc820 0xd050 0xd710 0x0140 0x0110
+				0x0210 0x02c0 0x1000 0x0a00 0x06c0 0x31a0
+				0x0af0 0x1170 0x0cb0 0x08d0 0x0aa0 0x0880
+				0x07b0 0x07b0 0x0100 0x0100 0x0100 0x0100
+				0x0100 0x0100 0x0100 0x0100 0x0100 0x0100
+				0x0100 0x0100 0x0100 0x0100 0x0100 0x0100
+			>;
+			/* Optional properties */
+			tgain		= /bits/ 16 <0xE71C>;	/* thermistor attribute */
+			toff		= /bits/ 16 <0x251A>;	/* thermistor attribute */
+		};
+
+		/* LG Battery profile */
+		maxim,configuration-SNN5951A {
+			/* Required properties */
+			version		= /bits/ 16 <0x0001>;
 			config		= /bits/ 16 <0x6254>;	/* Tex = 0, Ss = Aen = TS = Ten = ETHRM = 1 */
 			full_soc_thresh	= /bits/ 16 <0x5F00>;	/* app note constant */
-			design_cap	= /bits/ 16 <662>;	/* in 5uVh/Rsns = 0.5 mAh */
+			design_cap	= /bits/ 16 <606>;	/* in 5uVh/Rsns = 0.5 mAh */
 			ichgt_term	= /bits/ 16 <0x0066>;	/* battery attribute */
 			learn_cfg	= /bits/ 16 <0x2606>;	/* app note constant */
 			filter_cfg	= /bits/ 16 <0x87A4>;	/* app note constant */
@@ -377,6 +424,40 @@
 			tgain		= /bits/ 16 <0xE71C>;	/* thermistor attribute */
 			toff		= /bits/ 16 <0x251A>;	/* thermistor attribute */
 		};
+		/* Lishen battery profile */
+		maxim,configuration-SNN5950A {
+			/* Required properties */
+			version		= /bits/ 16 <0x0001>;
+			config          = /bits/ 16 <0x6254>;   /* Tex = 0, TS = Ten = ETHRM = 1,  Aen = 1 */
+			full_soc_thresh = /bits/ 16 <0x5F00>;   /* app note constant */
+			design_cap      = /bits/ 16 <662>;      /* in 5uVh/Rsns = 0.5 mAh */
+			ichgt_term      = /bits/ 16 <0x0066>;   /* battery attribute */
+			learn_cfg       = /bits/ 16 <0x2606>;   /* app note constant */
+			filter_cfg      = /bits/ 16 <0x87A4>;   /* app note constant */
+			relax_cfg       = /bits/ 16 <0x203B>;   /* Load = 5 mA, dV = 3.7 mV, dT = 6 mins */
+			fullcap         = /bits/ 16 <662>;      /* in 5uVh/Rsns = 0.5 mAh */
+			fullcapnom      = /bits/ 16 <662>;      /* in 5uVh/Rsns = 0.5 mAh */
+			qrtbl00         = /bits/ 16 <0x069A>;   /* battery attribute */
+			qrtbl10         = /bits/ 16 <0x0398>;   /* battery attribute */
+			qrtbl20         = /bits/ 16 <0x0298>;   /* battery attribute */
+			qrtbl30         = /bits/ 16 <0x0296>;   /* battery attribute */
+			rcomp0          = /bits/ 16 <0x003C>;   /* battery attribute */
+			tcompc0         = /bits/ 16 <0x231C>;   /* battery attribute */
+			maxim,cell-char-tbl = /bits/ 16 <       /* battery attribute */
+				0x9f80 0xa030 0xb220 0xb440 0xb890 0xb910
+				0xba10 0xba40 0xbf10 0xbf60 0xc2d0 0xc5e0
+				0xc640 0xcc90 0xd520 0xd780 0x05d0 0x00e0
+				0x01e0 0x03a0 0x08e0 0x1000 0x4000 0x1670
+				0x23d0 0x0df0 0x0a70 0x0aa0 0x06f0 0x0790
+				0x06b0 0x06b0 0x0100 0x0100 0x0100 0x0100
+				0x0100 0x0100 0x0100 0x0100 0x0100 0x0100
+				0x0100 0x0100 0x0100 0x0100 0x0100 0x0100
+			>;
+			/* Optional properties */
+			tgain           = /bits/ 16 <0xE71C>;   /* thermistor attribute */
+			toff            = /bits/ 16 <0x251A>;   /* thermistor attribute */
+		};
+
 		maxim,temp-conv {
 			start	= /bits/ 16 <(-20)>;	/* in degrees C */
 			result	= /bits/ 16 <