From patchwork Tue Oct 28 00:02:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 5167241 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 420299F349 for ; Tue, 28 Oct 2014 00:03:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 628002017A for ; Tue, 28 Oct 2014 00:03:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8325120211 for ; Tue, 28 Oct 2014 00:03:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753137AbaJ1AC5 (ORCPT ); Mon, 27 Oct 2014 20:02:57 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:37194 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753107AbaJ1ACz (ORCPT ); Mon, 27 Oct 2014 20:02:55 -0400 Received: by mail-wi0-f178.google.com with SMTP id q5so88156wiv.5 for ; Mon, 27 Oct 2014 17:02:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LuB9a76CY8nvqBxV4lzAEuW3ztcOB++aMbow2xzMjxQ=; b=BjphH2QzjP0amgfB8T2G043WAFzJxnyqUUuzs0R/7GRpPXazg4s5Yfr4YBDVImWx63 xlSPlNC65plvu4kcdggh7P6tsTUSxidLj6oRU5F4iC1Crfwlr26+9XSgCx7y2usUyxLX NjoXhZn3OA7cubEGAPIjcwuyUcPzzdIjbUNO1g2zFPRdajFy8oec7t+FUPAyJ3wHberZ JyjjkcUq8QT8GIAnhamneeruf2sYUGoIGKNvr2I4/OFvmvya8TcZIiuD1YyvKyyAp508 +Nl6l0/B/jd7JcofZbai6yEUBRQkgRZc1DI5L25gAO8sR/1nMVF7Ea4M5lG82M+s0vJu N6XA== X-Received: by 10.180.36.205 with SMTP id s13mr23331401wij.11.1414454573854; Mon, 27 Oct 2014 17:02:53 -0700 (PDT) Received: from fangorn.rup.mentorg.com (nat-min.mentorg.com. [139.181.32.34]) by mx.google.com with ESMTPSA id fq1sm13495340wib.12.2014.10.27.17.02.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Oct 2014 17:02:53 -0700 (PDT) From: Dmitry Eremin-Solenikov To: linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-input@vger.kernel.org, linux-leds@vger.kernel.org, linux-spi@vger.kernel.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org Cc: Andrea Adami , Russell King , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Linus Walleij , Alexandre Courbot , Dmitry Torokhov , Bryan Wu , Richard Purdie , Samuel Ortiz , Lee Jones , Mark Brown , Jingoo Han , Liam Girdwood Subject: [PATCH 12/15] ARM: pxa: poodle: don't preallocate IRQ space for locomo Date: Tue, 28 Oct 2014 03:02:05 +0300 Message-Id: <1414454528-24240-13-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1414454528-24240-1-git-send-email-dbaryshkov@gmail.com> References: <1414454528-24240-1-git-send-email-dbaryshkov@gmail.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 As new locomo driver supports SPARSE_IRQ, don't preallocate NR_IRQS space for it on poodle. Signed-off-by: Dmitry Eremin-Solenikov --- arch/arm/mach-pxa/include/mach/poodle.h | 2 +- arch/arm/mach-pxa/poodle.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-pxa/include/mach/poodle.h b/arch/arm/mach-pxa/include/mach/poodle.h index e8eb51e..105410a 100644 --- a/arch/arm/mach-pxa/include/mach/poodle.h +++ b/arch/arm/mach-pxa/include/mach/poodle.h @@ -91,7 +91,7 @@ #define POODLE_GPIO_MUTE_L (POODLE_LOCOMO_GPIO_BASE + 10) #define POODLE_GPIO_MUTE_R (POODLE_LOCOMO_GPIO_BASE + 11) -#define POODLE_NR_IRQS (IRQ_BOARD_START + 4) /* 4 for LoCoMo */ +#define POODLE_NR_IRQS IRQ_BOARD_START extern struct platform_device poodle_locomo_device; diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 3041d83..97eced9 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c @@ -181,14 +181,18 @@ static struct locomo_platform_data locomo_info = { .gpio_data = { .gpio_base = POODLE_LOCOMO_GPIO_BASE, }, - .bl_data = { + .lcd_data = { .comadj = 118, .gpio_lcd_vsha_on = POODLE_GPIO_LCD_VSHA_ON, .gpio_lcd_vshd_on = POODLE_GPIO_LCD_VSHD_ON, .gpio_lcd_vee_on = POODLE_GPIO_LCD_VEE_ON, .gpio_lcd_mod = POODLE_GPIO_LCD_MOD, + }, + .bl_data = { .gpio_fl_vr = POODLE_GPIO_FL_VR, }, + .gpio_amp1_on = -1, + .gpio_amp2_on = -1, }; struct platform_device poodle_locomo_device = { @@ -453,7 +457,7 @@ static void __init poodle_init(void) platform_scoop_config = &poodle_pcmcia_config; if (sharpsl_param.comadj != -1) - locomo_info.bl_data.comadj = sharpsl_param.comadj; + locomo_info.lcd_data.comadj = sharpsl_param.comadj; ret = platform_add_devices(devices, ARRAY_SIZE(devices)); if (ret)