提交 770f53d4 编写于 作者: A Andy Shevchenko

pinctrl: baytrail: Switch to to embedded struct pingroup

Since struct intel_pingroup got a new member, switch the driver to use it.
Signed-off-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: NMika Westerberg <mika.westerberg@linux.intel.com>
上级 277b95a9
...@@ -603,7 +603,7 @@ static const char *byt_get_group_name(struct pinctrl_dev *pctldev, ...@@ -603,7 +603,7 @@ static const char *byt_get_group_name(struct pinctrl_dev *pctldev,
{ {
struct intel_pinctrl *vg = pinctrl_dev_get_drvdata(pctldev); struct intel_pinctrl *vg = pinctrl_dev_get_drvdata(pctldev);
return vg->soc->groups[selector].name; return vg->soc->groups[selector].grp.name;
} }
static int byt_get_group_pins(struct pinctrl_dev *pctldev, static int byt_get_group_pins(struct pinctrl_dev *pctldev,
...@@ -613,8 +613,8 @@ static int byt_get_group_pins(struct pinctrl_dev *pctldev, ...@@ -613,8 +613,8 @@ static int byt_get_group_pins(struct pinctrl_dev *pctldev,
{ {
struct intel_pinctrl *vg = pinctrl_dev_get_drvdata(pctldev); struct intel_pinctrl *vg = pinctrl_dev_get_drvdata(pctldev);
*pins = vg->soc->groups[selector].pins; *pins = vg->soc->groups[selector].grp.pins;
*num_pins = vg->soc->groups[selector].npins; *num_pins = vg->soc->groups[selector].grp.npins;
return 0; return 0;
} }
...@@ -662,15 +662,15 @@ static void byt_set_group_simple_mux(struct intel_pinctrl *vg, ...@@ -662,15 +662,15 @@ static void byt_set_group_simple_mux(struct intel_pinctrl *vg,
raw_spin_lock_irqsave(&byt_lock, flags); raw_spin_lock_irqsave(&byt_lock, flags);
for (i = 0; i < group.npins; i++) { for (i = 0; i < group.grp.npins; i++) {
void __iomem *padcfg0; void __iomem *padcfg0;
u32 value; u32 value;
padcfg0 = byt_gpio_reg(vg, group.pins[i], BYT_CONF0_REG); padcfg0 = byt_gpio_reg(vg, group.grp.pins[i], BYT_CONF0_REG);
if (!padcfg0) { if (!padcfg0) {
dev_warn(vg->dev, dev_warn(vg->dev,
"Group %s, pin %i not muxed (no padcfg0)\n", "Group %s, pin %i not muxed (no padcfg0)\n",
group.name, i); group.grp.name, i);
continue; continue;
} }
...@@ -692,15 +692,15 @@ static void byt_set_group_mixed_mux(struct intel_pinctrl *vg, ...@@ -692,15 +692,15 @@ static void byt_set_group_mixed_mux(struct intel_pinctrl *vg,
raw_spin_lock_irqsave(&byt_lock, flags); raw_spin_lock_irqsave(&byt_lock, flags);
for (i = 0; i < group.npins; i++) { for (i = 0; i < group.grp.npins; i++) {
void __iomem *padcfg0; void __iomem *padcfg0;
u32 value; u32 value;
padcfg0 = byt_gpio_reg(vg, group.pins[i], BYT_CONF0_REG); padcfg0 = byt_gpio_reg(vg, group.grp.pins[i], BYT_CONF0_REG);
if (!padcfg0) { if (!padcfg0) {
dev_warn(vg->dev, dev_warn(vg->dev,
"Group %s, pin %i not muxed (no padcfg0)\n", "Group %s, pin %i not muxed (no padcfg0)\n",
group.name, i); group.grp.name, i);
continue; continue;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册