From patchwork Thu Nov 6 07:27:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 5239511 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 54693C11AC for ; Thu, 6 Nov 2014 07:30:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6771B20117 for ; Thu, 6 Nov 2014 07:30:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8B16420115 for ; Thu, 6 Nov 2014 07:30:28 +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 1XmHTx-0003y6-Ud; Thu, 06 Nov 2014 07:27:49 +0000 Received: from mail-pd0-x22c.google.com ([2607:f8b0:400e:c02::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XmHTv-0003ve-FS for linux-arm-kernel@lists.infradead.org; Thu, 06 Nov 2014 07:27:47 +0000 Received: by mail-pd0-f172.google.com with SMTP id r10so614845pdi.31 for ; Wed, 05 Nov 2014 23:27:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=DUFebNemV40tH5ZHQ6WGvuQtW05AjqxBcfnifxRRiJc=; b=TVlrpYfS6PrJmgNObzgiXoTGL4n+CD1fmVuqIQWclGv2Mwln3nar0Ihj5LoemZULSc ksfrvm1VaIfLnNjUY5f7C4+yCElutOq0TXgqONOBowqDQBUwaIHs0tHTOKL1hzueeh3s gpfKW3NXdOCQ6qiN/YHk5A2hsN9HFRS8h4qspG0g3IDVIzDPP2fL+1zmnElTZ/WwIl+N 3E5S9Bmy/HD0u4EW7mM7v+WXiZAb6jSMkp/pDeXEMoj9hQENXQG3wCinqGTGZcPJHw7a JNMGbZSIZK8+Uz88cElU6Sq4LeJXxdMoAaAcZJjslnHY2KtZo+5X2K2bfS43JfolknbK kI9w== X-Received: by 10.68.102.195 with SMTP id fq3mr2516774pbb.7.1415258846614; Wed, 05 Nov 2014 23:27:26 -0800 (PST) Received: from fangorn.rup.mentorg.com (nat-min.mentorg.com. [139.181.32.34]) by mx.google.com with ESMTPSA id ug6sm5011646pbc.72.2014.11.05.23.27.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Nov 2014 23:27:25 -0800 (PST) From: Dmitry Eremin-Solenikov To: Russell King Subject: [PATCH RESEND] ARM: sa1100 collie: use gpio-charger instead of pda-power Date: Thu, 6 Nov 2014 10:27:11 +0300 Message-Id: <1415258831-17239-1-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 2.1.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141105_232747_558926_9DD8EAD5 X-CRM114-Status: GOOD ( 14.08 ) X-Spam-Score: -0.8 (/) Cc: Andrea Adami , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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 Use gpio-charger driver instead of pda-power: it automatically cares about used gpio and since collie does not differentiate between usb and ac chargers, pda-power is an overkill for it. As a bonus this allows us to remove gpio_to_irq calls from machine init call - it is fragile. These gpio_to_irq calls will fail if gpios are registered later, via device driver mechanisms. Signed-off-by: Dmitry Eremin-Solenikov --- arch/arm/mach-sa1100/collie.c | 55 ++++++------------------------------------- 1 file changed, 7 insertions(+), 48 deletions(-) diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index 108939f..b90c7d8 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include