kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pinctrl: Ingenic: Unify the function name prefix to "ingenic_gpio_".

Browse source 
In the original code, some function names begin with "ingenic_gpio_",
and some with "gpio_ingenic_". For the sake of uniform style,
all of them are changed to the beginning of "ingenic_gpio_".

Signed-off-by: Zhou Yanjie <zhouyanjie@cduestc.edu.cn>
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Zhou Yanjie 2019-01-28 23:19:59 +08:00 committed by Linus Walleij
parent 5de1a73e78
commit b71c184412
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
drivers/pinctrl/pinctrl-ingenic.c
View file

@ -715,7 +715,7 @@ static const struct ingenic_chip_info jz4780_chip_info = {
.pull_downs = jz4770_pull_downs, .pull_downs = jz4770_pull_downs,
}; };
static u32 gpio_ingenic_read_reg(struct ingenic_gpio_chip *jzgc, u8 reg) static u32 ingenic_gpio_read_reg(struct ingenic_gpio_chip *jzgc, u8 reg)
{ {
unsigned int val; unsigned int val;
@ -724,7 +724,7 @@ static u32 gpio_ingenic_read_reg(struct ingenic_gpio_chip *jzgc, u8 reg)
return (u32) val; return (u32) val;
} }
static void gpio_ingenic_set_bit(struct ingenic_gpio_chip *jzgc, static void ingenic_gpio_set_bit(struct ingenic_gpio_chip *jzgc,
u8 reg, u8 offset, bool set) u8 reg, u8 offset, bool set)
{ {
if (set) if (set)
@ -738,7 +738,7 @@ static void gpio_ingenic_set_bit(struct ingenic_gpio_chip *jzgc,
static inline bool ingenic_gpio_get_value(struct ingenic_gpio_chip *jzgc, static inline bool ingenic_gpio_get_value(struct ingenic_gpio_chip *jzgc,
u8 offset) u8 offset)
{ {
unsigned int val = gpio_ingenic_read_reg(jzgc, GPIO_PIN); unsigned int val = ingenic_gpio_read_reg(jzgc, GPIO_PIN);
return !!(val & BIT(offset)); return !!(val & BIT(offset));
} }
@ -747,9 +747,9 @@ static void ingenic_gpio_set_value(struct ingenic_gpio_chip *jzgc,
u8 offset, int value) u8 offset, int value)
{ {
if (jzgc->jzpc->version >= ID_JZ4770) if (jzgc->jzpc->version >= ID_JZ4770)
gpio_ingenic_set_bit(jzgc, JZ4770_GPIO_PAT0, offset, !!value); ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_PAT0, offset, !!value);
else else
gpio_ingenic_set_bit(jzgc, JZ4740_GPIO_DATA, offset, !!value); ingenic_gpio_set_bit(jzgc, JZ4740_GPIO_DATA, offset, !!value);
} }
static void irq_set_type(struct ingenic_gpio_chip *jzgc, static void irq_set_type(struct ingenic_gpio_chip *jzgc,
@ -767,21 +767,21 @@ static void irq_set_type(struct ingenic_gpio_chip *jzgc,
switch (type) { switch (type) {
case IRQ_TYPE_EDGE_RISING: case IRQ_TYPE_EDGE_RISING:
gpio_ingenic_set_bit(jzgc, reg2, offset, true); ingenic_gpio_set_bit(jzgc, reg2, offset, true);
gpio_ingenic_set_bit(jzgc, reg1, offset, true); ingenic_gpio_set_bit(jzgc, reg1, offset, true);
break; break;
case IRQ_TYPE_EDGE_FALLING: case IRQ_TYPE_EDGE_FALLING:
gpio_ingenic_set_bit(jzgc, reg2, offset, false); ingenic_gpio_set_bit(jzgc, reg2, offset, false);
gpio_ingenic_set_bit(jzgc, reg1, offset, true); ingenic_gpio_set_bit(jzgc, reg1, offset, true);
break; break;
case IRQ_TYPE_LEVEL_HIGH: case IRQ_TYPE_LEVEL_HIGH:
gpio_ingenic_set_bit(jzgc, reg2, offset, true); ingenic_gpio_set_bit(jzgc, reg2, offset, true);
gpio_ingenic_set_bit(jzgc, reg1, offset, false); ingenic_gpio_set_bit(jzgc, reg1, offset, false);
break; break;
case IRQ_TYPE_LEVEL_LOW: case IRQ_TYPE_LEVEL_LOW:
default: default:
gpio_ingenic_set_bit(jzgc, reg2, offset, false); ingenic_gpio_set_bit(jzgc, reg2, offset, false);
gpio_ingenic_set_bit(jzgc, reg1, offset, false); ingenic_gpio_set_bit(jzgc, reg1, offset, false);
break; break;
} }
} }
@ -791,7 +791,7 @@ static void ingenic_gpio_irq_mask(struct irq_data *irqd)
struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd); struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc); struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
gpio_ingenic_set_bit(jzgc, GPIO_MSK, irqd->hwirq, true); ingenic_gpio_set_bit(jzgc, GPIO_MSK, irqd->hwirq, true);
} }
static void ingenic_gpio_irq_unmask(struct irq_data *irqd) static void ingenic_gpio_irq_unmask(struct irq_data *irqd)
@ -799,7 +799,7 @@ static void ingenic_gpio_irq_unmask(struct irq_data *irqd)
struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd); struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc); struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
gpio_ingenic_set_bit(jzgc, GPIO_MSK, irqd->hwirq, false); ingenic_gpio_set_bit(jzgc, GPIO_MSK, irqd->hwirq, false);
} }
static void ingenic_gpio_irq_enable(struct irq_data *irqd) static void ingenic_gpio_irq_enable(struct irq_data *irqd)
@ -809,9 +809,9 @@ static void ingenic_gpio_irq_enable(struct irq_data *irqd)
int irq = irqd->hwirq; int irq = irqd->hwirq;
if (jzgc->jzpc->version >= ID_JZ4770) if (jzgc->jzpc->version >= ID_JZ4770)
gpio_ingenic_set_bit(jzgc, JZ4770_GPIO_INT, irq, true); ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_INT, irq, true);
else else
gpio_ingenic_set_bit(jzgc, JZ4740_GPIO_SELECT, irq, true); ingenic_gpio_set_bit(jzgc, JZ4740_GPIO_SELECT, irq, true);
ingenic_gpio_irq_unmask(irqd); ingenic_gpio_irq_unmask(irqd);
} }
@ -825,9 +825,9 @@ static void ingenic_gpio_irq_disable(struct irq_data *irqd)
ingenic_gpio_irq_mask(irqd); ingenic_gpio_irq_mask(irqd);
if (jzgc->jzpc->version >= ID_JZ4770) if (jzgc->jzpc->version >= ID_JZ4770)
gpio_ingenic_set_bit(jzgc, JZ4770_GPIO_INT, irq, false); ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_INT, irq, false);
else else
gpio_ingenic_set_bit(jzgc, JZ4740_GPIO_SELECT, irq, false); ingenic_gpio_set_bit(jzgc, JZ4740_GPIO_SELECT, irq, false);
} }
static void ingenic_gpio_irq_ack(struct irq_data *irqd) static void ingenic_gpio_irq_ack(struct irq_data *irqd)
@ -850,9 +850,9 @@ static void ingenic_gpio_irq_ack(struct irq_data *irqd)
} }
if (jzgc->jzpc->version >= ID_JZ4770) if (jzgc->jzpc->version >= ID_JZ4770)
gpio_ingenic_set_bit(jzgc, JZ4770_GPIO_FLAG, irq, false); ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_FLAG, irq, false);
else else
gpio_ingenic_set_bit(jzgc, JZ4740_GPIO_DATA, irq, true); ingenic_gpio_set_bit(jzgc, JZ4740_GPIO_DATA, irq, true);
} }
static int ingenic_gpio_irq_set_type(struct irq_data *irqd, unsigned int type) static int ingenic_gpio_irq_set_type(struct irq_data *irqd, unsigned int type)
@ -907,9 +907,9 @@ static void ingenic_gpio_irq_handler(struct irq_desc *desc)
chained_irq_enter(irq_chip, desc); chained_irq_enter(irq_chip, desc);
if (jzgc->jzpc->version >= ID_JZ4770) if (jzgc->jzpc->version >= ID_JZ4770)
flag = gpio_ingenic_read_reg(jzgc, JZ4770_GPIO_FLAG); flag = ingenic_gpio_read_reg(jzgc, JZ4770_GPIO_FLAG);
else else
flag = gpio_ingenic_read_reg(jzgc, JZ4740_GPIO_FLAG); flag = ingenic_gpio_read_reg(jzgc, JZ4740_GPIO_FLAG);
for_each_set_bit(i, &flag, 32) for_each_set_bit(i, &flag, 32)
generic_handle_irq(irq_linear_revmap(gc->irq.domain, i)); generic_handle_irq(irq_linear_revmap(gc->irq.domain, i));