From patchwork Thu Mar 7 13:17:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lartey X-Patchwork-Id: 2231871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id A4C913FC8F for ; Thu, 7 Mar 2013 13:25:17 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UDal8-0004db-Se; Thu, 07 Mar 2013 13:21:23 +0000 Received: from slimlogic.co.uk ([89.16.172.20]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UDaiL-0003jQ-3O for linux-arm-kernel@lists.infradead.org; Thu, 07 Mar 2013 13:18:35 +0000 Received: from localhost.localdomain (cpc1-sgyl22-0-0-cust5.sgyl.cable.virginmedia.com [92.235.204.6]) by slimlogic.co.uk (Postfix) with ESMTPSA id 35F831006C5; Thu, 7 Mar 2013 13:18:27 +0000 (GMT) From: Ian Lartey To: linux-kernel@vger.kernel.org Subject: [PATCH v8 10/12] clk: Kconfig for Palmas clock driver Date: Thu, 7 Mar 2013 13:17:54 +0000 Message-Id: <1362662276-20792-10-git-send-email-ian@slimlogic.co.uk> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1362662276-20792-1-git-send-email-ian@slimlogic.co.uk> References: <1362662276-20792-1-git-send-email-ian@slimlogic.co.uk> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130307_081829_700957_F895B9E7 X-CRM114-Status: GOOD ( 11.07 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.6 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: t-kristo@ti.com, broonie@opensource.wolfsonmicro.com, mturquette@linaro.org, linux-watchdog@vger.kernel.org, swarren@wwwdotorg.org, j-keerthy@ti.com, linus.walleij@linaro.org, linux-doc@vger.kernel.org, lgirdwood@gmail.com, rob.herring@calxeda.com, grant.likely@secretlab.ca, wim@iguana.be, ldewangan@nvidia.com, rpurdie@rpsys.net, linux-arm-kernel@lists.infradead.org, rob@landley.net, cooloney@gmail.com, gg@slimlogic.co.uk, Ian Lartey , linux-leds@vger.kernel.org, sameo@linux.intel.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Signed-off-by: Graeme Gregory Signed-off-by: J Keerthy Signed-off-by: Ian Lartey --- drivers/clk/Kconfig | 8 ++++++++ drivers/clk/Makefile | 1 + drivers/leds/leds-palmas.c | 19 ++++++------------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index a47e6ee..a8e0655 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -63,6 +63,14 @@ config CLK_TWL6040 McPDM. McPDM module is using the external bit clock on the McPDM bus as functional clock. +config CLK_PALMAS + tristate "Palmas PMIC Clock Support" + depends on MFD_PALMAS + ---help--- + Enable clock support for the two clocks on Palmas PMIC chips: + - A 32KHz audio-gated clock (primarily for audio devices) + - A digitally-gated 32KHz clock + endmenu source "drivers/clk/mvebu/Kconfig" diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 300d477..77dc283 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -34,3 +34,4 @@ obj-$(CONFIG_X86) += x86/ obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o obj-$(CONFIG_CLK_TWL6040) += clk-twl6040.o +obj-$(CONFIG_CLK_PALMAS) += clk-palmas.o diff --git a/drivers/leds/leds-palmas.c b/drivers/leds/leds-palmas.c index 4a35352..ea53bfe 100644 --- a/drivers/leds/leds-palmas.c +++ b/drivers/leds/leds-palmas.c @@ -341,37 +341,30 @@ static int palmas_dt_to_pdata(struct device *dev, struct device_node *node, struct palmas_leds_platform_data *pdata) { - struct device_node *child_node; int ret; u32 prop; - child_node = of_get_child_by_name(node, "leds"); - if (!child_node) { - dev_err(dev, "child node 'palmas_leds' not found\n"); - return -EINVAL; - } - - ret = of_property_read_u32(child_node, "ti,led1-current", &prop); + ret = of_property_read_u32(node, "ti,led1-current", &prop); if (!ret) pdata->led1_current = prop; - ret = of_property_read_u32(child_node, "ti,led2-current", &prop); + ret = of_property_read_u32(node, "ti,led2-current", &prop); if (!ret) pdata->led2_current = prop; - ret = of_property_read_u32(child_node, "ti,led3-current", &prop); + ret = of_property_read_u32(node, "ti,led3-current", &prop); if (!ret) pdata->led3_current = prop; - ret = of_property_read_u32(child_node, "ti,led4-current", &prop); + ret = of_property_read_u32(node, "ti,led4-current", &prop); if (!ret) pdata->led4_current = prop; - ret = of_property_read_u32(child_node, "ti,chrg-led-mode", &prop); + ret = of_property_read_u32(node, "ti,chrg-led-mode", &prop); if (!ret) pdata->chrg_led_mode = prop; - ret = of_property_read_u32(child_node, "ti,chrg-led-vbat-low", &prop); + ret = of_property_read_u32(node, "ti,chrg-led-vbat-low", &prop); if (!ret) pdata->chrg_led_vbat_low = prop;