From patchwork Wed Dec 14 13:52:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 705672 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tdygQ6Q9Fz9srZ for ; Thu, 15 Dec 2016 00:52:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932406AbcLNNwR (ORCPT ); Wed, 14 Dec 2016 08:52:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53968 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932356AbcLNNwR (ORCPT ); Wed, 14 Dec 2016 08:52:17 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 49C7A61E51; Wed, 14 Dec 2016 13:52:16 +0000 (UTC) Received: from shalem.localdomain.com (vpn1-5-28.ams2.redhat.com [10.36.5.28]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uBEDqAkZ019147; Wed, 14 Dec 2016 08:52:15 -0500 From: Hans de Goede To: Lee Jones , Chen-Yu Tsai Cc: "russianneuromancer @ ya . ru" , linux-i2c@vger.kernel.org, Hans de Goede Subject: [PATCH 4/5] mfd: axp20x: Drop wrong AXP288_PMIC_ADC_EN define Date: Wed, 14 Dec 2016 14:52:08 +0100 Message-Id: <20161214135209.16369-4-hdegoede@redhat.com> In-Reply-To: <20161214135209.16369-1-hdegoede@redhat.com> References: <20161214135209.16369-1-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 14 Dec 2016 13:52:16 +0000 (UTC) Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org The adc-enable register for the axp288 is 0x82, not 0x84. 0x82 is already defined as AXP20X_ADC_EN1 and that is what the axp288_adc driver is actually using, so simply drop the wrong AXP288_PMIC_ADC_EN define. Signed-off-by: Hans de Goede Acked-by: Chen-Yu Tsai --- include/linux/mfd/axp20x.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h index 199cce3..fe93e00 100644 --- a/include/linux/mfd/axp20x.h +++ b/include/linux/mfd/axp20x.h @@ -232,7 +232,6 @@ enum { #define AXP288_PMIC_ADC_H 0x56 #define AXP288_PMIC_ADC_L 0x57 #define AXP288_ADC_TS_PIN_CTRL 0x84 -#define AXP288_PMIC_ADC_EN 0x84 /* Fuel Gauge */ #define AXP288_FG_RDC1_REG 0xba