From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753581AbaBZRB2 (ORCPT ); Wed, 26 Feb 2014 12:01:28 -0500 Received: from top.free-electrons.com ([176.31.233.9]:39839 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753139AbaBZRB1 (ORCPT ); Wed, 26 Feb 2014 12:01:27 -0500 From: Alexandre Belloni To: Nicolas Ferre Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jean-Christophe Plagniol-Villard , Maxime Ripard , Gregory Clement , b.brezillon@overkiz.com, Alexandre Belloni Subject: [PATCH 7/7] ARM: at91/dt: sama5d3: remove useless adc properties Date: Wed, 26 Feb 2014 18:01:14 +0100 Message-Id: <1393434074-15600-7-git-send-email-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1393434074-15600-1-git-send-email-alexandre.belloni@free-electrons.com> References: <1393434074-15600-1-git-send-email-alexandre.belloni@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove the properties that are not used anymore by the at91_adc driver. Also, stop using unit-addresses for the triggers as suggested by Mark Rutland in http://lists.infradead.org/pipermail/linux-arm-kernel/2014-February/234184.html Signed-off-by: Alexandre Belloni --- arch/arm/boot/dts/sama5d3.dtsi | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi index 26d7ed510c96..46f610a09b38 100644 --- a/arch/arm/boot/dts/sama5d3.dtsi +++ b/arch/arm/boot/dts/sama5d3.dtsi @@ -261,35 +261,30 @@ clocks = <&adc_clk>, <&adc_op_clk>; clock-names = "adc_clk", "adc_op_clk"; - atmel,adc-channel-base = <0x50>; atmel,adc-channels-used = <0xfff>; - atmel,adc-drdy-mask = <0x1000000>; - atmel,adc-num-channels = <12>; atmel,adc-startup-time = <40>; - atmel,adc-status-register = <0x30>; - atmel,adc-trigger-register = <0xc0>; atmel,adc-use-external; atmel,adc-vref = <3000>; atmel,adc-res = <10 12>; atmel,adc-res-names = "lowres", "highres"; status = "disabled"; - trigger@0 { + trigger0 { trigger-name = "external-rising"; trigger-value = <0x1>; trigger-external; }; - trigger@1 { + trigger1 { trigger-name = "external-falling"; trigger-value = <0x2>; trigger-external; }; - trigger@2 { + trigger2 { trigger-name = "external-any"; trigger-value = <0x3>; trigger-external; }; - trigger@3 { + trigger3 { trigger-name = "continuous"; trigger-value = <0x6>; }; -- 1.8.3.2