Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions arch/arm/boot/dts/dsi-panel-ili9488-hvga-video.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
* only version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/

/*---------------------------------------------------------------------------
* This file is autogenerated file using gcdb parser. Please do not edit it.
* Update input XML file to add a new entry or update variable in this file
* VERSION = "1.0"
*---------------------------------------------------------------------------*/
&mdss_mdp {
dsi_ili9488_hvga_vid: qcom,mdss_dsi_ili9488_hvga_video {
qcom,mdss-dsi-panel-name = "ili9488 hvga video mode dsi panel";
qcom,mdss-dsi-panel-controller = <&mdss_dsi0>;
qcom,cont-splash-enabled = <1>;
qcom,mdss-dsi-panel-type = "dsi_video_mode";
qcom,mdss-dsi-panel-destination = "display_1";
qcom,mdss-dsi-panel-framerate = <60>;
qcom,mdss-dsi-virtual-channel-id = <0>;
qcom,mdss-dsi-stream = <0>;
qcom,mdss-dsi-panel-width = <320>;
qcom,mdss-dsi-panel-height = <480>;
qcom,mdss-dsi-h-front-porch = <20>;//80
qcom,mdss-dsi-h-back-porch = <8>;//80
qcom,mdss-dsi-h-pulse-width = <8>;
qcom,mdss-dsi-h-sync-skew = <0>;
qcom,mdss-dsi-v-back-porch = <16>;//5PCLK
qcom,mdss-dsi-v-front-porch = <15>;//5
qcom,mdss-dsi-v-pulse-width = <2>;//5
qcom,mdss-dsi-h-left-border = <0>;
qcom,mdss-dsi-h-right-border = <0>;
qcom,mdss-dsi-v-top-border = <0>;
qcom,mdss-dsi-v-bottom-border = <0>;
qcom,mdss-dsi-bpp = <24>;
qcom,mdss-dsi-underflow-color = <0xff>;
qcom,mdss-dsi-border-color = <0>;
qcom,mdss-dsi-on-command = [
29 01 00 00 00 00 10
E0 00 08 12 0d 1b 0e 38 87 47 08 0E 0A 19 1b 0F
29 01 00 00 00 00 10
E1 00 13 18 03 0f 05 2a 24 3b 02 06 03 33 33 0F
29 01 00 00 00 00 03
C0 10 10
29 01 00 00 00 00 02
C1 41
29 01 00 00 00 00 04
C5 00 30 80
29 01 00 00 00 00 02
36 08
29 01 00 00 00 00 02
3A 66
29 01 00 00 00 00 02
B4 02
29 01 00 00 00 00 03
B6 02 22
29 01 00 00 00 00 02
E9 00
29 01 00 00 00 00 05
F7 A9 51 2C 82
05 01 00 00 96 00 02
11 00
05 01 00 00 1E 00 02
29 00
];
qcom,mdss-dsi-off-command = [05 01 00 00 1E 00 02 28 00
05 01 00 00 96 00 02 10 00];
qcom,mdss-dsi-on-command-state = "dsi_lp_mode";
qcom,mdss-dsi-off-command-state = "dsi_lp_mode";
qcom,mdss-dsi-h-sync-pulse = <1>;
qcom,mdss-dsi-traffic-mode = "non_burst_sync_pulse"; //non_burst_sync_event
qcom,mdss-dsi-lane-map = "lane_map_1032";
qcom,mdss-dsi-bllp-eof-power-mode;
qcom,mdss-dsi-bllp-power-mode;
qcom,mdss-dsi-lane-0-state;
qcom,mdss-dsi-panel-timings = [54 10 0a 00 30 35 0f 14 12 03 04 00];
qcom,mdss-dsi-t-clk-post = <0x1f>; //04
qcom,mdss-dsi-t-clk-pre = <0x2b>; //1B
qcom,mdss-dsi-bl-min-level = <1>;
qcom,mdss-dsi-bl-max-level = <255>;
qcom,mdss-dsi-dma-trigger = "trigger_sw";
qcom,mdss-dsi-mdp-trigger = "none";
qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";
qcom,mdss-dsi-reset-sequence = <1 20>, <0 20>, <1 120>;

};
};
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/msm8610-mdss-panels.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@
/include/ "dsi-panel-otm8018b-fwvga-video.dtsi" // lijiangshuo add for lead otm8018b for P821B10 20131226
/include/ "dsi-panel-nt35512-wvga-video.dtsi" /** ZTE_MODIFY zhoufan add for nt35512 ZGD LCD 2014-2-10 */
/include/ "dsi-panel-hx8379c_apex_wvga_video.dtsi" /** ZTE_MODIFY wangzhe add for hx8379c ZGD LCD 2014-6-27 */
/include/ "dsi-panel-ili9806e_apex_wvga_video.dtsi" /** ZTE_MODIFY wangzhe add for ili9806e ZGD LCD 2014-8-29 */
/include/ "dsi-panel-ili9806e_apex_wvga_video.dtsi" /** ZTE_MODIFY wangzhe add for ili9806e ZGD LCD 2014-8-29 */
/include/ "dsi-panel-ili9488-hvga-video.dtsi"
32 changes: 32 additions & 0 deletions arch/arm/boot/dts/msm8610-qrd.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,16 @@
focaltech,fw-delay-readid-ms = <10>;
focaltech,fw-delay-era-flsh-ms = <2000>;
};
msg21xx_ts@26{
compatible = "mstar,ms-msg21xx";
reg = <0x26>;
interrupt-parent = <&msmgpio>;
interrupts = <1 0x2>;
vdd-supply = <&pm8110_l19>;
vcc_i2c-supply = <&pm8110_l14>;
reset-gpio-pin = <&msmgpio 0 0x00>;
irq-gpio-pin = <&msmgpio 1 0x00>;
};
goodix@5d {
compatible = "goodix,Goodix-TS";
reg = <0x5d>;
Expand Down Expand Up @@ -128,6 +138,28 @@
//st,negate-y;
//st,negate-z;
};
mc3xxx@4c {
compatible = "mc,mc3xxx";
reg = <0x4c>;
vdd-supply = <&pm8110_l19>;
vio-supply = <&pm8110_l14>;
gpio-irq-pin = <&msmgpio 81 0>;
mc,axis-map-x = <1>;
mc,axis-map-y = <0>;
mc,axis-map-z = <2>;
mc,negate-z;
};
bma2xx@18 {
compatible = "bcm,bma2xx";
reg = <0x18>;
//interrupt-parent = <&msmgpio>;
//interrupts = <81 0x2>;
vdd-supply = <&pm8110_l19>;
vio-supply = <&pm8110_l14>;
bma2xx,gpio-irq1 = <&msmgpio 81 0>;
bma2xx,gpio-irq2 = <&msmgpio 82 0>;
bma2xx,orientation = <6>;
};
taos@39 {
compatible = "taos,tmd277x";
reg = <0x39>;
Expand Down
4 changes: 3 additions & 1 deletion arch/arm/mach-msm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,10 @@ obj-$(CONFIG_MACH_MSM8930_CDP) += board-8930-all.o board-8930-regulator-pm8038.o
obj-$(CONFIG_MACH_MSM8930_MTP) += board-8930-all.o board-8930-regulator-pm8038.o board-8930-regulator-pm8917.o
obj-$(CONFIG_MACH_MSM8930_FLUID) += board-8930-all.o board-8930-regulator-pm8038.o board-8930-regulator-pm8917.o
obj-$(CONFIG_PM8921_BMS) += bms-batterydata.o bms-batterydata-desay.o batterydata-lib.o
obj-$(CONFIG_QPNP_BMS) += bms-batterydata.o bms-batterydata-desay.o batterydata-lib.o bms_batterydata_4v2_554846.o bms_batterydata_4v2_524846.o
obj-$(CONFIG_QPNP_BMS) += bms-batterydata.o bms-batterydata-desay.o batterydata-lib.o bms_batterydata_4v2_554846.o
obj-$(CONFIG_QPNP_BMS) += bms-batterydata-oem.o bms-batterydata-qrd-4v35-2000mah.o bms-batterydata-qrd-4v2-1300mah.o
obj-$(CONFIG_BATT_ZTE_4V2_554846) += bms_batterydata_4v2_524846.o
obj-$(CONFIG_BATT_ZTE_4V2_554846_T792) += bms_batterydata_4v2_524846_t792.o
obj-$(CONFIG_MACH_APQ8064_CDP) += board-8064-all.o board-8064-regulator.o
obj-$(CONFIG_MACH_APQ8064_MTP) += board-8064-all.o board-8064-regulator.o
obj-$(CONFIG_MACH_APQ8064_LIQUID) += board-8064-all.o board-8064-regulator.o
Expand Down
109 changes: 109 additions & 0 deletions arch/arm/mach-msm/bms_batterydata_4v2_524846_t972.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
/********************************************************************
who: ZTEBSP doumingming
when: 20131223
what: add bms battery data for 554846 battery cells
notice: there is a macro for every battery data,
eg: CONFIG_BATT_ZTE_4V2_554846_T792
********************************************************************/
#include <linux/batterydata-lib.h>

static struct single_row_lut fcc_temp = {
.x = {-20, 0, 25, 40, 60},
.y = {1505, 1509, 1511, 1512, 1510},
.cols = 5
};

static struct single_row_lut fcc_sf = {
.x = {0},
.y = {100},
.cols = 1
};

static struct sf_lut rbatt_sf = {
.rows = 31,
.cols = 5,
.row_entries = {-20, 0, 25, 40, 60},
.percent = {100, 95, 90, 85, 80, 75, 70, 65, 60, 55, 50, 45, 40, 35, 30, 25, 20, 16, 13, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0},
.sf = {
{553, 177, 100, 90, 85},
{579, 183, 100, 91, 85},
{636, 209, 104, 92, 86},
{617, 207, 106, 94, 87},
{630, 208, 110, 96, 89},
{628, 213, 113, 99, 91},
{632, 203, 119, 103, 94},
{640, 192, 125, 108, 97},
{652, 189, 126, 113, 102},
{669, 188, 106, 101, 96},
{691, 194, 100, 91, 86},
{723, 203, 103, 93, 87},
{762, 220, 108, 98, 92},
{810, 251, 118, 105, 97},
{839, 271, 122, 105, 95},
{846, 259, 114, 98, 91},
{992, 267, 112, 97, 90},
{1534, 286, 113, 98, 90},
{2585, 317, 112, 97, 89},
{3919, 373, 115, 98, 91},
{4990, 421, 119, 101, 93},
{6415, 489, 123, 104, 94},
{8386, 597, 128, 106, 96},
{11088, 738, 134, 109, 96},
{14798, 970, 140, 111, 95},
{19935, 1387, 142, 109, 94},
{26957, 1923, 150, 111, 96},
{36179, 2675, 165, 117, 98},
{48041, 3741, 196, 126, 103},
{61480, 5207, 256, 141, 111},
{73273, 7457, 745, 215, 189}
}
};

static struct pc_temp_ocv_lut pc_temp_ocv = {
.rows = 31,
.cols = 5,
.temp = {-20, 0, 25, 40, 60},
.percent = {100, 95, 90, 85, 80, 75, 70, 65, 60, 55, 50, 45, 40, 35, 30, 25, 20, 16, 13, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0},
.ocv = {
{4170, 4161, 4164, 4157, 4157},
{4096, 4101, 4103, 4098, 4097},
{4025, 4048, 4053, 4048, 4046},
{3953, 3985, 3998, 3999, 4000},
{3919, 3950, 3962, 3960, 3958},
{3881, 3917, 3925, 3922, 3921},
{3847, 3875, 3892, 3889, 3887},
{3820, 3835, 3861, 3859, 3857},
{3801, 3807, 3832, 3832, 3830},
{3789, 3790, 3795, 3797, 3797},
{3778, 3784, 3778, 3775, 3771},
{3764, 3781, 3775, 3771, 3764},
{3744, 3775, 3772, 3768, 3762},
{3711, 3760, 3765, 3762, 3757},
{3669, 3718, 3734, 3731, 3730},
{3619, 3653, 3670, 3666, 3663},
{3567, 3593, 3610, 3609, 3606},
{3529, 3543, 3561, 3563, 3561},
{3501, 3516, 3525, 3525, 3525},
{3481, 3503, 3512, 3514, 3514},
{3468, 3497, 3507, 3508, 3509},
{3455, 3490, 3502, 3503, 3503},
{3438, 3483, 3495, 3497, 3497},
{3417, 3474, 3488, 3489, 3489},
{3390, 3459, 3476, 3477, 3474},
{3358, 3429, 3447, 3447, 3441},
{3318, 3386, 3400, 3400, 3393},
{3268, 3331, 3340, 3341, 3334},
{3204, 3257, 3264, 3267, 3259},
{3115, 3153, 3163, 3166, 3159},
{3000, 3000, 3000, 3000, 3000}
}
};

struct bms_battery_data ZTE_4v2_524846_t792_data = {
.fcc = 1200,
.fcc_temp_lut = &fcc_temp,
.fcc_sf_lut = &fcc_sf,
.pc_temp_ocv_lut = &pc_temp_ocv,
.rbatt_sf_lut = &rbatt_sf,
.default_rbatt_mohm = 196
};
4 changes: 4 additions & 0 deletions arch/arm/mach-msm/clock-8610.c
Original file line number Diff line number Diff line change
Expand Up @@ -3032,6 +3032,8 @@ static struct clk_lookup msm_clocks_8610[] = {
CLK_LOOKUP("cam_src_clk", mclk0_clk_src.c, "6-007d"),
CLK_LOOKUP("cam_src_clk", mclk0_clk_src.c, "6-006d"),
CLK_LOOKUP("cam_src_clk", mclk0_clk_src.c, "6-0076"), //GC2235
CLK_LOOKUP("cam_src_clk", mclk0_clk_src.c, "6-0078"),
CLK_LOOKUP("cam_src_clk", mclk0_clk_src.c, "6-007a"),
CLK_LOOKUP("cam_src_clk", mclk1_clk_src.c, "6-0078"),
CLK_LOOKUP("cam_src_clk", mclk0_clk_src.c, "6-0020"),
CLK_LOOKUP("cam_src_clk", mclk0_clk_src.c, "6-006a"),
Expand All @@ -3040,6 +3042,8 @@ static struct clk_lookup msm_clocks_8610[] = {
CLK_LOOKUP("cam_clk", mclk0_clk.c, "6-007d"),
CLK_LOOKUP("cam_clk", mclk0_clk.c, "6-006d"),
CLK_LOOKUP("cam_clk", mclk0_clk.c, "6-0076"), //GC2235
CLK_LOOKUP("cam_clk", mclk0_clk.c, "6-0078"),
CLK_LOOKUP("cam_clk", mclk0_clk.c, "6-007a"),
CLK_LOOKUP("cam_clk", mclk1_clk.c, "6-0078"),
CLK_LOOKUP("cam_clk", mclk0_clk.c, "6-0020"),
CLK_LOOKUP("cam_clk", mclk0_clk.c, "6-006a"),
Expand Down
12 changes: 12 additions & 0 deletions drivers/input/touchscreen/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -969,6 +969,18 @@ config TOUCHSCREEN_GEN_VKEYS
To compile this driver as a module, choose M here: the
module will be called gen_vkeys.

config TOUCHSCREEN_SYNAPTICS_I2C_MSG
tristate "MSG DSX I2C touchscreen"
depends on I2C
help
Say Y here if you have a MSG DSX I2C touchscreen
connected to your system.

If unsure, say N.

To compile this driver as a module, choose M here: the
module will be called msg_21xx_selfcap.

config TOUCHSCREEN_SYNAPTICS_I2C_RMI4
tristate "Synaptics DSX I2C touchscreen"
depends on I2C
Expand Down
1 change: 1 addition & 0 deletions drivers/input/touchscreen/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,4 @@ obj-$(CONFIG_TOUCHSCREEN_GT9XX) += gt9xx_zte/
else
obj-$(CONFIG_TOUCHSCREEN_GT9XX) += gt9xx/
endif
obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_MSG) += msg_21xx_selfcap.o
Loading