diff options
| author | Tony Lindgren | 2019-03-21 19:00:21 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2019-03-26 19:26:26 +0100 |
| commit | 70451127873fee41b966328e1617ccc04f6998e7 (patch) | |
| tree | cdb86c4017c913e6ad8637f2b49fb220d0eec6a3 /arch/arm/mach-omap2/i2c.c | |
| parent | ARM: OMAP2+: Allocate struct omap_hwmod based on dts data (diff) | |
| download | kernel-qcow2-linux-70451127873fee41b966328e1617ccc04f6998e7.tar.gz kernel-qcow2-linux-70451127873fee41b966328e1617ccc04f6998e7.tar.xz kernel-qcow2-linux-70451127873fee41b966328e1617ccc04f6998e7.zip | |
ARM: OMAP2+: Remove hwmod .rev data and use local SoC checks instead
We can just check for omap2 and 3 for i2c and smartreflex locally.
The rest of the .rev data is already unused.
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/i2c.c')
| -rw-r--r-- | arch/arm/mach-omap2/i2c.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/i2c.c b/arch/arm/mach-omap2/i2c.c index 37ff25ee3d89..1d8efc303daf 100644 --- a/arch/arm/mach-omap2/i2c.c +++ b/arch/arm/mach-omap2/i2c.c @@ -53,15 +53,10 @@ int omap_i2c_reset(struct omap_hwmod *oh) u16 i2c_con; int c = 0; - if (oh->class->rev == OMAP_I2C_IP_VERSION_2) { - i2c_con = OMAP4_I2C_CON_OFFSET; - } else if (oh->class->rev == OMAP_I2C_IP_VERSION_1) { + if (soc_is_omap24xx() || soc_is_omap34xx() || soc_is_am35xx()) i2c_con = OMAP2_I2C_CON_OFFSET; - } else { - WARN(1, "Cannot reset I2C block %s: unsupported revision\n", - oh->name); - return -EINVAL; - } + else + i2c_con = OMAP4_I2C_CON_OFFSET; /* Disable I2C */ v = omap_hwmod_read(oh, i2c_con); |