spi: Zap lpc32xx_ssp driver-related code

[oweals/u-boot.git] / drivers / gpio / mpc8xxx_gpio.c

diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index d4f3092df0739eda0790448402fb20bf122eb3c6..1dfd22522c7d5d4cba1b647ac76b8231af35b115 100644 (file)
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -57,20 +57,6 @@ static inline u32 mpc8xxx_gpio_get_dir(struct ccsr_gpio *base, u32 mask)
        return in_be32(&base->gpdir) & mask;
 }
 
-static inline void mpc8xxx_gpio_set_low(struct ccsr_gpio *base, u32 gpios)
-{
-       clrbits_be32(&base->gpdat, gpios);
-       /* GPDIR register 1 -> output */
-       setbits_be32(&base->gpdir, gpios);
-}
-
-static inline void mpc8xxx_gpio_set_high(struct ccsr_gpio *base, u32 gpios)
-{
-       setbits_be32(&base->gpdat, gpios);
-       /* GPDIR register 1 -> output */
-       setbits_be32(&base->gpdir, gpios);
-}
-
 static inline int mpc8xxx_gpio_open_drain_val(struct ccsr_gpio *base, u32 mask)
 {
        return in_be32(&base->gpodr) & mask;
@@ -104,14 +90,21 @@ static int mpc8xxx_gpio_direction_input(struct udevice *dev, uint gpio)
 static int mpc8xxx_gpio_set_value(struct udevice *dev, uint gpio, int value)
 {
        struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
+       struct ccsr_gpio *base = data->base;
+       u32 mask = gpio_mask(gpio);
+       u32 gpdir;
 
        if (value) {
-               data->dat_shadow |= gpio_mask(gpio);
-               mpc8xxx_gpio_set_high(data->base, gpio_mask(gpio));
+               data->dat_shadow |= mask;
        } else {
-               data->dat_shadow &= ~gpio_mask(gpio);
-               mpc8xxx_gpio_set_low(data->base, gpio_mask(gpio));
+               data->dat_shadow &= ~mask;
        }
+
+       gpdir = in_be32(&base->gpdir);
+       gpdir |= gpio_mask(gpio);
+       out_be32(&base->gpdat, gpdir & data->dat_shadow);
+       out_be32(&base->gpdir, gpdir);
+
        return 0;
 }
 
@@ -140,26 +133,6 @@ static int mpc8xxx_gpio_get_value(struct udevice *dev, uint gpio)
        return !!mpc8xxx_gpio_get_val(data->base, gpio_mask(gpio));
 }
 
-static int mpc8xxx_gpio_get_open_drain(struct udevice *dev, uint gpio)
-{
-       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
-
-       return !!mpc8xxx_gpio_open_drain_val(data->base, gpio_mask(gpio));
-}
-
-static int mpc8xxx_gpio_set_open_drain(struct udevice *dev, uint gpio,
-                                      int value)
-{
-       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
-
-       if (value)
-               mpc8xxx_gpio_open_drain_on(data->base, gpio_mask(gpio));
-       else
-               mpc8xxx_gpio_open_drain_off(data->base, gpio_mask(gpio));
-
-       return 0;
-}
-
 static int mpc8xxx_gpio_get_function(struct udevice *dev, uint gpio)
 {
        struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
@@ -236,8 +209,6 @@ static const struct dm_gpio_ops gpio_mpc8xxx_ops = {
        .direction_output       = mpc8xxx_gpio_direction_output,
        .get_value              = mpc8xxx_gpio_get_value,
        .set_value              = mpc8xxx_gpio_set_value,
-       .get_open_drain         = mpc8xxx_gpio_get_open_drain,
-       .set_open_drain         = mpc8xxx_gpio_set_open_drain,
        .get_function           = mpc8xxx_gpio_get_function,
 };