UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

sh-pfc: Rename sh_pfc window field to windows 

There's more than one window, name the field windows.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Laurent Pinchart 2013-12-11 04:26:25 +01:00 committed by Linus Walleij
parent de55c71feb
commit 5b46ac3a77
7 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/pinctrl/sh-pfc/core.c
View File

@ -34,20 +34,21 @@ static int sh_pfc_ioremap(struct sh_pfc *pfc, struct platform_device *pdev)
if (pdev->num_resources == 0) if (pdev->num_resources == 0)
return -EINVAL; return -EINVAL;
pfc->window = devm_kzalloc(pfc->dev, pdev->num_resources * pfc->windows = devm_kzalloc(pfc->dev, pdev->num_resources *
sizeof(*pfc->window), GFP_NOWAIT); sizeof(*pfc->windows), GFP_NOWAIT);
if (!pfc->window) if (!pfc->windows)
return -ENOMEM; return -ENOMEM;
pfc->num_windows = pdev->num_resources; pfc->num_windows = pdev->num_resources;
for (k = 0, res = pdev->resource; k < pdev->num_resources; k++, res++) { for (k = 0, res = pdev->resource; k < pdev->num_resources; k++, res++) {
WARN_ON(resource_type(res) != IORESOURCE_MEM); WARN_ON(resource_type(res) != IORESOURCE_MEM);
pfc->window[k].phys = res->start; pfc->windows[k].phys = res->start;
pfc->window[k].size = resource_size(res); pfc->windows[k].size = resource_size(res);
pfc->window[k].virt = devm_ioremap_nocache(pfc->dev, res->start, pfc->windows[k].virt =
resource_size(res)); devm_ioremap_nocache(pfc->dev, res->start,
if (!pfc->window[k].virt) resource_size(res));
if (!pfc->windows[k].virt)
return -ENOMEM; return -ENOMEM;
} }
@ -62,7 +63,7 @@ static void __iomem *sh_pfc_phys_to_virt(struct sh_pfc *pfc,
/* scan through physical windows and convert address */ /* scan through physical windows and convert address */
for (i = 0; i < pfc->num_windows; i++) { for (i = 0; i < pfc->num_windows; i++) {
window = pfc->window + i; window = pfc->windows + i;
if (address < window->phys) if (address < window->phys)
continue; continue;

2
drivers/pinctrl/sh-pfc/core.h
View File

@ -37,7 +37,7 @@ struct sh_pfc {
spinlock_t lock; spinlock_t lock;
unsigned int num_windows; unsigned int num_windows;
struct sh_pfc_window *window; struct sh_pfc_window *windows;
struct sh_pfc_pin_range *ranges; struct sh_pfc_pin_range *ranges;
unsigned int nr_ranges; unsigned int nr_ranges;

4
drivers/pinctrl/sh-pfc/gpio.c
View File

@ -347,7 +347,7 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
* GPIOs. * GPIOs.
*/ */
for (i = 0; i < pfc->num_windows; ++i) { for (i = 0; i < pfc->num_windows; ++i) {
struct sh_pfc_window *window = &pfc->window[i]; struct sh_pfc_window *window = &pfc->windows[i];
if (pfc->info->data_regs[0].reg >= window->phys && if (pfc->info->data_regs[0].reg >= window->phys &&
pfc->info->data_regs[0].reg < window->phys + window->size) pfc->info->data_regs[0].reg < window->phys + window->size)
@ -358,7 +358,7 @@ int sh_pfc_register_gpiochip(struct sh_pfc *pfc)
return 0; return 0;
/* Register the real GPIOs chip. */ /* Register the real GPIOs chip. */
chip = sh_pfc_add_gpiochip(pfc, gpio_pin_setup, &pfc->window[i]); chip = sh_pfc_add_gpiochip(pfc, gpio_pin_setup, &pfc->windows[i]);
if (IS_ERR(chip)) if (IS_ERR(chip))
return PTR_ERR(chip); return PTR_ERR(chip);

4
drivers/pinctrl/sh-pfc/pfc-r8a73a4.c
View File

@ -2680,7 +2680,7 @@ static unsigned int r8a73a4_pinmux_get_bias(struct sh_pfc *pfc,
{ {
void __iomem *addr; void __iomem *addr;
addr = pfc->window->virt + r8a73a4_portcr_offsets[pin >> 5] + pin; addr = pfc->windows->virt + r8a73a4_portcr_offsets[pin >> 5] + pin;
switch (ioread8(addr) & PORTCR_PULMD_MASK) { switch (ioread8(addr) & PORTCR_PULMD_MASK) {
case PORTCR_PULMD_UP: case PORTCR_PULMD_UP:
@ -2699,7 +2699,7 @@ static void r8a73a4_pinmux_set_bias(struct sh_pfc *pfc, unsigned int pin,
void __iomem *addr; void __iomem *addr;
u32 value; u32 value;
addr = pfc->window->virt + r8a73a4_portcr_offsets[pin >> 5] + pin; addr = pfc->windows->virt + r8a73a4_portcr_offsets[pin >> 5] + pin;
value = ioread8(addr) & ~PORTCR_PULMD_MASK; value = ioread8(addr) & ~PORTCR_PULMD_MASK;
switch (bias) { switch (bias) {

2
drivers/pinctrl/sh-pfc/pfc-r8a7740.c
View File

@ -3710,7 +3710,7 @@ static void __iomem *r8a7740_pinmux_portcr(struct sh_pfc *pfc, unsigned int pin)
&r8a7740_portcr_offsets[i]; &r8a7740_portcr_offsets[i];
if (i <= group->end_pin) if (i <= group->end_pin)
return pfc->window->virt + group->offset + pin; return pfc->windows->virt + group->offset + pin;
} }
return NULL; return NULL;

2
drivers/pinctrl/sh-pfc/pfc-sh7372.c
View File

@ -2574,7 +2574,7 @@ static void __iomem *sh7372_pinmux_portcr(struct sh_pfc *pfc, unsigned int pin)
&sh7372_portcr_offsets[i]; &sh7372_portcr_offsets[i];
if (i <= group->end_pin) if (i <= group->end_pin)
return pfc->window->virt + group->offset + pin; return pfc->windows->virt + group->offset + pin;
} }
return NULL; return NULL;

8
drivers/pinctrl/sh-pfc/pfc-sh73a0.c
View File

@ -3692,7 +3692,7 @@ static const struct pinmux_irq pinmux_irqs[] = {
static void sh73a0_vccq_mc0_endisable(struct regulator_dev *reg, bool enable) static void sh73a0_vccq_mc0_endisable(struct regulator_dev *reg, bool enable)
{ {
struct sh_pfc *pfc = reg->reg_data; struct sh_pfc *pfc = reg->reg_data;
void __iomem *addr = pfc->window[1].virt + 4; void __iomem *addr = pfc->windows[1].virt + 4;
unsigned long flags; unsigned long flags;
u32 value; u32 value;
@ -3725,7 +3725,7 @@ static int sh73a0_vccq_mc0_disable(struct regulator_dev *reg)
static int sh73a0_vccq_mc0_is_enabled(struct regulator_dev *reg) static int sh73a0_vccq_mc0_is_enabled(struct regulator_dev *reg)
{ {
struct sh_pfc *pfc = reg->reg_data; struct sh_pfc *pfc = reg->reg_data;
void __iomem *addr = pfc->window[1].virt + 4; void __iomem *addr = pfc->windows[1].virt + 4;
unsigned long flags; unsigned long flags;
u32 value; u32 value;
@ -3784,7 +3784,7 @@ static const unsigned int sh73a0_portcr_offsets[] = {
static unsigned int sh73a0_pinmux_get_bias(struct sh_pfc *pfc, unsigned int pin) static unsigned int sh73a0_pinmux_get_bias(struct sh_pfc *pfc, unsigned int pin)
{ {
void __iomem *addr = pfc->window->virt void __iomem *addr = pfc->windows->virt
+ sh73a0_portcr_offsets[pin >> 5] + pin; + sh73a0_portcr_offsets[pin >> 5] + pin;
u32 value = ioread8(addr) & PORTnCR_PULMD_MASK; u32 value = ioread8(addr) & PORTnCR_PULMD_MASK;
@ -3802,7 +3802,7 @@ static unsigned int sh73a0_pinmux_get_bias(struct sh_pfc *pfc, unsigned int pin)
static void sh73a0_pinmux_set_bias(struct sh_pfc *pfc, unsigned int pin, static void sh73a0_pinmux_set_bias(struct sh_pfc *pfc, unsigned int pin,
unsigned int bias) unsigned int bias)
{ {
void __iomem *addr = pfc->window->virt void __iomem *addr = pfc->windows->virt
+ sh73a0_portcr_offsets[pin >> 5] + pin; + sh73a0_portcr_offsets[pin >> 5] + pin;
u32 value = ioread8(addr) & ~PORTnCR_PULMD_MASK; u32 value = ioread8(addr) & ~PORTnCR_PULMD_MASK;