Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9451584pxu; Mon, 28 Dec 2020 17:03:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJzuelz4jfa+f2koDEt/6FkhNZrDqpThrLAYX5T7vT2Lh1zb+DfcQeKVrMBY/Lvh3h6i5yCP X-Received: by 2002:a05:6402:1646:: with SMTP id s6mr44025557edx.319.1609203818382; Mon, 28 Dec 2020 17:03:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609203818; cv=none; d=google.com; s=arc-20160816; b=V4cKl+ONrZrRQI5sGv9ILLXeAmw9eFudGtznpfWYERLZrxl4+/gnD8tl4cMeGHBLuy 5uGJapL32aHjuav3CPhlcalVmlSbeYqzyu+3mBIgDRgsqoLlbUJ6o2DaCMrNzcZfeKRP JVlnGFrvhCg+gXe+XS1gYj07aGEbNGfsL2VVv4QcAVmBnyrMqep351t0/VNPzMd1CVgg tphCt4AmPY/Yk4oJZ1MqVcvdcLz22+ycSDJXQb9IH62S6b3f0nPnhwXKO0qajoj0aBl7 wG/hOn0J+b9X4iLfKMY/T5FtSEhLQo88/gWaoBICa5iBCJR8p7E7zhINblJaItEjjiHi a8Jg== 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=uwzWyCVCKebYFOOoQpUQ3WxRhnK5XMSegeSlY5gv35Y=; b=0x/8cEHyBk2UG6VX49GYUyZfBcP19cpiXBInfwKK69j4D8kZjqVKI9yQXSQvQSwgBm zZMHUXJjVaNqCaTsXdJwBMhSwVo7AM9qQ6OJ4WOl2ZVo+2FaddH8+2JG0KfB26+ukjn2 FIP4V94uMi2JqzfmBfR3mm0De7DyaW+QpPNi0N+c3/0YakXaozFh6UAEsVCYUuMJGnz5 WBjW4noOw/a+sqQqDkjBhc/c0yrJyGAg5tGVj9UbT1Cv9JMH2GStm/R/AQQfK3N31oOG se+PN7C4HPAeBwIj8WuplR04IAzhoycrwwMNVaIuqYbbXNEtL9LTX7lbyZdf1Div+xUz JSZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oNTlVAhH; 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 t21si20781696edq.546.2020.12.28.17.03.16; Mon, 28 Dec 2020 17:03:38 -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=oNTlVAhH; 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 S1731431AbgL1QXD (ORCPT + 99 others); Mon, 28 Dec 2020 11:23:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:41364 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732213AbgL1NNS (ORCPT ); Mon, 28 Dec 2020 08:13:18 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 07E88207F7; Mon, 28 Dec 2020 13:12:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609161157; bh=skuoOwSJpwvgK4geaYDxScnf+WXXOoNx3w+TgBODg2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oNTlVAhHaWVBMT6sDsFbT1QzXfl4kY92a5SnmO39M7RUACnIzDc1jO6I5Veq6KOcr uPMMCudoOyIafw9VDoLvtsPLB5y3mmjCwaMrROQY3EGXhzCwuCEAB1R7rpnTczb42N iedqcj3j68LpK9xVI3KDfCq1GeUiuD61LGEWPyTc= 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.14 121/242] ARM: dts: at91: at91sam9rl: fix ADC triggers Date: Mon, 28 Dec 2020 13:48:46 +0100 Message-Id: <20201228124910.653222850@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124904.654293249@linuxfoundation.org> References: <20201228124904.654293249@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 7768342a66385..64273f9439926 100644 --- a/arch/arm/boot/dts/at91sam9rl.dtsi +++ b/arch/arm/boot/dts/at91sam9rl.dtsi @@ -274,23 +274,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