diff options
author | Zoltan HERPAI <wigyori@uid0.hu> | 2016-12-27 14:49:28 +0100 |
---|---|---|
committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-12-27 14:49:28 +0100 |
commit | 52b0b6ea7a440b4cf3c9eb33557be7ad63e23f77 (patch) | |
tree | f740c7d42e61af9166703c1b12bc9ce282ebf8a5 /package/boot/uboot-sunxi/patches/012-sun6i-fix-clock_twi_onoff.patch | |
parent | 9e2f8fa1e5df297c172ce1472eb076c3c0b27cad (diff) | |
download | master-187ad058-52b0b6ea7a440b4cf3c9eb33557be7ad63e23f77.tar.gz master-187ad058-52b0b6ea7a440b4cf3c9eb33557be7ad63e23f77.tar.bz2 master-187ad058-52b0b6ea7a440b4cf3c9eb33557be7ad63e23f77.zip |
sunxi: uboot-sunxi: update to 2016.11
While at it:
- refresh Theobroma patches
- refresh patches
- delete obsolete/upstreamed patches
- add support for Merrii A80 board
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Diffstat (limited to 'package/boot/uboot-sunxi/patches/012-sun6i-fix-clock_twi_onoff.patch')
-rw-r--r-- | package/boot/uboot-sunxi/patches/012-sun6i-fix-clock_twi_onoff.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/package/boot/uboot-sunxi/patches/012-sun6i-fix-clock_twi_onoff.patch b/package/boot/uboot-sunxi/patches/012-sun6i-fix-clock_twi_onoff.patch deleted file mode 100644 index 45416703a4..0000000000 --- a/package/boot/uboot-sunxi/patches/012-sun6i-fix-clock_twi_onoff.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 730d2f3a41c5ccae71b5008fffdf697d143be68c Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Wed, 16 Mar 2016 20:44:51 +0100 -Subject: [PATCH] sunxi: Fix clock_twi_onoff for sun6i - -The clock_sun6i.c implementation was not deasserting the reset for -the regular i2c controllers, this commit fixes this. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> -Acked-by: Ian Campbell <ijc@hellion.org.uk> ---- - arch/arm/cpu/armv7/sunxi/clock_sun6i.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - ---- a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c -+++ b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c -@@ -100,13 +100,18 @@ int clock_twi_onoff(int port, int state) - return 0; - } - -- /* set the apb clock gate for twi */ -- if (state) -+ /* set the apb clock gate and reset for twi */ -+ if (state) { - setbits_le32(&ccm->apb2_gate, - CLK_GATE_OPEN << (APB2_GATE_TWI_SHIFT+port)); -- else -+ setbits_le32(&ccm->apb2_reset_cfg, -+ 1 << (APB2_RESET_TWI_SHIFT + port)); -+ } else { -+ clrbits_le32(&ccm->apb2_reset_cfg, -+ 1 << (APB2_RESET_TWI_SHIFT + port)); - clrbits_le32(&ccm->apb2_gate, - CLK_GATE_OPEN << (APB2_GATE_TWI_SHIFT+port)); -+ } - - return 0; - } |