tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

pinctrl: ingenic: Rename registers from JZ4760_GPIO_* to JZ4770_GPIO_*

Now that JZ4760 support has been fixed, it looks wrong to have
JZ4760_GPIO_* registers being written if the SoC is a JZ4770 or later.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20201211232810.261565-2-paul@crapouillou.net
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Paul Cercueil and committed by
Linus Walleij b4aa4876 9a85c09a

+27 -27
+27 -27
drivers/pinctrl/pinctrl-ingenic.c
··· 37 37 #define JZ4740_GPIO_TRIG 0x70 38 38 #define JZ4740_GPIO_FLAG 0x80 39 39 40 - #define JZ4760_GPIO_INT 0x10 41 - #define JZ4760_GPIO_PAT1 0x30 42 - #define JZ4760_GPIO_PAT0 0x40 43 - #define JZ4760_GPIO_FLAG 0x50 44 - #define JZ4760_GPIO_PEN 0x70 40 + #define JZ4770_GPIO_INT 0x10 41 + #define JZ4770_GPIO_PAT1 0x30 42 + #define JZ4770_GPIO_PAT0 0x40 43 + #define JZ4770_GPIO_FLAG 0x50 44 + #define JZ4770_GPIO_PEN 0x70 45 45 46 46 #define X1830_GPIO_PEL 0x110 47 47 #define X1830_GPIO_PEH 0x120 ··· 1689 1689 u8 offset, int value) 1690 1690 { 1691 1691 if (jzgc->jzpc->info->version >= ID_JZ4770) 1692 - ingenic_gpio_set_bit(jzgc, JZ4760_GPIO_PAT0, offset, !!value); 1692 + ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_PAT0, offset, !!value); 1693 1693 else 1694 1694 ingenic_gpio_set_bit(jzgc, JZ4740_GPIO_DATA, offset, !!value); 1695 1695 } ··· 1719 1719 } 1720 1720 1721 1721 if (jzgc->jzpc->info->version >= ID_JZ4770) { 1722 - reg1 = JZ4760_GPIO_PAT1; 1723 - reg2 = JZ4760_GPIO_PAT0; 1722 + reg1 = JZ4770_GPIO_PAT1; 1723 + reg2 = JZ4770_GPIO_PAT0; 1724 1724 } else { 1725 1725 reg1 = JZ4740_GPIO_TRIG; 1726 1726 reg2 = JZ4740_GPIO_DIR; ··· 1759 1759 int irq = irqd->hwirq; 1760 1760 1761 1761 if (jzgc->jzpc->info->version >= ID_JZ4770) 1762 - ingenic_gpio_set_bit(jzgc, JZ4760_GPIO_INT, irq, true); 1762 + ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_INT, irq, true); 1763 1763 else 1764 1764 ingenic_gpio_set_bit(jzgc, JZ4740_GPIO_SELECT, irq, true); 1765 1765 ··· 1775 1775 ingenic_gpio_irq_mask(irqd); 1776 1776 1777 1777 if (jzgc->jzpc->info->version >= ID_JZ4770) 1778 - ingenic_gpio_set_bit(jzgc, JZ4760_GPIO_INT, irq, false); 1778 + ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_INT, irq, false); 1779 1779 else 1780 1780 ingenic_gpio_set_bit(jzgc, JZ4740_GPIO_SELECT, irq, false); 1781 1781 } ··· 1800 1800 } 1801 1801 1802 1802 if (jzgc->jzpc->info->version >= ID_JZ4770) 1803 - ingenic_gpio_set_bit(jzgc, JZ4760_GPIO_FLAG, irq, false); 1803 + ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_FLAG, irq, false); 1804 1804 else 1805 1805 ingenic_gpio_set_bit(jzgc, JZ4740_GPIO_DATA, irq, true); 1806 1806 } ··· 1857 1857 chained_irq_enter(irq_chip, desc); 1858 1858 1859 1859 if (jzgc->jzpc->info->version >= ID_JZ4770) 1860 - flag = ingenic_gpio_read_reg(jzgc, JZ4760_GPIO_FLAG); 1860 + flag = ingenic_gpio_read_reg(jzgc, JZ4770_GPIO_FLAG); 1861 1861 else 1862 1862 flag = ingenic_gpio_read_reg(jzgc, JZ4740_GPIO_FLAG); 1863 1863 ··· 1939 1939 unsigned int pin = gc->base + offset; 1940 1940 1941 1941 if (jzpc->info->version >= ID_JZ4770) { 1942 - if (ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_INT) || 1943 - ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_PAT1)) 1942 + if (ingenic_get_pin_config(jzpc, pin, JZ4770_GPIO_INT) || 1943 + ingenic_get_pin_config(jzpc, pin, JZ4770_GPIO_PAT1)) 1944 1944 return GPIO_LINE_DIRECTION_IN; 1945 1945 return GPIO_LINE_DIRECTION_OUT; 1946 1946 } ··· 1991 1991 'A' + offt, idx, func); 1992 1992 1993 1993 if (jzpc->info->version >= ID_X1000) { 1994 - ingenic_shadow_config_pin(jzpc, pin, JZ4760_GPIO_INT, false); 1994 + ingenic_shadow_config_pin(jzpc, pin, JZ4770_GPIO_INT, false); 1995 1995 ingenic_shadow_config_pin(jzpc, pin, GPIO_MSK, false); 1996 - ingenic_shadow_config_pin(jzpc, pin, JZ4760_GPIO_PAT1, func & 0x2); 1997 - ingenic_shadow_config_pin(jzpc, pin, JZ4760_GPIO_PAT0, func & 0x1); 1996 + ingenic_shadow_config_pin(jzpc, pin, JZ4770_GPIO_PAT1, func & 0x2); 1997 + ingenic_shadow_config_pin(jzpc, pin, JZ4770_GPIO_PAT0, func & 0x1); 1998 1998 ingenic_shadow_config_pin_load(jzpc, pin); 1999 1999 } else if (jzpc->info->version >= ID_JZ4770) { 2000 - ingenic_config_pin(jzpc, pin, JZ4760_GPIO_INT, false); 2000 + ingenic_config_pin(jzpc, pin, JZ4770_GPIO_INT, false); 2001 2001 ingenic_config_pin(jzpc, pin, GPIO_MSK, false); 2002 - ingenic_config_pin(jzpc, pin, JZ4760_GPIO_PAT1, func & 0x2); 2003 - ingenic_config_pin(jzpc, pin, JZ4760_GPIO_PAT0, func & 0x1); 2002 + ingenic_config_pin(jzpc, pin, JZ4770_GPIO_PAT1, func & 0x2); 2003 + ingenic_config_pin(jzpc, pin, JZ4770_GPIO_PAT0, func & 0x1); 2004 2004 } else { 2005 2005 ingenic_config_pin(jzpc, pin, JZ4740_GPIO_FUNC, true); 2006 2006 ingenic_config_pin(jzpc, pin, JZ4740_GPIO_TRIG, func & 0x2); ··· 2057 2057 'A' + offt, idx, input ? "in" : "out"); 2058 2058 2059 2059 if (jzpc->info->version >= ID_X1000) { 2060 - ingenic_shadow_config_pin(jzpc, pin, JZ4760_GPIO_INT, false); 2060 + ingenic_shadow_config_pin(jzpc, pin, JZ4770_GPIO_INT, false); 2061 2061 ingenic_shadow_config_pin(jzpc, pin, GPIO_MSK, true); 2062 - ingenic_shadow_config_pin(jzpc, pin, JZ4760_GPIO_PAT1, input); 2062 + ingenic_shadow_config_pin(jzpc, pin, JZ4770_GPIO_PAT1, input); 2063 2063 ingenic_shadow_config_pin_load(jzpc, pin); 2064 2064 } else if (jzpc->info->version >= ID_JZ4770) { 2065 - ingenic_config_pin(jzpc, pin, JZ4760_GPIO_INT, false); 2065 + ingenic_config_pin(jzpc, pin, JZ4770_GPIO_INT, false); 2066 2066 ingenic_config_pin(jzpc, pin, GPIO_MSK, true); 2067 - ingenic_config_pin(jzpc, pin, JZ4760_GPIO_PAT1, input); 2067 + ingenic_config_pin(jzpc, pin, JZ4770_GPIO_PAT1, input); 2068 2068 } else { 2069 2069 ingenic_config_pin(jzpc, pin, JZ4740_GPIO_SELECT, false); 2070 2070 ingenic_config_pin(jzpc, pin, JZ4740_GPIO_DIR, !input); ··· 2092 2092 bool pull; 2093 2093 2094 2094 if (jzpc->info->version >= ID_JZ4770) 2095 - pull = !ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_PEN); 2095 + pull = !ingenic_get_pin_config(jzpc, pin, JZ4770_GPIO_PEN); 2096 2096 else 2097 2097 pull = !ingenic_get_pin_config(jzpc, pin, JZ4740_GPIO_PULL_DIS); 2098 2098 ··· 2142 2142 } 2143 2143 2144 2144 } else if (jzpc->info->version >= ID_JZ4770) { 2145 - ingenic_config_pin(jzpc, pin, JZ4760_GPIO_PEN, !bias); 2145 + ingenic_config_pin(jzpc, pin, JZ4770_GPIO_PEN, !bias); 2146 2146 } else { 2147 2147 ingenic_config_pin(jzpc, pin, JZ4740_GPIO_PULL_DIS, !bias); 2148 2148 } ··· 2152 2152 unsigned int pin, bool high) 2153 2153 { 2154 2154 if (jzpc->info->version >= ID_JZ4770) 2155 - ingenic_config_pin(jzpc, pin, JZ4760_GPIO_PAT0, high); 2155 + ingenic_config_pin(jzpc, pin, JZ4770_GPIO_PAT0, high); 2156 2156 else 2157 2157 ingenic_config_pin(jzpc, pin, JZ4740_GPIO_DATA, high); 2158 2158 }