qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rockchip: resource: fix parse gpio base address error 

We should parse node name to identify the gpio port before
reading base address, it avoids to use miss match address.

Move out gpio_parse_base_address() from sub string parse is
better.

Set gpio as input mode before reading.

Change-Id: Iffd4ef7f3ceb1bb56a65680265af74ca50b14712
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2019-04-15 17:52:53 +08:00 committed by Jianhong Chen
parent efb93541fe
commit ff21a545f5
1 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
arch/arm/mach-rockchip/resource_img.c
View File

@ -414,6 +414,7 @@ int rockchip_read_resource_file(void *buf, const char *name,
#define KEY_WORDS_ADC_CTRL "#_" #define KEY_WORDS_ADC_CTRL "#_"
#define KEY_WORDS_ADC_CH "_ch" #define KEY_WORDS_ADC_CH "_ch"
#define KEY_WORDS_GPIO "#gpio" #define KEY_WORDS_GPIO "#gpio"
#define GPIO_SWPORT_DDR 0x04
#define GPIO_EXT_PORT 0x50 #define GPIO_EXT_PORT 0x50
#define MAX_ADC_CH_NR 10 #define MAX_ADC_CH_NR 10
#define MAX_GPIO_NR 10 #define MAX_GPIO_NR 10
@ -518,7 +519,8 @@ static int gpio_parse_base_address(fdt_addr_t *gpio_base_addr)
{ {
static int initial; static int initial;
ofnode parent, node; ofnode parent, node;
int i = 0; const char *name;
int idx, nr = 0;
if (initial) if (initial)
return 0; return 0;
@ -535,11 +537,19 @@ static int gpio_parse_base_address(fdt_addr_t *gpio_base_addr)
continue; continue;
} }
gpio_base_addr[i++] = ofnode_get_addr(node); name = ofnode_get_name(node);
debug(" - gpio%d: 0x%x\n", i - 1, (uint32_t)gpio_base_addr[i - 1]); if (!is_digit((char)*(name + 4))) {
debug(" - bad gpio node name: %s\n", name);
continue;
} }
if (i == 0) { nr++;
idx = *(name + 4) - '0';
gpio_base_addr[idx] = ofnode_get_addr(node);
debug(" - gpio%d: 0x%x\n", idx, (uint32_t)gpio_base_addr[idx]);
}
if (nr == 0) {
debug(" - parse gpio address failed\n"); debug(" - parse gpio address failed\n");
return -EINVAL; return -EINVAL;
} }
@ -574,6 +584,14 @@ static int rockchip_read_dtb_by_gpio(const char *file_name)
debug("%s\n", file_name); debug("%s\n", file_name);
/* Parse gpio address */
memset(gpio_base_addr, 0, sizeof(gpio_base_addr));
ret = gpio_parse_base_address(gpio_base_addr);
if (ret) {
debug(" - Can't parse gpio base address: %d\n", ret);
return ret;
}
strgpio = strstr(file_name, KEY_WORDS_GPIO); strgpio = strstr(file_name, KEY_WORDS_GPIO);
while (strgpio) { while (strgpio) {
debug(" - substr: %s\n", strgpio); debug(" - substr: %s\n", strgpio);
@ -588,13 +606,6 @@ static int rockchip_read_dtb_by_gpio(const char *file_name)
return -EINVAL; return -EINVAL;
} }
/* Parse gpio address */
ret = gpio_parse_base_address(gpio_base_addr);
if (ret) {
debug(" - Can't parse gpio base address: %d\n", ret);
return ret;
}
/* Read gpio value */ /* Read gpio value */
port = *(p + 0) - '0'; port = *(p + 0) - '0';
bank = *(p + 1) - 'a'; bank = *(p + 1) - 'a';
@ -606,9 +617,20 @@ static int rockchip_read_dtb_by_gpio(const char *file_name)
* is enough. We use cached_v[] to save what we have read, zero * is enough. We use cached_v[] to save what we have read, zero
* means not read before. * means not read before.
*/ */
if (cached_v[port] == 0) if (cached_v[port] == 0) {
if (!gpio_base_addr[port]) {
debug(" - can't find gpio%d base address\n", port);
return 0;
}
/* Input mode */
val = readl(gpio_base_addr[port] + GPIO_SWPORT_DDR);
val &= ~(1 << (bank * 8 + pin));
writel(val, gpio_base_addr[port] + GPIO_SWPORT_DDR);
cached_v[port] = cached_v[port] =
readl(gpio_base_addr[port] + GPIO_EXT_PORT); readl(gpio_base_addr[port] + GPIO_EXT_PORT);
}
/* Verify result */ /* Verify result */
bit = bank * 8 + pin; bit = bank * 8 + pin;
@ -623,7 +645,7 @@ static int rockchip_read_dtb_by_gpio(const char *file_name)
} }
debug(" - parse: gpio%d%c%d=%d, read=%d %s\n", debug(" - parse: gpio%d%c%d=%d, read=%d %s\n",
port, bank + 'a', pin, lvl, val, found ? "(Y)" : ""); port, bank + 'a', pin, lvl, val, found ? "(Y)" : "(N)");
} }
return found ? 0 : -ENOENT; return found ? 0 : -ENOENT;