1 From 730d2f3a41c5ccae71b5008fffdf697d143be68c Mon Sep 17 00:00:00 2001
2 From: Hans de Goede <hdegoede@redhat.com>
3 Date: Wed, 16 Mar 2016 20:44:51 +0100
4 Subject: [PATCH] sunxi: Fix clock_twi_onoff for sun6i
6 The clock_sun6i.c implementation was not deasserting the reset for
7 the regular i2c controllers, this commit fixes this.
9 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
10 Acked-by: Ian Campbell <ijc@hellion.org.uk>
12 arch/arm/cpu/armv7/sunxi/clock_sun6i.c | 11 ++++++++---
13 1 file changed, 8 insertions(+), 3 deletions(-)
15 --- a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c
16 +++ b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c
17 @@ -100,13 +100,18 @@ int clock_twi_onoff(int port, int state)
21 - /* set the apb clock gate for twi */
23 + /* set the apb clock gate and reset for twi */
25 setbits_le32(&ccm->apb2_gate,
26 CLK_GATE_OPEN << (APB2_GATE_TWI_SHIFT+port));
28 + setbits_le32(&ccm->apb2_reset_cfg,
29 + 1 << (APB2_RESET_TWI_SHIFT + port));
31 + clrbits_le32(&ccm->apb2_reset_cfg,
32 + 1 << (APB2_RESET_TWI_SHIFT + port));
33 clrbits_le32(&ccm->apb2_gate,
34 CLK_GATE_OPEN << (APB2_GATE_TWI_SHIFT+port));