From patchwork Tue Jul 30 20:18:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 170115 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp3062136ile; Tue, 30 Jul 2019 13:18:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqzp9T6oosEf8YjG84a8l8YlNxDmKyR6FoxviSitLqgYy/FNTE+TAlqXk1Es8rUwBpKKh+uZ X-Received: by 2002:a63:c442:: with SMTP id m2mr112394215pgg.286.1564517919235; Tue, 30 Jul 2019 13:18:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564517919; cv=none; d=google.com; s=arc-20160816; b=QDRcwBZcfiPeQF7AQhr2bh9l+n2W0OEQURjYluiHv8XFQXaY5P8poRWul+6wpA7OBL 7p/LdQs3FHK/Se4kDaEl72ilfs/1x4Y/yrDANSbzWr/WdzptALP2D7iO82UyLugbgCsr +5aUzMOFvBR4MDmiI9ysBydqDMPGqciOO28Z9lP9gT4zlsGK7bAO9ELbkbNNEcqV5UkC UipSWv1TfNMU3NbJ+RXHRRvcKAs/ZlPgPtC6VBEFvse8YLsD3yAsOHZ5zdpfzHgXtQD4 b/BXFSCi6+1CUSJeD64MBZnuZ0dEVC3g99wAnq5koSAZii+MUn8gx+7Kh3B/0BJOmEXc lkPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=/+5B+ELOYytBEM9Ys8TxNC2Z+KZj299Wj628j1kQ+9E=; b=MINPivBCoijfWX63eiZXHg5p2paz4SsSg7n87xeRpNlOrUr9lDEz0q6qHll76u3CuT iQ4v2KnK2KE0fhH4NPvlY0yZAXAz4YqmpVPuOwcFfWSJpkk1YifGtJxkG8xJl59l2mri tSKcQph1nog0jQCjUZRhWYPnSzl6cPWj3dUKaj1du84sIDrZW99xrKkF5HvZ1/sO+eRK qgGcKQPjb0JmeXApOQAg9f260i1BjfmD1ZqMG1Lbh22qBP9IDgxol2BsRkYFMq96lq0P slRutFrF2rpQbW8fUs4DLSs3o340FEIRX83ib4DvPqJo7vCsyhYTzm48LC5sBdBc4KAy 3Pzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z6ajn8Eq; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v31si27788462pjb.22.2019.07.30.13.18.38; Tue, 30 Jul 2019 13:18:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z6ajn8Eq; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728162AbfG3USi (ORCPT + 14 others); Tue, 30 Jul 2019 16:18:38 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:40479 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726837AbfG3USi (ORCPT ); Tue, 30 Jul 2019 16:18:38 -0400 Received: by mail-pg1-f196.google.com with SMTP id w10so30637438pgj.7 for ; Tue, 30 Jul 2019 13:18:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=/+5B+ELOYytBEM9Ys8TxNC2Z+KZj299Wj628j1kQ+9E=; b=Z6ajn8Eq54FskwayR1CFlUeCZ+zyox1QAnvnvKbBtW+7XQZMl+Ej/0s2fk4zZ/3clB cBZHL36ZpxqH27f05GLaEmfZajFBhlh9MWAX/libJBV3juUFnYJ2MHOURsh0srkqzfRz TEeTtrS0gxiRMMrq5W7cszSpNymxUi/Qda1u4Gc51TQSHfm9mErsDhdSFQXvsLX7K7dh eE5Uv1wOnccqUnSYhHL7MzR8WrwKVl71KoMRvJxkSOR3ZYeVAs8uroWQIFTkSgLH8XxA oQiL3tIOzwR4WrI864uukImXQQz8xquNLoMDZ5Xah2p1BO6+Nnbcw9dQQYjI0sJJ8rsL TO2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/+5B+ELOYytBEM9Ys8TxNC2Z+KZj299Wj628j1kQ+9E=; b=W7B4NTvDpDPC+Wks00vmmQABOCopvOxEcRnfjgYJADHy/Vp6e7SD3F2ty3ux8MbxGP CCFC2T7iLUImBunFcFv928GEPFOg3ItvVZkEV8KWj3LYGOCdeXMbM5z9ZCSzaPssdpjY yQe8vZNiJrNL0VWKCZtiGFI0Ezp7dg2F1iNNOQde1w/D5b874Iq9uA9ssUjS2ZOx6fML rwDv4lph9OrKxsNjtCi03iyEMpFt1la6q9PRAeiLgsBjEWV7+BG+tNrGBEC9OC0gp1r4 qlp9oTtqCOd4qK3fsiVZazErZ9ZHUG98U3mQqaVZiKAqmuN5ZTFcLLcTns/MHeYr3Z1p bmBg== X-Gm-Message-State: APjAAAXQk1S1Vsi/UCa+V4/nQkIcfu/LCESXc0t2IQ3eaGs7YKHVAoNc OpYgxKdGo+3FWySVVwI5TuxvGQ== X-Received: by 2002:a17:90a:cb18:: with SMTP id z24mr66567528pjt.108.1564517917670; Tue, 30 Jul 2019 13:18:37 -0700 (PDT) Received: from localhost.localdomain ([49.207.49.136]) by smtp.gmail.com with ESMTPSA id r75sm88113177pfc.18.2019.07.30.13.18.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 Jul 2019 13:18:36 -0700 (PDT) From: Amit Pundir To: Greg KH Cc: Stable , allen yan , Miquel Raynal , Gregory CLEMENT Subject: [PATCH for-4.14.y 1/3] arm64: dts: marvell: Fix A37xx UART0 register size Date: Wed, 31 Jul 2019 01:48:31 +0530 Message-Id: <1564517913-17164-1-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: allen yan commit c737abc193d16e62e23e2fb585b8b7398ab380d8 upstream. Armada-37xx UART0 registers are 0x200 bytes wide. Right next to them are the UART1 registers that should not be declared in this node. Update the example in DT bindings document accordingly. Signed-off-by: allen yan Signed-off-by: Miquel Raynal Signed-off-by: Gregory CLEMENT Signed-off-by: Amit Pundir --- Cherry-picked from lede/openwrt tree https://git.lede-project.org/?p=source.git. Build tested for ARCH=arm64 + defconfig Cleanly apply on 4.9.y as well but since lede stopped supporting v4.9.y, I'm not sure if this patch is tested on v4.9.y at all. Documentation/devicetree/bindings/serial/mvebu-uart.txt | 2 +- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/Documentation/devicetree/bindings/serial/mvebu-uart.txt b/Documentation/devicetree/bindings/serial/mvebu-uart.txt index 6087defd9f93..d37fabe17bd1 100644 --- a/Documentation/devicetree/bindings/serial/mvebu-uart.txt +++ b/Documentation/devicetree/bindings/serial/mvebu-uart.txt @@ -8,6 +8,6 @@ Required properties: Example: serial@12000 { compatible = "marvell,armada-3700-uart"; - reg = <0x12000 0x400>; + reg = <0x12000 0x200>; interrupts = <43>; }; diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi index 8c0cf7efac65..b554cdaf5e53 100644 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi @@ -134,7 +134,7 @@ uart0: serial@12000 { compatible = "marvell,armada-3700-uart"; - reg = <0x12000 0x400>; + reg = <0x12000 0x200>; interrupts = ; status = "disabled"; };