Skip to content

[linux6.6.y] pinctrl: zhaoxin: fix issues when builting into module #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
opsiff merged 1 commit into from
Jul 23, 2024
Merged

[linux6.6.y] pinctrl: zhaoxin: fix issues when builting into module #334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions drivers/pinctrl/zhaoxin/pinctrl-zhaoxin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,11 @@
#include <linux/pinctrl/pinmux.h>
#include <linux/pinctrl/pinconf.h>
#include <linux/pinctrl/pinconf-generic.h>
#include <linux/pinctrl/consumer.h>

#include "../core.h"
#include "pinctrl-zhaoxin.h"

static int pin_to_hwgpio(struct pinctrl_gpio_range *range, unsigned int pin)
{
int offset = 0;

if (range->pins) {
for (offset = 0; offset < range->npins; offset++)
if (pin == range->pins[offset])
break;
return range->base+offset-range->gc->base;
} else
return pin-range->pin_base+range->base-range->gc->base;
}

static u16 zx_pad_read16(struct zhaoxin_pinctrl *pctrl, u8 index)
{
outb(index, pctrl->pmio_rx90+pctrl->pmio_base);
Expand Down Expand Up @@ -498,7 +486,7 @@ static int zhaoxin_gpio_irq_type(struct irq_data *d, unsigned int type)
else if (type & IRQ_TYPE_LEVEL_HIGH)
value |= TRIGGER_HIGH_LEVEL << (point*4);
else
pr_debug(pctrl, "%s wrang type\n", __func__);
pr_debug("%s wrong type\n", __func__);

zx_pad_write16(pctrl, index, value);

Expand Down