On Tue, 11 Apr 2017, Kishon Vijay Abraham I wrote: > Hi, > > On Tuesday 11 April 2017 07:44 PM, Lee Jones wrote: > > On Mon, 10 Apr 2017, Kishon Vijay Abraham I wrote: > > > >> From: Krzysztof Kozlowski <[email protected]> > >> > >> The MFD-specific header will go away because it duplicates defines from > >> exynos-regs-pmu.h. > >> > >> Reported-by: kbuild test robot <[email protected]> > >> Signed-off-by: Krzysztof Kozlowski <[email protected]> > >> Reviewed-by: Bartlomiej Zolnierkiewicz <[email protected]> > >> Signed-off-by: Lee Jones <[email protected]> > > > > > > Okay, this is confusing. > > > > I'm guessing you're sending this to Greg for inclusion into -stable? > > No, it's not for stable. It's for 4.12.
Then I'm totally confused, since this patch has already been applied, which is obvious since I already signed it off? > > Isn't there a way to specify this intention? > > The pull request (cover letter) specifies this intention. Great! But you forgot to send it to me, doh! Why are you sending patches with a pull-request? > > Also, patch 1 and 3 appear to be identical. > > > > Not even sure how that's possible. Still have no idea how you managed to do this! > >> Signed-off-by: Kishon Vijay Abraham I <[email protected]> > >> --- > >> drivers/mfd/exynos-lpass.c | 4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > >> > >> diff --git a/drivers/mfd/exynos-lpass.c b/drivers/mfd/exynos-lpass.c > >> index 2e064fb8826f..8bebad92a385 100644 > >> --- a/drivers/mfd/exynos-lpass.c > >> +++ b/drivers/mfd/exynos-lpass.c > >> @@ -18,11 +18,11 @@ > >> #include <linux/io.h> > >> #include <linux/module.h> > >> #include <linux/mfd/syscon.h> > >> -#include <linux/mfd/syscon/exynos5-pmu.h> > >> #include <linux/of.h> > >> #include <linux/of_platform.h> > >> #include <linux/platform_device.h> > >> #include <linux/regmap.h> > >> +#include <linux/soc/samsung/exynos-regs-pmu.h> > >> #include <linux/types.h> > >> > >> /* LPASS Top register definitions */ > >> @@ -83,7 +83,7 @@ static void exynos_lpass_enable(struct exynos_lpass > >> *lpass) > >> > >> /* Activate related PADs from retention state */ > >> regmap_write(lpass->pmu, EXYNOS5433_PAD_RETENTION_AUD_OPTION, > >> - EXYNOS5433_PAD_INITIATE_WAKEUP_FROM_LOWPWR); > >> + EXYNOS_WAKEUP_FROM_LOWPWR); > >> > >> exynos_lpass_core_sw_reset(lpass, LPASS_I2S_SW_RESET); > >> exynos_lpass_core_sw_reset(lpass, LPASS_DMA_SW_RESET); > >> > > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
