From patchwork Mon Aug 5 07:24:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Jakubek X-Patchwork-Id: 13753180 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2AAE4C3DA7F for ; Mon, 5 Aug 2024 07:25:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mXjqaIKyj7IX12p7vaYq4Nq/31JWzkaHK9RWGWBCRUA=; b=Bq2nKKtxfmUBB6B0dRlvoXXiCU SgCAGaarnGbHDpnLK2CgRMpGHPgjb9+8ezXaJsN9bCRpaA0B6ypWrRSy2/hIb8rBK99QJlreHnK5v r8tDkNRUd8qjuOk1coR+fQ9RfHNv1bYNVlX8juyA1nPnWIAqK7+4vWbtdwAkOPogRGYozvqsNWFWM jQ57m7EePEnqqJY04zMGkNiZHprl0GHCLXJRfTqfDIMuywGy3XSsliJPE3irnXlWuK8U5E1r0MPZX knynAWqk9W/F38JbNka504SAvS/yybooVUfENjj6UKLyy/4y/Zt9C/KF4/RMlOUuJw7IsZRJ/x5gc S8wzZkxg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sas5g-0000000EvKd-2eml; Mon, 05 Aug 2024 07:25:12 +0000 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sas59-0000000EvAz-0kMk for linux-arm-kernel@lists.infradead.org; Mon, 05 Aug 2024 07:24:41 +0000 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-369cb9f086aso5779277f8f.0 for ; Mon, 05 Aug 2024 00:24:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722842677; x=1723447477; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=mXjqaIKyj7IX12p7vaYq4Nq/31JWzkaHK9RWGWBCRUA=; b=l+YfYOhdaoPhR1GWGppRo5PVu6k2CO8+xeg9yxb9MiwE2Es5+chzO1w2NGO9GoETgU Ttt8QC18d0o99jOetXrxUm8oNAMfa83D0apIX5b1JfG5rsaVVAJa+UZxhoB/0kRrhaY3 TZxuydghJnc32zKyPjXcQ+yWtLIeNOBNHujb4UZdebtnAtxB/+UH7t/yhrbCBuXJoYkd yy0dfUvePuklYVKGqWMuTq5UA7nw3ddMmfpMKY5G9xEWrq07s7EtJykZbi9u1ostF4kg tjXNlEcBLS1atBiOujZ1G04kzQimVlCbtuDRdYc3GStjshRna8DWQHt/elZGYt5GkVAB VRZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722842677; x=1723447477; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mXjqaIKyj7IX12p7vaYq4Nq/31JWzkaHK9RWGWBCRUA=; b=EIUbU1DsKe9PF/u+cLP11ruQ+6J2Rt9eL5Q2oVyy2NIyH45WQc4VhNttYC4tfGpa4N UWM4FqX9FeM04bkfPX78JLsA0cWn7FelYP0ACVSTzhxUh+vQGruxLs/g4UMP+BtLaobe 0AWV4ql4xFvhKja6beSXJHMxg9QXPQjZWArkC55dPXCRx8aXDs9GEJDlDkUHjRxvHBrV 9knxAh66K2TL+FnBj6AY9A7NN81Wq2MJlMEIg4BHvUBGWpH0dmYLr4iErqUIQ4WukqCk GHkdBNmYfaHNIRzECw6IqWLa/juTR3FsA7oG4Dzh1rohntT7d8GYK8Exe0fsf6etB+wE rfNQ== X-Forwarded-Encrypted: i=1; AJvYcCUfJN9mHwO/KU+ZSEoP1pllXcjY5fXYSer2z0XObOf9YgaPMWOJcwVskZu6kXwHmT84QtNsyVNbHABy1X99gs820BJnKn+kM0Iln0+eRdeotDy7m1g= X-Gm-Message-State: AOJu0YzPxA11jGB9Bo5p7O+v8Oo2sNPsfdzOmKmS+1d067pqUBlicSkK DeFtscPurrURP1+WKIIC+od3ihDlIss+09timJYbyXctyZOefkrG X-Google-Smtp-Source: AGHT+IHAcgyhD4dmsR0AChh9uYGwbpeDLD37EIXsBLBrXazHRhm3Xg5xJVG6vvmo3R+Qbu+U5pn1wA== X-Received: by 2002:adf:e644:0:b0:367:8f29:f7b6 with SMTP id ffacd0b85a97d-36bbc1c0bc3mr8270739f8f.51.1722842677096; Mon, 05 Aug 2024 00:24:37 -0700 (PDT) Received: from standask-GA-A55M-S2HP (lu-nat-113-247.ehs.sk. [188.123.113.247]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36bbd06dfb4sm8904169f8f.103.2024.08.05.00.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 00:24:36 -0700 (PDT) Date: Mon, 5 Aug 2024 09:24:35 +0200 From: Stanislav Jakubek To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Orson Zhai , Baolin Wang , Baolin Wang , Chunyan Zhang Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/4] arm64: dts: sprd: reorder clock-names after clocks Message-ID: <13ea4a27f0d1428a925a6f817f9370673eaec938.1722842067.git.stano.jakubek@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240805_002439_249390_B023EAF9 X-CRM114-Status: GOOD ( 12.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DT convention is to have property-names after property. While at it, cleanup indentation for some clocks. No functional change. Reviewed-by: Baolin Wang Signed-off-by: Stanislav Jakubek --- arch/arm64/boot/dts/sprd/sc9863a.dtsi | 4 +-- arch/arm64/boot/dts/sprd/ums512.dtsi | 4 +-- arch/arm64/boot/dts/sprd/whale2.dtsi | 38 +++++++++++++++------------ 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/arch/arm64/boot/dts/sprd/sc9863a.dtsi b/arch/arm64/boot/dts/sprd/sc9863a.dtsi index a7b897966882..e5a2857721e2 100644 --- a/arch/arm64/boot/dts/sprd/sc9863a.dtsi +++ b/arch/arm64/boot/dts/sprd/sc9863a.dtsi @@ -556,9 +556,9 @@ sdio0: mmc@20300000 { reg = <0 0x20300000 0 0x1000>; interrupts = ; - clock-names = "sdio", "enable"; clocks = <&aon_clk CLK_SDIO0_2X>, <&apahb_gate CLK_SDIO0_EB>; + clock-names = "sdio", "enable"; assigned-clocks = <&aon_clk CLK_SDIO0_2X>; assigned-clock-parents = <&rpll CLK_RPLL_390M>; @@ -572,9 +572,9 @@ sdio3: mmc@20600000 { reg = <0 0x20600000 0 0x1000>; interrupts = ; - clock-names = "sdio", "enable"; clocks = <&aon_clk CLK_EMMC_2X>, <&apahb_gate CLK_EMMC_EB>; + clock-names = "sdio", "enable"; assigned-clocks = <&aon_clk CLK_EMMC_2X>; assigned-clock-parents = <&rpll CLK_RPLL_390M>; diff --git a/arch/arm64/boot/dts/sprd/ums512.dtsi b/arch/arm64/boot/dts/sprd/ums512.dtsi index 4c080df48724..efa14309cc4e 100644 --- a/arch/arm64/boot/dts/sprd/ums512.dtsi +++ b/arch/arm64/boot/dts/sprd/ums512.dtsi @@ -849,9 +849,9 @@ sdio0: mmc@1100000 { compatible = "sprd,sdhci-r11"; reg = <0x1100000 0x1000>; interrupts = ; - clock-names = "sdio", "enable"; clocks = <&ap_clk CLK_SDIO0_2X>, <&apapb_gate CLK_SDIO0_EB>; + clock-names = "sdio", "enable"; assigned-clocks = <&ap_clk CLK_SDIO0_2X>; assigned-clock-parents = <&pll1 CLK_RPLL>; status = "disabled"; @@ -861,9 +861,9 @@ sdio3: mmc@1400000 { compatible = "sprd,sdhci-r11"; reg = <0x1400000 0x1000>; interrupts = ; - clock-names = "sdio", "enable"; clocks = <&ap_clk CLK_EMMC_2X>, <&apapb_gate CLK_EMMC_EB>; + clock-names = "sdio", "enable"; assigned-clocks = <&ap_clk CLK_EMMC_2X>; assigned-clock-parents = <&pll1 CLK_RPLL>; status = "disabled"; diff --git a/arch/arm64/boot/dts/sprd/whale2.dtsi b/arch/arm64/boot/dts/sprd/whale2.dtsi index cdf52fd78ee4..a28f995fb3ff 100644 --- a/arch/arm64/boot/dts/sprd/whale2.dtsi +++ b/arch/arm64/boot/dts/sprd/whale2.dtsi @@ -75,9 +75,10 @@ uart0: serial@0 { "sprd,sc9836-uart"; reg = <0x0 0x100>; interrupts = ; - clock-names = "enable", "uart", "source"; clocks = <&apapb_gate CLK_UART0_EB>, - <&ap_clk CLK_UART0>, <&ext_26m>; + <&ap_clk CLK_UART0>, + <&ext_26m>; + clock-names = "enable", "uart", "source"; status = "disabled"; }; @@ -86,9 +87,10 @@ uart1: serial@100000 { "sprd,sc9836-uart"; reg = <0x100000 0x100>; interrupts = ; - clock-names = "enable", "uart", "source"; clocks = <&apapb_gate CLK_UART1_EB>, - <&ap_clk CLK_UART1>, <&ext_26m>; + <&ap_clk CLK_UART1>, + <&ext_26m>; + clock-names = "enable", "uart", "source"; status = "disabled"; }; @@ -97,9 +99,10 @@ uart2: serial@200000 { "sprd,sc9836-uart"; reg = <0x200000 0x100>; interrupts = ; - clock-names = "enable", "uart", "source"; clocks = <&apapb_gate CLK_UART2_EB>, - <&ap_clk CLK_UART2>, <&ext_26m>; + <&ap_clk CLK_UART2>, + <&ext_26m>; + clock-names = "enable", "uart", "source"; status = "disabled"; }; @@ -108,9 +111,10 @@ uart3: serial@300000 { "sprd,sc9836-uart"; reg = <0x300000 0x100>; interrupts = ; - clock-names = "enable", "uart", "source"; clocks = <&apapb_gate CLK_UART3_EB>, - <&ap_clk CLK_UART3>, <&ext_26m>; + <&ap_clk CLK_UART3>, + <&ext_26m>; + clock-names = "enable", "uart", "source"; status = "disabled"; }; }; @@ -129,8 +133,8 @@ ap_dma: dma-controller@20100000 { /* For backwards compatibility: */ #dma-channels = <32>; dma-channels = <32>; - clock-names = "enable"; clocks = <&apahb_gate CLK_DMA_EB>; + clock-names = "enable"; }; sdio3: mmc@50430000 { @@ -138,10 +142,10 @@ sdio3: mmc@50430000 { reg = <0 0x50430000 0 0x1000>; interrupts = ; - clock-names = "sdio", "enable", "2x_enable"; clocks = <&aon_prediv CLK_EMMC_2X>, - <&apahb_gate CLK_EMMC_EB>, - <&aon_gate CLK_EMMC_2X_EN>; + <&apahb_gate CLK_EMMC_EB>, + <&aon_gate CLK_EMMC_2X_EN>; + clock-names = "sdio", "enable", "2x_enable"; assigned-clocks = <&aon_prediv CLK_EMMC_2X>; assigned-clock-parents = <&clk_l0_409m6>; @@ -194,8 +198,8 @@ hwlock: hwspinlock@40500000 { compatible = "sprd,hwspinlock-r3p0"; reg = <0 0x40500000 0 0x1000>; #hwlock-cells = <1>; - clock-names = "enable"; clocks = <&aon_gate CLK_SPLK_EB>; + clock-names = "enable"; }; eic_debounce: gpio@40210000 { @@ -258,9 +262,9 @@ watchdog@40310000 { reg = <0 0x40310000 0 0x1000>; interrupts = ; timeout-sec = <12>; - clock-names = "enable", "rtc_enable"; clocks = <&aon_gate CLK_APCPU_WDG_EB>, - <&aon_gate CLK_AP_WDG_RTC_EB>; + <&aon_gate CLK_AP_WDG_RTC_EB>; + clock-names = "enable", "rtc_enable"; }; }; @@ -277,9 +281,9 @@ agcp_dma: dma-controller@41580000 { /* For backwards compatibility: */ #dma-channels = <32>; dma-channels = <32>; - clock-names = "enable", "ashb_eb"; clocks = <&agcp_gate CLK_AGCP_DMAAP_EB>, - <&agcp_gate CLK_AGCP_AP_ASHB_EB>; + <&agcp_gate CLK_AGCP_AP_ASHB_EB>; + clock-names = "enable", "ashb_eb"; }; }; };