mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 u-boot/drivers/gpio/rk_gpio.c
..
..
@@ -130,7 +130,6 @@
130
130
 	struct rockchip_pinctrl_priv *pctrl_priv;
131
131
 	struct rockchip_pin_bank *bank;
132
132
 	char *end = NULL;
133
-	static int gpio;
134
133
 	int id = -1, ret;
135
134
 
136
135
 	priv->regs = dev_read_addr_ptr(dev);
..
..
@@ -152,14 +151,12 @@
152
151
 	end = strrchr(dev->name, '@');
153
152
 	if (end)
154
153
 		id = trailing_strtoln(dev->name, end);
155
-	else
154
+	if (id < 0)
156
155
 		dev_read_alias_seq(dev, &id);
157
156
 
158
-	if (id < 0)
159
-		id = gpio++;
160
-
161
-	if (id >= pctrl_priv->ctrl->nr_banks) {
162
-		dev_err(dev, "bank id invalid\n");
157
+	if (id < 0 || id >= pctrl_priv->ctrl->nr_banks) {
158
+		dev_err(dev, "nr_banks=%d, bank id=%d invalid\n",
159
+			pctrl_priv->ctrl->nr_banks, id);
163
160
 		return -EINVAL;
164
161
 	}
165
162