From patchwork Mon Jul 25 20:02:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Ramsauer X-Patchwork-Id: 652396 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 3rysd92DQtz9sdg for ; Tue, 26 Jul 2016 06:03:25 +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=uYVD4bhK; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752839AbcGYUDN (ORCPT ); Mon, 25 Jul 2016 16:03:13 -0400 Received: from ramses-pyramidenbau.de ([37.120.178.10]:40950 "EHLO mail.ramses-pyramidenbau.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751415AbcGYUDM (ORCPT ); Mon, 25 Jul 2016 16:03:12 -0400 Received: from localhost.localdomain (p5B0956CE.dip0.t-ipconnect.de [91.9.86.206]) (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 15CB31220A3; Mon, 25 Jul 2016 22:03:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ramses-pyramidenbau.de; s=default; t=1469476999; bh=fuH7ZZ+D2zJF+Hx38Izuqq4PauqOy9cQhq3bEwonyoE=; h=From:To:Cc:Subject:Date; b=uYVD4bhKP9Mb+2BvRA0zCM6TDGt8qL6zIm8wycUtv0nZOUF+cJ8+PC1Xz9747bIQ3 fbwCpbU/1ALRxuCntoDebyC/bTxV+gIIkfZ0c8yRZkQ5wipR9CcsASahbpE927kSKL OY4MPBZKO6RT+ywZMb2qGOOUZVM0hvKHxTlXB6ZU= From: Ralf Ramsauer To: Thierry Reding , Stephen Warren , arm@kernel.org Cc: Ralf Ramsauer , Alexandre Courbot , linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] ARM: tegra: fix erroneous address in dts Date: Mon, 25 Jul 2016 22:02:52 +0200 Message-Id: <1469476972-3624-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. This patch is only required for 4.7.x, as there is another patch in the queue for 4.8 that will remove all '0,' prefixes (b5896f67ab3c in linux-next). Fixes: c90bb7b9b9 ("ARM: tegra: Add high speed UARTs to Jetson TK1 device tree") Signed-off-by: Ralf Ramsauer Acked-by: Thierry Reding Cc: stable@vger.kernel.org Cc: linux-tegra@vger.kernel.org --- Stable maintainers, this is targetted at v4.7 only, the offending patch was merged in 4.7-rc1. We tried to get this in via ARM-SoC maintainers, but it was too late for 4.7. Only 4.7.x is affected, as there is another patch in the queue that will fix this issue in 4.8. Ralf --- 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"; };