diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 11:58:13 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 11:58:13 -0400 |
| commit | 716479a39fc9f1f867735fc0dafaa8cd547bc72b (patch) | |
| tree | 4c5ba37d5236a8c5d1acc80786c5b45f0e64e2b8 | |
| parent | 72ecd793865f91c3cdeb06884f230f38f434c67c (diff) | |
| parent | 829e4887b8676255778e162efc57e4a0f18f8bb3 (diff) | |
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
| -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 @@ | |||
| 62 | brightness-levels = <256 128 64 16 8 4 0>; | 62 | brightness-levels = <256 128 64 16 8 4 0>; |
| 63 | default-brightness-level = <6>; | 63 | default-brightness-level = <6>; |
| 64 | 64 | ||
| 65 | power-supply = <®_12v>; | ||
| 65 | enable-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>; | 66 | enable-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>; |
| 66 | }; | 67 | }; |
| 67 | 68 | ||
| @@ -83,6 +84,15 @@ | |||
| 83 | regulator-always-on; | 84 | regulator-always-on; |
| 84 | }; | 85 | }; |
| 85 | 86 | ||
| 87 | reg_12v: regulator2 { | ||
| 88 | compatible = "regulator-fixed"; | ||
| 89 | regulator-name = "fixed-12V"; | ||
| 90 | regulator-min-microvolt = <12000000>; | ||
| 91 | regulator-max-microvolt = <12000000>; | ||
| 92 | regulator-boot-on; | ||
| 93 | regulator-always-on; | ||
| 94 | }; | ||
| 95 | |||
| 86 | rsnd_ak4613: sound { | 96 | rsnd_ak4613: sound { |
| 87 | compatible = "simple-audio-card"; | 97 | compatible = "simple-audio-card"; |
| 88 | 98 | ||
