Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9398890pxu; Mon, 28 Dec 2020 15:12:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJzf767Wp7QmQSQM7sgiGqDb9vD3uP8yjYm9pjbpK4S8uud3WxMvtISWdGN4lDla3y2to0YC X-Received: by 2002:a17:906:eb8d:: with SMTP id mh13mr42513729ejb.299.1609197153016; Mon, 28 Dec 2020 15:12:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609197153; cv=none; d=google.com; s=arc-20160816; b=JoCRYl9pJxY7cs1CPYU4W+3SCmhNhAj0l7bqHlu5k9i6r1ofCKvY70tuu/G6/C65BU odPr3xR5np9MoTsMVeFGzAqA13giNzOuq7t8hCLqXGWcHMRbiuqSIpISQ9Ng7mdRCnHc g2CRr8Vdx8FKTvPPyJS64PuIAtqwezGN5eH3TU0VyGyZN0skFI3XCkpt3dcPxyC4xyA/ 0gNOW/T6+ufYly9DT8CSN2fWeCC31vbbKcapo1aeIevcipdaPV4Si9tDyEhPzvRm5UYb HNdHVoiDNqkSMWIiD2D9R/v4cmAmY8TYw6azhws5rqSL4EKL4TKX2X7t8sJtepCUEUHC cClg== 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=/TBuP+VHlFSQUVfmFf5gvI8PcViVxipx7uCgMhwyx5Y=; b=xj3rtx4hb3VQpE+blYsfDGYUF0FyjZtSHFZs9D7xkdT9a64hnFKwwf1LcuWwfGmOYi kqfAlEXI9td5PxwSAnGlEgumr69NhEPk33RoN0f8iBTWYdeijmHcEfx8Yvm7mHkL/VeA xqZ8GvrH4JEGZTLKsgJi09+7eUloJtSoyQ6C4NFoFM+SPFRjo4mPqjeQP/aJek2Rfy4w 5IdCwul/5b7eGXOCxGxdlf1Q4MOoFsp7JBdjrePLm+tCJc6n6f87khv7GLXXZrmZdM4Z lZYz+UBukasuNM/RmuDDm9p+z/K9xvAhloA/9nnBdjF9fYDabHWNkdMCEHoK+dLeRWry pIBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UXsr3rrD; 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 61si21220122edk.598.2020.12.28.15.12.11; Mon, 28 Dec 2020 15:12:33 -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=UXsr3rrD; 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 S2439971AbgL1OMu (ORCPT + 99 others); Mon, 28 Dec 2020 09:12:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:46870 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439901AbgL1OMg (ORCPT ); Mon, 28 Dec 2020 09:12:36 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id E5410207B2; Mon, 28 Dec 2020 14:12:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609164741; bh=xkVwTlQKoeBRjRMfMVMMsBVDaghygZpptWfyJFmZItM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UXsr3rrD3pJfr99yI9O3QNwBYM27nsGOqt6W4YihfjvOQ7vb+/kvLsmTQndCBbE0h HbBbBiOPSazzQqSGr+XbLBCKXYRo2sP2SjBUvp17eNqvzbzziAKi3btC6fcfzAxjC2 nTDtyrdluiBle8lMGLA45RKeuJ6QQV4+vP4eTBv0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexandre Belloni , Sasha Levin Subject: [PATCH 5.10 250/717] ARM: dts: at91: at91sam9rl: fix ADC triggers Date: Mon, 28 Dec 2020 13:44:08 +0100 Message-Id: <20201228125032.965028511@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@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 5653e70c84b4b..36a42a9fe1957 100644 --- a/arch/arm/boot/dts/at91sam9rl.dtsi +++ b/arch/arm/boot/dts/at91sam9rl.dtsi @@ -282,23 +282,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