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

Commit 716479a3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-fixes-for-v4.14' of... 

Merge tag 'renesas-fixes-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

Pull "Renesas ARM Based SoC Fixes for v4.14" from Simon Horman:

Add 12V regulator to backlight allowing the power supply
for the backlight to be found.

* tag 'renesas-fixes-for-v4.14' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: dts: salvator-common: add 12V regulator to backlight
parents 72ecd793 829e4887

arch/arm64/boot/dts/renesas/salvator-common.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
		brightness-levels = <256 128 64 16 8 4 0>;

		default-brightness-level = <6>;



		power-supply = <&reg_12v>;

		enable-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>;

	};
@@ -83,6 +84,15 @@ 
		regulator-always-on;

	};



	reg_12v: regulator2 {

		compatible = "regulator-fixed";

		regulator-name = "fixed-12V";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		regulator-boot-on;

		regulator-always-on;

	};



	rsnd_ak4613: sound {

		compatible = "simple-audio-card";