Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af3a3a1a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add timer default trigger for PMI632 RGB LEDs"

parents 7dec14e8 c675900d

arch/arm64/boot/dts/qcom/pmi632.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -436,16 +436,19 @@ 
				label = "red";

				pwms = <&pmi632_pwm 0 1000000>;

				led-sources = <0>;

				linux,default-trigger = "timer";

			};

			green {

				label = "green";

				pwms = <&pmi632_pwm 1 1000000>;

				led-sources = <1>;

				linux,default-trigger = "timer";

			};

			blue {

				label = "blue";

				pwms = <&pmi632_pwm 2 1000000>;

				led-sources = <2>;

				linux,default-trigger = "timer";

			};

		};

drivers/leds/leds-qti-tri-led.c

+1 −4
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ 
#define TRILED_NUM_MAX			3



#define PWM_PERIOD_DEFAULT_NS		1000000

#define LED_BLINK_ON_MS			125

#define LED_BLINK_OFF_MS		875



struct pwm_setting {

	u32	pre_period_ns;
@@ -309,8 +307,7 @@ static int qpnp_tri_led_register(struct qpnp_tri_led_chip *chip) 
		led->cdev.blink_set = qpnp_tri_led_set_blink;

		led->cdev.default_trigger = led->default_trigger;

		led->cdev.brightness = LED_OFF;

		led->cdev.blink_delay_on = LED_BLINK_ON_MS;

		led->cdev.blink_delay_off = LED_BLINK_OFF_MS;

		led->cdev.flags |= LED_KEEP_TRIGGER;



		rc = devm_led_classdev_register(chip->dev, &led->cdev);

		if (rc < 0) {