From patchwork Sun Feb 8 15:48:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ivaylo Dimitrov X-Patchwork-Id: 5797681 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BD0DCBF440 for ; Sun, 8 Feb 2015 15:49:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C05482018E for ; Sun, 8 Feb 2015 15:49:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E9E2F20172 for ; Sun, 8 Feb 2015 15:49:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755755AbbBHPtW (ORCPT ); Sun, 8 Feb 2015 10:49:22 -0500 Received: from mail-wg0-f47.google.com ([74.125.82.47]:40791 "EHLO mail-wg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751716AbbBHPtU (ORCPT ); Sun, 8 Feb 2015 10:49:20 -0500 Received: by mail-wg0-f47.google.com with SMTP id n12so22282400wgh.6; Sun, 08 Feb 2015 07:49:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Jodt5jPVjUdnr1/hW2nJOMRFaAg+m771JEUAPpEkVeo=; b=Ce0UVl3dKHUldXvq0jJcYwyI67Sl9AA4aeN4G2CC9IoXk4ERXCVY1YIH+SnG9QOS90 Dvau0hzqJzegoNyokzzZN79JBHWeDHORX8AEj+OUxDexjnC80dOG8y97TRKtG0eqXa0P SwAnPSnk2tizpAjBIWt6JR8Ho99xSiRexiFEncUNNJMx3X6P+ViPkt4lsthQr8Kzd/2h dH6kPhpuKyJqCDLhroxlEbmTjkqMwxu25iQwtPICDQJq8Bq1tW+6Jvw5TPEaenn9Vnh1 gRWF03M/8A32XEoDxBMpBcgLjN1Ieqjhz5VRK1hnJhyvUp1Mw35JFbFX1ouwb9Oe2fzO yiXg== X-Received: by 10.194.90.210 with SMTP id by18mr30564624wjb.80.1423410559709; Sun, 08 Feb 2015 07:49:19 -0800 (PST) Received: from localhost.localdomain ([46.249.74.23]) by mx.google.com with ESMTPSA id dj4sm12428809wjc.13.2015.02.08.07.49.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 08 Feb 2015 07:49:19 -0800 (PST) From: Ivaylo Dimitrov To: tony@atomide.com Cc: pali.rohar@gmail.com, pavel@ucw.cz, linux-omap@vger.kernel.org, devicetree@vger.kernel.org, Ivaylo Dimitrov Subject: [PATCH] ARM: DTS: omap3-n900.dts: fix i2c bus numbering Date: Sun, 8 Feb 2015 17:48:56 +0200 Message-Id: <1423410536-16579-1-git-send-email-ivo.g.dimitrov.75@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With legacy boot i2c buses on Nokia N900 are numbered i2c1, i2c2 and i2c3. Commit 20b80942ef4e ("ARM: dts: OMAP3+: Add i2c aliases") fixed the numbering with DT boot, but introduced a regression on N900 - aliases become i2c0, i2c1 and i2c2. Fix that by providing the correct aliases in the board dts. Signed-off-by: Ivaylo Dimitrov Tested-by: Pali Rohár Acked-by: Nishanth Menon --- arch/arm/boot/dts/omap3-n900.dts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts index b550c41..68bf3cd 100644 --- a/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -16,6 +16,13 @@ model = "Nokia N900"; compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3"; + aliases { + i2c0; + i2c1 = &i2c1; + i2c2 = &i2c2; + i2c3 = &i2c3; + }; + cpus { cpu@0 { cpu0-supply = <&vcc>;