Skip to content

Commit

Permalink
Merge tag 'renesas-fixes-for-v4.14' of https://git.kernel.org/pub/scm…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
arndb committed Oct 19, 2017
2 parents 72ecd79 + 829e488 commit 716479a
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions arch/arm64/boot/dts/renesas/salvator-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};

Expand All @@ -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";

Expand Down

0 comments on commit 716479a

Please sign in to comment.