]> www.infradead.org Git - users/willy/xarray.git/commitdiff
i2c: qcom-geni: Use generic definitions for bus frequencies
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Sat, 22 Mar 2025 14:47:36 +0000 (16:47 +0200)
committerAndi Shyti <andi@smida.it>
Mon, 19 May 2025 20:23:54 +0000 (22:23 +0200)
Since we have generic definitions for bus frequencies, let's use them.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Christopher Obbard <christopher.obbard@linaro.org>
Reviewed-by: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com>
Link: https://lore.kernel.org/r/20250322144736.472777-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
drivers/i2c/busses/i2c-qcom-geni.c

index 515a784c951ca6e87564fd1827a36eeb57e098fd..ccea575fb7838db864ca4a2b21ebb3835b2567b2 100644 (file)
@@ -71,7 +71,6 @@ enum geni_i2c_err_code {
                                                                        << 5)
 
 #define I2C_AUTO_SUSPEND_DELAY 250
-#define KHZ(freq)              (1000 * freq)
 #define PACKING_BYTES_PW       4
 
 #define ABORT_TIMEOUT          HZ
@@ -148,18 +147,18 @@ struct geni_i2c_clk_fld {
  * source_clock = 19.2 MHz
  */
 static const struct geni_i2c_clk_fld geni_i2c_clk_map_19p2mhz[] = {
-       {KHZ(100), 7, 10, 12, 26},
-       {KHZ(400), 2,  5, 11, 22},
-       {KHZ(1000), 1, 2,  8, 18},
-       {},
+       { I2C_MAX_STANDARD_MODE_FREQ, 7, 10, 12, 26 },
+       { I2C_MAX_FAST_MODE_FREQ, 2,  5, 11, 22 },
+       { I2C_MAX_FAST_MODE_PLUS_FREQ, 1, 2,  8, 18 },
+       {}
 };
 
 /* source_clock = 32 MHz */
 static const struct geni_i2c_clk_fld geni_i2c_clk_map_32mhz[] = {
-       {KHZ(100), 8, 14, 18, 40},
-       {KHZ(400), 4,  3, 11, 20},
-       {KHZ(1000), 2, 3,  6, 15},
-       {},
+       { I2C_MAX_STANDARD_MODE_FREQ, 8, 14, 18, 40 },
+       { I2C_MAX_FAST_MODE_FREQ, 4,  3, 11, 20 },
+       { I2C_MAX_FAST_MODE_PLUS_FREQ, 2, 3,  6, 15 },
+       {}
 };
 
 static int geni_i2c_clk_map_idx(struct geni_i2c_dev *gi2c)
@@ -812,7 +811,7 @@ static int geni_i2c_probe(struct platform_device *pdev)
                                       &gi2c->clk_freq_out);
        if (ret) {
                dev_info(dev, "Bus frequency not specified, default to 100kHz.\n");
-               gi2c->clk_freq_out = KHZ(100);
+               gi2c->clk_freq_out = I2C_MAX_STANDARD_MODE_FREQ;
        }
 
        if (has_acpi_companion(dev))