X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=drivers%2Fgpio%2Fmxs_gpio.c;fp=drivers%2Fgpio%2Fmxs_gpio.c;h=e0e627d36c7af6e6ec44c017886d56a1f2801b20;hb=637b84ce3094c73f1c6c34376af93a81e18ed4bf;hp=82ae23d315e045121bb7ea4154b73a799616cbc6;hpb=01ced72cdb2dde4d334069f6170abf0f27b56dbc;p=karo-tx-uboot.git

diff --git a/drivers/gpio/mxs_gpio.c b/drivers/gpio/mxs_gpio.c
index 82ae23d315..e0e627d36c 100644
--- a/drivers/gpio/mxs_gpio.c
+++ b/drivers/gpio/mxs_gpio.c
@@ -35,13 +35,6 @@
 #error "Please select CONFIG_SOC_MX23 or CONFIG_SOC_MX28"
 #endif
 
-#define GPIO_INT_FALL_EDGE	0x0
-#define GPIO_INT_LOW_LEV	0x1
-#define GPIO_INT_RISE_EDGE	0x2
-#define GPIO_INT_HIGH_LEV	0x3
-#define GPIO_INT_LEV_MASK	(1 << 0)
-#define GPIO_INT_POL_MASK	(1 << 1)
-
 void mxs_gpio_init(void)
 {
 	int i;
@@ -56,59 +49,73 @@ void mxs_gpio_init(void)
 
 int gpio_get_value(unsigned gpio)
 {
-	uint32_t bank = PAD_BANK(gpio);
+	uint32_t bank = MXS_GPIO_TO_BANK(gpio);
 	uint32_t offset = PINCTRL_DIN(bank);
-	struct mxs_register_32 *reg =
-		(struct mxs_register_32 *)(MXS_PINCTRL_BASE + offset);
+	struct mxs_register_32 *reg = (void *)(MXS_PINCTRL_BASE + offset);
+
+	if (bank >= PINCTRL_BANKS)
+		return -EINVAL;
 
-	return (readl(&reg->reg) >> PAD_PIN(gpio)) & 1;
+	return (readl(&reg->reg) >> MXS_GPIO_TO_PIN(gpio)) & 1;
 }
 
 int gpio_set_value(unsigned gpio, int value)
 {
-	uint32_t bank = PAD_BANK(gpio);
+	uint32_t bank = MXS_GPIO_TO_BANK(gpio);
 	uint32_t offset = PINCTRL_DOUT(bank);
-	struct mxs_register_32 *reg =
-		(struct mxs_register_32 *)(MXS_PINCTRL_BASE + offset);
+	struct mxs_register_32 *reg = (void *)(MXS_PINCTRL_BASE + offset);
+
+	if (bank >= PINCTRL_BANKS)
+		return -EINVAL;
 
 	if (value)
-		writel(1 << PAD_PIN(gpio), &reg->reg_set);
+		writel(1 << MXS_GPIO_TO_PIN(gpio), &reg->reg_set);
 	else
-		writel(1 << PAD_PIN(gpio), &reg->reg_clr);
+		writel(1 << MXS_GPIO_TO_PIN(gpio), &reg->reg_clr);
 
 	return 0;
 }
 
 int gpio_direction_input(unsigned gpio)
 {
-	uint32_t bank = PAD_BANK(gpio);
+	uint32_t bank = MXS_GPIO_TO_BANK(gpio);
 	uint32_t offset = PINCTRL_DOE(bank);
-	struct mxs_register_32 *reg =
-		(struct mxs_register_32 *)(MXS_PINCTRL_BASE + offset);
+	struct mxs_register_32 *reg = (void *)(MXS_PINCTRL_BASE + offset);
 
-	writel(1 << PAD_PIN(gpio), &reg->reg_clr);
+	if (bank >= PINCTRL_BANKS)
+		return -EINVAL;
+
+	writel(1 << MXS_GPIO_TO_PIN(gpio), &reg->reg_clr);
 
 	return 0;
 }
 
 int gpio_direction_output(unsigned gpio, int value)
 {
-	uint32_t bank = PAD_BANK(gpio);
+	uint32_t bank = MXS_GPIO_TO_BANK(gpio);
 	uint32_t offset = PINCTRL_DOE(bank);
-	struct mxs_register_32 *reg =
-		(struct mxs_register_32 *)(MXS_PINCTRL_BASE + offset);
+	struct mxs_register_32 *reg = (void *)(MXS_PINCTRL_BASE + offset);
+
+	if (bank >= PINCTRL_BANKS)
+		return -EINVAL;
 
 	gpio_set_value(gpio, value);
 
-	writel(1 << PAD_PIN(gpio), &reg->reg_set);
+	writel(1 << MXS_GPIO_TO_PIN(gpio), &reg->reg_set);
 
 	return 0;
 }
 
 int gpio_request(unsigned gpio, const char *label)
 {
-	if (PAD_BANK(gpio) >= PINCTRL_BANKS)
-		return -1;
+	if (MXS_GPIO_TO_BANK(gpio) >= PINCTRL_BANKS) {
+		printf("%s(): Invalid GPIO%d (GPIO_%u_%u) requested; possibly intended: GPIO_%u_%u\n",
+			__func__, gpio, gpio / 32, gpio % 32,
+			PAD_BANK(gpio), PAD_PIN(gpio));
+		printf("Linear GPIO number required rather than iomux_cfg_t cookie!\n");
+		printf("Possibly missing MXS_PAD_TO_GPIO() in the GPIO specification.\n");
+		return -EINVAL;
+	}
 
 	return 0;
 }