From patchwork Tue Oct 7 21:00:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Heimpold X-Patchwork-Id: 5049141 Return-Path: X-Original-To: patchwork-linux-arm@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 AD00E9F295 for ; Tue, 7 Oct 2014 21:05:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E741720225 for ; Tue, 7 Oct 2014 21:05:08 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 35C5120220 for ; Tue, 7 Oct 2014 21:05:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XbbtN-0005P6-9D; Tue, 07 Oct 2014 21:01:57 +0000 Received: from mo6-p00-ob.smtp.rzone.de ([2a01:238:20a:202:5300::5]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XbbtK-0005Jy-8g for linux-arm-kernel@lists.infradead.org; Tue, 07 Oct 2014 21:01:55 +0000 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; t=1412715688; l=598; s=domk; d=heimpold.de; h=Date:Subject:Cc:To:From; bh=QTPmh7F0bOhYIySG/0UC71m/mY4=; b=Bdsr3RFM/tfZ83SiAt0oKJpk8y0pfFAG0gb83HB2NF0RSlGdCDIUxDgRJ2vnhqeDhjW GTe233E1wUw8nyxXLPlAMXgplypKzR10j/e7FN4ZtheY6ks7bC1zCRrMW1ni31JFkRANa lYZy+ylrXKRNjN+Ara1AwaoW9wlXo+OfOkI= X-RZG-AUTH: :O2kGeEG7b/pS1EW8QnKjhhg/vO4pzqdNys2z+NfqLSUoNNCTudAGGnyHtjxQcL7AHc3WPPU= X-RZG-CLASS-ID: mo00 Received: from tonne.mhei.heimpold.itr (dslb-178-012-194-168.178.012.pools.vodafone-ip.de [178.12.194.168]) by post.strato.de (RZmta 35.10 DYNA|AUTH) with ESMTPA id 6040b2q97L1S7ic; Tue, 7 Oct 2014 23:01:28 +0200 (CEST) Received: from kerker.fritz.box (kerker.fritz.box [192.168.8.1]) by tonne.mhei.heimpold.itr (Postfix) with ESMTP id 1DE371329F4; Tue, 7 Oct 2014 23:01:28 +0200 (CEST) From: Michael Heimpold To: shawn.guo@freescale.com Subject: [PATCH] ARM: dts: imx28-evk: remove duplicate property Date: Tue, 7 Oct 2014 23:00:39 +0200 Message-Id: <1412715639-9565-1-git-send-email-mhei@heimpold.de> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141007_140154_635152_AEACBE91 X-CRM114-Status: UNSURE ( 7.74 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.1 (/) Cc: Fabio Estevam , Michael Heimpold , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 Seems to be a left-over from an automatic merge. Signed-off-by: Michael Heimpold Cc: Fabio Estevam Reviewed-by: Fabio Estevam --- arch/arm/boot/dts/imx28-evk.dts | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts index 09664fc..2944d39 100644 --- a/arch/arm/boot/dts/imx28-evk.dts +++ b/arch/arm/boot/dts/imx28-evk.dts @@ -182,7 +182,6 @@ }; lradc@80050000 { - fsl,lradc-touchscreen-wires = <4>; status = "okay"; fsl,lradc-touchscreen-wires = <4>; fsl,ave-ctrl = <4>;