Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9247210pxu; Mon, 28 Dec 2020 10:21:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJyq6zzpjKA2rFEdCLXlmWFKA3dPHk2LP8jnXtRAcCYEsa2Dqm6BY8aP7Do/O+gR2TL0qDWa X-Received: by 2002:aa7:d5d6:: with SMTP id d22mr42827032eds.160.1609179677664; Mon, 28 Dec 2020 10:21:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609179677; cv=none; d=google.com; s=arc-20160816; b=J4BecHY6Edq54OyNvzQVdveKvoeeSDDX3h22WdU4Runj0WJybBi+EtBmFelEc7Wr00 P5o8M9x66mJWVAH6Q/yAUn/iYBOOa/BlDWGqUs7PxY+ClwbG68e5e3i+Zw/O+g9VQ7lH 4h/7MYRF16GM2snNl3s6ZzbA0M7sYBGK8hTMsxVSvVw3KmrqoZga2GMXl9boI3baN9NJ JFQN8DYYe0ypP3hDrG+xQ/He0tFlty1Hsds8mkyaBDc0xA0k3SSpkrpfQrQtC0t5weSz pbdyL7/1sekQT5w//zJRAF7oLG/DB/Zr8KUQ0n02Xxirf6x048oLeEW9kY+jW0V17nKL RwKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1/SzSnMtVrXxi40nMs9AHp7MTHM10VY+PKlEBQcYBcQ=; b=YUW31G4b0k8eBNo4wP3x91JlM2irEatPK+25voVPI8kXx3wyJx+5JOBZbuweT0imjX yd31XUZRFU/Mx05lAYt1W9QBsN4bP58ZvRIeOYyOjqirDvpCnl/GFRpFxZouDWf38Lsg SB8x96PSm2y2VO8CU2boVs5Hw1dKymJg/lKhhqSOcwzPC/8K9MErxECWEoisEw29fwa8 3du+HDlEOjQDDFBUxAMJz9XI4ktJKix7mVFQW8SApHLoSP/w9nKTi7AtmbDUL8nC4Jl3 fLiWY27j1MRSn53gRGU0gx9Dl/PtKq3xv7ifM6VTDyi/yrsOVkHUaIQTyP3LYsiyBeBG rB/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Km/Ucu5Q"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f11si19023203ejw.546.2020.12.28.10.20.55; Mon, 28 Dec 2020 10:21:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Km/Ucu5Q"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390182AbgL1N3t (ORCPT + 99 others); Mon, 28 Dec 2020 08:29:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:58016 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390062AbgL1N3N (ORCPT ); Mon, 28 Dec 2020 08:29:13 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5F3EC207CF; Mon, 28 Dec 2020 13:28:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609162113; bh=xPhre7l8dT8O8tjD8Y4PnUjg+62h/YxwsgXebb5np7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Km/Ucu5QR963oeOZlrDXIUTBUR1EUINe03VAePPhoUwnZzl+jkekV5l5BgZwHaQ/3 mH5vYnGzJ5DKx3Yjp+0Exd2kdSwg5Ac+wWVGJUJHaMolheX+4/T3JolUlOrzjqcxwX ojcP0XaECynbsUYSnqC+WXD1xNksl7fDvWMvfyOE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexandre Belloni , Sasha Levin Subject: [PATCH 4.19 184/346] ARM: dts: at91: at91sam9rl: fix ADC triggers Date: Mon, 28 Dec 2020 13:48:23 +0100 Message-Id: <20201228124928.680981222@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124919.745526410@linuxfoundation.org> References: <20201228124919.745526410@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexandre Belloni [ Upstream commit 851a95da583c26e2ddeb7281e9b61f0d76ea5aba ] The triggers for the ADC were taken from at91sam9260 dtsi but are not correct. Fixes: a4c1d6c75822 ("ARM: at91/dt: sam9rl: add lcd, adc, usb gadget and pwm support") Signed-off-by: Alexandre Belloni Link: https://lore.kernel.org/r/20201128222818.1910764-10-alexandre.belloni@bootlin.com Signed-off-by: Sasha Levin --- arch/arm/boot/dts/at91sam9rl.dtsi | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi index ad495f5a5790f..cdf016232fb7d 100644 --- a/arch/arm/boot/dts/at91sam9rl.dtsi +++ b/arch/arm/boot/dts/at91sam9rl.dtsi @@ -277,23 +277,26 @@ atmel,adc-use-res = "highres"; trigger0 { - trigger-name = "timer-counter-0"; + trigger-name = "external-rising"; trigger-value = <0x1>; + trigger-external; }; + trigger1 { - trigger-name = "timer-counter-1"; - trigger-value = <0x3>; + trigger-name = "external-falling"; + trigger-value = <0x2>; + trigger-external; }; trigger2 { - trigger-name = "timer-counter-2"; - trigger-value = <0x5>; + trigger-name = "external-any"; + trigger-value = <0x3>; + trigger-external; }; trigger3 { - trigger-name = "external"; - trigger-value = <0x13>; - trigger-external; + trigger-name = "continuous"; + trigger-value = <0x6>; }; }; -- 2.27.0