shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

clkmsr: init clkmsr earlier for lcd driver called

Browse Source 
PD#158608: clkmsr: init clkmsr earlier for lcd driver called.
also add missed pwm config in dts for backlight,
and add pwm pointer protection in backlight driver.

Change-Id: Ib3d435a0f4418e31d94e65b1cee9919f1f6325c8
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>
This commit is contained in:
Evoke Zhang
2018-01-11 16:51:36 +08:00
committed by Bo Yang
parent 0a20c93893
commit 2d3ba04332
5 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/boot/dts/amlogic/mesontxlx_r311-panel.dtsi
View File

@@ -534,6 +534,7 @@
pinctrl_version = <2>; /* for uboot */
interrupts = <0 3 1>;
interrupt-names = "ldim_vsync";
bl_pwm_config = <&bl_pwm_conf>;
/* pwm port: PWM_A, PWM_B, PWM_C, PWM_D, PWM_E, PWM_F, PWM_VS*/
/* power index:(point gpios_index, 0xff=invalid) */

4
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
View File

@@ -1440,6 +1440,10 @@
status = "okay";
};
&pwm_ab {
status = "okay";
};
&pwm_cd {
status = "okay";
};

4
arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
View File

@@ -1440,6 +1440,10 @@
status = "okay";
};
&pwm_ab {
status = "okay";
};
&pwm_cd {
status = "okay";
};

2
drivers/amlogic/clk/clk_measure.c
View File

@@ -830,7 +830,7 @@ static void __exit aml_clkmsr_exit(void)
platform_driver_unregister(&aml_clkmsr_driver);
}
module_init(aml_clkmsr_init);
arch_initcall(aml_clkmsr_init);
module_exit(aml_clkmsr_exit);
MODULE_DESCRIPTION("Amlogic clkmsr module");

23
drivers/amlogic/media/vout/backlight/aml_bl.c
View File

@@ -457,7 +457,7 @@ static void bl_set_pwm(struct bl_pwm_config_s *bl_pwm)
case BL_PWM_F:
pwm_period = 1000000000 / bl_pwm->pwm_freq;
pwm_duty = (pwm_period * bl_pwm->pwm_duty) / 100;
if ((!IS_ERR(bl_pwm->pwm_data.pwm)) &&
if ((!IS_ERR_OR_NULL(bl_pwm->pwm_data.pwm)) &&
((bl_pwm->pwm_data.port_index % 2) ==
bl_pwm->pwm_data.meson_index) &&
(bl_pwm->pwm_data.port_index ==
@@ -525,7 +525,7 @@ void bl_pwm_ctrl(struct bl_pwm_config_s *bl_pwm, int status)
case BL_PWM_D:
case BL_PWM_E:
case BL_PWM_F:
if (!IS_ERR(bl_pwm->pwm_data.pwm)) {
if (!IS_ERR_OR_NULL(bl_pwm->pwm_data.pwm)) {
pwm_get_state(bl_pwm->pwm_data.pwm, &pstate);
pwm_constant_enable(bl_pwm->pwm_data.meson,
bl_pwm->pwm_data.meson_index);
@@ -1919,7 +1919,7 @@ static int pwm_channel_conf(struct bl_config_s *bconf,
bl_pwm->pwm_data.meson_index = index1;
bl_pwm->pwm_data.pwm = devm_of_pwm_get(
bl_drv->dev, child, NULL);
if (IS_ERR(bl_pwm->pwm_data.pwm)) {
if (IS_ERR_OR_NULL(bl_pwm->pwm_data.pwm)) {
ret = PTR_ERR(bl_pwm->pwm_data.pwm);
BLERR("unable to request bl_pwm\n");
return ret;
@@ -2367,6 +2367,11 @@ static ssize_t bl_debug_pwm_show(struct class *class,
case BL_PWM_D:
case BL_PWM_E:
case BL_PWM_F:
if (IS_ERR_OR_NULL(bl_pwm->pwm_data.pwm)) {
len += sprintf(buf+len,
"pwm invalid\n");
break;
}
pwm_get_state(bl_pwm->pwm_data.pwm, &pstate);
len += sprintf(buf+len,
"\n"
@@ -2426,6 +2431,11 @@ static ssize_t bl_debug_pwm_show(struct class *class,
case BL_PWM_D:
case BL_PWM_E:
case BL_PWM_F:
if (IS_ERR_OR_NULL(bl_pwm->pwm_data.pwm)) {
len += sprintf(buf+len,
"pwm invalid\n");
break;
}
pwm_get_state(bl_pwm->pwm_data.pwm, &pstate);
len += sprintf(buf+len,
"\n"
@@ -2479,6 +2489,11 @@ static ssize_t bl_debug_pwm_show(struct class *class,
case BL_PWM_D:
case BL_PWM_E:
case BL_PWM_F:
if (IS_ERR_OR_NULL(bl_pwm->pwm_data.pwm)) {
len += sprintf(buf+len,
"pwm invalid\n");
break;
}
pwm_get_state(bl_pwm->pwm_data.pwm, &pstate);
len += sprintf(buf+len,
"\n"
@@ -2801,7 +2816,7 @@ static int aml_bl_creat_class(void)
int i;
bl_debug_class = class_create(THIS_MODULE, "aml_bl");
if (IS_ERR(bl_debug_class)) {
if (IS_ERR_OR_NULL(bl_debug_class)) {
BLERR("create aml_bl debug class fail\n");
return -1;
}