From mboxrd@z Thu Jan 1 00:00:00 1970 From: Moritz Fischer Date: Mon, 16 Jan 2017 09:50:47 -0800 Subject: [U-Boot] [PATCH RESEND v2 4/4] i2c: i2c-cdns: No need for dedicated probe function In-Reply-To: <1484589047-6395-1-git-send-email-moritz.fischer@ettus.com> References: <1484589047-6395-1-git-send-email-moritz.fischer@ettus.com> Message-ID: <1484589047-6395-4-git-send-email-moritz.fischer@ettus.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de The generic probe code in dm works, so get rid of the leftover cruft. Signed-off-by: Moritz Fischer Cc: Heiko Schocher Cc: Michal Simek Cc: u-boot at lists.denx.de --- Changes from v1: - None --- drivers/i2c/i2c-cdns.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c index 89d429b..dec1820 100644 --- a/drivers/i2c/i2c-cdns.c +++ b/drivers/i2c/i2c-cdns.c @@ -226,26 +226,6 @@ static int cdns_i2c_set_bus_speed(struct udevice *dev, unsigned int speed) return 0; } -/* Probe to see if a chip is present. */ -static int cdns_i2c_probe_chip(struct udevice *bus, uint chip_addr, - uint chip_flags) -{ - struct i2c_cdns_bus *i2c_bus = dev_get_priv(bus); - struct cdns_i2c_regs *regs = i2c_bus->regs; - - /* Attempt to read a byte */ - setbits_le32(®s->control, CDNS_I2C_CONTROL_CLR_FIFO | - CDNS_I2C_CONTROL_RW); - clrbits_le32(®s->control, CDNS_I2C_CONTROL_HOLD); - writel(0xFF, ®s->interrupt_status); - writel(chip_addr, ®s->address); - writel(1, ®s->transfer_size); - - return (cdns_i2c_wait(regs, CDNS_I2C_INTERRUPT_COMP | - CDNS_I2C_INTERRUPT_NACK) & - CDNS_I2C_INTERRUPT_COMP) ? 0 : -ETIMEDOUT; -} - static int cdns_i2c_write_data(struct i2c_cdns_bus *i2c_bus, u32 addr, u8 *data, u32 len) { @@ -453,7 +433,6 @@ static int cdns_i2c_ofdata_to_platdata(struct udevice *dev) static const struct dm_i2c_ops cdns_i2c_ops = { .xfer = cdns_i2c_xfer, - .probe_chip = cdns_i2c_probe_chip, .set_bus_speed = cdns_i2c_set_bus_speed, }; -- 2.7.4