From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757413AbbI1MZU (ORCPT ); Mon, 28 Sep 2015 08:25:20 -0400 Received: from regular1.263xmail.com ([211.150.99.133]:41380 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757134AbbI1MZS (ORCPT ); Mon, 28 Sep 2015 08:25:18 -0400 X-263anti-spam: KSV:0;BIG:0;ABS:1;DNS:0;ATT:0;SPF:S; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-ADDR-CHECKED: 0 X-RL-SENDER: zhengxing@rock-chips.com X-FST-TO: heiko@sntech.de X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: zhengxing@rock-chips.com X-UNIQUE-TAG: <61482f7608f44281c438fcf8bdc852b2> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Message-ID: <560931A3.2020403@rock-chips.com> Date: Mon, 28 Sep 2015 20:25:07 +0800 From: Xing Zheng User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120410 Thunderbird/11.0.1 MIME-Version: 1.0 To: =?UTF-8?B?SGVpa28gU3TDvGJuZXI=?= CC: linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 7/9] rockchip: make sure timer5 is enabled on rk3036 platforms References: <1442478540-15068-1-git-send-email-zhengxing@rock-chips.com> <1442486244-1833-1-git-send-email-zhengxing@rock-chips.com> <11125723.j2J5LpAGi4@diego> In-Reply-To: <11125723.j2J5LpAGi4@diego> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2015年09月17日 23:05, Heiko Stübner wrote: > Am Donnerstag, 17. September 2015, 18:37:24 schrieb Xing Zheng: >> The timer5 supplies the architected timer and thus as has to run when >> the system clocksource and clockevents drivers are registered. > please kindly ask the people doing uboot development to do this in uboot > itself in future socs :-) - for example Simon's rk3288 mainline uboot does > this correctly. OK, I will ask the engineer who is doing uboot whether needs to add this patch. So I will remove it from the patchset v3 of "Build and support rk3036 SoC platform". Thanks. >> Signed-off-by: Xing Zheng >> --- >> >> Changes in v2: None >> >> arch/arm/mach-rockchip/rockchip.c | 22 ++++++++++++++++++++++ >> 1 file changed, 22 insertions(+) >> >> diff --git a/arch/arm/mach-rockchip/rockchip.c >> b/arch/arm/mach-rockchip/rockchip.c index b6cf3b4..937047f 100644 >> --- a/arch/arm/mach-rockchip/rockchip.c >> +++ b/arch/arm/mach-rockchip/rockchip.c >> @@ -32,6 +32,8 @@ >> #define RK3288_GRF_SOC_CON0 0x244 >> #define RK3288_TIMER6_7_PHYS 0xff810000 >> >> +#define RK3036_TIMER5_PHYS 0x200440a0 >> + > #define RK3036_TIMER_PHYS 0x20044000 > --> the actual base address of the timer block > > As it looks like that we'll need to duplicate that timer init at least for the > rk3036 and the timer ip in question is actually the same on both, please split > out the actual work into a separate function like > > static void rockchip_init_arch_timer_supply(resource_size_t phys, int offs) > { > reg_base = ioremap(phys, SZ_16K); > if (reg_base) { > writel(0, reg_base + offs + 0x10); > writel(0xffffffff, reg_base + offs); > writel(0xffffffff, reg_base + offs + 0x04); > writel(1, reg_base + offs + 0x10); > dsb(); > iounmap(reg_base); > } else { > pr_err("rockchip: could not map timer registers\n"); > } > } Done. > >> static void __init rockchip_timer_init(void) >> { >> if (of_machine_is_compatible("rockchip,rk3288")) { >> @@ -64,6 +66,25 @@ static void __init rockchip_timer_init(void) > for the rk3288 exchange the timer init against > rockchip_init_arch_timer_supply(RK3288_TIMER6_7_PHYS, 0x20); Done. >> regmap_write(grf, RK3288_GRF_SOC_CON0, 0x10000000); >> else >> pr_err("rockchip: could not get grf syscon\n"); >> + } else if (of_machine_is_compatible("rockchip,rk3036")) { >> + void __iomem *reg_base; >> + >> + /* >> + * Most/all uboot versions for rk3036 don't enable timer5 >> + * which is needed for the architected timer to work. >> + * So make sure it is running during early boot. >> + */ >> + reg_base = ioremap(RK3036_TIMER5_PHYS, SZ_16K); >> + if (reg_base) { >> + writel(0, reg_base + 0x10); >> + writel(0xffffffff, reg_base); >> + writel(0xffffffff, reg_base + 0x04); >> + writel(1, reg_base + 0x10); >> + dsb(); >> + iounmap(reg_base); >> + } else { >> + pr_err("rockchip: could not map timer5 registers\n"); >> + } > rockchip_init_arch_timer_supply(RK3036_TIMER_PHYS, 0xa0); Done. >> } >> >> of_clk_init(NULL); >> @@ -79,6 +100,7 @@ static void __init rockchip_dt_init(void) >> >> static const char * const rockchip_board_dt_compat[] = { >> "rockchip,rk2928", >> + "rockchip,rk3036", >> "rockchip,rk3066a", >> "rockchip,rk3066b", >> "rockchip,rk3188", >