From patchwork Mon Aug 26 17:31:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu X-Patchwork-Id: 13778299 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 70392C5472D for ; Mon, 26 Aug 2024 17:35:18 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=T370sUu57dJFmbuCp0n0YvqcvgntixC3zniQ7Z2kajQ=; b=LoDGhLXxYfRO6e84pwuBCsuwFC UWP6MZvoJ+oaqAENVu7+pSmcgyZOBcEJtlpvVqgt9x4Kbt1PPzhWnFfkh66v2Zavxdo0Zhv5YLqe+ NEah5KDB9jvLf9DPPUW5WlOTqAz6kEcz6bifFNNPUffjMpCROS1UrHh6ruU7Xd9KZ8Q1jpo1MqsLr xkgk75W1m2R6Wqh5N8xnV3rBpjeRIoFgBkcVicq96pgOz/JhBOXmXYqEbFlgsWx/7NqbeHB3ujJZS GgjFkNLft7+eEOu6tWIlIs1bIcBRUW17yDGUejeCj2PLnxKrMiiTNymoEf7ZqvdNSJ5P8C6Fm10+Q 747KfrjQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sidcQ-00000008FIb-31YK; Mon, 26 Aug 2024 17:35:06 +0000 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sidYu-00000008EF4-3gVb for linux-arm-kernel@lists.infradead.org; Mon, 26 Aug 2024 17:31:30 +0000 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-53346132365so5413283e87.1 for ; Mon, 26 Aug 2024 10:31:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1724693487; x=1725298287; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T370sUu57dJFmbuCp0n0YvqcvgntixC3zniQ7Z2kajQ=; b=pEALM+gpKoKxhIRf/qHLs3Dj9BgPxwWesFnz8kG5bNE4gnF3MJ+eaPR40JlzjDrwmo UOMBMvpgXfwaYkr4XdVm4C7vIelfAWQtuuiRuYr7EHnEGPnln1CfrapXFxwgir5a/nWR RAK1m2rpL0TIGP7yjKNhIeEWC7mUy6Z+cCaN8x2sBAlevm7LdLLZ6HglNbFLq9xgP7Bn afFlBAfyGQscibmFjeC5sx1pgUZC/pn78R8PzseZVzKNbpDOCHMzCaf6sn6LGt6ZvHJn eBjeoZusXRV2t+DeEiqqbzMmVaOsdnDVECcWE7s6uS65wxG1sAkjI3TCl7YME4hB5F90 chbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724693487; x=1725298287; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T370sUu57dJFmbuCp0n0YvqcvgntixC3zniQ7Z2kajQ=; b=QjHCG5g1fvkOlXNDgmClF05DNnyf397I/L9Raoa5gATM1bnojxUzWF1vSLynyNQ9MO GLGSfNz7vvC+Psofc10HS2hjn7hH5qWSJ2ZRpgik1BS8vkgP98t5Gq9ySggVXTe2XTQP SmbWb96IYbpiTExj7I+vxywQIjTqLn6CLkZW8GGeSJCWuECxBBwirll+rF+D1b/RHOmZ AKywUIVoeJCfhqQjgyAO9p/gEX6S+SblqCwopwPFCWEpR5bWc04kDBYdTtGTdYt+tMtY 9u3xXPdem6aOPVqStq6Z2FNTzMF+OexUp8inRbe7dC8Hc4VNdiypVZi0p5e8eU7fg+2S yavQ== X-Gm-Message-State: AOJu0Yxn3yM3oeKFvAO0u3eKfFqZ0wVGKtwXiR3sdQymayEHD5Z/DowI wiLSM/WqgqWtCnDEn39JqHLuMzzW04wbXu42mllOxbslN52yvlfzU/CL1qgfdSA= X-Google-Smtp-Source: AGHT+IHl5ECdva99iS8MGwyQOyjCeOAz2cu6VPsZOx2yoj1QvjX+04dStE1ffy8Es6Mq3ecn4kJkDQ== X-Received: by 2002:a05:6512:2210:b0:52d:582e:4117 with SMTP id 2adb3069b0e04-5344e4fd009mr59543e87.54.1724693486663; Mon, 26 Aug 2024 10:31:26 -0700 (PDT) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.144]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a86e548781csm446566b.28.2024.08.26.10.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2024 10:31:26 -0700 (PDT) From: Claudiu Beznea To: nicolas.ferre@microchip.com, alexandre.belloni@bootlin.com, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, mturquette@baylibre.com, sboyd@kernel.org Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, Claudiu Beznea Subject: [PATCH 3/3] ARM: dts: microchip: Use SCKC_{TD, MD}_SLCK IDs for clk32k clocks Date: Mon, 26 Aug 2024 20:31:16 +0300 Message-Id: <20240826173116.3628337-4-claudiu.beznea@tuxon.dev> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240826173116.3628337-1-claudiu.beznea@tuxon.dev> References: <20240826173116.3628337-1-claudiu.beznea@tuxon.dev> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240826_103128_939812_6993BB6C X-CRM114-Status: GOOD ( 11.88 ) 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 Use the newly introduced macros instead of raw number. With this device tree code is a bit easier to understand. Signed-off-by: Claudiu Beznea --- arch/arm/boot/dts/microchip/sam9x60.dtsi | 18 +++++++++--------- arch/arm/boot/dts/microchip/sama7g5.dtsi | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/microchip/sam9x60.dtsi b/arch/arm/boot/dts/microchip/sam9x60.dtsi index 04a6d716ecaf..eeda277e684f 100644 --- a/arch/arm/boot/dts/microchip/sam9x60.dtsi +++ b/arch/arm/boot/dts/microchip/sam9x60.dtsi @@ -560,7 +560,7 @@ tcb0: timer@f8008000 { #size-cells = <0>; reg = <0xf8008000 0x100>; interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>; - clocks = <&pmc PMC_TYPE_PERIPHERAL 17>, <&clk32k 0>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 17>, <&clk32k SCKC_MD_SLCK>; clock-names = "t0_clk", "slow_clk"; }; @@ -570,7 +570,7 @@ tcb1: timer@f800c000 { #size-cells = <0>; reg = <0xf800c000 0x100>; interrupts = <45 IRQ_TYPE_LEVEL_HIGH 0>; - clocks = <&pmc PMC_TYPE_PERIPHERAL 45>, <&clk32k 0>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 45>, <&clk32k SCKC_MD_SLCK>; clock-names = "t0_clk", "slow_clk"; }; @@ -1038,7 +1038,7 @@ hlcdc: hlcdc@f8038000 { compatible = "microchip,sam9x60-hlcdc"; reg = <0xf8038000 0x4000>; interrupts = <25 IRQ_TYPE_LEVEL_HIGH 0>; - clocks = <&pmc PMC_TYPE_PERIPHERAL 25>, <&pmc PMC_TYPE_GCK 25>, <&clk32k 1>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 25>, <&pmc PMC_TYPE_GCK 25>, <&clk32k SCKC_TD_SLCK>; clock-names = "periph_clk","sys_clk", "slow_clk"; assigned-clocks = <&pmc PMC_TYPE_GCK 25>; assigned-clock-parents = <&pmc PMC_TYPE_CORE PMC_MCK>; @@ -1313,20 +1313,20 @@ pmc: clock-controller@fffffc00 { reg = <0xfffffc00 0x200>; interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; #clock-cells = <2>; - clocks = <&clk32k 1>, <&clk32k 0>, <&main_xtal>; + clocks = <&clk32k SCKC_TD_SLCK>, <&clk32k SCKC_MD_SLCK>, <&main_xtal>; clock-names = "td_slck", "md_slck", "main_xtal"; }; reset_controller: reset-controller@fffffe00 { compatible = "microchip,sam9x60-rstc"; reg = <0xfffffe00 0x10>; - clocks = <&clk32k 0>; + clocks = <&clk32k SCKC_MD_SLCK>; }; shutdown_controller: poweroff@fffffe10 { compatible = "microchip,sam9x60-shdwc"; reg = <0xfffffe10 0x10>; - clocks = <&clk32k 0>; + clocks = <&clk32k SCKC_MD_SLCK>; #address-cells = <1>; #size-cells = <0>; atmel,wakeup-rtc-timer; @@ -1338,7 +1338,7 @@ rtt: rtc@fffffe20 { compatible = "microchip,sam9x60-rtt", "atmel,at91sam9260-rtt"; reg = <0xfffffe20 0x20>; interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; - clocks = <&clk32k 1>; + clocks = <&clk32k SCKC_TD_SLCK>; }; pit: timer@fffffe40 { @@ -1364,14 +1364,14 @@ rtc: rtc@fffffea8 { compatible = "microchip,sam9x60-rtc", "atmel,at91sam9x5-rtc"; reg = <0xfffffea8 0x100>; interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; - clocks = <&clk32k 1>; + clocks = <&clk32k SCKC_TD_SLCK>; }; watchdog: watchdog@ffffff80 { compatible = "microchip,sam9x60-wdt"; reg = <0xffffff80 0x24>; interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; - clocks = <&clk32k 0>; + clocks = <&clk32k SCKC_MD_SLCK>; status = "disabled"; }; }; diff --git a/arch/arm/boot/dts/microchip/sama7g5.dtsi b/arch/arm/boot/dts/microchip/sama7g5.dtsi index 17bcdcf0cf4a..2efca9838d69 100644 --- a/arch/arm/boot/dts/microchip/sama7g5.dtsi +++ b/arch/arm/boot/dts/microchip/sama7g5.dtsi @@ -246,7 +246,7 @@ pmc: clock-controller@e0018000 { reg = <0xe0018000 0x200>; interrupts = ; #clock-cells = <2>; - clocks = <&clk32k 1>, <&clk32k 0>, <&main_xtal>; + clocks = <&clk32k SCKC_TD_SLCK>, <&clk32k SCKC_MD_SLCK>, <&main_xtal>; clock-names = "td_slck", "md_slck", "main_xtal"; }; @@ -254,13 +254,13 @@ reset_controller: reset-controller@e001d000 { compatible = "microchip,sama7g5-rstc"; reg = <0xe001d000 0xc>, <0xe001d0e4 0x4>; #reset-cells = <1>; - clocks = <&clk32k 0>; + clocks = <&clk32k SCKC_MD_SLCK>; }; shdwc: poweroff@e001d010 { compatible = "microchip,sama7g5-shdwc", "syscon"; reg = <0xe001d010 0x10>; - clocks = <&clk32k 0>; + clocks = <&clk32k SCKC_MD_SLCK>; #address-cells = <1>; #size-cells = <0>; atmel,wakeup-rtc-timer; @@ -272,7 +272,7 @@ rtt: rtc@e001d020 { compatible = "microchip,sama7g5-rtt", "microchip,sam9x60-rtt", "atmel,at91sam9260-rtt"; reg = <0xe001d020 0x30>; interrupts = ; - clocks = <&clk32k 1>; + clocks = <&clk32k SCKC_TD_SLCK>; }; clk32k: clock-controller@e001d050 { @@ -291,14 +291,14 @@ rtc: rtc@e001d0a8 { compatible = "microchip,sama7g5-rtc", "microchip,sam9x60-rtc"; reg = <0xe001d0a8 0x30>; interrupts = ; - clocks = <&clk32k 1>; + clocks = <&clk32k SCKC_TD_SLCK>; }; ps_wdt: watchdog@e001d180 { compatible = "microchip,sama7g5-wdt"; reg = <0xe001d180 0x24>; interrupts = ; - clocks = <&clk32k 0>; + clocks = <&clk32k SCKC_MD_SLCK>; }; chipid@e0020000 { @@ -312,7 +312,7 @@ tcb1: timer@e0800000 { #size-cells = <0>; reg = <0xe0800000 0x100>; interrupts = , , ; - clocks = <&pmc PMC_TYPE_PERIPHERAL 91>, <&pmc PMC_TYPE_PERIPHERAL 92>, <&pmc PMC_TYPE_PERIPHERAL 93>, <&clk32k 1>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 91>, <&pmc PMC_TYPE_PERIPHERAL 92>, <&pmc PMC_TYPE_PERIPHERAL 93>, <&clk32k SCKC_TD_SLCK>; clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk"; }; @@ -906,7 +906,7 @@ tcb0: timer@e2814000 { #size-cells = <0>; reg = <0xe2814000 0x100>; interrupts = , , ; - clocks = <&pmc PMC_TYPE_PERIPHERAL 88>, <&pmc PMC_TYPE_PERIPHERAL 89>, <&pmc PMC_TYPE_PERIPHERAL 90>, <&clk32k 1>; + clocks = <&pmc PMC_TYPE_PERIPHERAL 88>, <&pmc PMC_TYPE_PERIPHERAL 89>, <&pmc PMC_TYPE_PERIPHERAL 90>, <&clk32k SCKC_TD_SLCK>; clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk"; };