On Wed, 2015-05-20 at 10:43 +0200, Matthias Brugger wrote:
> 2015-05-19 21:51 GMT+02:00 Stephen Boyd <sboyd@xxxxxxxxxxxxxx>:
> > On 05/16/15 00:58, Yingjoe Chen wrote:
> >> diff --git a/arch/arm/mach-mediatek/mediatek.c b/arch/arm/mach-mediatek/mediatek.c
> >> index a954900..6b38d67 100644
> >> --- a/arch/arm/mach-mediatek/mediatek.c
> >> +++ b/arch/arm/mach-mediatek/mediatek.c
> >> @@ -16,6 +16,34 @@
> >> */
> >> #include <linux/init.h>
> >> #include <asm/mach/arch.h>
> >> +#include <linux/of.h>
> >> +#include <linux/clk-provider.h>
> >> +#include <linux/clocksource.h>
> >> +
> >> +
> >> +#define GPT6_CON_MT65xx 0x10008060
> >> +#define GPT_ENABLE 0x31
> >> +
> >> +static void __init mediatek_timer_init(void)
> >> +{
> >> + void __iomem *gpt_base = 0;
> >
> > = NULL ?
> >
> >> +
> >> + if (of_machine_is_compatible("mediatek,mt6589") ||
> >> + of_machine_is_compatible("mediatek,mt8135") ||
> >> + of_machine_is_compatible("mediatek,mt8127")) {
> >> + /* turn on GPT6 which ungates arch timer clocks */
> >> + gpt_base = ioremap(GPT6_CON_MT65xx, 0x04);
> >> + }
> >> +
> >> + /* enabel clock and set to free-run */
> >
> > s/enabel/enable/
> >
> >> + if (gpt_base) {
> >> + writel(GPT_ENABLE, gpt_base);
> >> + iounmap(gpt_base);
> >> + }
> >> +
> >
> > Why not join the two conditions together?
>
> The initial patch supposed that on different SoCs GPT6_CON register
> would be mapped on different addresses, but that seems not the case.
> So yes, we can join the two conditions together.
>
> Yingjoe, can you add the changes in the next series or do you want me to do it?
Hi,
I'll change these in next series. Thanks.
Joe.C
--
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
