From patchwork Mon Aug 17 22:06:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Cvek X-Patchwork-Id: 7027691 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 017ABC05AC for ; Mon, 17 Aug 2015 22:06:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2EB06205EC for ; Mon, 17 Aug 2015 22:06:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5598F205E5 for ; Mon, 17 Aug 2015 22:06:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZRSVq-0006QJ-91; Mon, 17 Aug 2015 22:04:14 +0000 Received: from bubo.tul.cz ([2001:718:1c01:16::aa]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZRSVm-0005yu-Vd for linux-arm-kernel@lists.infradead.org; Mon, 17 Aug 2015 22:04:11 +0000 Received: from [78.80.185.17] (78-80-185-17.tmcz.cz [78.80.185.17]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by bubo.tul.cz (Postfix) with ESMTPSA id A61071F0006; Tue, 18 Aug 2015 00:03:26 +0200 (CEST) From: Petr Cvek Subject: [PATCH v2 20/21] ARM: pxa: magician: Re-add pdata for new leds-pasic3 driver To: robert.jarzmik@free.fr, philipp.zabel@gmail.com, daniel@zonque.org, haojian.zhuang@gmail.com, sameo@linux.intel.com, lee.jones@linaro.org, cooloney@gmail.com, rpurdie@rpsys.net, j.anaszewski@samsung.com, linux@arm.linux.org.uk, sre@kernel.org, dbaryshkov@gmail.com, dwmw2@infradead.org References: Message-ID: <55D25AF2.1080408@tul.cz> Date: Tue, 18 Aug 2015 00:06:42 +0200 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150817_150411_200497_5C66AF85 X-CRM114-Status: GOOD ( 10.71 ) X-Spam-Score: -2.5 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, linux-leds@vger.kernel.org, linux-pm@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Re-add definition of LEDs PASIC3 to magician.c. Signed-off-by: Petr Cvek --- arch/arm/mach-pxa/magician.c | 54 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index d8994dd..5f02ce4 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c @@ -597,6 +597,58 @@ static struct platform_device leds_gpio = { }; /* + * PASIC3 LEDs + */ + +static struct pasic3_led magician_pasic3_leds[] = { + { + .hw_num = 0, + .name = "magician:red", + .default_trigger = "ds2760-battery.0-charging", + .bit_blink_en = R06_CH0_EN, + .bit_force_on = R06_CH0_FORCE_ON, + .bit_mask = MASK_CH0, + .reg_delay_on = PASIC3_CH0_DELAY_ON, + .reg_delay_off = PASIC3_CH0_DELAY_OFF, + }, + { + .hw_num = 1, + .name = "magician:green", + .default_trigger = "ds2760-battery.0-charging-or-full", + .bit_blink_en = R06_CH1_EN, + .bit_force_on = R06_CH1_FORCE_ON, + .bit_mask = MASK_CH1, + .reg_delay_on = PASIC3_CH1_DELAY_ON, + .reg_delay_off = PASIC3_CH1_DELAY_OFF, + }, + { + .hw_num = 2, + .name = "magician:blue", + .default_trigger = "bluetooth", + .bit_blink_en = R06_CH2_EN, + .bit_force_on = R06_CH2_FORCE_ON, + .bit_mask = MASK_CH2, + .reg_delay_on = PASIC3_CH2_DELAY_ON, + .reg_delay_off = PASIC3_CH2_DELAY_OFF, + }, +}; + +static struct pasic3_leds_pdata magician_pasic3_led_pdata = { + .leds = magician_pasic3_leds, + .num_leds = ARRAY_SIZE(magician_pasic3_leds), + /* Green LED doesn't use power_gpio */ + .power_gpio = EGPIO_MAGICIAN_LED_POWER, +}; + +static struct platform_device pasic3_leds = { + .name = "leds-pasic3", + .id = -1, + .dev = { + .platform_data = &magician_pasic3_led_pdata, + }, +}; + +/* * PASIC3 DS1WM */ @@ -616,7 +668,7 @@ static struct resource pasic3_resources[] = { static struct pasic3_platform_data pasic3_platform_data = { .clock_rate = 4000000, -/* .led_pdata = &pasic3_leds_info, */ + .pasic3_leds = &pasic3_leds, }; static struct platform_device pasic3 = {