| Message ID | 1414489832-28011-1-git-send-email-pankaj.dubey@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Pankaj Dubey wrote: > > This patch fixes a typo in struct named as "exynos5_list_diable_wfi_wfe" > by making it "exynos5_list_disable_wfi_wfe" which is more meaningful. > Yes, 'disable' is more meaningful ;) I'll apply this into non-critical-fixes for 3.19. Thanks, Kukjin > Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com> > --- > arch/arm/mach-exynos/pmu.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c > index cfc62e8..e5e1846 100644 > --- a/arch/arm/mach-exynos/pmu.c > +++ b/arch/arm/mach-exynos/pmu.c > @@ -330,7 +330,7 @@ static unsigned int const exynos5_list_both_cnt_feed[] = { > EXYNOS5_TOP_PWR_SYSMEM_OPTION, > }; > > -static unsigned int const exynos5_list_diable_wfi_wfe[] = { > +static unsigned int const exynos5_list_disable_wfi_wfe[] = { > EXYNOS5_ARM_CORE1_OPTION, > EXYNOS5_FSYS_ARM_OPTION, > EXYNOS5_ISP_ARM_OPTION, > @@ -361,11 +361,11 @@ static void exynos5_init_pmu(void) > /* > * Disable WFI/WFE on XXX_OPTION > */ > - for (i = 0 ; i < ARRAY_SIZE(exynos5_list_diable_wfi_wfe) ; i++) { > - tmp = pmu_raw_readl(exynos5_list_diable_wfi_wfe[i]); > + for (i = 0 ; i < ARRAY_SIZE(exynos5_list_disable_wfi_wfe) ; i++) { > + tmp = pmu_raw_readl(exynos5_list_disable_wfi_wfe[i]); > tmp &= ~(EXYNOS5_OPTION_USE_STANDBYWFE | > EXYNOS5_OPTION_USE_STANDBYWFI); > - pmu_raw_writel(tmp, exynos5_list_diable_wfi_wfe[i]); > + pmu_raw_writel(tmp, exynos5_list_disable_wfi_wfe[i]); > } > } > > -- > 1.7.9.5
Hello Pankaj, Kukjin, On Tue, Oct 28, 2014 at 10:50 AM, Pankaj Dubey <pankaj.dubey@samsung.com> wrote: > This patch fixes a typo in struct named as "exynos5_list_diable_wfi_wfe" > by making it "exynos5_list_disable_wfi_wfe" which is more meaningful. > > Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com> After this patch, "[PATCH v9 1/2] ARM: EXYNOS: Add platform driver support for Exynos PMU" [0] does not apply cleanly anymore. Pankaj, Are you planning to rebase and re-post that patch? Kukjin, It would be great if you can pick all the pending Exynos5420 S2R patches to avoid these kind of conflicts. Thanks a lot and best regards, Javier [0]: https://lkml.org/lkml/2014/10/6/90
Hello Kukjin, > > After this patch, "[PATCH v9 1/2] ARM: EXYNOS: Add platform driver > support for Exynos PMU" [0] does not apply cleanly anymore. > I see that you already picked all the Exynos S2R patches on your v3.19-next/mach-exynos branch and also resolved that conflict. Is just that this branch was not merged in your for-next branch and that's why I didn't see the patches in linux-next. Sorry for the noise. Best regards, Javier
On 11/11/14 18:54, Javier Martinez Canillas wrote: > Hello Kukjin, > >> >> After this patch, "[PATCH v9 1/2] ARM: EXYNOS: Add platform driver >> support for Exynos PMU" [0] does not apply cleanly anymore. >> > > I see that you already picked all the Exynos S2R patches on your > v3.19-next/mach-exynos branch and also resolved that conflict. > Yes, but I couldn't merge it into -next because of some conflicts between for-next and mach-exynos branch at that time. Note I've merged into -next just now, so if any problems in -next, please let us know. > Is just that this branch was not merged in your for-next branch and > that's why I didn't see the patches in linux-next. > > Sorry for the noise. No problem, thanks. - Kukjin
diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c index cfc62e8..e5e1846 100644 --- a/arch/arm/mach-exynos/pmu.c +++ b/arch/arm/mach-exynos/pmu.c @@ -330,7 +330,7 @@ static unsigned int const exynos5_list_both_cnt_feed[] = { EXYNOS5_TOP_PWR_SYSMEM_OPTION, }; -static unsigned int const exynos5_list_diable_wfi_wfe[] = { +static unsigned int const exynos5_list_disable_wfi_wfe[] = { EXYNOS5_ARM_CORE1_OPTION, EXYNOS5_FSYS_ARM_OPTION, EXYNOS5_ISP_ARM_OPTION, @@ -361,11 +361,11 @@ static void exynos5_init_pmu(void) /* * Disable WFI/WFE on XXX_OPTION */ - for (i = 0 ; i < ARRAY_SIZE(exynos5_list_diable_wfi_wfe) ; i++) { - tmp = pmu_raw_readl(exynos5_list_diable_wfi_wfe[i]); + for (i = 0 ; i < ARRAY_SIZE(exynos5_list_disable_wfi_wfe) ; i++) { + tmp = pmu_raw_readl(exynos5_list_disable_wfi_wfe[i]); tmp &= ~(EXYNOS5_OPTION_USE_STANDBYWFE | EXYNOS5_OPTION_USE_STANDBYWFI); - pmu_raw_writel(tmp, exynos5_list_diable_wfi_wfe[i]); + pmu_raw_writel(tmp, exynos5_list_disable_wfi_wfe[i]); } }
This patch fixes a typo in struct named as "exynos5_list_diable_wfi_wfe" by making it "exynos5_list_disable_wfi_wfe" which is more meaningful. Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com> --- arch/arm/mach-exynos/pmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)