From patchwork Tue Mar 26 01:21:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: achew@nvidia.com X-Patchwork-Id: 2334131 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id ED6BB3FD8C for ; Tue, 26 Mar 2013 01:24:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933676Ab3CZBYn (ORCPT ); Mon, 25 Mar 2013 21:24:43 -0400 Received: from hqemgate03.nvidia.com ([216.228.121.140]:2239 "EHLO hqemgate03.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933663Ab3CZBYm (ORCPT ); Mon, 25 Mar 2013 21:24:42 -0400 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate03.nvidia.com id ; Mon, 25 Mar 2013 18:27:08 -0700 Received: from hqemhub01.nvidia.com ([172.17.108.22]) by hqnvupgp08.nvidia.com (PGP Universal service); Mon, 25 Mar 2013 18:21:23 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Mon, 25 Mar 2013 18:21:23 -0700 Received: from achew-linux64.nvidia.com (172.20.144.16) by hqemhub01.nvidia.com (172.20.150.30) with Microsoft SMTP Server (TLS) id 8.3.298.1; Mon, 25 Mar 2013 18:21:39 -0700 From: Andrew Chew To: , , , , , , , , , , , , , , , CC: , , , , , Subject: [PATCH V5 6/9] ARM: mxs: Provide regulator to pwm-backlight Date: Mon, 25 Mar 2013 18:21:50 -0700 Message-ID: <1364260913-25490-7-git-send-email-achew@nvidia.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1364260913-25490-1-git-send-email-achew@nvidia.com> References: <1364260913-25490-1-git-send-email-achew@nvidia.com> MIME-Version: 1.0 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org The pwm-backlight driver now takes a mandatory regulator that is gotten during driver probe. Initialize a dummy regulator to satisfy this requirement. Signed-off-by: Andrew Chew Acked-by: Alexandre Courbot Acked-by: Shawn Guo --- Moved backlight power regulator into top-level regulators node. arch/arm/boot/dts/imx23-evk.dts | 6 ++++++ arch/arm/boot/dts/imx28-apf28dev.dts | 6 ++++++ arch/arm/boot/dts/imx28-cfa10049.dts | 6 ++++++ arch/arm/boot/dts/imx28-evk.dts | 6 ++++++ arch/arm/boot/dts/imx28-tx28.dts | 11 +++++++++++ 5 files changed, 35 insertions(+) diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts index 035c13f..ce5048e 100644 --- a/arch/arm/boot/dts/imx23-evk.dts +++ b/arch/arm/boot/dts/imx23-evk.dts @@ -95,6 +95,11 @@ regulator-max-microvolt = <3300000>; gpio = <&gpio1 29 0>; }; + + reg_backlight_power: fixed-regulator { + compatible = "regulator-fixed"; + regulator-name = "backlight-power"; + }; }; backlight { @@ -102,5 +107,6 @@ pwms = <&pwm 2 5000000>; brightness-levels = <0 4 8 16 32 64 128 255>; default-brightness-level = <6>; + power-supply = <®_backlight_power>; }; }; diff --git a/arch/arm/boot/dts/imx28-apf28dev.dts b/arch/arm/boot/dts/imx28-apf28dev.dts index 6d8865b..e354dc5 100644 --- a/arch/arm/boot/dts/imx28-apf28dev.dts +++ b/arch/arm/boot/dts/imx28-apf28dev.dts @@ -132,6 +132,11 @@ regulator-max-microvolt = <5000000>; gpio = <&gpio1 23 1>; }; + + reg_backlight_power: fixed-regulator { + compatible = "regulator-fixed"; + regulator-name = "backlight-power"; + }; }; leds { @@ -150,5 +155,6 @@ pwms = <&pwm 3 191000>; brightness-levels = <0 4 8 16 32 64 128 255>; default-brightness-level = <6>; + power-supply = <®_backlight_power>; }; }; diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts index a0d3e9f..a6eddd6 100644 --- a/arch/arm/boot/dts/imx28-cfa10049.dts +++ b/arch/arm/boot/dts/imx28-cfa10049.dts @@ -205,6 +205,11 @@ regulator-max-microvolt = <5000000>; gpio = <&gpio0 7 1>; }; + + reg_backlight_power: fixed-regulator { + compatible = "regulator-fixed"; + regulator-name = "backlight-power"; + }; }; ahb@80080000 { @@ -304,5 +309,6 @@ pwms = <&pwm 3 5000000>; brightness-levels = <0 4 8 16 32 64 128 255>; default-brightness-level = <6>; + power-supply = <®_backlight_power>; }; }; diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts index 2da316e..7ba7216 100644 --- a/arch/arm/boot/dts/imx28-evk.dts +++ b/arch/arm/boot/dts/imx28-evk.dts @@ -285,6 +285,11 @@ gpio = <&gpio3 8 0>; enable-active-high; }; + + reg_backlight_power: fixed-regulator { + compatible = "regulator-fixed"; + regulator-name = "backlight-power"; + }; }; sound { @@ -312,5 +317,6 @@ pwms = <&pwm 2 5000000>; brightness-levels = <0 4 8 16 32 64 128 255>; default-brightness-level = <6>; + power-supply = <®_backlight_power>; }; }; diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts index 37be532..7fa5a44 100644 --- a/arch/arm/boot/dts/imx28-tx28.dts +++ b/arch/arm/boot/dts/imx28-tx28.dts @@ -97,6 +97,16 @@ }; }; + regulators { + compatible = "simple-bus"; + + reg_backlight_power: fixed-regulator { + compatible = "regulator-fixed"; + regulator-name = "backlight-power"; + }; + }; + + leds { compatible = "gpio-leds"; @@ -112,5 +122,6 @@ pwms = <&pwm 0 5000000>; brightness-levels = <0 4 8 16 32 64 128 255>; default-brightness-level = <6>; + power-supply = <®_backlight_power>; }; };