Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp693018ybg; Mon, 1 Jun 2020 11:50:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJYNK7PfemniT2QNOY8xLaM7j/dGPRktksa/k7Kddw3tbmuElNK/usQRAN0sMZH887KcM2 X-Received: by 2002:a05:6402:70b:: with SMTP id w11mr22342028edx.251.1591037458603; Mon, 01 Jun 2020 11:50:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591037458; cv=none; d=google.com; s=arc-20160816; b=SuZFGW88t8i1lPUKUH4CTbEIlnWhRpLAL80u9ZFq7pGfbdGBvCT1Ps7Alige5de67r FqsP0w5bcwk8YN0n+Ea2icPgB2EfCHV887RHltbpYOwQm1AXWea0fi6P9n81Qe5+2WqS 85vjGmpWbP7nYQbAH8D54Hp4O+WjF7GRwX8xEeTVxq+sKjPAtsI5HMaLTRqFYNo2CZVE vbuXABQ4CaWa0nYeuFQsfVWU8F5kshlx0Hl68d0F02VKDrQbO89fVW7tkG0SRZSe1C0z pewWKHTh33LQcrSW1Edt65OzN79mioxIROScPl+XDFHVElBHJQxh2eVWclFY5cwVyhHQ 12kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WlGv86q0euwpQkCIW5CSdlTxyX836kMRfn0U3yqi8AQ=; b=pkSfxm+VhaQYrOgla55gfarZ7tMVjoalivkBuYCK19fl/ruVg7/Yf34+99Wt3+05GU /uYfyJGaTovSmKssWT1itLDvNxMlfrFk2gSa3HNUzXJMaOECmSlEQm5+IRvy/kICfiHN MOQud9L8ClHoqftFez10lwSCz1mNtzHmIOQBbCdLm2G7Hom9oT7qJ7aGYvz4t3+62b2n EfCYN4yLygI5Od6T4Az40eZ7xRvbir5CG4HDzzETdDdtHW4vPdBDBKSZ/TuQ1LDg27SO sA400Aoer3aaJU0tnKr/4wFWDMoEeoUUoJRGq1z5bx0y6Mn6DapWlkAoNHH6GDPGFoGH 5F3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tV0Db8wb; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s15si178665ejq.486.2020.06.01.11.50.34; Mon, 01 Jun 2020 11:50:58 -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=@kernel.org header.s=default header.b=tV0Db8wb; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730267AbgFASs4 (ORCPT + 99 others); Mon, 1 Jun 2020 14:48:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:53220 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730570AbgFASHV (ORCPT ); Mon, 1 Jun 2020 14:07:21 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 23601206E2; Mon, 1 Jun 2020 18:07:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034840; bh=IXhxczKtqIZE62kYPXGoHl9XrWCOFM6MO3cDOy4QMAg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tV0Db8wbPR0V28GBvtc9WiggRycpZj3uWQ+rbfBKrUDuLo2hFc66EDvTvlX/Al/WR mewNDCiaHYFaNAWxpTFTxDjFlvsNs6Kl/ngnzCE1A20OhtiSnFipUtSNr8CqUEhxgd r9r8EBkUgPJ0RG/d9lHhvR+bmGqaRfbmQXpCHb4M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Jonker , Heiko Stuebner , Sasha Levin Subject: [PATCH 5.4 036/142] ARM: dts: rockchip: swap clock-names of gpu nodes Date: Mon, 1 Jun 2020 19:53:14 +0200 Message-Id: <20200601174041.719173473@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174037.904070960@linuxfoundation.org> References: <20200601174037.904070960@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johan Jonker [ Upstream commit b14f3898d2c25a9b47a61fb879d0b1f3af92c59b ] Dts files with Rockchip 'gpu' nodes were manually verified. In order to automate this process arm,mali-utgard.txt has been converted to yaml. In the new setup dtbs_check with arm,mali-utgard.yaml expects clock-names values in the same order, so fix that. Signed-off-by: Johan Jonker Link: https://lore.kernel.org/r/20200425192500.1808-1-jbx6244@gmail.com Signed-off-by: Heiko Stuebner Signed-off-by: Sasha Levin --- arch/arm/boot/dts/rk3036.dtsi | 2 +- arch/arm/boot/dts/rk322x.dtsi | 2 +- arch/arm/boot/dts/rk3xxx.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index c776321b2cc4..d282a7b638d8 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -128,7 +128,7 @@ assigned-clocks = <&cru SCLK_GPU>; assigned-clock-rates = <100000000>; clocks = <&cru SCLK_GPU>, <&cru SCLK_GPU>; - clock-names = "core", "bus"; + clock-names = "bus", "core"; resets = <&cru SRST_GPU>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi index 340ed6ccb08f..c60784f3aa75 100644 --- a/arch/arm/boot/dts/rk322x.dtsi +++ b/arch/arm/boot/dts/rk322x.dtsi @@ -561,7 +561,7 @@ "pp1", "ppmmu1"; clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>; - clock-names = "core", "bus"; + clock-names = "bus", "core"; resets = <&cru SRST_GPU_A>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi index 97307a405e60..bce0b05ef7bf 100644 --- a/arch/arm/boot/dts/rk3xxx.dtsi +++ b/arch/arm/boot/dts/rk3xxx.dtsi @@ -84,7 +84,7 @@ compatible = "arm,mali-400"; reg = <0x10090000 0x10000>; clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>; - clock-names = "core", "bus"; + clock-names = "bus", "core"; assigned-clocks = <&cru ACLK_GPU>; assigned-clock-rates = <100000000>; resets = <&cru SRST_GPU>; -- 2.25.1