Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pinctrl: Move pint PM storage structure out of blackfin architecture.

It is better to keep this structure in the pinctrl-adi2 driver.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Sonic Zhang and committed by
Linus Walleij
1e6f8e3c 94e69207

+14 -10
-9
arch/blackfin/include/asm/irq.h
··· 20 20 /* SYS_IRQS and NR_IRQS are defined in <mach-bf5xx/irq.h> */ 21 21 #include <mach/irq.h> 22 22 23 - /* 24 - * pm save bfin pint registers 25 - */ 26 - struct adi_pm_pint_save { 27 - u32 assign; 28 - u32 edge_set; 29 - u32 invert_set; 30 - }; 31 - 32 23 #if ANOMALY_05000244 && defined(CONFIG_BFIN_ICACHE) 33 24 # define NOP_PAD_ANOMALY_05000244 "nop; nop;" 34 25 #else
+14 -1
drivers/pinctrl/pinctrl-adi2.c
··· 89 89 u32 mux; 90 90 }; 91 91 92 + /* 93 + * struct gpio_pint_saved - PINT registers saved in PM operations 94 + * 95 + * @assign: ASSIGN register 96 + * @edge_set: EDGE_SET register 97 + * @invert_set: INVERT_SET register 98 + */ 99 + struct gpio_pint_saved { 100 + u32 assign; 101 + u32 edge_set; 102 + u32 invert_set; 103 + }; 104 + 92 105 /** 93 106 * struct gpio_pint - Pin interrupt controller device. Multiple ADI GPIO 94 107 * banks can be mapped into one Pin interrupt controller. ··· 127 114 int irq; 128 115 struct irq_domain *domain[2]; 129 116 struct gpio_pint_regs *regs; 130 - struct adi_pm_pint_save saved_data; 117 + struct gpio_pint_saved saved_data; 131 118 int map_count; 132 119 spinlock_t lock; 133 120