From patchwork Sun Aug 2 21:56:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 51807 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id E7C9F229FD for ; Sun, 2 Aug 2015 21:58:25 +0000 (UTC) Received: by wibdx1 with SMTP id dx1sf21213366wib.2 for ; Sun, 02 Aug 2015 14:58:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:cc:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=Ehg9eAujma7LKXkVTijeNFTIWywYaF2S0M0ujhznjT4=; b=biYk/YE09bndMyHwC9LCb+PH+aU4vU+mhx3gdyyPH4FEw/cJgwfJ/JkB79WqDvOxSQ YsuKl812r9AQrkZl3ZC17tiCvvd2cc8DVH0d8A7mEC0Yco5PeXhTq4UFHYuYRLD1sAI3 sVIMbT2ezw7asbQZhnsVm5iyJGsrkxvB/cXXe99AGRwLJI/3VKcSK+95YrU61Sg1ANWP XWB0QTiez775hehj1Fc0N5XfdHdW5ZWXFMHBaNEM7GVpMlVAIj9d3QNYY1rCabXy4NT7 i+ZepwtBDnluy+ecSGOuRxPDz7qOKIhvYD7wAV5dlKbtJhJXgPEEm+XwS+IRotUJUs6W 4RrA== X-Gm-Message-State: ALoCoQnfrMjxV88NHC/DreWxpsQ/CeoOxbAvrxgzE53y+JAVeFNJQTzGL086gT6QmdMJAe3n60jT X-Received: by 10.180.79.10 with SMTP id f10mr4811770wix.3.1438552705292; Sun, 02 Aug 2015 14:58:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.74 with SMTP id k10ls498904laf.30.gmail; Sun, 02 Aug 2015 14:58:25 -0700 (PDT) X-Received: by 10.152.115.165 with SMTP id jp5mr3349766lab.102.1438552705007; Sun, 02 Aug 2015 14:58:25 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id d2si10320612laa.7.2015.08.02.14.58.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Aug 2015 14:58:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by lacct8 with SMTP id ct8so39340946lac.2 for ; Sun, 02 Aug 2015 14:58:24 -0700 (PDT) X-Received: by 10.152.18.162 with SMTP id x2mr13911616lad.73.1438552704911; Sun, 02 Aug 2015 14:58:24 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp1548173lba; Sun, 2 Aug 2015 14:58:23 -0700 (PDT) X-Received: by 10.69.11.5 with SMTP id ee5mr17443628pbd.89.1438552703053; Sun, 02 Aug 2015 14:58:23 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id wl8si9483482pbc.254.2015.08.02.14.58.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Aug 2015 14:58:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZM1Fv-0001fj-1M; Sun, 02 Aug 2015 21:57:19 +0000 Received: from mail-lb0-f181.google.com ([209.85.217.181]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZM1Fr-0001YA-2G for linux-arm-kernel@lists.infradead.org; Sun, 02 Aug 2015 21:57:15 +0000 Received: by lbbyj8 with SMTP id yj8so68935277lbb.0 for ; Sun, 02 Aug 2015 14:56:52 -0700 (PDT) X-Received: by 10.152.120.135 with SMTP id lc7mr13536232lab.41.1438552611939; Sun, 02 Aug 2015 14:56:51 -0700 (PDT) Received: from localhost.localdomain.localdomain (c-297471d5.01-192-6c756e10.cust.bredbandsbolaget.se. [213.113.116.41]) by smtp.gmail.com with ESMTPSA id sg8sm2541318lbb.33.2015.08.02.14.56.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Aug 2015 14:56:50 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/4] ARM: nomadik: push accelerometer down to boards Date: Sun, 2 Aug 2015 23:56:46 +0200 Message-Id: <1438552606-4625-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150802_145715_495984_8059B660 X-CRM114-Status: GOOD ( 13.41 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.217.181 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.217.181 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Cc: Linus Walleij MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 The two Nomadik variants have the accelerometer mounted on different I2C lines. Push the definition down to the top-level board DTS files to get things right. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-nomadik-nhk15.dts | 5 +++++ arch/arm/boot/dts/ste-nomadik-s8815.dts | 8 ++++++++ arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 5 ----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts index 9d888b0e75af..4a21c6492dbb 100644 --- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts +++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts @@ -83,6 +83,11 @@ }; i2c0 { + lis3lv02dl@1d { + /* Accelerometer */ + compatible = "st,lis3lv02dl-accel"; + reg = <0x1d>; + }; stmpe0: stmpe2401@43 { compatible = "st,stmpe2401"; reg = <0x43>; diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts index 11b5e34150b8..35282c0105c6 100644 --- a/arch/arm/boot/dts/ste-nomadik-s8815.dts +++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts @@ -105,6 +105,14 @@ }; }; + i2c1 { + lis3lv02dl@1d { + /* Accelerometer */ + compatible = "st,lis3lv02dl-accel"; + reg = <0x1d>; + }; + }; + /* GPIO I2C connected to the USB portions of the STw4811 only */ gpio-i2c { compatible = "i2c-gpio"; diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index defabe053114..314f59c12162 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -726,11 +726,6 @@ compatible = "st,stw5095"; reg = <0x1a>; }; - lis3lv02dl@1d { - /* Accelerometer */ - compatible = "st,lis3lv02dl-accel"; - reg = <0x1d>; - }; }; amba {