Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9038364pxu; Mon, 28 Dec 2020 05:07:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJxkISaxwjaFTocuvrc8rfHHykP3kTblnU1nxTgiTprB5oz6iWEI1YwNmVF2PEjFtyTCdVcG X-Received: by 2002:a50:fd10:: with SMTP id i16mr42692091eds.331.1609160852412; Mon, 28 Dec 2020 05:07:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609160852; cv=none; d=google.com; s=arc-20160816; b=ig8M5rhnvb7Q9gUMHruf2GhfRGcIuZ8Fx86fayo+BjQ2DSd5foZ5z8CjubKR8xW+gM 89RGFLQKishnqhgu10+iE8POZdsQjRi/YW5sB4GC4dBSUrJdE4zo78DyOlmY+GxWKK8B b2LSKwQ9gkLKO+GNZs6wt0EFeAdB7tWE11CyYpF0D/Y048KHKf2G3CqKVIAnw9hoOiWu sfwGliX55Vx2FUWFEP4u0EH5YB+BwA/F3YMWN4FnQ4oEMqGpmEczkUhOMgttZky5isPa oleRBgpcYAd2AqPlPdQ6GLmiT2Nferl5c/Ucl9hJYvrczQtB/dY2cxhSesZWtEEqR3Bc tGnw== 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=Ksi8d7P5XGykluNP/GeF/jg2swcROgcl9gQddWfjjL0=; b=MGUAuxnsAafDZGESN+y0xmUtR1wJ7hVM+RA7B3ngTS2Eq9yAGiqQMk0RsqKRxMHD1X 74Hr3T1F5je4QyDDsiw9Yq9HknfdBc3Vg3TS6lkqorNx27cKEB0SqZFILHzQjH1hW9Mq YHyKe7rrLFCwYWG81mZbRPSBVFGRb/JqJ0A1Y0bZypatjJHV35UY4UNJpCDtnXwUo5IZ UNR6ElfGePAmEKUahod+HvWyZo8JrUzZ8UA3VBifTxuSUuI4vfedVX6HXR2kJEAqTSd0 286DoA2w4NccEUnF+zX6xq1kxOzZ3hQtHIGrHW1oVWKGzMMRIPFFGsVzojAtebqqtxCm 9ioQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="pmci/nSe"; 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 39si19453970edr.374.2020.12.28.05.07.08; Mon, 28 Dec 2020 05:07:32 -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="pmci/nSe"; 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 S1730577AbgL1NFN (ORCPT + 99 others); Mon, 28 Dec 2020 08:05:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:32882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730530AbgL1NE4 (ORCPT ); Mon, 28 Dec 2020 08:04:56 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 80EDC22573; Mon, 28 Dec 2020 13:04:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609160656; bh=S5JGl4x/owV7kIzszVzzfyWvbrx0SEppAjrlvDBEBJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pmci/nSet3BXcBK65lB93Bf86XPBHK/ZrZNIYK+DZM6rckIq7f4G5wxWFeX9X3LCX G5A7O7IL+G2OHVI/gUj6eavNjlc6VzGssCCv9NB55WUPmJS8qsJMjO+x+PjqFH1u+I 7HITrAXP1VPbBdjSKLs/OaDqfONr1bPF18VrAVV8= 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.9 085/175] ARM: dts: at91: at91sam9rl: fix ADC triggers Date: Mon, 28 Dec 2020 13:48:58 +0100 Message-Id: <20201228124857.361674060@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124853.216621466@linuxfoundation.org> References: <20201228124853.216621466@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 70adf940d98c0..620aa3f555f8a 100644 --- a/arch/arm/boot/dts/at91sam9rl.dtsi +++ b/arch/arm/boot/dts/at91sam9rl.dtsi @@ -266,23 +266,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