From patchwork Sat Aug 8 13:58:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Chauvet X-Patchwork-Id: 505320 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9467A140271 for ; Sat, 8 Aug 2015 23:58:24 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=eJg/MDRG; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932829AbbHHN6R (ORCPT ); Sat, 8 Aug 2015 09:58:17 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:37858 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932826AbbHHN6Q (ORCPT ); Sat, 8 Aug 2015 09:58:16 -0400 Received: by wibhh20 with SMTP id hh20so97716493wib.0 for ; Sat, 08 Aug 2015 06:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=MhL/qhCkfPhKUO0+z8FsATr4zxZtKgX9xjs7SqHmTU8=; b=eJg/MDRG2cxatWk6QEUyCMIDHVzDp0+uwY3O2mBve4RTiWuld0n7Zw+AHokmyX/91N dOLXvZwLyTZV/RVHTxYu1FYoXuUADEC3juNCAtuJ+x4V6rk1Fwo124pT7Xj2koVCCAjT 5cxy5w8LT0ECC7DXjrn6czwDbwjkwXjepLOxijfnbX0uejfpVI7Eb0yjSak8p/8fm48z Oph7khCky4YxuaYC4mRFcbhWgUzW/2JKmKPjnjL4SZQ044Aczp1pQqPLZPb+7Qryv5rl 1yNOzW1wk+kfoCZuOZecb/Hb0xbIFB1BGmHbrDA0uocUJKR6bUGA7i0zYBgIP6N6anvs vx8Q== X-Received: by 10.194.57.166 with SMTP id j6mr25512424wjq.29.1439042295342; Sat, 08 Aug 2015 06:58:15 -0700 (PDT) Received: from arrakis.kwizart.net (182.12.195.77.rev.sfr.net. [77.195.12.182]) by smtp.gmail.com with ESMTPSA id c3sm19655878wja.3.2015.08.08.06.58.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Aug 2015 06:58:14 -0700 (PDT) From: Nicolas Chauvet To: linux-tegra@vger.kernel.org Cc: Thierry Reding , linux-arm-kernel@lists.infradead.org, Paul Walmsley , Nicolas Chauvet Subject: [PATCH] [ARM][TEGRA] Fix AHB base address on tegra20, tegra30 and tegra114 Date: Sat, 8 Aug 2015 15:58:12 +0200 Message-Id: <1439042292-19912-1-git-send-email-kwizart@gmail.com> X-Mailer: git-send-email 2.4.3 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Current base address is wrong by 0x04 bytes for AHB bus device as shown in dmesg: tegra-ahb 6000c004.ahb: incorrect AHB base address in DT data - enabling workaround To correct old dtbs, the commit ce7a10b0ff3db63 checks for the low bit of the base address and removes theses 0x04 bytes at runtime. This patch fix the original dts, so upstream version doesn't need the workaround of the base address. As both addresses are valid, this patch doesn't break compatibility Tested on tegra20-paz00 (aka ac100) Signed-off-by: Nicolas Chauvet Reviewed-by: Paul Walmsley --- arch/arm/boot/dts/tegra114.dtsi | 4 ++-- arch/arm/boot/dts/tegra20.dtsi | 4 ++-- arch/arm/boot/dts/tegra30.dtsi | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi index f58a3d9..4bdf8f9 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi @@ -214,9 +214,9 @@ #dma-cells = <1>; }; - ahb: ahb@6000c004 { + ahb: ahb@6000c000 { compatible = "nvidia,tegra114-ahb", "nvidia,tegra30-ahb"; - reg = <0x6000c004 0x14c>; + reg = <0x6000c000 0x150>; }; gpio: gpio@6000d000 { diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index f444b67..f6f1461 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi @@ -225,9 +225,9 @@ #dma-cells = <1>; }; - ahb@6000c004 { + ahb@6000c000 { compatible = "nvidia,tegra20-ahb"; - reg = <0x6000c004 0x10c>; /* AHB Arbitration + Gizmo Controller */ + reg = <0x6000c000 0x110>; /* AHB Arbitration + Gizmo Controller */ }; gpio: gpio@6000d000 { diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index 782b11b..559763e 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -329,9 +329,9 @@ #dma-cells = <1>; }; - ahb: ahb@6000c004 { + ahb: ahb@6000c000 { compatible = "nvidia,tegra30-ahb"; - reg = <0x6000c004 0x14c>; /* AHB Arbitration + Gizmo Controller */ + reg = <0x6000c000 0x150>; /* AHB Arbitration + Gizmo Controller */ }; gpio: gpio@6000d000 {