| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 21 Apr 2022 17:26:31 +0200
From: Alexandre TORGUE <alexandre.torgue@...s.st.com>
To: <gabriel.fernandez@...s.st.com>,
Michael Turquette <mturquette@...libre.com>,
Stephen Boyd <sboyd@...nel.org>,
Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski@...onical.com>,
Maxime Coquelin <mcoquelin.stm32@...il.com>,
Philipp Zabel <p.zabel@...gutronix.de>
CC: <linux-clk@...r.kernel.org>, <devicetree@...r.kernel.org>,
<linux-stm32@...md-mailman.stormreply.com>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-kernel@...r.kernel.org>
Subject: Re: [PATCH RESEND v3 13/13] ARM: dts: stm32: add RCC on STM32MP13x
SoC family
On 3/16/22 14:10, gabriel.fernandez@...s.st.com wrote:
> From: Gabriel Fernandez <gabriel.fernandez@...s.st.com>
>
> Enables Reset and Clocks Controller on STM32MP13
>
> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@...s.st.com>
> ---
> arch/arm/boot/dts/stm32mp131.dtsi | 107 +++++++++++------------------
> arch/arm/boot/dts/stm32mp133.dtsi | 4 +-
> arch/arm/boot/dts/stm32mp13xf.dtsi | 3 +-
> 3 files changed, 46 insertions(+), 68 deletions(-)
>
> diff --git a/arch/arm/boot/dts/stm32mp131.dtsi b/arch/arm/boot/dts/stm32mp131.dtsi
> index 78eac53224d4..d7300b00ec19 100644
> --- a/arch/arm/boot/dts/stm32mp131.dtsi
> +++ b/arch/arm/boot/dts/stm32mp131.dtsi
> @@ -4,6 +4,8 @@
> * Author: Alexandre Torgue <alexandre.torgue@...s.st.com> for STMicroelectronics.
> */
> #include <dt-bindings/interrupt-controller/arm-gic.h>
> +#include <dt-bindings/clock/stm32mp13-clks.h>
> +#include <dt-bindings/reset/stm32mp13-resets.h>
>
> / {
> #address-cells = <1>;
> @@ -64,54 +66,8 @@ scmi_reset: protocol@16 {
> };
> };
> };
> - clocks {
> - clk_axi: clk-axi {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - clock-frequency = <266500000>;
> - };
> -
> - clk_hse: clk-hse {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - clock-frequency = <24000000>;
> - };
> -
> - clk_hsi: clk-hsi {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - clock-frequency = <64000000>;
> - };
> -
> - clk_lsi: clk-lsi {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - clock-frequency = <32000>;
> - };
> -
> - clk_pclk3: clk-pclk3 {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - clock-frequency = <104438965>;
> - };
>
> - clk_pclk4: clk-pclk4 {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - clock-frequency = <133250000>;
> - };
> -
> - clk_pll4_p: clk-pll4_p {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - clock-frequency = <50000000>;
> - };
> -
> - clk_pll4_r: clk-pll4_r {
> - #clock-cells = <0>;
> - compatible = "fixed-clock";
> - clock-frequency = <99000000>;
> - };
> + clocks {
> };
>
> intc: interrupt-controller@...21000 {
> @@ -148,7 +104,8 @@ uart4: serial@...10000 {
> compatible = "st,stm32h7-uart";
> reg = <0x40010000 0x400>;
> interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&clk_hsi>;
> + clocks = <&rcc UART4_K>;
> + resets = <&rcc UART4_R>;
> status = "disabled";
> };
>
> @@ -163,7 +120,8 @@ dma1: dma-controller@...00000 {
> <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&clk_pclk4>;
> + clocks = <&rcc DMA1>;
> + resets = <&rcc DMA1_R>;
> #dma-cells = <4>;
> st,mem2mem;
> dma-requests = <8>;
> @@ -180,7 +138,8 @@ dma2: dma-controller@...01000 {
> <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&clk_pclk4>;
> + clocks = <&rcc DMA2>;
> + resets = <&rcc DMA2_R>;
> #dma-cells = <4>;
> st,mem2mem;
> dma-requests = <8>;
> @@ -189,13 +148,29 @@ dma2: dma-controller@...01000 {
> dmamux1: dma-router@...02000 {
> compatible = "st,stm32h7-dmamux";
> reg = <0x48002000 0x40>;
> - clocks = <&clk_pclk4>;
> + clocks = <&rcc DMAMUX1>;
> + resets = <&rcc DMAMUX1_R>;
> #dma-cells = <3>;
> dma-masters = <&dma1 &dma2>;
> dma-requests = <128>;
> dma-channels = <16>;
> };
>
> + rcc: rcc@...00000 {
> + compatible = "st,stm32mp13-rcc", "syscon";
> + reg = <0x50000000 0x1000>;
> + #clock-cells = <1>;
> + #reset-cells = <1>;
> +
> + clock-names = "hse", "hsi", "csi", "lse", "lsi";
> +
It doesn't match with current yaml description. I'm preparing a patch to
update rcc yaml file. You will have to check that it matches with this node.
> + clocks = <&scmi_clk CK_SCMI_HSE>,
> + <&scmi_clk CK_SCMI_HSI>,
> + <&scmi_clk CK_SCMI_CSI>,
> + <&scmi_clk CK_SCMI_LSE>,
> + <&scmi_clk CK_SCMI_LSI>;
> + };
> +
> exti: interrupt-controller@...0d000 {
> compatible = "st,stm32mp13-exti", "syscon";
> interrupt-controller;
> @@ -206,14 +181,14 @@ exti: interrupt-controller@...0d000 {
> syscfg: syscon@...20000 {
> compatible = "st,stm32mp157-syscfg", "syscon";
> reg = <0x50020000 0x400>;
> - clocks = <&clk_pclk3>;
> + clocks = <&rcc SYSCFG>;
> };
>
> mdma: dma-controller@...00000 {
> compatible = "st,stm32h7-mdma";
> reg = <0x58000000 0x1000>;
> interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&clk_pclk4>;
> + clocks = <&rcc MDMA>;
> #dma-cells = <5>;
> dma-channels = <32>;
> dma-requests = <48>;
> @@ -225,8 +200,9 @@ sdmmc1: mmc@...05000 {
> reg = <0x58005000 0x1000>, <0x58006000 0x1000>;
> interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "cmd_irq";
> - clocks = <&clk_pll4_p>;
> + clocks = <&rcc SDMMC1_K>;
> clock-names = "apb_pclk";
> + resets = <&rcc SDMMC1_R>;
> cap-sd-highspeed;
> cap-mmc-highspeed;
> max-frequency = <130000000>;
> @@ -239,8 +215,9 @@ sdmmc2: mmc@...07000 {
> reg = <0x58007000 0x1000>, <0x58008000 0x1000>;
> interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "cmd_irq";
> - clocks = <&clk_pll4_p>;
> + clocks = <&rcc SDMMC2_K>;
> clock-names = "apb_pclk";
> + resets = <&rcc SDMMC2_R>;
> cap-sd-highspeed;
> cap-mmc-highspeed;
> max-frequency = <130000000>;
> @@ -250,7 +227,7 @@ sdmmc2: mmc@...07000 {
> iwdg2: watchdog@...02000 {
> compatible = "st,stm32mp1-iwdg";
> reg = <0x5a002000 0x400>;
> - clocks = <&clk_pclk4>, <&clk_lsi>;
> + clocks = <&rcc IWDG2>, <&scmi_clk CK_SCMI_LSI>;
> clock-names = "pclk", "lsi";
> status = "disabled";
> };
> @@ -289,7 +266,7 @@ gpioa: gpio@...02000 {
> interrupt-controller;
> #interrupt-cells = <2>;
> reg = <0x0 0x400>;
> - clocks = <&clk_pclk4>;
> + clocks = <&rcc GPIOA>;
> st,bank-name = "GPIOA";
> ngpios = <16>;
> gpio-ranges = <&pinctrl 0 0 16>;
> @@ -301,7 +278,7 @@ gpiob: gpio@...03000 {
> interrupt-controller;
> #interrupt-cells = <2>;
> reg = <0x1000 0x400>;
> - clocks = <&clk_pclk4>;
> + clocks = <&rcc GPIOB>;
> st,bank-name = "GPIOB";
> ngpios = <16>;
> gpio-ranges = <&pinctrl 0 16 16>;
> @@ -313,7 +290,7 @@ gpioc: gpio@...04000 {
> interrupt-controller;
> #interrupt-cells = <2>;
> reg = <0x2000 0x400>;
> - clocks = <&clk_pclk4>;
> + clocks = <&rcc GPIOC>;
> st,bank-name = "GPIOC";
> ngpios = <16>;
> gpio-ranges = <&pinctrl 0 32 16>;
> @@ -325,7 +302,7 @@ gpiod: gpio@...05000 {
> interrupt-controller;
> #interrupt-cells = <2>;
> reg = <0x3000 0x400>;
> - clocks = <&clk_pclk4>;
> + clocks = <&rcc GPIOD>;
> st,bank-name = "GPIOD";
> ngpios = <16>;
> gpio-ranges = <&pinctrl 0 48 16>;
> @@ -337,7 +314,7 @@ gpioe: gpio@...06000 {
> interrupt-controller;
> #interrupt-cells = <2>;
> reg = <0x4000 0x400>;
> - clocks = <&clk_pclk4>;
> + clocks = <&rcc GPIOE>;
> st,bank-name = "GPIOE";
> ngpios = <16>;
> gpio-ranges = <&pinctrl 0 64 16>;
> @@ -349,7 +326,7 @@ gpiof: gpio@...07000 {
> interrupt-controller;
> #interrupt-cells = <2>;
> reg = <0x5000 0x400>;
> - clocks = <&clk_pclk4>;
> + clocks = <&rcc GPIOF>;
> st,bank-name = "GPIOF";
> ngpios = <16>;
> gpio-ranges = <&pinctrl 0 80 16>;
> @@ -361,7 +338,7 @@ gpiog: gpio@...08000 {
> interrupt-controller;
> #interrupt-cells = <2>;
> reg = <0x6000 0x400>;
> - clocks = <&clk_pclk4>;
> + clocks = <&rcc GPIOG>;
> st,bank-name = "GPIOG";
> ngpios = <16>;
> gpio-ranges = <&pinctrl 0 96 16>;
> @@ -373,7 +350,7 @@ gpioh: gpio@...09000 {
> interrupt-controller;
> #interrupt-cells = <2>;
> reg = <0x7000 0x400>;
> - clocks = <&clk_pclk4>;
> + clocks = <&rcc GPIOH>;
> st,bank-name = "GPIOH";
> ngpios = <15>;
> gpio-ranges = <&pinctrl 0 112 15>;
> @@ -385,7 +362,7 @@ gpioi: gpio@...0a000 {
> interrupt-controller;
> #interrupt-cells = <2>;
> reg = <0x8000 0x400>;
> - clocks = <&clk_pclk4>;
> + clocks = <&rcc GPIOI>;
> st,bank-name = "GPIOI";
> ngpios = <8>;
> gpio-ranges = <&pinctrl 0 128 8>;
> diff --git a/arch/arm/boot/dts/stm32mp133.dtsi b/arch/arm/boot/dts/stm32mp133.dtsi
> index 0fb1386257cf..531c263c9f46 100644
> --- a/arch/arm/boot/dts/stm32mp133.dtsi
> +++ b/arch/arm/boot/dts/stm32mp133.dtsi
> @@ -15,7 +15,7 @@ m_can1: can@...0e000 {
> interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "int0", "int1";
> - clocks = <&clk_hse>, <&clk_pll4_r>;
> + clocks = <&scmi_clk CK_SCMI_HSE>, <&rcc FDCAN_K>;
> clock-names = "hclk", "cclk";
> bosch,mram-cfg = <0x0 0 0 32 0 0 2 2>;
> status = "disabled";
> @@ -28,7 +28,7 @@ m_can2: can@...0f000 {
> interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
> <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
> interrupt-names = "int0", "int1";
> - clocks = <&clk_hse>, <&clk_pll4_r>;
> + clocks = <&scmi_clk CK_SCMI_HSE>, <&rcc FDCAN_K>;
> clock-names = "hclk", "cclk";
> bosch,mram-cfg = <0x1400 0 0 32 0 0 2 2>;
> status = "disabled";
> diff --git a/arch/arm/boot/dts/stm32mp13xf.dtsi b/arch/arm/boot/dts/stm32mp13xf.dtsi
> index fa6889e30591..4d00e7592882 100644
> --- a/arch/arm/boot/dts/stm32mp13xf.dtsi
> +++ b/arch/arm/boot/dts/stm32mp13xf.dtsi
> @@ -10,7 +10,8 @@ cryp: crypto@...02000 {
> compatible = "st,stm32mp1-cryp";
> reg = <0x54002000 0x400>;
> interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
> - clocks = <&clk_axi>;
> + clocks = <&rcc CRYP1>;
> + resets = <&rcc CRYP1_R>;
> status = "disabled";
> };
> };
Powered by blists - more mailing lists