aboutsummaryrefslogtreecommitdiff
path: root/drivers/pinctrl/pinctrl-sti.c
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-04-19 12:14:01 +0900
committerTom Rini <trini@konsulko.com>2018-05-07 15:15:27 -0400
commit8c1de5e08b845eb71c9a247d16bc81ebdab0598d (patch)
tree3cfa1a137c58f01b0a658bc53d0efec5c1734aca /drivers/pinctrl/pinctrl-sti.c
parent9ce751a6f5d6683b0fabd3cfc62da7e9f30bc57f (diff)
downloadu-boot-8c1de5e08b845eb71c9a247d16bc81ebdab0598d.zip
u-boot-8c1de5e08b845eb71c9a247d16bc81ebdab0598d.tar.gz
u-boot-8c1de5e08b845eb71c9a247d16bc81ebdab0598d.tar.bz2
regmap: clean up regmap allocation
Putting zero length array at the end of struct is a common technique to embed arbitrary length of members. There is no good reason to let regmap_alloc_count() branch by "if (count <= 1)". As far as I understood the code, regmap->base is an alias of regmap->ranges[0].start, but it is not helpful but make the code just ugly. Rename regmap_alloc_count() to regmap_alloc() because the _count suffix seems pointless. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org> [trini: fixup cpu_info-rcar.c] Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/pinctrl/pinctrl-sti.c')
-rw-r--r--drivers/pinctrl/pinctrl-sti.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c
index ed137d6..f0cd845 100644
--- a/drivers/pinctrl/pinctrl-sti.c
+++ b/drivers/pinctrl/pinctrl-sti.c
@@ -61,7 +61,7 @@ void sti_alternate_select(struct udevice *dev, struct sti_pin_desc *pin_desc)
int bank = pin_desc->bank;
int pin = pin_desc->pin;
- sysconfreg = (unsigned long *)plat->regmap->base;
+ sysconfreg = (unsigned long *)plat->regmap->ranges[0].start;
switch (bank) {
case 0 ... 5: /* in "SBC Bank" */
@@ -95,7 +95,7 @@ void sti_pin_configure(struct udevice *dev, struct sti_pin_desc *pin_desc)
unsigned long *sysconfreg;
int bank = pin_desc->bank;
- sysconfreg = (unsigned long *)plat->regmap->base + 40;
+ sysconfreg = (unsigned long *)plat->regmap->ranges[0].start + 40;
/*
* NOTE: The PIO configuration for the PIO pins in the