openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gpio: omap: constify register tables 

We must never alter the register tables; these are read-only as far
as the driver is concerned.  Constify these tables.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Russell King 2019-06-10 20:11:00 +03:00 committed by Linus Walleij
parent 9c7f798d17
commit 18bd49c4c7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpio/gpio-omap.c
View File

@ -48,6 +48,8 @@ struct gpio_regs {
struct gpio_bank { struct gpio_bank {
void __iomem *base; void __iomem *base;
const struct omap_gpio_reg_offs *regs;
int irq; int irq;
u32 non_wakeup_gpios; u32 non_wakeup_gpios;
u32 enabled_non_wakeup_gpios; u32 enabled_non_wakeup_gpios;
@ -75,8 +77,6 @@ struct gpio_bank {
void (*set_dataout)(struct gpio_bank *bank, unsigned gpio, int enable); void (*set_dataout)(struct gpio_bank *bank, unsigned gpio, int enable);
int (*get_context_loss_count)(struct device *dev); int (*get_context_loss_count)(struct device *dev);
struct omap_gpio_reg_offs *regs;
}; };
#define GPIO_MOD_CTRL_BIT BIT(0) #define GPIO_MOD_CTRL_BIT BIT(0)
@ -1075,7 +1075,7 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc)
static void omap_gpio_init_context(struct gpio_bank *p) static void omap_gpio_init_context(struct gpio_bank *p)
{ {
struct omap_gpio_reg_offs *regs = p->regs; const struct omap_gpio_reg_offs *regs = p->regs;
void __iomem *base = p->base; void __iomem *base = p->base;
p->context.ctrl = readl_relaxed(base + regs->ctrl); p->context.ctrl = readl_relaxed(base + regs->ctrl);
@ -1094,7 +1094,7 @@ static void omap_gpio_init_context(struct gpio_bank *p)
static void omap_gpio_restore_context(struct gpio_bank *bank) static void omap_gpio_restore_context(struct gpio_bank *bank)
{ {
struct omap_gpio_reg_offs *regs = bank->regs; const struct omap_gpio_reg_offs *regs = bank->regs;
void __iomem *base = bank->base; void __iomem *base = bank->base;
writel_relaxed(bank->context.wake_en, base + regs->wkup_en); writel_relaxed(bank->context.wake_en, base + regs->wkup_en);
@ -1267,7 +1267,7 @@ static int gpio_omap_cpu_notifier(struct notifier_block *nb,
return NOTIFY_OK; return NOTIFY_OK;
} }
static struct omap_gpio_reg_offs omap2_gpio_regs = { static const struct omap_gpio_reg_offs omap2_gpio_regs = {
.revision = OMAP24XX_GPIO_REVISION, .revision = OMAP24XX_GPIO_REVISION,
.direction = OMAP24XX_GPIO_OE, .direction = OMAP24XX_GPIO_OE,
.datain = OMAP24XX_GPIO_DATAIN, .datain = OMAP24XX_GPIO_DATAIN,
@ -1290,7 +1290,7 @@ static struct omap_gpio_reg_offs omap2_gpio_regs = {
.fallingdetect = OMAP24XX_GPIO_FALLINGDETECT, .fallingdetect = OMAP24XX_GPIO_FALLINGDETECT,
}; };
static struct omap_gpio_reg_offs omap4_gpio_regs = { static const struct omap_gpio_reg_offs omap4_gpio_regs = {
.revision = OMAP4_GPIO_REVISION, .revision = OMAP4_GPIO_REVISION,
.direction = OMAP4_GPIO_OE, .direction = OMAP4_GPIO_OE,
.datain = OMAP4_GPIO_DATAIN, .datain = OMAP4_GPIO_DATAIN,

2
include/linux/platform_data/gpio-omap.h
View File

@ -200,7 +200,7 @@ struct omap_gpio_platform_data {
bool is_mpuio; /* whether the bank is of type MPUIO */ bool is_mpuio; /* whether the bank is of type MPUIO */
u32 non_wakeup_gpios; u32 non_wakeup_gpios;
struct omap_gpio_reg_offs *regs; const struct omap_gpio_reg_offs *regs;
/* Return context loss count due to PM states changing */ /* Return context loss count due to PM states changing */
int (*get_context_loss_count)(struct device *dev); int (*get_context_loss_count)(struct device *dev);