From patchwork Mon Jul 18 09:46:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Ramsauer X-Patchwork-Id: 649454 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 3rtJH96JWpz9s2Q for ; Mon, 18 Jul 2016 19:47:01 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ramses-pyramidenbau.de header.i=@ramses-pyramidenbau.de header.b=yf0CZRmV; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751456AbcGRJrA (ORCPT ); Mon, 18 Jul 2016 05:47:00 -0400 Received: from ramses-pyramidenbau.de ([37.120.178.10]:52808 "EHLO mail.ramses-pyramidenbau.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751326AbcGRJrA (ORCPT ); Mon, 18 Jul 2016 05:47:00 -0400 Received: from localhost.localdomain (nat-lan-36.hs-regensburg.de [212.201.131.86]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.ramses-pyramidenbau.de (Postfix) with ESMTPSA id 2A6EF120981; Mon, 18 Jul 2016 11:47:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ramses-pyramidenbau.de; s=default; t=1468835224; bh=aEWAx8esD7AsQEyP+kBFP834FYpt37HiZiBD3thhfBE=; h=From:To:Cc:Subject:Date; b=yf0CZRmVT9vXsWjG2w3rifft0PdHVwz7/2Kpb+d+Mm+Qv2l4UJ8GMQVUcGJ8zV0g/ rmUlKHePSfn1Mvg06VD7cZH7ScFMGZFZ88MjF31dOx+/e+RDo452PrI69P7SobkS8I +KkCb+30lWvNbo18+qZZrBfGXg6tX6QhGftvU62k= From: Ralf Ramsauer To: Thierry Reding , Stephen Warren , arm@kernel.org Cc: Alexandre Courbot , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Ralf Ramsauer , linux-tegra@vger.kernel.org Subject: [RESEND PATCH] ARM: tegra: fix erroneous address in dts Date: Mon, 18 Jul 2016 11:46:48 +0200 Message-Id: <1468835208-13426-1-git-send-email-ralf@ramses-pyramidenbau.de> X-Mailer: git-send-email 2.7.3 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org c90bb7b enabled the high speed UARTs of the Jetson TK1. Due to a merge quirk, wrong addresses were introduced. Fix it and use the correct addresses. Thierry let me know, that there is another patch (b5896f67ab3c in linux-next) in preparation which removes all the '0,' prefixes of unit addresses on Tegra124 and is planned to go upstream in 4.8, so this patch will get reverted then. But for the moment, this patch is necessary to fix current misbehaviour. Fixes: c90bb7b9b9 ("ARM: tegra: Add high speed UARTs to Jetson TK1 device tree") Signed-off-by: Ralf Ramsauer Acked-by: Thierry Reding Cc: linux-tegra@vger.kernel.org --- arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts index 941f362..f4d8125 100644 --- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts +++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts @@ -1386,7 +1386,7 @@ * Pin 41: BR_UART1_TXD * Pin 44: BR_UART1_RXD */ - serial@70006000 { + serial@0,70006000 { compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; status = "okay"; }; @@ -1398,7 +1398,7 @@ * Pin 71: UART2_CTS_L * Pin 74: UART2_RTS_L */ - serial@70006040 { + serial@0,70006040 { compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; status = "okay"; };