diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2017-10-19 17:58:13 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 17:58:13 +0200 |
| commit | 716479a39fc9f1f867735fc0dafaa8cd547bc72b (patch) | |
| tree | 4c5ba37d5236a8c5d1acc80786c5b45f0e64e2b8 /arch | |
| parent | ARM: ux500: Fix regression while init PM domains (diff) | |
| parent | arm64: dts: salvator-common: add 12V regulator to backlight (diff) | |
| download | linux-dev-716479a39fc9f1f867735fc0dafaa8cd547bc72b.tar.xz linux-dev-716479a39fc9f1f867735fc0dafaa8cd547bc72b.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/boot/dts/renesas/salvator-common.dtsi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi index 4786c67b5e65..d9d885006a8e 100644 --- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi +++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi @@ -62,6 +62,7 @@ brightness-levels = <256 128 64 16 8 4 0>; default-brightness-level = <6>; + power-supply = <®_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"; |