From patchwork Thu Jul 4 17:41:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Jakubek X-Patchwork-Id: 13724138 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 BD44CC3271F for ; Thu, 4 Jul 2024 17:42:17 +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=DD+79gEm0XI4lApuwdUr/m+jS9/o8tYpP//fuDo0BF0=; b=oXd03jRDksJ29QEJi3wwy83AoU iqJgixmfoYrJjzsnyEPKH3OWh0o/IfhBXo9KafRN1uxzLprRWCvipDnVebJwU1hkmlrL31/W3J8+N WrPOVgC6TGwgiZ/Gea0twOvKrt1MTfrSTTboj6Y0+eI7rHc7I0z7MLH3U+Xh6M3V4kazCJQwW/Tid gvdquB+JyI1bhFFkxskiP+t0zMKbsZYu2EwFh8wOGgsbwCxVZQUKz2CwE+FQ2w7j/MLThM/5tLLM2 8vTKFppBt4hgrnnwDMoHWeRxI5zE1banGViURcQYpflzIlQ1WJYoxHyrx98uf0cltCVwKJ8geG8E0 cwK+aokg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sPQT8-0000000E3YV-3LjG; Thu, 04 Jul 2024 17:42:06 +0000 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sPQSv-0000000E3VR-193p for linux-arm-kernel@lists.infradead.org; Thu, 04 Jul 2024 17:41:54 +0000 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-36798ea618bso541031f8f.0 for ; Thu, 04 Jul 2024 10:41:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720114911; x=1720719711; 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=DD+79gEm0XI4lApuwdUr/m+jS9/o8tYpP//fuDo0BF0=; b=j7hSbdGc4+TunNxT5Bm5LGM7CDORh/APB/fJ9xiwc8zBWd2LMpgFgtMZLTkYBta8uU v2ckpfWlGIPhoqDRc0Fa6DiJzWVuvbxVlLn7q3QsOA08HHjTjz/O6g+56GnUic7iaNSa BMgADcI6Zlz2/juO5J0cv0jr63biGfpkl0RFZ+X/wDtXy1jItGMlYTtwWSyYFmy7QqWQ ORLyp66Z+HZKQsW6pE059fbF05GQan2Xrp+wadcby6/3NyHlh4LKyoB398R4HqfxEP+2 5dE5O/hLyKyRYYbdbMqoeRIACkiQVFnYM9LJ1luzXwhLVnUfS/lLrbYPuuxHTfe2uvvN uSEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720114911; x=1720719711; 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=DD+79gEm0XI4lApuwdUr/m+jS9/o8tYpP//fuDo0BF0=; b=OUsCAaRfpRGDA6e/WWkbyA6Mvxgf/LUxTtqQc99x+ef43pYYYtx8v1pMVYZ1GYYnTC RX1RVq5ROAuf0gcXu2Fks5SMgcfV11CUXpOfp3YWXQq4ad+zt11EZ24X+mzuZnw+/3Hb PJXM4hjGzeJBCg7i2qHC1eH6gAyDY1DSsvg32MjweGAi7oIqkyeH+nDMzojyyPnnW7Cd HP1z+27ULXQfwoavksmEzfp4CgK33txUfOx4XuW+L13ZL1E/qUP9AFoLU0NNemDvoeCj J6uh6Vtsl82lgpzUTE9UaAL4cqL7oVi0oI2rDTYNt2KEaTN5mPJKQEL6JmJEUcwddmmt HnEA== X-Forwarded-Encrypted: i=1; AJvYcCXZNlhx5+7efu1D1fnirRYVBCuMHz6IiWTuN+a8z3zvB85yvp7lT70EFMLd+or2vr8uUCdoWZyPc4ebjAXI4nqfhKTTjlPXw2zmNeh9VR2PCgYtHK8= X-Gm-Message-State: AOJu0YzfbZHUV5DOmhSj+Hh59H9HMQlp1xEZNz0YVjLTcRKHRHxSsktq u/3QAg6GPIXf+XykTdsV7y6+bPIzpuMb1iLQGhEc62WVgAJ1P90U X-Google-Smtp-Source: AGHT+IGmbxgZZZex3R3p7fd8tn7nK0WGsIU6quKOVgqMY0z4nZ9HyLjjPfBDs1wD+vOgmxfmqxrYwQ== X-Received: by 2002:a05:6000:acf:b0:362:69f1:a08 with SMTP id ffacd0b85a97d-3679dd24f5amr2079362f8f.19.1720114911455; Thu, 04 Jul 2024 10:41:51 -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-367a18c2810sm1395455f8f.18.2024.07.04.10.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 10:41:51 -0700 (PDT) Date: Thu, 4 Jul 2024 19:41:49 +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 1/3] arm64: dts: sprd: rename SDHCI nodes to mmc Message-ID: <5262c00966eef7db054debff93cdd789dbfce34d.1720112081.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-20240704_104153_334214_C28D1068 X-CRM114-Status: GOOD ( 13.41 ) 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 bindings expect SDHCI/MMC nodes to be called 'mmc', rename them. Signed-off-by: Stanislav Jakubek --- arch/arm64/boot/dts/sprd/sc9863a.dtsi | 4 ++-- arch/arm64/boot/dts/sprd/whale2.dtsi | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/sprd/sc9863a.dtsi b/arch/arm64/boot/dts/sprd/sc9863a.dtsi index 53e5b77d70b5..a7b897966882 100644 --- a/arch/arm64/boot/dts/sprd/sc9863a.dtsi +++ b/arch/arm64/boot/dts/sprd/sc9863a.dtsi @@ -551,7 +551,7 @@ ap-ahb { #size-cells = <2>; ranges; - sdio0: sdio@20300000 { + sdio0: mmc@20300000 { compatible = "sprd,sdhci-r11"; reg = <0 0x20300000 0 0x1000>; interrupts = ; @@ -567,7 +567,7 @@ sdio0: sdio@20300000 { no-mmc; }; - sdio3: sdio@20600000 { + sdio3: mmc@20600000 { compatible = "sprd,sdhci-r11"; reg = <0 0x20600000 0 0x1000>; interrupts = ; diff --git a/arch/arm64/boot/dts/sprd/whale2.dtsi b/arch/arm64/boot/dts/sprd/whale2.dtsi index 7068bfd2f4c3..cdf52fd78ee4 100644 --- a/arch/arm64/boot/dts/sprd/whale2.dtsi +++ b/arch/arm64/boot/dts/sprd/whale2.dtsi @@ -133,7 +133,7 @@ ap_dma: dma-controller@20100000 { clocks = <&apahb_gate CLK_DMA_EB>; }; - sdio3: sdio@50430000 { + sdio3: mmc@50430000 { compatible = "sprd,sdhci-r11"; reg = <0 0x50430000 0 0x1000>; interrupts = ; From patchwork Thu Jul 4 17:42:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Jakubek X-Patchwork-Id: 13724139 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 83411C30653 for ; Thu, 4 Jul 2024 17:42:48 +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=DO7q/NGNcPdvMIxjhvqwBYf8uSmJ6wXA8Ckn0WCsX4c=; b=ca/j2P5q5c7gpnFLBVNeLze/FN e2z1sWvGE7dSsn3lho/Bz3XQLVOxQZQN2XsCJ6EJSaWV4N1IMB0ZKwBmXqCWYqX1jGui7TvLxB3xm cigRfKIfjRWqMcBSCW8aleW9PNIkCtUhVN0C0t/DJlkmfH98Vqke3Y3pc91sZPjnaYs3OhSvZgQ1C 7GOmcnd9tDuG8LtkkmoIZn8GI+5aNsrRYD/6oiJ2Jj7INCGd1kjMsjZ1VfQNSYzv7ME8NcJso8shh HMA1bngavfH2PtzSAYn761V6eDUfYOHrlGh6LKkfzwSjeoR3AEdUDydYO0wzJl6PYeQ1yW0Iqh8uB qm23exWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sPQTc-0000000E3he-3T9y; Thu, 04 Jul 2024 17:42:36 +0000 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sPQTN-0000000E3cf-46zo for linux-arm-kernel@lists.infradead.org; Thu, 04 Jul 2024 17:42:23 +0000 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-42562e4b5d1so5851755e9.1 for ; Thu, 04 Jul 2024 10:42:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720114940; x=1720719740; 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=DO7q/NGNcPdvMIxjhvqwBYf8uSmJ6wXA8Ckn0WCsX4c=; b=fmLv75aL0H95g5tzXpoO5axLUa1y558nS9RkCIxWC2u3PG2MvayFRsOWJzYq0gYkI/ A4pZ33/7pP1G+KUMxyk4GdJMNXBkIzItLofXnNIltxELLmRUzIqwWk3veghxOK9g+fZ4 cbZ0okmnaCFZxFPw9CijwbJkMGVOowj3bf/7HMUmj8u5W0EucBJUpSJ3ggoRuahXGmlc TxKrzXgw/S2otUvJr9sj6Yra6mA6RFOJdsMTfgxKllKndvDvyfVLt0V8ZZat0AH09Uba 486RPb349LrDMhw+ewCWPVh7bCHOjuS1T97j9kwyzTkDxRfkTtEboX8tX9CI1j210kkf qpWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720114940; x=1720719740; 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=DO7q/NGNcPdvMIxjhvqwBYf8uSmJ6wXA8Ckn0WCsX4c=; b=TLOJrvZvqM3U0OWt09Z7XZ+U4/GhSRk9z6e4nj5E+M+cph41bbWRC+9SdjqZ/zJxXK iJVUCxjKj7+/3GkyvJ4MmXct9k6mNVJgKRjoEtDSvFQE+eZ/qMU+Wy0tdRZ0GvdCGiZY hsm31TdG0y23GfhTvnNyzVB8lUfi9dLonlW0JNKGtTq3wKIHyOkSFX9Ez/mX5Pn5wzVg C9HzXDyEFg8rYO59LeK/iCJzb4q+XFWMVpr+wdrrHWcpNcLIq6a6al/+i35OvZlaM0c+ t5MNJMYEDZuzj+Gkl7jec9iNGrRrUvj+Pk3Adv6Pk/2Eignz5z2zMbvdQzevbjxWKFkm 3TSw== X-Forwarded-Encrypted: i=1; AJvYcCVGKBryb1Joe+rgkmlPuc3ItwOF4GTv9jCHiVe8RHse4dUa4RZQ2Ydgj7xx083JEOLHO0anxOeTCR8iMa1+tCHOP1PplreTB9D0XgQO5We7EA98ZZw= X-Gm-Message-State: AOJu0YxJaBDmRq+zv7rHfxTD9i4eXZ5wixWK2Argw00wsbh+5ZmkSIOO jT9kQ0wUZC1LK2lvfK4+6dkO6+g9jAosKe/P38mBTcVFdMkAjg3q X-Google-Smtp-Source: AGHT+IFCwuIDDla90x+4B9eGYmM36tynt3nGQCnGhZ+87WBaBNnvKSxXhQRuFh4TsAVnci4xfZkbPg== X-Received: by 2002:a05:600c:5126:b0:424:bb93:7aad with SMTP id 5b1f17b1804b1-4264a36eebbmr19192325e9.0.1720114940403; Thu, 04 Jul 2024 10:42:20 -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 5b1f17b1804b1-4264a2ca4c2sm32598535e9.36.2024.07.04.10.42.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 10:42:20 -0700 (PDT) Date: Thu, 4 Jul 2024 19:42:18 +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 2/3] arm64: dts: sprd: reorder clock-names after clocks Message-ID: <9623744b096c026f481fc5d03ba8f1643e487534.1720112081.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-20240704_104222_049211_F756F49E X-CRM114-Status: GOOD ( 12.46 ) 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. 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"; }; }; }; From patchwork Thu Jul 4 17:42:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Jakubek X-Patchwork-Id: 13724140 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 95E02C30653 for ; Thu, 4 Jul 2024 17:43:11 +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=7vtZ/w5zNW89im8HqRZwOomQ2OX/mj8N4Kk6rmuQv3s=; b=qZg/OtkkL66gWIrXySGrgR9bzZ +X8kee2Aa1xRZr/6Hr16y3lLorNHfKApKCXkP0X2z/7EhZ5NXMZ9/zDCYNKXxW0TLkIuIQoUHHEZJ 17X3LSJBu+WsQBA9u3DMOGMG7by8lYYPKMPxTCTlwX0qEDNhEhd4JpHAvW330Po5I6WmpEmgtE9cE 5CPRu+wKcBRL/hrCumP2xcZxZpiNT9WHrtt66sJflDJ30T9UQYcLOgJkI051FtaFdrO/sd5gqk2tU zQSTg8yduOsNvobDeL1Qv4j4eOIkm7PrUodwzT5e35d3czujtFPTKeP0/FAAgoj6FusS0U69A/OOc Rqyotfmg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sPQU2-0000000E3p3-0dkd; Thu, 04 Jul 2024 17:43:02 +0000 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sPQTo-0000000E3l8-0EwS for linux-arm-kernel@lists.infradead.org; Thu, 04 Jul 2024 17:42:49 +0000 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-36799a67d9cso745348f8f.0 for ; Thu, 04 Jul 2024 10:42:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720114966; x=1720719766; 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=7vtZ/w5zNW89im8HqRZwOomQ2OX/mj8N4Kk6rmuQv3s=; b=j7M1T7Jlv+lEizG8CYH8z6/jf/uwYtVc6wApjYIdz/4948haNY5sTSGyVClpElwlJ5 +B9jVKj2rsxtFmZYP4kqK4u53y2mRdX7IcdUmKJYfYfld2zScK5941SQZE8PrjAffYGK D89adhszww+FmcIQP2YjhwHxWQMTFM6xtwKUVazDFxGL0rGReaBOgVRb9xOmP7i+dm8W D9hxmhgyLnIAnSOMEcCWraj3R64+lKHurwGerxsoQ6a3/b7NQH+U3c5FofPye7yr68bj zZaVQoFlf8rdEpwWJWTlXnD09ViRoblHXR0oi+vrJqfYHftTZP5R8HdkQP1jQ2boC41Q f3wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720114966; x=1720719766; 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=7vtZ/w5zNW89im8HqRZwOomQ2OX/mj8N4Kk6rmuQv3s=; b=NzaICJNdKLHeBJrjccqG4urGeJfk8BJqwtpHPnAh7vpY8VuLkT9RA+GzC08a+aL/Ca q/fzmz4M91qLgdH3jg7rgWI6f1ZCiXamzHGh6yrikxF47jtbGUPk3PSIfK3rP0eOHh7w uanhSffavGnZO4ix3o/pI2fdkhHPW99R6OfKpU3Zd4x54mSPb/Qymd4hErPeuugg2W99 ZzqixGJAoAQahbgkEBHPvgcUQRo/MqECNvuC9tSq5fCRHgsWFl8iZxMnGtok3ONkZ3gv HTdB5C7aEQcIEBYjMHoct/cXYrocOvdb0LEcUx9gB0FbTi4YcYwlccIPCQBl7T8DSM9n veSg== X-Forwarded-Encrypted: i=1; AJvYcCUWhX+tElmaPJ8ne1fyESTg27mH1S0J9uojRJR1pb3P8RVDWloj58gEyj5DM9VfpeqTlBS8tDBBL4LcA6aSoWccbS5ivJEGB8/XsSmM4i49azNTteI= X-Gm-Message-State: AOJu0YycGknixz1B9W2trAX26dSsJx2z5sb/AE4Y7v7/09rTXghRPCeE fClpwyWRRvAstLYTtHhh1vJPoxsFFbKVlz8JFsTkKnu6JedZVBb7 X-Google-Smtp-Source: AGHT+IGwpA/Ri2KHPLe1mfcS2CB7JJKPp3dCeWWL3NpPfWiKB2u2gHJTCgiK5unDKILf/5mIRxG7aw== X-Received: by 2002:adf:eccf:0:b0:367:92e3:9171 with SMTP id ffacd0b85a97d-3679dd26d28mr2500477f8f.19.1720114966421; Thu, 04 Jul 2024 10:42:46 -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-367938a6e97sm4693217f8f.109.2024.07.04.10.42.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jul 2024 10:42:46 -0700 (PDT) Date: Thu, 4 Jul 2024 19:42:44 +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 3/3] arm64: dts: sprd: move/add SPDX license to top of the file Message-ID: 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-20240704_104248_122678_0D4D8669 X-CRM114-Status: GOOD ( 14.71 ) 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 Checkpatch complains about the SPDX-License-Identifier being in the wrong place. Move it to the top of the file to fix these warnings. In cases of the license being specified only in text, convert these to the SPDX-License-Identifier. Signed-off-by: Stanislav Jakubek --- arch/arm64/boot/dts/sprd/sc2731.dtsi | 3 +-- arch/arm64/boot/dts/sprd/sc9836-openphone.dts | 3 +-- arch/arm64/boot/dts/sprd/sc9836.dtsi | 3 +-- arch/arm64/boot/dts/sprd/sc9860.dtsi | 3 +-- arch/arm64/boot/dts/sprd/sharkl64.dtsi | 3 +-- arch/arm64/boot/dts/sprd/sp9860g-1h10.dts | 3 +-- arch/arm64/boot/dts/sprd/whale2.dtsi | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/arch/arm64/boot/dts/sprd/sc2731.dtsi b/arch/arm64/boot/dts/sprd/sc2731.dtsi index e15409f55f43..fc4e2b1e160e 100644 --- a/arch/arm64/boot/dts/sprd/sc2731.dtsi +++ b/arch/arm64/boot/dts/sprd/sc2731.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Spreadtrum SC2731 PMIC dts file * * Copyright (C) 2018, Spreadtrum Communications Inc. - * - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ &adi_bus { diff --git a/arch/arm64/boot/dts/sprd/sc9836-openphone.dts b/arch/arm64/boot/dts/sprd/sc9836-openphone.dts index e5657c35cd10..b98589ea5ac2 100644 --- a/arch/arm64/boot/dts/sprd/sc9836-openphone.dts +++ b/arch/arm64/boot/dts/sprd/sc9836-openphone.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0-only OR MIT) /* * Spreadtrum SC9836 openphone board DTS file * * Copyright (C) 2014, Spreadtrum Communications Inc. - * - * This file is licensed under a dual GPLv2 or X11 license. */ /dts-v1/; diff --git a/arch/arm64/boot/dts/sprd/sc9836.dtsi b/arch/arm64/boot/dts/sprd/sc9836.dtsi index 8bb8a70966d2..bc3fc9fc3d90 100644 --- a/arch/arm64/boot/dts/sprd/sc9836.dtsi +++ b/arch/arm64/boot/dts/sprd/sc9836.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0-only OR MIT) /* * Spreadtrum SC9836 SoC DTS file * * Copyright (C) 2014, Spreadtrum Communications Inc. - * - * This file is licensed under a dual GPLv2 or X11 license. */ #include "sharkl64.dtsi" diff --git a/arch/arm64/boot/dts/sprd/sc9860.dtsi b/arch/arm64/boot/dts/sprd/sc9860.dtsi index 31952d361a8a..d2456d633c39 100644 --- a/arch/arm64/boot/dts/sprd/sc9860.dtsi +++ b/arch/arm64/boot/dts/sprd/sc9860.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Spreadtrum SC9860 SoC * * Copyright (C) 2016, Spreadtrum Communications Inc. - * - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ #include diff --git a/arch/arm64/boot/dts/sprd/sharkl64.dtsi b/arch/arm64/boot/dts/sprd/sharkl64.dtsi index 69f64e7fce7c..bf58702c4e07 100644 --- a/arch/arm64/boot/dts/sprd/sharkl64.dtsi +++ b/arch/arm64/boot/dts/sprd/sharkl64.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0-only OR MIT) /* * Spreadtrum Sharkl64 platform DTS file * * Copyright (C) 2014, Spreadtrum Communications Inc. - * - * This file is licensed under a dual GPLv2 or X11 license. */ / { diff --git a/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts b/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts index 1ce3cbbd9668..095b24a31313 100644 --- a/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts +++ b/arch/arm64/boot/dts/sprd/sp9860g-1h10.dts @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Spreadtrum SP9860g board * * Copyright (C) 2017, Spreadtrum Communications Inc. - * - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ /dts-v1/; diff --git a/arch/arm64/boot/dts/sprd/whale2.dtsi b/arch/arm64/boot/dts/sprd/whale2.dtsi index a28f995fb3ff..a551e14ce826 100644 --- a/arch/arm64/boot/dts/sprd/whale2.dtsi +++ b/arch/arm64/boot/dts/sprd/whale2.dtsi @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) /* * Spreadtrum Whale2 platform peripherals * * Copyright (C) 2016, Spreadtrum Communications Inc. - * - * SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ #include