From patchwork Sun Dec 7 22:10:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Larsson X-Patchwork-Id: 27376 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Xxk22-0003I6-2K; Sun, 07 Dec 2014 23:10:22 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-6) with esmtp id 1Xxk1z-0001XS-5Y; Sun, 07 Dec 2014 23:10:21 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753457AbaLGWKR (ORCPT + 1 other); Sun, 7 Dec 2014 17:10:17 -0500 Received: from smtp.bredband2.com ([83.219.192.166]:41020 "EHLO smtp.bredband2.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753427AbaLGWKP (ORCPT ); Sun, 7 Dec 2014 17:10:15 -0500 Received: from localhost.localdomain (92-244-23-216.customers.ownit.se [92.244.23.216]) (Authenticated sender: ed8153) by smtp.bredband2.com (Postfix) with ESMTPA id C417810281A; Sun, 7 Dec 2014 23:10:03 +0100 (CET) From: Benjamin Larsson To: crope@iki.fi Cc: Linux Media Mailing List Subject: [PATCH 2/2] mn88472: fix firmware loading Date: Sun, 7 Dec 2014 23:10:03 +0100 Message-Id: <1417990203-758-2-git-send-email-benjamin@southpole.se> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1417990203-758-1-git-send-email-benjamin@southpole.se> References: <1417990203-758-1-git-send-email-benjamin@southpole.se> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.12.7.220620 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1600_1699 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' The firmware must be loaded one byte at a time via the 0xf6 register. Signed-off-by: Benjamin Larsson --- drivers/staging/media/mn88472/mn88472.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/drivers/staging/media/mn88472/mn88472.c b/drivers/staging/media/mn88472/mn88472.c index ffee187..ba1bc8d 100644 --- a/drivers/staging/media/mn88472/mn88472.c +++ b/drivers/staging/media/mn88472/mn88472.c @@ -290,7 +290,7 @@ static int mn88472_init(struct dvb_frontend *fe) { struct i2c_client *client = fe->demodulator_priv; struct mn88472_dev *dev = i2c_get_clientdata(client); - int ret, len, remaining; + int ret, i; const struct firmware *fw = NULL; u8 *fw_file = MN88472_FIRMWARE; @@ -330,19 +330,12 @@ static int mn88472_init(struct dvb_frontend *fe) if (ret) goto err; - for (remaining = fw->size; remaining > 0; - remaining -= (dev->i2c_wr_max - 1)) { - len = remaining; - if (len > (dev->i2c_wr_max - 1)) - len = (dev->i2c_wr_max - 1); - - ret = regmap_bulk_write(dev->regmap[0], 0xf6, - &fw->data[fw->size - remaining], len); - if (ret) { - dev_err(&client->dev, - "firmware download failed=%d\n", ret); - goto err; - } + for (i = 0 ; i < fw->size ; i++) + ret |= regmap_write(dev->regmap[0], 0xf6, fw->data[i]); + if (ret) { + dev_err(&client->dev, + "firmware download failed=%d\n", ret); + goto err; } ret = regmap_write(dev->regmap[0], 0xf5, 0x00);