Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4688675pxj; Wed, 12 May 2021 10:56:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykwZMxlVy6uHGEBnTpz2IqlmXccPRHHK70BsuCXr4L0pkztYiQcp8wcsOY3mYxjypxi9ja X-Received: by 2002:a17:906:e096:: with SMTP id gh22mr39140880ejb.101.1620842174409; Wed, 12 May 2021 10:56:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620842174; cv=none; d=google.com; s=arc-20160816; b=YW+3dHhSKcNzZTrwb7XmXPfnwoIeBn7oZtzNkTCoXrTYvlFzW+fQ6Pqm6mqyog2c2H I7fQNsfWhcTs3iXwwJ6uTn+E7jFPeGOfJU0OvHm+PL7elTXrSnmHAV5U4T9Zg10qQuUN Yr7dn7modOxHxmluZhegJIRQtOrSOP0AH0ZvinPwHpD9aqv+/4RxIg2t/GctAFx7E/O6 c4aYMeQlHaMix+RJrjhPXqMbxtwTh2k14GnNm0OdazSQ4TrtbnzAzLJ92xE0fl32k3OB 3NnkbfCYKg0WtCO0NcUSlRrjxII1ZppQ2pO70aki08StRsUsnBk/J3o2Yp4Ts8zx0XQI 8vVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EDOrgs5liWpHVwYjHE9kfl0N1WU2wm0EQKq3aDdyUgc=; b=uL6iGLW1bMw36jab0U2MJ5bWTvcXa/HXvzm5oZCHmZsne1mxl/s+NsPyICULXKKOD4 jSe6HtLs8XuXy3q8HkQnCZ+65u0QA5eimePGobsEZyq2mizXj/9mSdajv2zXZ/yraq9u 7+m4blDTzbWNKmk5/zviyHR1beIML0hJLspqfGTSiRMWZMHZ7SokHHbg7bbCTkPtfnju +Zhn/N7K2CkeoqMowTtxJUqvAmt7h8nLBwwE5FNMLr/qkMABtfNvRZ1RnkGKo+jwBHdR tndf7fgk9eFW+Zz2bleR5u2H8R7JCIUl2g4Ak1TjE+WQGl7JbijMHhADBlh7+mpLM6SK bLtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NRT2rFj3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dd14si310033edb.350.2021.05.12.10.55.49; Wed, 12 May 2021 10:56:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NRT2rFj3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350030AbhELRrL (ORCPT + 99 others); Wed, 12 May 2021 13:47:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:49190 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239874AbhELQQP (ORCPT ); Wed, 12 May 2021 12:16:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CEDC561D59; Wed, 12 May 2021 15:42:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834168; bh=lR6VFXI+3PyUbpl7FG1A6iS2iML3XrMI1/krbe+pEAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NRT2rFj34AWw+ClBxq+T0cnowkjY6Msv17Yc+f9cJbsGpLn4TCPcYJx90FIRBBjsa Agjji4GARgn5Tl4kaOfAtV1G2xP8dmuum8XqasaS5GQ+E+mMZsuLhOf8+rLYQHaaLt /ByHqLzzFWL3Pi3KzC1LtPYu91HcuNzwaSO09RIs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= , Florian Fainelli , Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 5.11 434/601] mips: bmips: fix syscon-reboot nodes Date: Wed, 12 May 2021 16:48:31 +0200 Message-Id: <20210512144842.129714918@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144827.811958675@linuxfoundation.org> References: <20210512144827.811958675@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Álvaro Fernández Rojas [ Upstream commit cde58b861a1d365568588adda59d42351c0c4ad3 ] Commit a23c4134955e added the clock controller nodes, incorrectly changing the syscon-reboot nodes addresses. Fixes: a23c4134955e ("MIPS: BMIPS: add clock controller nodes") Signed-off-by: Álvaro Fernández Rojas Acked-by: Florian Fainelli Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/boot/dts/brcm/bcm3368.dtsi | 2 +- arch/mips/boot/dts/brcm/bcm63268.dtsi | 2 +- arch/mips/boot/dts/brcm/bcm6358.dtsi | 2 +- arch/mips/boot/dts/brcm/bcm6362.dtsi | 2 +- arch/mips/boot/dts/brcm/bcm6368.dtsi | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/mips/boot/dts/brcm/bcm3368.dtsi b/arch/mips/boot/dts/brcm/bcm3368.dtsi index 69cbef472377..d4b2b430dad0 100644 --- a/arch/mips/boot/dts/brcm/bcm3368.dtsi +++ b/arch/mips/boot/dts/brcm/bcm3368.dtsi @@ -59,7 +59,7 @@ periph_cntl: syscon@fff8c008 { compatible = "syscon"; - reg = <0xfff8c000 0x4>; + reg = <0xfff8c008 0x4>; native-endian; }; diff --git a/arch/mips/boot/dts/brcm/bcm63268.dtsi b/arch/mips/boot/dts/brcm/bcm63268.dtsi index e0021ff9f144..940594436872 100644 --- a/arch/mips/boot/dts/brcm/bcm63268.dtsi +++ b/arch/mips/boot/dts/brcm/bcm63268.dtsi @@ -59,7 +59,7 @@ periph_cntl: syscon@10000008 { compatible = "syscon"; - reg = <0x10000000 0xc>; + reg = <0x10000008 0x4>; native-endian; }; diff --git a/arch/mips/boot/dts/brcm/bcm6358.dtsi b/arch/mips/boot/dts/brcm/bcm6358.dtsi index 9d93e7f5e6fc..d79c88c2fc9c 100644 --- a/arch/mips/boot/dts/brcm/bcm6358.dtsi +++ b/arch/mips/boot/dts/brcm/bcm6358.dtsi @@ -59,7 +59,7 @@ periph_cntl: syscon@fffe0008 { compatible = "syscon"; - reg = <0xfffe0000 0x4>; + reg = <0xfffe0008 0x4>; native-endian; }; diff --git a/arch/mips/boot/dts/brcm/bcm6362.dtsi b/arch/mips/boot/dts/brcm/bcm6362.dtsi index eb10341b75ba..8a21cb761ffd 100644 --- a/arch/mips/boot/dts/brcm/bcm6362.dtsi +++ b/arch/mips/boot/dts/brcm/bcm6362.dtsi @@ -59,7 +59,7 @@ periph_cntl: syscon@10000008 { compatible = "syscon"; - reg = <0x10000000 0xc>; + reg = <0x10000008 0x4>; native-endian; }; diff --git a/arch/mips/boot/dts/brcm/bcm6368.dtsi b/arch/mips/boot/dts/brcm/bcm6368.dtsi index 52c19f40b9cc..8e87867ebc04 100644 --- a/arch/mips/boot/dts/brcm/bcm6368.dtsi +++ b/arch/mips/boot/dts/brcm/bcm6368.dtsi @@ -59,7 +59,7 @@ periph_cntl: syscon@100000008 { compatible = "syscon"; - reg = <0x10000000 0xc>; + reg = <0x10000008 0x4>; native-endian; }; -- 2.30.2