From patchwork Mon May 10 10:17:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 433068 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2713863jao; Mon, 10 May 2021 03:46:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpfOH4reK3CX188iHnvZ3k3svPgNFlj42E+JpBPkmp+e2Nj6rbdR0b7BTgDUOs7J4Ldaj9 X-Received: by 2002:a05:6402:4251:: with SMTP id g17mr28083440edb.205.1620643592947; Mon, 10 May 2021 03:46:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620643592; cv=none; d=google.com; s=arc-20160816; b=Vdn4xCXXVMV6d2QJSAS/Ni88cExLr2vOTxeX5w+EOm0Z1y+tzQxK4x1hweCYoVFbS6 +93pLphepZHMKgJkcbyYZZFibI+Cd+a9LkUs8yvOQcgHmwpOd0EM4zB3UIzO0Z+HY7Y/ NtF9yK/GMY1nRPdQqsQ0NQCLrDcN49Nq2cXaGxFsSCGDxohUZhOLhw2JQ8Qd9iZYtPBl iqAKEKURK1I9lbp5GIJ7rIOyPJEaW3t8r3wjN9KEk6qE+pDu03yGO9XV0k8G9NUrL46d IM1AX8fAjlYeHxwpdhPoXslRHd9lIxDfCCZ8TbLoYTXPXcPs2ZFqlDCK3YOclCgg/tJH lnBg== 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=IgZSCdCQ0LsT7R0pOIaR5jokcQscOrLF/I8woyWSfBE=; b=f9VkQTZy86m1+1TZeQzmLDknP4wu+N/TEY3blqPvycXhnvLVK9HH05geqdhjLyShiU qcwS70skuqf2NglvjBUPf3S9n0yZ3VlTNcpERofYtaXn7E8wAlrnZDZJRi/oRXwwpLRH iau+juY/5YFgQbqRWIaNwbXobGeoCw6RsGRQRCNMPo2qHyL17O0LJdsowMwYv77vVdi8 pZUznIkeMxgwnrHhn+E/QPf7Edyw+1kkQUscOOU+UrUSZgrJZVkrNnBEQhsRUi9V/Y4o mh4LaQzZkgjegAbh1jOxAUSsWqwpVGUvADup153JpvDxV+4wx1Xhf0oAmEYr4bjScT24 yTag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iJEF0ME0; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 gu21si13494880ejb.12.2021.05.10.03.46.32; Mon, 10 May 2021 03:46:32 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=iJEF0ME0; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S232515AbhEJKq4 (ORCPT + 12 others); Mon, 10 May 2021 06:46:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:58338 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232858AbhEJKon (ORCPT ); Mon, 10 May 2021 06:44:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6CCB56147F; Mon, 10 May 2021 10:33:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620642837; bh=RTVKMu38CsacE5dSCpTjPWE/fao9P9Fzu0/N5gnhw40=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iJEF0ME0Zm9+E54ZI8bPAuS9vqlRZm+zykmu7a/gYl9uBD6/1D67sVm6xwqKGypjo tqXQ2JC0DipOupa8AbvPtUqrqVKZBS1K+o9XLKf33G18RFaT0eqgpCVdlI56++Z/h4 67a4XIMEqVYpEbXLk5ki1/FVZcWMvrZGencI7yOM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Sasha Levin Subject: [PATCH 5.10 072/299] ARM: dts: ux500: Fix up TVK R3 sensors Date: Mon, 10 May 2021 12:17:49 +0200 Message-Id: <20210510102007.297924261@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102004.821838356@linuxfoundation.org> References: <20210510102004.821838356@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit aeceecd40d94ed3c00bfe1cfe59dd1bfac2fc6fe ] The TVK1281618 R3 sensors are different from the R2 board, some incorrectness is fixed and some new sensors added, we also rename the nodes appropriately with accelerometer@ etc. Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi | 73 +++++++++++++------ 1 file changed, 50 insertions(+), 23 deletions(-) -- 2.30.2 diff --git a/arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi index 9f285c7cf914..c0de1337bdaa 100644 --- a/arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi +++ b/arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi @@ -8,37 +8,43 @@ / { soc { i2c@80128000 { - /* Marked: - * 129 - * M35 - * L3GD20 - */ - l3gd20@6a { - /* Gyroscope */ - compatible = "st,l3gd20"; - status = "disabled"; + accelerometer@19 { + compatible = "st,lsm303dlhc-accel"; st,drdy-int-pin = <1>; - drive-open-drain; - reg = <0x6a>; // 0x6a or 0x6b + reg = <0x19>; vdd-supply = <&ab8500_ldo_aux1_reg>; vddio-supply = <&db8500_vsmps2_reg>; + interrupt-parent = <&gpio2>; + interrupts = <18 IRQ_TYPE_EDGE_RISING>, + <19 IRQ_TYPE_EDGE_RISING>; + pinctrl-names = "default"; + pinctrl-0 = <&accel_tvk_mode>; }; - /* - * Marked: - * 2122 - * C3H - * DQEEE - * LIS3DH? - */ - lis3dh@18 { - /* Accelerometer */ - compatible = "st,lis3dh-accel"; + magnetometer@1e { + compatible = "st,lsm303dlm-magn"; st,drdy-int-pin = <1>; - reg = <0x18>; + reg = <0x1e>; vdd-supply = <&ab8500_ldo_aux1_reg>; vddio-supply = <&db8500_vsmps2_reg>; + // This interrupt is not properly working with the driver + // interrupt-parent = <&gpio1>; + // interrupts = <0 IRQ_TYPE_EDGE_RISING>; pinctrl-names = "default"; - pinctrl-0 = <&accel_tvk_mode>; + pinctrl-0 = <&magn_tvk_mode>; + }; + gyroscope@68 { + /* Gyroscope */ + compatible = "st,l3g4200d-gyro"; + reg = <0x68>; + vdd-supply = <&ab8500_ldo_aux1_reg>; + vddio-supply = <&db8500_vsmps2_reg>; + }; + pressure@5c { + /* Barometer/pressure sensor */ + compatible = "st,lps001wp-press"; + reg = <0x5c>; + vdd-supply = <&ab8500_ldo_aux1_reg>; + vddio-supply = <&db8500_vsmps2_reg>; }; }; @@ -54,5 +60,26 @@ }; }; }; + + pinctrl { + accelerometer { + accel_tvk_mode: accel_tvk { + /* Accelerometer interrupt lines 1 & 2 */ + tvk_cfg { + pins = "GPIO82_C1", "GPIO83_D3"; + ste,config = <&gpio_in_pd>; + }; + }; + }; + magnetometer { + magn_tvk_mode: magn_tvk { + /* GPIO 32 used for DRDY, pull this down */ + tvk_cfg { + pins = "GPIO32_V2"; + ste,config = <&gpio_in_pd>; + }; + }; + }; + }; }; };