forked from lbdroid/AOSP-SU-PATCH
-
Notifications
You must be signed in to change notification settings - Fork 14
/
kernel_moto_shamu_LEDPWM.patch
264 lines (251 loc) · 7.37 KB
/
kernel_moto_shamu_LEDPWM.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
diff --git a/arch/arm/boot/dts/apq8084-shamu/apq8084-moto-common.dtsi b/arch/arm/boot/dts/apq8084-shamu/apq8084-moto-common.dtsi
index 7a412f9..0c7b6f2 100644
--- a/arch/arm/boot/dts/apq8084-shamu/apq8084-moto-common.dtsi
+++ b/arch/arm/boot/dts/apq8084-shamu/apq8084-moto-common.dtsi
@@ -1154,12 +1154,6 @@
};
};
};
-
- qcom,pma8084@1 {
- pma8084_lpg2: pwm@b200 {
- #pwm-cells = <2>;
- };
- };
};
&usb3 {
diff --git a/arch/arm/boot/dts/apq8084-shamu/apq8084-shamu.dtsi b/arch/arm/boot/dts/apq8084-shamu/apq8084-shamu.dtsi
index 732f1de..3e10a3d 100644
--- a/arch/arm/boot/dts/apq8084-shamu/apq8084-shamu.dtsi
+++ b/arch/arm/boot/dts/apq8084-shamu/apq8084-shamu.dtsi
@@ -155,8 +155,8 @@
qcom,pull = <5>; /* No Pull */
qcom,invert = <0>; /* Do not invert the output */
qcom,vin-sel = <0>; /* VIN 0*/
- qcom,src-sel = <2>; /* FUNC 1 */
- qcom,out-strength = <2>; /* Medium drive strength */
+ qcom,src-sel = <2>; /* FUNC 1 = LPG */
+ qcom,out-strength = <1>; /* Low drive strength */
qcom,master-en = <1>; /* Enable GPIO */
};
@@ -166,8 +166,8 @@
qcom,pull = <5>; /* No Pull */
qcom,invert = <0>; /* Do not invert the output */
qcom,vin-sel = <0>; /* VIN 0*/
- qcom,src-sel = <2>; /* FUNC 1 */
- qcom,out-strength = <2>; /* Medium drive strength */
+ qcom,src-sel = <2>; /* FUNC 1 = LPG */
+ qcom,out-strength = <1>; /* Low drive strength */
qcom,master-en = <1>; /* Enable GPIO */
};
@@ -177,8 +177,8 @@
qcom,pull = <5>; /* No Pull */
qcom,invert = <0>; /* Do not invert the output */
qcom,vin-sel = <0>; /* VIN 0*/
- qcom,src-sel = <2>; /* FUNC 1 */
- qcom,out-strength = <2>; /* Medium drive strength */
+ qcom,src-sel = <2>; /* FUNC 1 = LPG */
+ qcom,out-strength = <1>; /* Low drive strength */
qcom,master-en = <1>; /* Enable GPIO */
};
};
@@ -228,14 +228,36 @@
compatible = "qcom,leds-qpnp";
reg = <0xc600 0x100>;
status = "okay";
- qcom,led_gpio_7 {
- label = "gpio";
+ qcom,led_lpg_red {
+ label = "rgb";
linux,name = "red";
- qcom,max-current = <20>;
- qcom,id = <8>;
- qcom,source-sel = <1>;
- qcom,mode-ctrl = <0x10>;
- qcom,vin-ctrl = <0x02>;
+ qcom,mode = "pwm";
+ qcom,pwm-channel = <2>;
+/* qcom,duty-ms = <20>;
+ qcom,start-idx = <1>;
+ qcom,idx-len = <10>;
+ qcom,duty-pcts = [00 19 32 4B 64
+ 64 4B 32 19 00];
+ qcom,max-current = <12>;
+ qcom,default-state = "off";
+ qcom,id = <3>;
+ linux,default-trigger = "none";
+*/
+ qcom,start-idx = <1>;
+ qcom,idx-len = <10>;
+ qcom,duty-pcts = [00 19 32 4B 64
+ 64 4B 32 19 00];
+ qcom,lut-flags = <3>;
+ qcom,pause-lo = <0>;
+ qcom,pause-hi = <0>;
+ qcom,ramp-step-ms = <255>;
+ qcom,max-current = <12>;
+ qcom,default-state = "on";
+ qcom,turn-off-delay-ms = <500>;
+ qcom,id = <3>;
+ linux,default-trigger = "none";
+ qcom,pwm-us = <1000>;
+ qcom,use-blink;
};
};
@@ -244,13 +266,25 @@
reg = <0xc700 0x100>;
status = "okay";
qcom,led_gpio_8 {
- label = "gpio";
+ label = "rgb";
linux,name = "green";
- qcom,max-current = <20>;
- qcom,id = <8>;
- qcom,source-sel = <1>;
- qcom,mode-ctrl = <0x10>;
- qcom,vin-ctrl = <0x02>;
+ qcom,mode = "pwm";
+ qcom,pwm-channel = <3>;
+ qcom,start-idx = <1>;
+ qcom,idx-len = <10>;
+ qcom,duty-pcts = [00 19 32 4B 64
+ 64 4B 32 19 00];
+ qcom,lut-flags = <3>;
+ qcom,pause-lo = <0>;
+ qcom,pause-hi = <0>;
+ qcom,ramp-step-ms = <255>;
+ qcom,max-current = <12>;
+ qcom,default-state = "on";
+ qcom,turn-off-delay-ms = <500>;
+ qcom,id = <4>;
+ linux,default-trigger = "none";
+ qcom,pwm-us = <1000>;
+ qcom,use-blink;
};
};
@@ -259,16 +293,59 @@
reg = <0xc800 0x100>;
status = "okay";
qcom,led_gpio_9 {
- label = "gpio";
+ label = "rgb";
linux,name = "blue";
- qcom,max-current = <20>;
- qcom,id = <8>;
- qcom,source-sel = <1>;
- qcom,mode-ctrl = <0x10>;
- qcom,vin-ctrl = <0x02>;
+ qcom,mode = "pwm";
+ qcom,pwm-channel = <4>;
+ qcom,start-idx = <1>;
+ qcom,idx-len = <10>;
+ qcom,duty-pcts = [00 19 32 4B 64
+ 64 4B 32 19 00];
+ qcom,lut-flags = <3>;
+ qcom,pause-lo = <0>;
+ qcom,pause-hi = <0>;
+ qcom,ramp-step-ms = <255>;
+ qcom,max-current = <12>;
+ qcom,default-state = "on";
+ qcom,turn-off-delay-ms = <500>;
+ qcom,id = <5>;
+ linux,default-trigger = "none";
+ qcom,pwm-us = <1000>;
+ qcom,use-blink;
};
};
};
+ qcom,pma8084@1 {
+ pma8084_lpg3: pwm@b300 {
+ compatible = "qcom,qpnp-pwm";
+ reg = <0xb300 0x100>,
+ <0xb042 0x7e>;
+ reg-names = "qpnp-lpg-channel-base", "qpnp-lpg-lut-base";
+ qcom,channel-id = <2>;
+ qcom,supported-sizes = <6>, <7>, <9>;
+ qcom,ramp-index = <2>;
+ };
+
+ pma8084_lpg4: pwm@b400 {
+ compatible = "qcom,qpnp-pwm";
+ reg = <0xb400 0x100>,
+ <0xb042 0x7e>;
+ reg-names = "qpnp-lpg-channel-base", "qpnp-lpg-lut-base";
+ qcom,channel-id = <3>;
+ qcom,supported-sizes = <6>, <7>, <9>;
+ qcom,ramp-index = <3>;
+ };
+
+ pma8084_lpg5: pwm@b500 {
+ compatible = "qcom,qpnp-pwm";
+ reg = <0xb500 0x100>,
+ <0xb042 0x7e>;
+ reg-names = "qpnp-lpg-channel-base", "qpnp-lpg-lut-base";
+ qcom,channel-id = <4>;
+ qcom,supported-sizes = <6>, <7>, <9>;
+ qcom,ramp-index = <4>;
+ };
+ };
};
&pma8084_l18 {
diff --git a/arch/arm/boot/dts/qcom/msm8974pro-ac-pma8084-pm8941.dtsi b/arch/arm/boot/dts/qcom/msm8974pro-ac-pma8084-pm8941.dtsi
index 9742ceb..d21fe0b 100644
--- a/arch/arm/boot/dts/qcom/msm8974pro-ac-pma8084-pm8941.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8974pro-ac-pma8084-pm8941.dtsi
@@ -259,7 +259,7 @@
* Disable PMA8084 PWM/LPG devices in order to avoid a channel-id collision
* with PM8941 PWM/LPG devices.
*/
-&pma8084_lpg1 {
+/*&pma8084_lpg1 {
status = "disabled";
};
@@ -281,4 +281,4 @@
&pma8084_lpg6 {
status = "disabled";
-};
+};*/
diff --git a/arch/arm/configs/shamu_defconfig b/arch/arm/configs/shamu_defconfig
index eed5ef5..c08f163 100644
--- a/arch/arm/configs/shamu_defconfig
+++ b/arch/arm/configs/shamu_defconfig
@@ -516,6 +516,7 @@ CONFIG_LEDS_QPNP=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_SWITCH=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_QPNP=y
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c
index ce8921a..6cec767 100644
--- a/drivers/leds/led-core.c
+++ b/drivers/leds/led-core.c
@@ -64,7 +64,7 @@ static void led_blink_setup(struct led_classdev *led_cdev,
/* blink with 1 Hz as default if nothing specified */
if (!*delay_on && !*delay_off)
- *delay_on = *delay_off = 500;
+ *delay_on = 500; *delay_off = 3500;
led_set_software_blink(led_cdev, *delay_on, *delay_off);
}
diff --git a/drivers/leds/leds-qpnp.c b/drivers/leds/leds-qpnp.c
index 4d812e5..1ddbb6d 100644
--- a/drivers/leds/leds-qpnp.c
+++ b/drivers/leds/leds-qpnp.c
@@ -10,6 +10,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
+#define DEBUG
#include <linux/kernel.h>
#include <linux/module.h>
diff --git a/drivers/pwm/pwm-qpnp.c b/drivers/pwm/pwm-qpnp.c
index 2401249..abc9ab8 100644
--- a/drivers/pwm/pwm-qpnp.c
+++ b/drivers/pwm/pwm-qpnp.c
@@ -15,6 +15,7 @@
* The HW module is also called LPG (Light Pattern Generator).
*/
+#define DEBUG
#define pr_fmt(fmt) "%s: " fmt, __func__
#include <linux/module.h>