From patchwork Mon Apr 1 21:53:23 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: 2372851 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 A963DDFB7B for ; Mon, 1 Apr 2013 21:56:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759056Ab3DAV4J (ORCPT ); Mon, 1 Apr 2013 17:56:09 -0400 Received: from hqemgate04.nvidia.com ([216.228.121.35]:16952 "EHLO hqemgate04.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758411Ab3DAV4I (ORCPT ); Mon, 1 Apr 2013 17:56:08 -0400 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate04.nvidia.com id ; Mon, 01 Apr 2013 14:53:07 -0700 Received: from hqemhub02.nvidia.com ([172.20.12.94]) by hqnvupgp08.nvidia.com (PGP Universal service); Mon, 01 Apr 2013 14:52:26 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Mon, 01 Apr 2013 14:52:26 -0700 Received: from achew-linux64.nvidia.com (172.20.144.16) by hqemhub02.nvidia.com (172.20.150.31) with Microsoft SMTP Server (TLS) id 8.3.298.1; Mon, 1 Apr 2013 14:53:07 -0700 From: Andrew Chew To: , , , , , , , , , , , , CC: , , , , , Subject: [PATCH V6 4/9] ARM: EXYNOS: Provide regulator to pwm-backlight Date: Mon, 1 Apr 2013 14:53:23 -0700 Message-ID: <1364853208-32503-5-git-send-email-achew@nvidia.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1364853208-32503-1-git-send-email-achew@nvidia.com> References: <1364853208-32503-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 --- arch/arm/mach-exynos/mach-nuri.c | 7 +++++++ arch/arm/plat-samsung/dev-backlight.c | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index 1ea7973..0223863 100644 --- a/arch/arm/mach-exynos/mach-nuri.c +++ b/arch/arm/mach-exynos/mach-nuri.c @@ -294,6 +294,10 @@ static void nuri_bl_exit(struct device *dev) gpio_free(EXYNOS4_GPE2(3)); } +/* Dummy regulator for pwm-backlight driver */ +static struct regulator_consumer_supply backlight_supply = + REGULATOR_SUPPLY("power", "pwm-backlight"); + /* nuri pwm backlight */ static struct platform_pwm_backlight_data nuri_backlight_data = { .pwm_id = 0, @@ -1368,6 +1372,9 @@ static void __init nuri_machine_init(void) nuri_ehci_init(); s3c_hsotg_set_platdata(&nuri_hsotg_pdata); + regulator_register_always_on(-1, "backlight-power", + &backlight_supply, 1, 0); + /* Last */ platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices)); } diff --git a/arch/arm/plat-samsung/dev-backlight.c b/arch/arm/plat-samsung/dev-backlight.c index 5f197dc..23ce16b 100644 --- a/arch/arm/plat-samsung/dev-backlight.c +++ b/arch/arm/plat-samsung/dev-backlight.c @@ -14,12 +14,18 @@ #include #include #include +#include +#include #include #include #include #include +/* Dummy regulator for pwm-backlight driver */ +static struct regulator_consumer_supply backlight_supply = + REGULATOR_SUPPLY("power", "pwm-backlight"); + static int samsung_bl_init(struct device *dev) { int ret = 0; @@ -37,6 +43,9 @@ static int samsung_bl_init(struct device *dev) /* Configure GPIO pin with specific GPIO function for PWM timer */ s3c_gpio_cfgpin(bl_gpio_info->no, bl_gpio_info->func); + regulator_register_always_on(-1, "backlight-power", + &backlight_supply, 1, 0); + return 0; }