summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorOlliver Schinagl <o.schinagl@ultimaker.com>2015-12-03 17:49:28 +0100
committerHans de Goede <hdegoede@redhat.com>2015-12-10 15:45:48 +0100
commit887e2fd9daf0be92395046b85efc38af0c6ccda1 (patch)
tree548c3beac28e86c05fa61546fab1e5839714b8ac /arch
parent6edf6a21798507daa5446eb859b5ea15386985c8 (diff)
downloadu-boot-imx-887e2fd9daf0be92395046b85efc38af0c6ccda1.zip
u-boot-imx-887e2fd9daf0be92395046b85efc38af0c6ccda1.tar.gz
u-boot-imx-887e2fd9daf0be92395046b85efc38af0c6ccda1.tar.bz2
sunxi: twi: Enable clocks on sun7i
Commit 6c739c5d added code to enable i2c bus 4 and 5 on the sun7i SoC but forgot to extend the range check in clock_twi_onoff, resulting in the clock not getting enabled. The range-check is not needed at all, since clock_twi_onoff only gets called with such high indexes when CONFIG_I2C3_ENABLE / CONFIG_I2C4_ENABLE is set and Kconfig already only allows these on sun6i / sun7i. This commit removes the range-check all together fixing i2c bus 4 and 5 not working on sun7i. Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com> [hdegoede@redhat.com] Remove range check instead of extending it Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv7/sunxi/clock_sun4i.c3
-rw-r--r--arch/arm/cpu/armv7/sunxi/clock_sun6i.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/clock_sun4i.c b/arch/arm/cpu/armv7/sunxi/clock_sun4i.c
index 7c8eff9..ef62c4f 100644
--- a/arch/arm/cpu/armv7/sunxi/clock_sun4i.c
+++ b/arch/arm/cpu/armv7/sunxi/clock_sun4i.c
@@ -67,9 +67,6 @@ int clock_twi_onoff(int port, int state)
struct sunxi_ccm_reg *const ccm =
(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
- if (port > 2)
- return -1;
-
/* set the apb clock gate for twi */
if (state)
setbits_le32(&ccm->apb1_gate,
diff --git a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c
index 916ee48..4501884 100644
--- a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c
+++ b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c
@@ -77,9 +77,6 @@ int clock_twi_onoff(int port, int state)
struct sunxi_ccm_reg *const ccm =
(struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
- if (port > 3)
- return -1;
-
/* set the apb clock gate for twi */
if (state)
setbits_le32(&ccm->apb2_gate,