Tomasz, On Fri, May 17, 2013 at 9:24 AM, Tomasz Figa <t.figa@xxxxxxxxxxx> wrote: > On DT-enabled systems pinctrl-exynos driver is responsible for handling > of wake-up EINT interrupts. This patch adjusts wake-up mask > configuration code to take wake-up mask value from pinctrl-exynos driver > on DT-enabled systems. > > Signed-off-by: Tomasz Figa <t.figa@xxxxxxxxxxx> > Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> > --- > arch/arm/mach-exynos/include/mach/pm-core.h | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) A little ugly because of the need to support old non-device tree boards, but seems reasonable. Means that if you have a device tree you'd better be using pincontrol. Assuming that's true now someone needs to go through and remove all of the device tree support (and bindings Documentation) for gpio-samsung. Maybe someone has already started? On exynos5250-snow (pinmux backported to 3.8): Tested-by: Doug Anderson <dianders@xxxxxxxxxxxx> Reviewed-by: Doug Anderson <dianders@xxxxxxxxxxxx> On Fri, May 17, 2013 at 9:24 AM, Tomasz Figa <t.figa@xxxxxxxxxxx> wrote: > On DT-enabled systems pinctrl-exynos driver is responsible for handling > of wake-up EINT interrupts. This patch adjusts wake-up mask > configuration code to take wake-up mask value from pinctrl-exynos driver > on DT-enabled systems. > > Signed-off-by: Tomasz Figa <t.figa@xxxxxxxxxxx> > Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> > --- > arch/arm/mach-exynos/include/mach/pm-core.h | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-exynos/include/mach/pm-core.h b/arch/arm/mach-exynos/include/mach/pm-core.h > index 7dbbfec..296090e 100644 > --- a/arch/arm/mach-exynos/include/mach/pm-core.h > +++ b/arch/arm/mach-exynos/include/mach/pm-core.h > @@ -18,8 +18,15 @@ > #ifndef __ASM_ARCH_PM_CORE_H > #define __ASM_ARCH_PM_CORE_H __FILE__ > > +#include <linux/of.h> > #include <mach/regs-pmu.h> > > +#ifdef CONFIG_PINCTRL_EXYNOS > +extern u32 exynos_get_eint_wake_mask(void); > +#else > +static inline u32 exynos_get_eint_wake_mask(void) { return 0xffffffff; } > +#endif > + > static inline void s3c_pm_debug_init_uart(void) > { > /* nothing here yet */ > @@ -27,7 +34,12 @@ static inline void s3c_pm_debug_init_uart(void) > > static inline void s3c_pm_arch_prepare_irqs(void) > { > - __raw_writel(s3c_irqwake_eintmask, S5P_EINT_WAKEUP_MASK); > + u32 eintmask = s3c_irqwake_eintmask; > + > + if (of_have_populated_dt()) > + eintmask = exynos_get_eint_wake_mask(); > + > + __raw_writel(eintmask, S5P_EINT_WAKEUP_MASK); > __raw_writel(s3c_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK); > } > > -- > 1.8.2.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html