From patchwork Tue Feb 7 16:41:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 39258 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cb8qX-0002sk-0l; Tue, 07 Feb 2017 16:42:25 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-5) with esmtp id 1cb8qU-00024i-97; Tue, 07 Feb 2017 17:42:24 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755416AbdBGQmJ (ORCPT + 1 other); Tue, 7 Feb 2017 11:42:09 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:37180 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755373AbdBGQmG (ORCPT ); Tue, 7 Feb 2017 11:42:06 -0500 Received: by mail-wm0-f41.google.com with SMTP id v77so162578237wmv.0 for ; Tue, 07 Feb 2017 08:42:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mFnZxn5h9uxIX92fDyQw5euPQLiqMjB8G9mvPlV0W+k=; b=JXTeTcJPlHqI5glDeCsH5YGhfwlmxnBw9t/mIl+3AexVqg1cABHcarE1koJZOqSO+L bAZn6ppa3cLvnjuRQ8IODhcOWOAwjx3uzuktUVaAom6A6ktl2Q3YkM26ev0DJOUMxYAn MWB+YaxV205Mp4FAGB4C9UGSR8mDAaq7La0VApIPyq881iOJ2iBhAQGdREnO7it7fTAg NuBky8w8/A1BVOi6yxF8jeoM0QhTDEi4UV481e0fRTRvhAHP0+aBTW5PWjpCovFy8g/5 hCEqkR9YHrkofda8jkz7wQFRq3V2zZOuBf6FHqA0fOddRrlslSc5Oq+gM8IUrY8SLFO3 LiEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mFnZxn5h9uxIX92fDyQw5euPQLiqMjB8G9mvPlV0W+k=; b=iPgxMI+T70JJv1pV/nBMLd0rdMTlrT0Lt6aKqhU6c85cuAA3CN2Xfbaa8fukmKlfHE 6zTK3zc3m+OfJAA3+ipUsJq22zTCDpE8fcxqRsTZqm8vg9LKOlfn17CBN8TLgooLJHZW Xavn8Q0dv1Q/u9LLt4C1+InyVG1Qe7ylNFE+oaGx7QrYF3JQHSJBzOQ5LDyZ0U5osWJA WdSftc/5Q3gi/ei/69Saq7PN3zDllbPg5LhjR3cEAj6bcBRTWqY38Yo0gd7J28THiRaz 1FmFBjq1KgrSQwmULbg52ZjUFxBYaIo4GkJ73bDtqM/5KA05DtMeUlAIxMGvOFr24ZLf N4nQ== X-Gm-Message-State: AIkVDXKjZ5vH2W2rYoqX5jusY8l3Bydl577KrQv+K5CfF28NLSopOd1Q9V/+3WcFxC7cCo78 X-Received: by 10.223.135.69 with SMTP id 5mr16633238wrz.174.1486485715213; Tue, 07 Feb 2017 08:41:55 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 8sm3958185wmg.1.2017.02.07.08.41.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Feb 2017 08:41:54 -0800 (PST) From: Bartosz Golaszewski To: Kevin Hilman , Sekhar Nori , Patrick Titiano , Michael Turquette , Rob Herring , Mark Rutland , Russell King , Alexandre Bailon , David Lechner , Laurent Pinchart , Mauro Carvalho Chehab , Lad Prabhakar Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 08/10] ARM: davinci: fix the DT boot on da850-evm Date: Tue, 7 Feb 2017 17:41:21 +0100 Message-Id: <1486485683-11427-9-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1486485683-11427-1-git-send-email-bgolaszewski@baylibre.com> References: <1486485683-11427-1-git-send-email-bgolaszewski@baylibre.com> 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: 2017.2.7.163315 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1200_1299 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, ECARD_WORD 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_URI_IN_BODY 0, __FROM_DOMAIN_IN_ANY_TO2 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_RCPTS_TO_X5 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0, __YOUTUBE_RCVD 0' When we enable vpif capture on the da850-evm we hit a BUG_ON() because the i2c adapter can't be found. The board file boot uses i2c adapter 1 but in the DT mode it's actually adapter 0. Drop the problematic lines. Signed-off-by: Bartosz Golaszewski Acked-by: Kevin Hilman --- arch/arm/mach-davinci/pdata-quirks.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/mach-davinci/pdata-quirks.c b/arch/arm/mach-davinci/pdata-quirks.c index 94948c1..09f62ac 100644 --- a/arch/arm/mach-davinci/pdata-quirks.c +++ b/arch/arm/mach-davinci/pdata-quirks.c @@ -116,10 +116,6 @@ static void __init da850_vpif_legacy_init(void) if (of_machine_is_compatible("ti,da850-lcdk")) da850_vpif_capture_config.subdev_count = 1; - /* EVM (UI card) uses i2c adapter 1 (not default: zero) */ - if (of_machine_is_compatible("ti,da850-evm")) - da850_vpif_capture_config.i2c_adapter_id = 1; - ret = da850_register_vpif_capture(&da850_vpif_capture_config); if (ret) pr_warn("%s: VPIF capture setup failed: %d\n",