diff options
| -rw-r--r-- | arch/arm/common/scoop.c | 31 | ||||
| -rw-r--r-- | arch/arm/include/asm/hardware/scoop.h | 2 |
2 files changed, 0 insertions, 33 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index 697c64913990..7713a08bb10c 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c | |||
| @@ -124,37 +124,6 @@ static int scoop_gpio_direction_output(struct gpio_chip *chip, | |||
| 124 | return 0; | 124 | return 0; |
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | unsigned short set_scoop_gpio(struct device *dev, unsigned short bit) | ||
| 128 | { | ||
| 129 | unsigned short gpio_bit; | ||
| 130 | unsigned long flag; | ||
| 131 | struct scoop_dev *sdev = dev_get_drvdata(dev); | ||
| 132 | |||
| 133 | spin_lock_irqsave(&sdev->scoop_lock, flag); | ||
| 134 | gpio_bit = ioread16(sdev->base + SCOOP_GPWR) | bit; | ||
| 135 | iowrite16(gpio_bit, sdev->base + SCOOP_GPWR); | ||
| 136 | spin_unlock_irqrestore(&sdev->scoop_lock, flag); | ||
| 137 | |||
| 138 | return gpio_bit; | ||
| 139 | } | ||
| 140 | |||
| 141 | unsigned short reset_scoop_gpio(struct device *dev, unsigned short bit) | ||
| 142 | { | ||
| 143 | unsigned short gpio_bit; | ||
| 144 | unsigned long flag; | ||
| 145 | struct scoop_dev *sdev = dev_get_drvdata(dev); | ||
| 146 | |||
| 147 | spin_lock_irqsave(&sdev->scoop_lock, flag); | ||
| 148 | gpio_bit = ioread16(sdev->base + SCOOP_GPWR) & ~bit; | ||
| 149 | iowrite16(gpio_bit, sdev->base + SCOOP_GPWR); | ||
| 150 | spin_unlock_irqrestore(&sdev->scoop_lock, flag); | ||
| 151 | |||
| 152 | return gpio_bit; | ||
| 153 | } | ||
| 154 | |||
| 155 | EXPORT_SYMBOL(set_scoop_gpio); | ||
| 156 | EXPORT_SYMBOL(reset_scoop_gpio); | ||
| 157 | |||
| 158 | unsigned short read_scoop_reg(struct device *dev, unsigned short reg) | 127 | unsigned short read_scoop_reg(struct device *dev, unsigned short reg) |
| 159 | { | 128 | { |
| 160 | struct scoop_dev *sdev = dev_get_drvdata(dev); | 129 | struct scoop_dev *sdev = dev_get_drvdata(dev); |
diff --git a/arch/arm/include/asm/hardware/scoop.h b/arch/arm/include/asm/hardware/scoop.h index dfb8330599f9..46492a63a7c4 100644 --- a/arch/arm/include/asm/hardware/scoop.h +++ b/arch/arm/include/asm/hardware/scoop.h | |||
| @@ -63,7 +63,5 @@ struct scoop_pcmcia_config { | |||
| 63 | extern struct scoop_pcmcia_config *platform_scoop_config; | 63 | extern struct scoop_pcmcia_config *platform_scoop_config; |
| 64 | 64 | ||
| 65 | void reset_scoop(struct device *dev); | 65 | void reset_scoop(struct device *dev); |
| 66 | unsigned short __deprecated set_scoop_gpio(struct device *dev, unsigned short bit); | ||
| 67 | unsigned short __deprecated reset_scoop_gpio(struct device *dev, unsigned short bit); | ||
| 68 | unsigned short read_scoop_reg(struct device *dev, unsigned short reg); | 66 | unsigned short read_scoop_reg(struct device *dev, unsigned short reg); |
| 69 | void write_scoop_reg(struct device *dev, unsigned short reg, unsigned short data); | 67 | void write_scoop_reg(struct device *dev, unsigned short reg, unsigned short data); |
