aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-10-22 23:14:53 +0200
committerLars-Peter Clausen <lars@metafoo.de>2009-10-22 23:23:41 +0200
commit9f2e82d92c16103afcab79453b18db12666f85f9 (patch)
treebd484c3974cf7ad09ba7e92c770c6ae54381d628
parent1f1ca4f3f01de47f95dbae66ece7aa42363c62d3 (diff)
pcf50606: remove gpo driver
Since it is not use and probably never will be it's safe to remove it.
-rw-r--r--drivers/mfd/Kconfig7
-rw-r--r--drivers/mfd/Makefile1
-rw-r--r--drivers/mfd/pcf50606-gpo.c119
-rw-r--r--include/linux/mfd/pcf50606/gpo.h42
4 files changed, 0 insertions, 169 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 4e952cc7a8f..aa167dde4b7 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -279,13 +279,6 @@ config PCF50606_ADC
Say yes here if you want to include support for ADC in the
NXP PCF50606 chip.
-config PCF50606_GPO
- tristate "Support for NXP PCF50606 GPO"
- depends on MFD_PCF50606
- help
- Say yes here if you want to include support GPO for pins on
- the PCF50606 chip.
-
endmenu
menu "Multimedia Capabilities Port drivers"
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index ba41b36f2c5..b02f8362ee7 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -47,5 +47,4 @@ obj-$(CONFIG_AB3100_CORE) += ab3100-core.o
obj-$(CONFIG_MFD_PCF50606) += pcf50606-core.o
obj-$(CONFIG_PCF50606_ADC) += pcf50606-adc.o
-obj-$(CONFIG_PCF50606_GPO) += pcf50606-gpo.o
diff --git a/drivers/mfd/pcf50606-gpo.c b/drivers/mfd/pcf50606-gpo.c
deleted file mode 100644
index 3510f8b48e9..00000000000
--- a/drivers/mfd/pcf50606-gpo.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Philips PCF50606 GPO Driver
- *
- * (C) 2006-2008 by Openmoko, Inc.
- * Author: Balaji Rao <balajirrao@openmoko.org>
- * All rights reserved.
- *
- * Broken down from monstrous PCF50606 driver mainly by
- * Harald Welte, Andy Green Werner Almesberger and Matt Hsu
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- */
-
-#include <linux/kernel.h>
-
-#include <linux/mfd/pcf50606/core.h>
-#include <linux/mfd/pcf50606/gpo.h>
-
-void pcf50606_gpo_set_active(struct pcf50606 *pcf, int gpo, int val)
-{
- u8 reg, value, mask;
-
- reg = gpo;
- value = val;
- mask = 0x07;
-
- if (gpo == PCF50606_GPO2) {
- value = val << 4;
- mask = 0x07 << 4;
- }
- pcf50606_reg_set_bit_mask(pcf, reg, mask, value);
-}
-EXPORT_SYMBOL_GPL(pcf50606_gpo_set_active);
-
-int pcf50606_gpo_get_active(struct pcf50606 *pcf, int gpo)
-{
- u8 reg, value, shift = 0;
-
- reg = gpo;
- if (gpo == PCF50606_GPO2)
- shift = 4;
-
- value = pcf50606_reg_read(pcf, reg);
-
- return (value >> shift) & 0x07;
-}
-EXPORT_SYMBOL_GPL(pcf50606_gpo_get_active);
-
-void pcf50606_gpo_set_standby(struct pcf50606 *pcf, int gpo, int val)
-{
- u8 reg;
-
- if (gpo == PCF50606_GPO1 || gpo == PCF50606_GPO2) {
- dev_err(pcf->dev, "Can't set standby settings for GPO[12]n");
- return;
- }
-
- reg = gpo;
-
- pcf50606_reg_set_bit_mask(pcf, gpo, 0x07 << 3, val);
-}
-EXPORT_SYMBOL_GPL(pcf50606_gpo_set_standby);
-
-int pcf50606_gpo_get_standby(struct pcf50606 *pcf, int gpo)
-{
- u8 reg, value;
-
- if (gpo == PCF50606_GPO1 || gpo == PCF50606_GPO2) {
- dev_err(pcf->dev, "Can't get standby settings for GPO[12]n");
- return -EINVAL;
- }
-
- reg = gpo;
- value = pcf50606_reg_read(pcf, reg);
-
- return (value >> 3) & 0x07;
-}
-EXPORT_SYMBOL_GPL(pcf50606_gpo_get_standby);
-
-void pcf50606_gpo_invert_set(struct pcf50606 *pcf, int gpo, int invert)
-{
- u8 reg, value, mask;
-
- reg = gpo;
- value = !!invert << 6;
- mask = 0x01 << 6;
-
- if (gpo == PCF50606_GPO1) {
- mask = 0x01 << 4;
- value = !!invert << 4;
- }
- else if (gpo == PCF50606_GPO2) {
- mask = 0x01 << 7;
- value = !!invert << 7;
- }
-
- pcf50606_reg_set_bit_mask(pcf, reg, mask, value);
-}
-EXPORT_SYMBOL_GPL(pcf50606_gpo_invert_set);
-
-int pcf50606_gpo_invert_get(struct pcf50606 *pcf, int gpo)
-{
- u8 reg, value, shift;
-
- reg = gpo;
- shift = 6;
-
- if (gpo == PCF50606_GPO1)
- shift = 4;
- else if (gpo == PCF50606_GPO2)
- shift = 7;
-
- value = pcf50606_reg_read(pcf, reg);
-
- return (value >> shift) & 0x01;
-}
-EXPORT_SYMBOL_GPL(pcf50606_gpo_invert_get);
diff --git a/include/linux/mfd/pcf50606/gpo.h b/include/linux/mfd/pcf50606/gpo.h
deleted file mode 100644
index 081b127d754..00000000000
--- a/include/linux/mfd/pcf50606/gpo.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * gpo.h -- GPO driver for NXP PCF50606
- *
- * (C) 2006-2008 by Openmoko, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- */
-
-#ifndef __LINUX_MFD_PCF50606_GPO_H
-#define __LINUX_MFD_PCF50606_GPO_H
-
-#include <linux/mfd/pcf50633/core.h>
-
-#define PCF50606_REG_GPOC1 0x38
-#define PCF50606_REG_GPOC2 0x39
-#define PCF50606_REG_GPOC3 0x3a
-#define PCF50606_REG_GPOC4 0x3b
-#define PCF50606_REG_GPOC5 0x3c
-
-#define PCF50606_GPO1 PCF50606_REG_GPOC1
-#define PCF50606_GPO2 PCF50606_REG_GPOC1
-#define PCF50606_GPOOD1 PCF50606_REG_GPOC2
-#define PCF50606_GPOOD2 PCF50606_REG_GPOC3
-#define PCF50606_GPOOD3 PCF50606_REG_GPOC4
-#define PCF50606_GPOOD4 PCF50606_REG_GPOC5
-
-#define PCF50606_GPOCFG_GPOSEL_MASK 0x07
-
-void pcf50606_gpo_set_active(struct pcf50606 *pcf, int gpo, int value);
-int pcf50606_gpo_get_active(struct pcf50606 *pcf, int gpo);
-void pcf50606_gpo_set_standby(struct pcf50606 *pcf, int gpo, int value);
-int pcf50606_gpo_get_standby(struct pcf50606 *pcf, int gpo);
-
-void pcf50606_gpo_invert_set(struct pcf50606 *, int gpo, int invert);
-int pcf50606_gpo_invert_get(struct pcf50606 *pcf, int gpo);
-
-#endif /* __LINUX_MFD_PCF50606_GPIO_H */
-