Merge tag 'mips-fixes-for-2019.01' of git://git.denx.de/u-boot-mips

[oweals/u-boot.git] / arch / arm / mach-omap2 / am33xx / clk_synthesizer.c

diff --git a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
index 316e677c65c7026d1a4de99f291eccfa171b542b..ff1bfaf84b69e5b260f4590bbc86c7306de8657b 100644 (file)
--- a/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
+++ b/arch/arm/mach-omap2/am33xx/clk_synthesizer.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * clk-synthesizer.c
  *
  * Clock synthesizer apis
  *
  * Copyright (C) 2016, Texas Instruments, Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 
@@ -15,6 +14,7 @@
 
 /**
  * clk_synthesizer_reg_read - Read register from synthesizer.
+ * dev:                i2c bus device (not used if CONFIG_DM_I2C is not set)
  * @addr:      addr within the i2c device
  * buf:                Buffer to which value is to be read.
  *
@@ -22,13 +22,14 @@
  * be send along with enabling byte read more, and then read can happen.
  * Returns 0 on success
  */
-static int clk_synthesizer_reg_read(int addr, uint8_t *buf)
+static int clk_synthesizer_reg_read(struct udevice *dev, int addr, u8 *buf)
 {
        int rc;
 
        /* Enable Bye read */
        addr = addr | CLK_SYNTHESIZER_BYTE_MODE;
 
+#ifndef CONFIG_DM_I2C
        /* Send the command byte */
        rc = i2c_write(CLK_SYNTHESIZER_I2C_ADDR, addr, 1, buf, 1);
        if (rc)
@@ -36,26 +37,46 @@ static int clk_synthesizer_reg_read(int addr, uint8_t *buf)
 
        /* Read the Data */
        return i2c_read(CLK_SYNTHESIZER_I2C_ADDR, addr, 1, buf, 1);
+#else
+       /* Send the command byte */
+       rc = dm_i2c_reg_write(dev, addr, *buf);
+       if (rc)
+               printf("Failed to send command to clock synthesizer\n");
+
+       /* Read the Data */
+       rc = dm_i2c_reg_read(dev, addr);
+       if (rc < 0)
+               return rc;
+
+       *buf = (u8)rc;
+       return 0;
+#endif
+
 }
 
 /**
  * clk_synthesizer_reg_write - Write a value to register in synthesizer.
+ * dev:                i2c bus device (not used if CONFIG_DM_I2C is not set)
  * @addr:      addr within the i2c device
  * val:                Value to be written in the addr.
  *
  * Enable the byte read mode in the address and start the i2c transfer.
  * Returns 0 on success
  */
-static int clk_synthesizer_reg_write(int addr, uint8_t val)
+static int clk_synthesizer_reg_write(struct udevice *dev, int addr, u8 val)
 {
-       uint8_t cmd[2];
+       u8 cmd[2];
        int rc = 0;
 
        /* Enable byte write */
        cmd[0] = addr | CLK_SYNTHESIZER_BYTE_MODE;
        cmd[1] = val;
 
+#ifndef CONFIG_DM_I2C
        rc = i2c_write(CLK_SYNTHESIZER_I2C_ADDR, addr, 1, cmd, 2);
+#else
+       rc = dm_i2c_write(dev, addr, cmd, 2);
+#endif
        if (rc)
                printf("Clock synthesizer reg write failed at addr = 0x%x\n",
                       addr);
@@ -73,30 +94,42 @@ static int clk_synthesizer_reg_write(int addr, uint8_t val)
 int setup_clock_synthesizer(struct clk_synth *data)
 {
        int rc;
-       uint8_t val;
-
+       u8 val = 0;
+       struct udevice *dev = NULL;
+#ifndef CONFIG_DM_I2C
        rc =  i2c_probe(CLK_SYNTHESIZER_I2C_ADDR);
        if (rc) {
                printf("i2c probe failed at address 0x%x\n",
                       CLK_SYNTHESIZER_I2C_ADDR);
                return rc;
        }
-
-       rc = clk_synthesizer_reg_read(CLK_SYNTHESIZER_ID_REG, &val);
+#else
+       rc = i2c_get_chip_for_busnum(0, CLK_SYNTHESIZER_I2C_ADDR, 1, &dev);
+       if (rc) {
+               printf("failed to get device for synthesizer at address 0x%x\n",
+                      CLK_SYNTHESIZER_I2C_ADDR);
+               return rc;
+       }
+#endif
+       rc = clk_synthesizer_reg_read(dev, CLK_SYNTHESIZER_ID_REG, &val);
        if (val != data->id)
                return rc;
 
        /* Crystal Load capacitor selection */
-       rc = clk_synthesizer_reg_write(CLK_SYNTHESIZER_XCSEL, data->capacitor);
+       rc = clk_synthesizer_reg_write(dev, CLK_SYNTHESIZER_XCSEL,
+                                      data->capacitor);
        if (rc)
                return rc;
-       rc = clk_synthesizer_reg_write(CLK_SYNTHESIZER_MUX_REG, data->mux);
+       rc = clk_synthesizer_reg_write(dev, CLK_SYNTHESIZER_MUX_REG,
+                                      data->mux);
        if (rc)
                return rc;
-       rc = clk_synthesizer_reg_write(CLK_SYNTHESIZER_PDIV2_REG, data->pdiv2);
+       rc = clk_synthesizer_reg_write(dev, CLK_SYNTHESIZER_PDIV2_REG,
+                                      data->pdiv2);
        if (rc)
                return rc;
-       rc = clk_synthesizer_reg_write(CLK_SYNTHESIZER_PDIV3_REG, data->pdiv3);
+       rc = clk_synthesizer_reg_write(dev, CLK_SYNTHESIZER_PDIV3_REG,
+                                      data->pdiv3);
        if (rc)
                return rc;