From patchwork Sun Apr 12 12:24:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 6202911 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DC82B9F691 for ; Sun, 12 Apr 2015 12:25:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C84E2018E for ; Sun, 12 Apr 2015 12:25:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28FCA2017E for ; Sun, 12 Apr 2015 12:25:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751154AbbDLMZU (ORCPT ); Sun, 12 Apr 2015 08:25:20 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:34706 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752000AbbDLMZS (ORCPT ); Sun, 12 Apr 2015 08:25:18 -0400 Received: by pacyx8 with SMTP id yx8so72750043pac.1; Sun, 12 Apr 2015 05:25:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+cMgmnKVgst599Xqkaat4BUzOVnhq2JqgSrpPl+E2no=; b=U6tU0LaFcJp6F7rJ3qu0mW+m3KgNRHkzzwesxvRDddF+khyhhESuVeopqDp2+MdzLY uTmqY4HpUTfQlMGo9RQ8RJMjiIc8v5rteSsbptI8eKbmVkEv2Zo85ATdZWOOm+dcU7Il d5DYkxRfRa3dfevHbCVSwQgsuRHioEqLw//JqbAdrF624iIJ9nz9I/j8xTAw/GEJdrWd KEMWia5C/rnTo2p1F+PWVT2N4zmPVOxT7fibNgmoEKKomxw4ROmDwT7MD1cPU2MWEw5M eA9FGnZqyiE+BBA9k5pYruombMEQdixoyUB5orGxs22fSfX0Qp3IQisgHbmz7alCBU6/ hJqQ== X-Received: by 10.70.88.203 with SMTP id bi11mr17143437pdb.121.1428841517408; Sun, 12 Apr 2015 05:25:17 -0700 (PDT) Received: from localhost.localdomain ([125.130.175.98]) by mx.google.com with ESMTPSA id jc9sm4276197pbd.54.2015.04.12.05.25.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Apr 2015 05:25:16 -0700 (PDT) From: Krzysztof Kozlowski To: Kukjin Kim , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Olof Johansson , Marek Szyprowski , Krzysztof Kozlowski Subject: [PATCH 3/7] ARM: dts: Remove duplicated I2C 7 nodes in Snow Date: Sun, 12 Apr 2015 21:24:50 +0900 Message-Id: <1428841494-20769-4-git-send-email-k.kozlowski.k@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1428841494-20769-1-git-send-email-k.kozlowski.k@gmail.com> References: <1428841494-20769-1-git-send-email-k.kozlowski.k@gmail.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_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 The i2c_7 node (i2c@12CD0000) with LVDS bridge child node was put in Exynos5250 Snow DTS file twice. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/exynos5250-snow.dts | 46 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts index 2657e842e5a5..7ecdad0517e7 100644 --- a/arch/arm/boot/dts/exynos5250-snow.dts +++ b/arch/arm/boot/dts/exynos5250-snow.dts @@ -177,30 +177,6 @@ }; }; - i2c@12CD0000 { - ptn3460: lvds-bridge@20 { - compatible = "nxp,ptn3460"; - reg = <0x20>; - powerdown-gpios = <&gpy2 5 GPIO_ACTIVE_HIGH>; - reset-gpios = <&gpx1 5 GPIO_ACTIVE_HIGH>; - edid-emulation = <5>; - - ports { - port@0 { - bridge_out: endpoint { - remote-endpoint = <&panel_in>; - }; - }; - - port@1 { - bridge_in: endpoint { - remote-endpoint = <&dp_out>; - }; - }; - }; - }; - }; - sound { compatible = "google,snow-audio-max98095"; @@ -507,6 +483,28 @@ samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <66000>; + ptn3460: lvds-bridge@20 { + compatible = "nxp,ptn3460"; + reg = <0x20>; + powerdown-gpios = <&gpy2 5 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpx1 5 GPIO_ACTIVE_HIGH>; + edid-emulation = <5>; + + ports { + port@0 { + bridge_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + + port@1 { + bridge_in: endpoint { + remote-endpoint = <&dp_out>; + }; + }; + }; + }; + max98095: codec@11 { compatible = "maxim,max98095"; reg = <0x11>;