From patchwork Tue Jul 22 11:08:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Enric Balletbo i Serra X-Patchwork-Id: 4601051 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E9C569F2B8 for ; Tue, 22 Jul 2014 11:09:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2FDD120155 for ; Tue, 22 Jul 2014 11:09:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 90D3820154 for ; Tue, 22 Jul 2014 11:09:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752548AbaGVLJD (ORCPT ); Tue, 22 Jul 2014 07:09:03 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:56930 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751514AbaGVLJD (ORCPT ); Tue, 22 Jul 2014 07:09:03 -0400 Received: by mail-wg0-f52.google.com with SMTP id a1so7675493wgh.11 for ; Tue, 22 Jul 2014 04:09:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id; bh=1xglElnJkvPRDWULmGdoK9x08IAfTQvJR5lZjVb+vdQ=; b=jrK1n28M2f0NKPER8PphBptBTR7korgFpamUBMsx3M/tOYgC+2oJNDWJQACeRA6whr 1ZnF0xhfa6vG8O6aS5JBKk6427m/kncWt+xxYU7Vix8tUUiHx1iOXKz/HF8vVJazT8aT +7FgfGQOW4LN58aQQQRHHCRyZ9pZJt9OmDP6RAxMbSlSdnyS/sS2QUnuXFlgZHTDnhoy DnZAgCszm36ORl1Ebd2f/B65ksZ8PXvKwrhUOelKCIFgxAjsLNvSiRgaQ57US7ilThMo EdNAqNqxvSJoYsRopB5udQUDYgYhOdh4gIdiyShkseiYctT5P+Eycl1MibOQbl2So/o4 BBdA== X-Received: by 10.195.11.132 with SMTP id ei4mr25098414wjd.95.1406027340797; Tue, 22 Jul 2014 04:09:00 -0700 (PDT) Received: from localhost.localdomain (43.Red-2-139-180.staticIP.rima-tde.net. [2.139.180.43]) by mx.google.com with ESMTPSA id v14sm165976wjw.38.2014.07.22.04.08.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Jul 2014 04:09:00 -0700 (PDT) From: Enric Balletbo i Serra To: gregkh@linuxfoundation.org, pavan_savoy@ti.com, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org Cc: Enric Balletbo i Serra Subject: [PATCH] drivers/misc/ti-st: Load firmware from ti-connectivity directory. Date: Tue, 22 Jul 2014 13:08:38 +0200 Message-Id: <1406027318-26186-1-git-send-email-eballetbo@iseebcn.com> X-Mailer: git-send-email 1.9.1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Looks like the default location for TI firmware is inside the ti-connectivity directory, to be coherent with other firmware request used by TI drivers, load the TIInit firmware from this directory instead of /lib/firmware directly. Signed-off-by: Enric Balletbo i Serra --- drivers/misc/ti-st/st_kim.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c index 9d3dbb2..fa6a900 100644 --- a/drivers/misc/ti-st/st_kim.c +++ b/drivers/misc/ti-st/st_kim.c @@ -244,7 +244,8 @@ static long read_local_version(struct kim_data_s *kim_gdata, char *bts_scr_name) if (version & 0x8000) maj_ver |= 0x0008; - sprintf(bts_scr_name, "TIInit_%d.%d.%d.bts", chip, maj_ver, min_ver); + sprintf(bts_scr_name, "ti-connectivity/TIInit_%d.%d.%d.bts", + chip, maj_ver, min_ver); /* to be accessed later via sysfs entry */ kim_gdata->version.full = version; @@ -287,7 +288,7 @@ static long download_firmware(struct kim_data_s *kim_gdata) long len = 0; unsigned char *ptr = NULL; unsigned char *action_ptr = NULL; - unsigned char bts_scr_name[30] = { 0 }; /* 30 char long bts scr name? */ + unsigned char bts_scr_name[40] = { 0 }; /* 40 char long bts scr name? */ int wr_room_space; int cmd_size; unsigned long timeout;