i2c: designware: don't infer timings described by ACPI from clock rate
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Fri, 19 May 2017 08:56:40 +0000 (09:56 +0100)
committerWolfram Sang <wsa@the-dreams.de>
Fri, 19 May 2017 12:36:24 +0000 (14:36 +0200)
commit9d6408433019bfae15e2d0d5f4498c4ff70b86c0
tree7475c97c5a420f29f4f867ddf6256a9dba75d7aa
parent8b4822de59d5d9919b9b045183a36c673ce20b73
i2c: designware: don't infer timings described by ACPI from clock rate

Commit bd698d24b1b57 ("i2c: designware: Get selected speed mode
sda-hold-time via ACPI") updated the logic that reads the timing
parameters for various I2C bus rates from the DSDT, to only read
the timing parameters for the currently selected mode.

This causes a WARN_ON() splat on platforms that legally omit the clock
frequency from the ACPI description, because in the new situation, the
core I2C designware driver still accesses the fields in the driver
struct that we no longer populate, and proceeds to calculate them from
the clock frequency. Since the clock frequency is unspecified, the
driver complains loudly using a WARN_ON().

So revert back to the old situation, where the struct fields for all
timings are populated, but retain the new logic which chooses the SDA
hold time from the timing mode that is currently in use.

Fixes: bd698d24b1b57 ("i2c: designware: Get selected speed mode ...")
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reported-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-designware-platdrv.c