From patchwork Tue Mar 19 18:59:26 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: 2303851 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6A7ACE00E6 for ; Tue, 19 Mar 2013 19:02:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932101Ab3CSTCq (ORCPT ); Tue, 19 Mar 2013 15:02:46 -0400 Received: from hqemgate04.nvidia.com ([216.228.121.35]:14965 "EHLO hqemgate04.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757187Ab3CSTCo (ORCPT ); Tue, 19 Mar 2013 15:02:44 -0400 Received: from hqnvupgp07.nvidia.com (Not Verified[216.228.121.13]) by hqemgate04.nvidia.com id ; Tue, 19 Mar 2013 11:59:42 -0700 Received: from hqemhub03.nvidia.com ([172.17.108.22]) by hqnvupgp07.nvidia.com (PGP Universal service); Tue, 19 Mar 2013 11:59:45 -0700 X-PGP-Universal: processed; by hqnvupgp07.nvidia.com on Tue, 19 Mar 2013 11:59:45 -0700 Received: from achew-linux64.nvidia.com (172.20.144.16) by hqemhub03.nvidia.com (172.20.150.15) with Microsoft SMTP Server (TLS) id 8.3.298.1; Tue, 19 Mar 2013 11:59:44 -0700 From: Andrew Chew To: , , , , , , , , , , , , , , , , CC: , , , , , , Subject: [PATCH V4 2/9] ARM: S3C24XX: Provide regulator to pwm-backlight Date: Tue, 19 Mar 2013 11:59:26 -0700 Message-ID: <1363719573-20926-3-git-send-email-achew@nvidia.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1363719573-20926-1-git-send-email-achew@nvidia.com> References: <1363719573-20926-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 --- arch/arm/mach-s3c24xx/mach-h1940.c | 8 ++++++++ arch/arm/mach-s3c24xx/mach-rx1950.c | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c index 8dd6601..d2594b8 100644 --- a/arch/arm/mach-s3c24xx/mach-h1940.c +++ b/arch/arm/mach-s3c24xx/mach-h1940.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include #include @@ -497,6 +499,9 @@ static void h1940_backlight_exit(struct device *dev) gpio_set_value(H1940_LATCH_MAX1698_nSHUTDOWN, 0); } +/* Dummy regulator for pwm-backlight driver */ +static struct regulator_consumer_supply backlight_supply = + REGULATOR_SUPPLY("enable", "pwm-backlight"); static struct platform_pwm_backlight_data backlight_data = { .pwm_id = 0, @@ -720,6 +725,9 @@ static void __init h1940_init(void) gpio_request(H1940_LATCH_SD_POWER, "SD power"); gpio_direction_output(H1940_LATCH_SD_POWER, 0); + regulator_register_always_on(-1, "backlight-enable", + &backlight_supply, 1, 0); + platform_add_devices(h1940_devices, ARRAY_SIZE(h1940_devices)); gpio_request(S3C2410_GPA(1), "Red LED blink"); diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c index e4d67a3..ac674b6 100644 --- a/arch/arm/mach-s3c24xx/mach-rx1950.c +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include #include @@ -518,6 +520,10 @@ static int rx1950_backlight_notify(struct device *dev, int brightness) return brightness; } +/* Dummy regulator for pwm-backlight driver */ +static struct regulator_consumer_supply backlight_supply = + REGULATOR_SUPPLY("enable", "pwm-backlight"); + static struct platform_pwm_backlight_data rx1950_backlight_data = { .pwm_id = 0, .max_brightness = 24, @@ -795,6 +801,9 @@ static void __init rx1950_init_machine(void) gpio_direction_output(S3C2410_GPA(4), 0); gpio_direction_output(S3C2410_GPJ(6), 0); + regulator_register_always_on(-1, "backlight-enable", + &backlight_supply, 1, 0); + platform_add_devices(rx1950_devices, ARRAY_SIZE(rx1950_devices)); i2c_register_board_info(0, rx1950_i2c_devices,