Merge branch 'u-boot/master' into u-boot-arm/master

[karo-tx-uboot.git] / drivers / gpio / mxs_gpio.c

diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index b7e959128e8e8b40f4da2bc8c87f259f28136aff..d9a7a3aaf663e971b4b28b96801e4f402a6ced51 100644 (file)
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -4,23 +4,7 @@
  * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
  * on behalf of DENX Software Engineering GmbH
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -69,68 +53,64 @@ void mxs_gpio_init(void)
        }
 }
 
-int gpio_get_value(int gp)
+int gpio_get_value(unsigned gpio)
 {
-       uint32_t bank = PAD_BANK(gp);
+       uint32_t bank = PAD_BANK(gpio);
        uint32_t offset = PINCTRL_DIN(bank);
-       struct mx28_register *reg =
-               (struct mx28_register *)(MXS_PINCTRL_BASE + offset);
+       struct mxs_register_32 *reg =
+               (struct mxs_register_32 *)(MXS_PINCTRL_BASE + offset);
 
-       return (readl(&reg->reg) >> PAD_PIN(gp)) & 1;
+       return (readl(&reg->reg) >> PAD_PIN(gpio)) & 1;
 }
 
-void gpio_set_value(int gp, int value)
+void gpio_set_value(unsigned gpio, int value)
 {
-       uint32_t bank = PAD_BANK(gp);
+       uint32_t bank = PAD_BANK(gpio);
        uint32_t offset = PINCTRL_DOUT(bank);
-       struct mx28_register *reg =
-               (struct mx28_register *)(MXS_PINCTRL_BASE + offset);
+       struct mxs_register_32 *reg =
+               (struct mxs_register_32 *)(MXS_PINCTRL_BASE + offset);
 
        if (value)
-               writel(1 << PAD_PIN(gp), &reg->reg_set);
+               writel(1 << PAD_PIN(gpio), &reg->reg_set);
        else
-               writel(1 << PAD_PIN(gp), &reg->reg_clr);
+               writel(1 << PAD_PIN(gpio), &reg->reg_clr);
 }
 
-int gpio_direction_input(int gp)
+int gpio_direction_input(unsigned gpio)
 {
-       uint32_t bank = PAD_BANK(gp);
+       uint32_t bank = PAD_BANK(gpio);
        uint32_t offset = PINCTRL_DOE(bank);
-       struct mx28_register *reg =
-               (struct mx28_register *)(MXS_PINCTRL_BASE + offset);
+       struct mxs_register_32 *reg =
+               (struct mxs_register_32 *)(MXS_PINCTRL_BASE + offset);
 
-       writel(1 << PAD_PIN(gp), &reg->reg_clr);
+       writel(1 << PAD_PIN(gpio), &reg->reg_clr);
 
        return 0;
 }
 
-int gpio_direction_output(int gp, int value)
+int gpio_direction_output(unsigned gpio, int value)
 {
-       uint32_t bank = PAD_BANK(gp);
+       uint32_t bank = PAD_BANK(gpio);
        uint32_t offset = PINCTRL_DOE(bank);
-       struct mx28_register *reg =
-               (struct mx28_register *)(MXS_PINCTRL_BASE + offset);
+       struct mxs_register_32 *reg =
+               (struct mxs_register_32 *)(MXS_PINCTRL_BASE + offset);
 
-       writel(1 << PAD_PIN(gp), &reg->reg_set);
+       writel(1 << PAD_PIN(gpio), &reg->reg_set);
 
-       gpio_set_value(gp, value);
+       gpio_set_value(gpio, value);
 
        return 0;
 }
 
-int gpio_request(int gp, const char *label)
+int gpio_request(unsigned gpio, const char *label)
 {
-       if (PAD_BANK(gp) > PINCTRL_BANKS)
-               return -EINVAL;
+       if (PAD_BANK(gpio) >= PINCTRL_BANKS)
+               return -1;
 
        return 0;
 }
 
-void gpio_free(int gp)
+int gpio_free(unsigned gpio)
 {
-}
-
-void gpio_toggle_value(int gp)
-{
-       gpio_set_value(gp, !gpio_get_value(gp));
+       return 0;
 }