From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.128.51 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793909243; b=ut1kzMEpKJbDk+P3PluEoifiueRQApcvQfNgPoJ+DF+z9mPCaXsoeV5dzKR0XGmS1tms JJmk0MJYrRudy11bBZEyEp3x/TBxTGuoAE6z8GVsHzoOPxY6dTNu1gAfurkNKbXTqqakN 1FMTZ0yPoqHXan3C/vMOcT/WMtfRf9oZe5n4KaYseXrK82If84seBVs+/rqWCRWN3Agma PCeZ83is3pduC4TYs4GjeR+krrroSKm0hYJ5kj9Qvd4YxDvIocBSzjhcjAUYhqwTzZyuM 6m/AFdTMB0rdiSGPTaxKMT6I+MnZs/dH1OXA08hNK5KvhL7ZB7sqDzo8X5fzTkYFAOQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793909243; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=v8EgQl9rPmO32J3WQwpPn6FuQGoxmZBgtbFEiMNkqUg=; b=sDExTLySxnZqP6q3MPYcLVCK5+HSKemPZns5wPTSHNO6adXiFkm3yx0vk9PKVBbZA76m /LjxtRbbWIXGyK30XvdZ9uAS7fxE8ZZNMZb0R1FY306XrtbVZTKP2Q8uLfsJ4rZwxabux aZcIagJdR297rjVoKRmqljs6ZDMziiw1mPwJUXy8uyf++JisiihD2Z90tlReMiMh1/YH2 fmDvoKIhcjW8pBTeY5QG1329jqWB+lqJG9LdRDX+JeMym5h1CX7AesKqsoU9QlUFpufVG px3ucc7zOvqPOYd6yrhNS4xNuGQQknq9VxUkHq3YJO6eYfYW2c0iUZfrDmH0WRJcoLg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=ky8XXgSK; arc=none smtp.remote-ip=209.85.128.51 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D0EF60A262D for ; Thu, 5 Nov 2026 20:07:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 1D0EF60A262D Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=ky8XXgSK Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4a2072b9832so6268385e9.1 for ; Thu, 05 Nov 2026 12:07:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793909241; x=1794514041; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=v8EgQl9rPmO32J3WQwpPn6FuQGoxmZBgtbFEiMNkqUg=; b=ky8XXgSKR4LDmSw+T0DhDyOrGs3XZkNTyVogIJ5ZMCUgYvCL+XcF9ijQUXbm6G0pdW 1X9pQDBxTpsQml3HWJf7rvqo9xWjOx8S8PrVvhrAmiTBiIszCRDZuSMgHS2jTkocNuDf Z7aAN63abnacm4e3UduDErGi1KAyBUTpZcRdkjyOBi6xYJS2gKquIQuiXw2KD4K8D/c7 +JHV7w+p1H8hNRFjFCp++6SPhEsyGr+7i50H3aNLSmJAgtDE2X0TYCTZUF7uY5NrO7fb VH4kcot4Xxa78/NeHBqcjmhTV6xvKVTV32yGmm3oMsMZySVPe7OmCQ/nKTmjOTrJpI/w 5ZQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793909241; x=1794514041; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=v8EgQl9rPmO32J3WQwpPn6FuQGoxmZBgtbFEiMNkqUg=; b=z6j2SR5xep9Lu5eHzylNr8f/pRUIAfLl5OZQszxW9R1u/xxa2iJuzOre1Qa9KYd8mi Q+k0sITc7bfLnExHH2omuh3bw4xkjDBEGz+FLZo9uiHuSku5VW2f+DwfbuXp3CMhhMiv 4XA3vJ0VThuMtdpR82TJyNuPTor945R5k9LZbc7f5n4P3xyny5PYEtnF7LJEvLWWqIaY B6KgUBVUTXK/A+aB3REaBwRZQpixiljEV39oFvFO+p0/++zm5j/5q/6bG9COW3dXqM6z 5pLUkDl2ZKtqsoGf3d4ObvegW5OArBA4UN8DQimhCmmRwE2W8LVEbA7ydrDlXJByKy2K VVPg== X-Forwarded-Encrypted: i=1; AKwUvBy6oegJXZM9lsgpJ3J5yED6SJrXD95JoiJMUbbxM7qfvow3OwgZLo2DgJn4aNyj5yO9oEfvqIQjNze3o9c=@vger.kernel.org X-Gm-Message-State: APuU4Z8pMPj4CnqnVpVxDY+zeqXjT8pHvgkp8gvOfM2QyKVu+AqcIpb1 9dh6xeo4k2AXazet5j+lVVRrg/j5Cz6BTc4KbRExwmGjuB77rvfy2kFq X-Gm-Gg: AYBFou0x15gS/PDY7/hlGoegv/5KwZoudlqGTIFylqttCYa63H1OiTY6uLsgI73SGBP 0wZIdLWc0arMyYKyL5Q/ubKSRmYhZ3x9+uZ4f+ALNgaLezaPmFProGBmQd5UpMupxktT3D2h5Nf LvCMCbns//0lleYBS/Guz4sJICDyd9kXy2c/LNnAALJL9m0KArLWuF0RDHpemGJDt/2rJbLBZsX HdByyWNGRCMR9LjJEVYxr1DwktPc5jZv3UKuCVgEwwYxijUuzEqCBg62iy0TNk9EzwfKio4bVHA KzJ+uy2lb2Vnx1ztj1fF7D1Y29Ug5GB6Lt5022/tRJV9iiRQ0wvcO/M+gd3PLJQpySMHPwmAI32 3A82ltQo6bUv3/ZH0p5qdna6HvPdLwyHhDBhBwFIbXoaOlTQmycJv3csM99wkzNdaFSwY2+zw0y goNG6ExsleW3KwQZeh1cL9o0iKrVx1DB+TWvjhL4WxP4QOzH+nhWeUGAsPkB3FfhM589j9NJBss yjcf4WBW2N7nhExLxWD8jRC5roGB/BCTViqm5kzqNF7wuxIQFukvQelOxO9dok1Eu1YhFcuHyO0 Ws+5J0tAZevnJrk0NJTapPUuXiPoBVKfgh0rEYnRL741bkSGKJWvaRi5iOX9hScPQsk6xbEIoeH 7CyPB X-Received: by 2002:a05:600c:4f42:b0:4b2:4b5e:8141 with SMTP id 5b1f17b1804b1-4b6df4f2304mr3830505e9.9.1793909240484; Thu, 05 Nov 2026 12:07:20 -0800 (PST) Received: from antoniarch (78-212-29-45.subs.proxad.net. [78.212.29.45]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4b433ebd278sm131671835e9.3.2026.11.05.12.07.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2026 12:07:20 -0800 (PST) From: Antoni Pokusinski To: vigneshr@ti.com, andi.shyti@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, aaro.koskinen@iki.fi, andreas@kemnade.info, khilman@baylibre.com, rogerq@kernel.org, tony@atomide.com, jmkrzyszt@gmail.com, sumit.semwal@linaro.org, christian.koenig@amd.com, phasta@kernel.org Cc: linux-omap@vger.kernel.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, Antoni Pokusinski Subject: [PATCH 3/3] i2c: omap: add DMA support Date: Thu, 5 Nov 2026 21:05:54 +0100 Message-ID: <20261105200556.34240-5-apokusinski01@gmail.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261105200556.34240-2-apokusinski01@gmail.com> References: <20261105200556.34240-2-apokusinski01@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add support for the TX and RX DMA requests of the OMAP I2C controller. The DMA transactions are dispatched only if the I2C message size is a multiple of the configured FIFO threshold and is greater than a predefined threshold of 8 bytes. Support for DMA transactions that are not a multiple of the FIFO threshold can be added in the future using the draining feature. Signed-off-by: Antoni Pokusinski --- drivers/i2c/busses/i2c-omap.c | 291 +++++++++++++++++++++++++++++++++- 1 file changed, 287 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index f02d294db42a..59e633c80236 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -5,6 +5,7 @@ * Copyright (C) 2003 MontaVista Software, Inc. * Copyright (C) 2005 Nokia Corporation * Copyright (C) 2004 - 2007 Texas Instruments. + * Copyright (C) 2026 Antoni Pokusiński * * Originally written by MontaVista Software, Inc. * Additional contributions by: @@ -13,10 +14,13 @@ * Juha Yrjölä * Syed Khasim * Nishant Menon + * Antoni Pokusiński */ #include #include +#include +#include #include #include #include @@ -50,6 +54,8 @@ /* timeout for making decision on bus free status */ #define OMAP_I2C_BUS_FREE_TIMEOUT (msecs_to_jiffies(10)) +#define OMAP_I2C_DMA_THRESHOLD 8 + /* For OMAP3 I2C_IV has changed to I2C_WE (wakeup enable) */ enum { OMAP_I2C_REV_REG = 0, @@ -57,6 +63,10 @@ enum { OMAP_I2C_STAT_REG, OMAP_I2C_IV_REG, OMAP_I2C_WE_REG, + OMAP_I2C_DMARXENABLE_SET, + OMAP_I2C_DMATXENABLE_SET, + OMAP_I2C_DMARXENABLE_CLR, + OMAP_I2C_DMATXENABLE_CLR, OMAP_I2C_SYSS_REG, OMAP_I2C_BUF_REG, OMAP_I2C_CNT_REG, @@ -176,12 +186,27 @@ enum { #define OMAP_I2C_IP_V2_INTERRUPTS_MASK 0x6FFF +struct omap_i2c_dma { + struct dma_chan *chan_rx; + struct dma_chan *chan_tx; + struct dma_chan *chan_using; + struct device *dma_dev; + u8 *curr_msg_buf; + struct i2c_msg *curr_msg; + dma_addr_t dma_buf; + unsigned int dma_len; + enum dma_data_direction dma_data_dir; + struct completion complete; + dma_addr_t phy_addr; +}; + struct omap_i2c_dev { struct device *dev; void __iomem *base; /* virtual */ int irq; int reg_shift; /* bit shift for I2C register addresses */ struct completion cmd_complete; + struct omap_i2c_dma *dma; struct resource *ioarea; u32 latency; /* maximum mpu wkup latency */ void (*set_mpu_wkup_lat)(struct device *dev, @@ -242,6 +267,10 @@ static const u8 reg_map_ip_v2[] = { [OMAP_I2C_STAT_REG] = 0x28, [OMAP_I2C_IV_REG] = 0x34, [OMAP_I2C_WE_REG] = 0x34, + [OMAP_I2C_DMARXENABLE_SET] = 0x38, + [OMAP_I2C_DMATXENABLE_SET] = 0x3c, + [OMAP_I2C_DMARXENABLE_CLR] = 0x40, + [OMAP_I2C_DMATXENABLE_CLR] = 0x44, [OMAP_I2C_SYSS_REG] = 0x90, [OMAP_I2C_BUF_REG] = 0x94, [OMAP_I2C_CNT_REG] = 0x98, @@ -655,6 +684,144 @@ static void omap_i2c_wait(struct omap_i2c_dev *omap) } while (!(stat & mask) && count < 5); } +static void omap_i2c_dma_callback(void *arg) +{ + struct omap_i2c_dev *omap = (struct omap_i2c_dev *)arg; + + complete(&omap->dma->complete); +} + +static int omap_i2c_dma_xfer(struct omap_i2c_dev *omap, struct i2c_msg *msg) +{ + int ret; + struct dma_slave_config dma_sconfig = {0}; + struct omap_i2c_dma *dma = omap->dma; + struct dma_async_tx_descriptor *txdesc; + struct device *dev = &omap->adapter.dev; + + dma->curr_msg = msg; + + dma->curr_msg_buf = i2c_get_dma_safe_msg_buf(msg, 1); + if (!dma->curr_msg_buf) + return -ENOMEM; + + if (omap->receiver) { + dma->chan_using = dma->chan_rx; + + dma_sconfig.src_addr = dma->phy_addr + + (omap->regs[OMAP_I2C_DATA_REG] + << omap->reg_shift); + dma_sconfig.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; + dma_sconfig.src_maxburst = omap->threshold; + dma_sconfig.direction = DMA_DEV_TO_MEM; + } else { + dma->chan_using = dma->chan_tx; + + dma_sconfig.dst_addr = dma->phy_addr + + (omap->regs[OMAP_I2C_DATA_REG] + << omap->reg_shift); + dma_sconfig.dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; + dma_sconfig.dst_maxburst = omap->threshold; + dma_sconfig.direction = DMA_MEM_TO_DEV; + } + + ret = dmaengine_slave_config(dma->chan_using, &dma_sconfig); + if (ret < 0) { + dev_err(dev, "DMA channel config failed: %d\n", ret); + goto err_map; + } + + dma->dma_len = msg->len; + dma->dma_data_dir = omap->receiver ? DMA_FROM_DEVICE : DMA_TO_DEVICE; + + dma->dma_dev = dmaengine_get_dma_device(dma->chan_using); + + dma->dma_buf = dma_map_single(dma->dma_dev, dma->curr_msg_buf, + dma->dma_len, dma->dma_data_dir); + if (dma_mapping_error(dma->dma_dev, dma->dma_buf)) { + dev_err(dev, "DMA mapping failed\n"); + ret = -EINVAL; + goto err_map; + } + + txdesc = dmaengine_prep_slave_single(dma->chan_using, dma->dma_buf, + dma->dma_len, + omap->receiver ? DMA_DEV_TO_MEM : + DMA_MEM_TO_DEV, + DMA_PREP_INTERRUPT | DMA_CTRL_ACK); + if (!txdesc) { + dev_err(dev, "Not able to get desc for DMA xfer\n"); + ret = -EINVAL; + goto err_desc; + } + + reinit_completion(&dma->complete); + + dmaengine_desc_set_callback(txdesc, omap_i2c_dma_callback, NULL, omap); + ret = dma_submit_error(dmaengine_submit(txdesc)); + if (ret < 0) { + dev_err(dev, "DMA submit failed\n"); + goto err_submit; + } + + dma_async_issue_pending(dma->chan_using); + return 0; + +err_submit: + dmaengine_terminate_sync(dma->chan_using); +err_desc: + dma_unmap_single(dma->dma_dev, dma->dma_buf, dma->dma_len, + dma->dma_data_dir); +err_map: + i2c_put_dma_safe_msg_buf(dma->curr_msg_buf, msg, false); + return ret; +} + +static void omap_i2c_dma_cleanup(struct omap_i2c_dev *omap, bool xferred) +{ + struct omap_i2c_dma *dma = omap->dma; + + dma_unmap_single(dma->dma_dev, dma->dma_buf, dma->dma_len, + dma->dma_data_dir); + i2c_put_dma_safe_msg_buf(dma->curr_msg_buf, dma->curr_msg, xferred); +} + +static void omap_i2c_dma_enable_req(struct omap_i2c_dev *omap) +{ + u16 w; + + w = omap_i2c_read_reg(omap, OMAP_I2C_BUF_REG); + if (omap->receiver) { + w |= OMAP_I2C_BUF_RDMA_EN; + omap_i2c_write_reg(omap, OMAP_I2C_BUF_REG, w); + + omap_i2c_write_reg(omap, OMAP_I2C_DMARXENABLE_SET, 1); + } else { + w |= OMAP_I2C_BUF_XDMA_EN; + omap_i2c_write_reg(omap, OMAP_I2C_BUF_REG, w); + + omap_i2c_write_reg(omap, OMAP_I2C_DMATXENABLE_SET, 1); + } +} + +static void omap_i2c_dma_disable_req(struct omap_i2c_dev *omap) +{ + u16 w; + + w = omap_i2c_read_reg(omap, OMAP_I2C_BUF_REG); + if (omap->receiver) { + w &= ~OMAP_I2C_BUF_RDMA_EN; + omap_i2c_write_reg(omap, OMAP_I2C_BUF_REG, w); + + omap_i2c_write_reg(omap, OMAP_I2C_DMARXENABLE_CLR, 1); + } else { + w &= ~OMAP_I2C_BUF_XDMA_EN; + omap_i2c_write_reg(omap, OMAP_I2C_BUF_REG, w); + + omap_i2c_write_reg(omap, OMAP_I2C_DMATXENABLE_CLR, 1); + } +} + /* * Low level master read/write transaction. */ @@ -664,7 +831,7 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap, struct omap_i2c_dev *omap = i2c_get_adapdata(adap); unsigned long time_left; u16 w; - int ret; + int ret, use_dma; dev_dbg(omap->dev, "addr: 0x%04x, len: %d, flags: 0x%x, stop: %d\n", msg->addr, msg->len, msg->flags, stop); @@ -672,6 +839,14 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap, omap->receiver = !!(msg->flags & I2C_M_RD); omap_i2c_resize_fifo(omap, msg->len, omap->receiver); + /** + * REVISIT: If the message size is not a multiple of the threshold, + * the draining feature must be used. + */ + use_dma = !polling && omap->dma && msg->len >= OMAP_I2C_DMA_THRESHOLD && + !(omap->flags & OMAP_I2C_FLAG_NO_FIFO) && + msg->len % omap->threshold == 0; + omap_i2c_write_reg(omap, OMAP_I2C_SA_REG, msg->addr); /* REVISIT: Could the STB bit of I2C_CON be used with probing? */ @@ -692,6 +867,17 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap, reinit_completion(&omap->cmd_complete); omap->cmd_err = 0; + if (use_dma) { + ret = omap_i2c_dma_xfer(omap, msg); + if (ret) { + omap_i2c_reset(omap); + __omap_i2c_init(omap); + return ret; + } + + omap_i2c_dma_enable_req(omap); + } + w = OMAP_I2C_CON_EN | OMAP_I2C_CON_MST | OMAP_I2C_CON_STT; /* High speed configuration */ @@ -742,8 +928,17 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap, * into arbitration and we're currently unable to recover from it. */ if (!polling) { - time_left = wait_for_completion_timeout(&omap->cmd_complete, - OMAP_I2C_TIMEOUT); + time_left = OMAP_I2C_TIMEOUT; + + if (use_dma) + time_left = wait_for_completion_timeout( + &omap->dma->complete, + time_left); + + if (time_left) + time_left = wait_for_completion_timeout( + &omap->cmd_complete, + time_left); } else { do { omap_i2c_wait(omap); @@ -753,6 +948,15 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap, time_left = !ret; } + if (use_dma) { + omap_i2c_dma_disable_req(omap); + + if (!time_left || omap->cmd_err) + dmaengine_terminate_sync(omap->dma->chan_using); + + omap_i2c_dma_cleanup(omap, time_left && !omap->cmd_err); + } + if (time_left == 0) { omap_i2c_reset(omap); __omap_i2c_init(omap); @@ -1338,10 +1542,70 @@ static struct i2c_bus_recovery_info omap_i2c_bus_recovery_info = { .recover_bus = i2c_generic_scl_recovery, }; +static struct omap_i2c_dma *omap_i2c_dma_init(struct omap_i2c_dev *omap, + dma_addr_t phy_addr) +{ + struct device *dev = omap->dev; + struct omap_i2c_dma *dma; + int ret; + + dma = devm_kzalloc(dev, sizeof(*dma), GFP_KERNEL); + if (!dma) + return ERR_PTR(-ENOMEM); + + dma->phy_addr = phy_addr; + + init_completion(&dma->complete); + + dma->chan_tx = dma_request_chan(dev, "tx"); + if (IS_ERR(dma->chan_tx)) { + ret = PTR_ERR(dma->chan_tx); + if (ret != -ENODEV) + dev_err_probe(dev, ret, + "can't request DMA tx channel\n"); + goto dma_free; + } + + dma->chan_rx = dma_request_chan(dev, "rx"); + if (IS_ERR(dma->chan_rx)) { + ret = PTR_ERR(dma->chan_rx); + if (ret != -ENODEV) + dev_err_probe(dev, ret, + "can't request DMA rx channel\n"); + goto dma_tx_fail; + } + + return dma; + +dma_tx_fail: + dma_release_channel(dma->chan_tx); +dma_free: + devm_kfree(dev, dma); + + return ERR_PTR(ret); +} + +static void omap_i2c_dma_free(struct omap_i2c_dev *omap) +{ + struct omap_i2c_dma *dma = omap->dma; + + dma->dma_buf = 0; + dma->dma_len = 0; + + dma_release_channel(dma->chan_tx); + dma->chan_tx = NULL; + + dma_release_channel(dma->chan_rx); + dma->chan_rx = NULL; + + dma->chan_using = NULL; +} + static int omap_i2c_probe(struct platform_device *pdev) { struct omap_i2c_dev *omap; + struct resource *res; struct i2c_adapter *adap; const struct omap_i2c_bus_platform_data *pdata = dev_get_platdata(&pdev->dev); @@ -1359,7 +1623,7 @@ omap_i2c_probe(struct platform_device *pdev) if (!omap) return -ENOMEM; - omap->base = devm_platform_ioremap_resource(pdev, 0); + omap->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(omap->base)) return PTR_ERR(omap->base); @@ -1478,6 +1742,22 @@ omap_i2c_probe(struct platform_device *pdev) goto err_unuse_clocks; } + if (omap->scheme != OMAP_I2C_SCHEME_0) { + omap->dma = omap_i2c_dma_init(omap, (dma_addr_t)res->start); + if (PTR_ERR(omap->dma) == -EPROBE_DEFER) { + r = -EPROBE_DEFER; + dev_err_probe(&pdev->dev, r, + "can't get DMA channels\n"); + goto err_unuse_clocks; + } else if (PTR_ERR(omap->dma) == -ENODEV) { + dev_dbg(omap->dev, "DMA setup failed\n"); + omap->dma = NULL; + } else if (IS_ERR(omap->dma)) { + r = PTR_ERR(omap->dma); + goto err_unuse_clocks; + } + } + adap = &omap->adapter; i2c_set_adapdata(adap, omap); adap->owner = THIS_MODULE; @@ -1523,6 +1803,9 @@ static void omap_i2c_remove(struct platform_device *pdev) if (omap->mux_state) mux_state_deselect(omap->mux_state); + if (omap->dma) + omap_i2c_dma_free(omap); + ret = pm_runtime_get_sync(&pdev->dev); if (ret < 0) dev_err(omap->dev, "Failed to resume hardware, skip disable\n"); -- 2.56.0