From: Lars-Peter Clausen <lars@metafoo.de>
To: sameo@linux.intel.com
Cc: linux-kernel@vger.kernel.org,
Lars-Peter Clausen <lars@metafoo.de>,
Ben Dooks <ben-linux@fluff.org>
Subject: [PATCH 1/3] gta02: Remove usage of pcf50633 gpio api
Date: Wed, 12 May 2010 03:31:14 +0200 [thread overview]
Message-ID: <1273627876-26922-2-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1273627876-26922-1-git-send-email-lars@metafoo.de>
This is the only user of the pcf50633 gpio api. Since the custom interface is
going to be replaced with gpiolib all users need to be removed or replaced.
It is safe to remove it in this case since it is used to turn a gpio off for
which there is no matching enable function call.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: Ben Dooks <ben-linux@fluff.org>
---
arch/arm/mach-s3c2440/Kconfig | 1 -
arch/arm/mach-s3c2440/mach-gta02.c | 12 ++----------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
index 9d102b9..16e7066 100644
--- a/arch/arm/mach-s3c2440/Kconfig
+++ b/arch/arm/mach-s3c2440/Kconfig
@@ -95,7 +95,6 @@ config MACH_NEO1973_GTA02
bool "Openmoko GTA02 / Freerunner phone"
select CPU_S3C2442
select MFD_PCF50633
- select PCF50633_GPIO
select I2C
select POWER_SUPPLY
select MACH_NEO1973
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index 120a26f..1c7d36d 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -54,7 +54,6 @@
#include <linux/mfd/pcf50633/core.h>
#include <linux/mfd/pcf50633/mbc.h>
#include <linux/mfd/pcf50633/adc.h>
-#include <linux/mfd/pcf50633/gpio.h>
#include <linux/mfd/pcf50633/pmic.h>
#include <linux/mfd/pcf50633/backlight.h>
@@ -167,16 +166,9 @@ gta02_configure_pmu_for_charger(struct pcf50633 *pcf, void *unused, int res)
int ma;
/* Interpret charger type */
- if (res < ((ADC_NOM_CHG_DETECT_USB + ADC_NOM_CHG_DETECT_1A) / 2)) {
-
- /*
- * Sanity - stop GPO driving out now that we have a 1A charger
- * GPO controls USB Host power generation on GTA02
- */
- pcf50633_gpio_set(pcf, PCF50633_GPO, 0);
-
+ if (res < ((ADC_NOM_CHG_DETECT_USB + ADC_NOM_CHG_DETECT_1A) / 2))
ma = 1000;
- } else
+ else
ma = 100;
pcf50633_mbc_usb_curlim_set(pcf, ma);
--
1.5.6.5
next prev parent reply other threads:[~2010-05-12 1:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-12 1:31 [PATCH 0/3] pcf50633: Replace custom gpio api with gpiolib Lars-Peter Clausen
2010-05-12 1:31 ` Lars-Peter Clausen [this message]
2010-05-12 1:31 ` [PATCH 2/3] MFD: pcf50633-gpio: Add gpiolib support Lars-Peter Clausen
2010-05-12 1:31 ` [PATCH 3/3] MFD: pcf50633: Move pcf50633-gpio driver to the gpio drivers folder Lars-Peter Clausen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1273627876-26922-2-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=ben-linux@fluff.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®