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? Isn't there a way to specify this intention? Also, patch 1 and 3 appear to be identical. Not even sure how that's possible. > 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); > -- > 2.11.0 > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
