On Thu, Jan 26, 2017 at 09:48:11PM +0200, Krzysztof Kozlowski wrote: > On Thu, Jan 26, 2017 at 09:33:49AM +0100, Marek Szyprowski wrote: > > This patch adds support for retention control for Exynos5433 SoCs. Three > > groups of pins has been defined for retention control: common shared group > > for ALIVE, CPIF, eSE, FINGER, IMEM, NFC, PERIC, TOUCH pin banks and > > separate control for FSYS and AUD pin banks, for which PMU retention > > registers match whole banks. > > > > Signed-off-by: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> > > --- > > drivers/pinctrl/samsung/pinctrl-exynos.c | 58 +++++++++++++++++++++++++++++ > > include/linux/soc/samsung/exynos-regs-pmu.h | 16 ++++++++ I already have some non-conflicting changes to exynos-regs-pmu.h in my branch. Now I want to add some more which will create conflicts. How about splitting the header to separate patch, so I will take it to my exynos-pmu branch? Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
