From patchwork Sun Jan 15 07:59:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 9517319 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0A713601DA for ; Sun, 15 Jan 2017 07:59:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5A9D2842C for ; Sun, 15 Jan 2017 07:59:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D7AAF28440; Sun, 15 Jan 2017 07:59:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA6B22842C for ; Sun, 15 Jan 2017 07:59:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750787AbdAOH7g (ORCPT ); Sun, 15 Jan 2017 02:59:36 -0500 Received: from guitar.tcltek.co.il ([192.115.133.116]:55847 "EHLO mx.tkos.co.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750733AbdAOH7g (ORCPT ); Sun, 15 Jan 2017 02:59:36 -0500 Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id D2A43440538; Sun, 15 Jan 2017 09:59:31 +0200 (IST) From: Baruch Siach To: Philipp Zabel Cc: linux-media@vger.kernel.org, Baruch Siach , Fabio Estevam Subject: [PATCH v2] [media] coda: add Freescale firmware compatibility location Date: Sun, 15 Jan 2017 09:59:14 +0200 Message-Id: <5723860e4668aebd07ea61d17b7879bea8b2f230.1484467154.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.11.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The Freescale provided imx-vpu looks for firmware files under /lib/firmware/vpu by default. Make coda look there for firmware files to ease the update path. Cc: Fabio Estevam Signed-off-by: Baruch Siach --- v2: add compatibility path; don't change existing path (Fabio) --- drivers/media/platform/coda/coda-common.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c index 9e6bdafa16f5..ce0d00f3f3ba 100644 --- a/drivers/media/platform/coda/coda-common.c +++ b/drivers/media/platform/coda/coda-common.c @@ -2079,6 +2079,7 @@ static const struct coda_devtype coda_devdata[] = { [CODA_IMX27] = { .firmware = { "vpu_fw_imx27_TO2.bin", + "vpu/vpu_fw_imx27_TO2.bin", "v4l-codadx6-imx27.bin" }, .product = CODA_DX6, @@ -2092,6 +2093,7 @@ static const struct coda_devtype coda_devdata[] = { [CODA_IMX53] = { .firmware = { "vpu_fw_imx53.bin", + "vpu/vpu_fw_imx53.bin", "v4l-coda7541-imx53.bin" }, .product = CODA_7541, @@ -2106,6 +2108,7 @@ static const struct coda_devtype coda_devdata[] = { [CODA_IMX6Q] = { .firmware = { "vpu_fw_imx6q.bin", + "vpu/vpu_fw_imx6q.bin", "v4l-coda960-imx6q.bin" }, .product = CODA_960, @@ -2120,6 +2123,7 @@ static const struct coda_devtype coda_devdata[] = { [CODA_IMX6DL] = { .firmware = { "vpu_fw_imx6d.bin", + "vpu/vpu_fw_imx6d.bin", "v4l-coda960-imx6dl.bin" }, .product = CODA_960,