| 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
| ||
|
Message-ID: <64ac012e-e471-9093-b253-4798bbfa8cb4@pengutronix.de>
Date: Thu, 9 Feb 2023 09:10:18 +0100
From: Ahmad Fatoum <a.fatoum@...gutronix.de>
To: Gatien Chevallier <gatien.chevallier@...s.st.com>,
Oleksii_Moisieiev@...m.com, gregkh@...uxfoundation.org,
herbert@...dor.apana.org.au, davem@...emloft.net,
robh+dt@...nel.org, krzysztof.kozlowski+dt@...aro.org,
alexandre.torgue@...s.st.com, vkoul@...nel.org, jic23@...nel.org,
olivier.moysan@...s.st.com, arnaud.pouliquen@...s.st.com,
mchehab@...nel.org, fabrice.gasnier@...s.st.com,
ulf.hansson@...aro.org, edumazet@...gle.com, kuba@...nel.org,
pabeni@...hat.com
Cc: devicetree@...r.kernel.org, alsa-devel@...a-project.org,
linux-iio@...r.kernel.org, netdev@...r.kernel.org,
linux-usb@...r.kernel.org, linux-mmc@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-spi@...r.kernel.org,
linux-i2c@...r.kernel.org, dmaengine@...r.kernel.org,
linux-crypto@...r.kernel.org, linux-serial@...r.kernel.org,
linux-phy@...ts.infradead.org,
linux-stm32@...md-mailman.stormreply.com,
linux-arm-kernel@...ts.infradead.org, linux-media@...r.kernel.org
Subject: Re: [Linux-stm32] [PATCH v3 6/6] ARM: dts: stm32: add ETZPC as a
system bus for STM32MP13x boards
On 09.02.23 08:46, Ahmad Fatoum wrote:
> Hello Gatien,
>
> On 27.01.23 17:40, Gatien Chevallier wrote:
>> The STM32 System Bus is an internal bus on which devices are connected.
>> ETZPC is a peripheral overseeing the firewall bus that configures
>> and control access to the peripherals connected on it.
>>
>> For more information on which peripheral is securable, please read
>> the STM32MP13 reference manual.
>
> Diff is way too big. Please split up the alphabetic reordering into its
> own commit, so actual functional changes are apparent.
Ah, I see now that you are moving securable peripherals into a new bus.
I share Uwe's confusion of considering the ETZPC as bus.
Does this configuration even change dynamically? Why can't you implement
this binding in the bootloader and have Linux only see a DT where unavailable
nodes are status = "disabled"; secure-status = "okay"?
For inspiration, see barebox' device tree fixups when devices are disabled
per fuse:
https://elixir.bootlin.com/barebox/v2023.01.0/source/drivers/base/featctrl.c#L122
Cheers,
Ahmad
>
> Thanks,
> Ahmad
>
>>
>> Signed-off-by: Gatien Chevallier <gatien.chevallier@...s.st.com>
>> ---
>>
>> No changes in V2.
>>
>> Changes in V3:
>> -Use appriopriate node name: bus
>>
>> arch/arm/boot/dts/stm32mp131.dtsi | 407 +++++++++++++++--------------
>> arch/arm/boot/dts/stm32mp133.dtsi | 51 ++--
>> arch/arm/boot/dts/stm32mp13xc.dtsi | 19 +-
>> arch/arm/boot/dts/stm32mp13xf.dtsi | 18 +-
>> 4 files changed, 258 insertions(+), 237 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/stm32mp131.dtsi b/arch/arm/boot/dts/stm32mp131.dtsi
>> index accc3824f7e9..24462a647101 100644
>> --- a/arch/arm/boot/dts/stm32mp131.dtsi
>> +++ b/arch/arm/boot/dts/stm32mp131.dtsi
>> @@ -253,148 +253,6 @@ dmamux1: dma-router@...02000 {
>> dma-channels = <16>;
>> };
>>
>> - adc_2: adc@...04000 {
>> - compatible = "st,stm32mp13-adc-core";
>> - reg = <0x48004000 0x400>;
>> - interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
>> - clocks = <&rcc ADC2>, <&rcc ADC2_K>;
>> - clock-names = "bus", "adc";
>> - interrupt-controller;
>> - #interrupt-cells = <1>;
>> - #address-cells = <1>;
>> - #size-cells = <0>;
>> - status = "disabled";
>> -
>> - adc2: adc@0 {
>> - compatible = "st,stm32mp13-adc";
>> - #io-channel-cells = <1>;
>> - #address-cells = <1>;
>> - #size-cells = <0>;
>> - reg = <0x0>;
>> - interrupt-parent = <&adc_2>;
>> - interrupts = <0>;
>> - dmas = <&dmamux1 10 0x400 0x80000001>;
>> - dma-names = "rx";
>> - status = "disabled";
>> -
>> - channel@13 {
>> - reg = <13>;
>> - label = "vrefint";
>> - };
>> - channel@14 {
>> - reg = <14>;
>> - label = "vddcore";
>> - };
>> - channel@16 {
>> - reg = <16>;
>> - label = "vddcpu";
>> - };
>> - channel@17 {
>> - reg = <17>;
>> - label = "vddq_ddr";
>> - };
>> - };
>> - };
>> -
>> - usbotg_hs: usb@...00000 {
>> - compatible = "st,stm32mp15-hsotg", "snps,dwc2";
>> - reg = <0x49000000 0x40000>;
>> - clocks = <&rcc USBO_K>;
>> - clock-names = "otg";
>> - resets = <&rcc USBO_R>;
>> - reset-names = "dwc2";
>> - interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
>> - g-rx-fifo-size = <512>;
>> - g-np-tx-fifo-size = <32>;
>> - g-tx-fifo-size = <256 16 16 16 16 16 16 16>;
>> - dr_mode = "otg";
>> - otg-rev = <0x200>;
>> - usb33d-supply = <&usb33>;
>> - status = "disabled";
>> - };
>> -
>> - spi4: spi@...02000 {
>> - compatible = "st,stm32h7-spi";
>> - reg = <0x4c002000 0x400>;
>> - interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
>> - clocks = <&rcc SPI4_K>;
>> - resets = <&rcc SPI4_R>;
>> - #address-cells = <1>;
>> - #size-cells = <0>;
>> - dmas = <&dmamux1 83 0x400 0x01>,
>> - <&dmamux1 84 0x400 0x01>;
>> - dma-names = "rx", "tx";
>> - status = "disabled";
>> - };
>> -
>> - spi5: spi@...03000 {
>> - compatible = "st,stm32h7-spi";
>> - reg = <0x4c003000 0x400>;
>> - interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
>> - clocks = <&rcc SPI5_K>;
>> - resets = <&rcc SPI5_R>;
>> - #address-cells = <1>;
>> - #size-cells = <0>;
>> - dmas = <&dmamux1 85 0x400 0x01>,
>> - <&dmamux1 86 0x400 0x01>;
>> - dma-names = "rx", "tx";
>> - status = "disabled";
>> - };
>> -
>> - i2c3: i2c@...04000 {
>> - compatible = "st,stm32mp13-i2c";
>> - reg = <0x4c004000 0x400>;
>> - interrupt-names = "event", "error";
>> - interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
>> - <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
>> - clocks = <&rcc I2C3_K>;
>> - resets = <&rcc I2C3_R>;
>> - #address-cells = <1>;
>> - #size-cells = <0>;
>> - dmas = <&dmamux1 73 0x400 0x1>,
>> - <&dmamux1 74 0x400 0x1>;
>> - dma-names = "rx", "tx";
>> - st,syscfg-fmp = <&syscfg 0x4 0x4>;
>> - i2c-analog-filter;
>> - status = "disabled";
>> - };
>> -
>> - i2c4: i2c@...05000 {
>> - compatible = "st,stm32mp13-i2c";
>> - reg = <0x4c005000 0x400>;
>> - interrupt-names = "event", "error";
>> - interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,
>> - <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
>> - clocks = <&rcc I2C4_K>;
>> - resets = <&rcc I2C4_R>;
>> - #address-cells = <1>;
>> - #size-cells = <0>;
>> - dmas = <&dmamux1 75 0x400 0x1>,
>> - <&dmamux1 76 0x400 0x1>;
>> - dma-names = "rx", "tx";
>> - st,syscfg-fmp = <&syscfg 0x4 0x8>;
>> - i2c-analog-filter;
>> - status = "disabled";
>> - };
>> -
>> - i2c5: i2c@...06000 {
>> - compatible = "st,stm32mp13-i2c";
>> - reg = <0x4c006000 0x400>;
>> - interrupt-names = "event", "error";
>> - interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
>> - <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
>> - clocks = <&rcc I2C5_K>;
>> - resets = <&rcc I2C5_R>;
>> - #address-cells = <1>;
>> - #size-cells = <0>;
>> - dmas = <&dmamux1 115 0x400 0x1>,
>> - <&dmamux1 116 0x400 0x1>;
>> - dma-names = "rx", "tx";
>> - st,syscfg-fmp = <&syscfg 0x4 0x10>;
>> - i2c-analog-filter;
>> - status = "disabled";
>> - };
>> -
>> rcc: rcc@...00000 {
>> compatible = "st,stm32mp13-rcc", "syscon";
>> reg = <0x50000000 0x1000>;
>> @@ -431,34 +289,6 @@ mdma: dma-controller@...00000 {
>> dma-requests = <48>;
>> };
>>
>> - sdmmc1: mmc@...05000 {
>> - compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell";
>> - arm,primecell-periphid = <0x20253180>;
>> - reg = <0x58005000 0x1000>, <0x58006000 0x1000>;
>> - interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
>> - clocks = <&rcc SDMMC1_K>;
>> - clock-names = "apb_pclk";
>> - resets = <&rcc SDMMC1_R>;
>> - cap-sd-highspeed;
>> - cap-mmc-highspeed;
>> - max-frequency = <130000000>;
>> - status = "disabled";
>> - };
>> -
>> - sdmmc2: mmc@...07000 {
>> - compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell";
>> - arm,primecell-periphid = <0x20253180>;
>> - reg = <0x58007000 0x1000>, <0x58008000 0x1000>;
>> - interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
>> - clocks = <&rcc SDMMC2_K>;
>> - clock-names = "apb_pclk";
>> - resets = <&rcc SDMMC2_R>;
>> - cap-sd-highspeed;
>> - cap-mmc-highspeed;
>> - max-frequency = <130000000>;
>> - status = "disabled";
>> - };
>> -
>> usbh_ohci: usb@...0c000 {
>> compatible = "generic-ohci";
>> reg = <0x5800c000 0x1000>;
>> @@ -486,29 +316,6 @@ iwdg2: watchdog@...02000 {
>> status = "disabled";
>> };
>>
>> - usbphyc: usbphyc@...06000 {
>> - #address-cells = <1>;
>> - #size-cells = <0>;
>> - #clock-cells = <0>;
>> - compatible = "st,stm32mp1-usbphyc";
>> - reg = <0x5a006000 0x1000>;
>> - clocks = <&rcc USBPHY_K>;
>> - resets = <&rcc USBPHY_R>;
>> - vdda1v1-supply = <®11>;
>> - vdda1v8-supply = <®18>;
>> - status = "disabled";
>> -
>> - usbphyc_port0: usb-phy@0 {
>> - #phy-cells = <0>;
>> - reg = <0>;
>> - };
>> -
>> - usbphyc_port1: usb-phy@1 {
>> - #phy-cells = <1>;
>> - reg = <1>;
>> - };
>> - };
>> -
>> rtc: rtc@...04000 {
>> compatible = "st,stm32mp1-rtc";
>> reg = <0x5c004000 0x400>;
>> @@ -536,6 +343,220 @@ ts_cal2: calib@5e {
>> };
>> };
>>
>> + etzpc: bus@...07000 {
>> + compatible = "st,stm32mp13-sys-bus";
>> + reg = <0x5c007000 0x400>;
>> + #address-cells = <1>;
>> + #size-cells = <1>;
>> + feature-domain-controller;
>> + #feature-domain-cells = <1>;
>> + ranges;
>> +
>> + adc_2: adc@...04000 {
>> + compatible = "st,stm32mp13-adc-core";
>> + reg = <0x48004000 0x400>;
>> + interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&rcc ADC2>, <&rcc ADC2_K>;
>> + clock-names = "bus", "adc";
>> + interrupt-controller;
>> + #interrupt-cells = <1>;
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + feature-domains = <&etzpc 33>;
>> + status = "disabled";
>> +
>> + adc2: adc@0 {
>> + compatible = "st,stm32mp13-adc";
>> + #io-channel-cells = <1>;
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + reg = <0x0>;
>> + interrupt-parent = <&adc_2>;
>> + interrupts = <0>;
>> + dmas = <&dmamux1 10 0x400 0x80000001>;
>> + dma-names = "rx";
>> + status = "disabled";
>> +
>> + channel@13 {
>> + reg = <13>;
>> + label = "vrefint";
>> + };
>> + channel@14 {
>> + reg = <14>;
>> + label = "vddcore";
>> + };
>> + channel@16 {
>> + reg = <16>;
>> + label = "vddcpu";
>> + };
>> + channel@17 {
>> + reg = <17>;
>> + label = "vddq_ddr";
>> + };
>> + };
>> + };
>> +
>> + usbotg_hs: usb@...00000 {
>> + compatible = "st,stm32mp15-hsotg", "snps,dwc2";
>> + reg = <0x49000000 0x40000>;
>> + clocks = <&rcc USBO_K>;
>> + clock-names = "otg";
>> + resets = <&rcc USBO_R>;
>> + reset-names = "dwc2";
>> + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
>> + g-rx-fifo-size = <512>;
>> + g-np-tx-fifo-size = <32>;
>> + g-tx-fifo-size = <256 16 16 16 16 16 16 16>;
>> + dr_mode = "otg";
>> + otg-rev = <0x200>;
>> + usb33d-supply = <&usb33>;
>> + feature-domains = <&etzpc 34>;
>> + status = "disabled";
>> + };
>> +
>> + spi4: spi@...02000 {
>> + compatible = "st,stm32h7-spi";
>> + reg = <0x4c002000 0x400>;
>> + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&rcc SPI4_K>;
>> + resets = <&rcc SPI4_R>;
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + dmas = <&dmamux1 83 0x400 0x01>,
>> + <&dmamux1 84 0x400 0x01>;
>> + dma-names = "rx", "tx";
>> + feature-domains = <&etzpc 18>;
>> + status = "disabled";
>> + };
>> +
>> + spi5: spi@...03000 {
>> + compatible = "st,stm32h7-spi";
>> + reg = <0x4c003000 0x400>;
>> + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&rcc SPI5_K>;
>> + resets = <&rcc SPI5_R>;
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + dmas = <&dmamux1 85 0x400 0x01>,
>> + <&dmamux1 86 0x400 0x01>;
>> + dma-names = "rx", "tx";
>> + feature-domains = <&etzpc 19>;
>> + status = "disabled";
>> + };
>> +
>> + i2c3: i2c@...04000 {
>> + compatible = "st,stm32mp13-i2c";
>> + reg = <0x4c004000 0x400>;
>> + interrupt-names = "event", "error";
>> + interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,
>> + <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&rcc I2C3_K>;
>> + resets = <&rcc I2C3_R>;
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + dmas = <&dmamux1 73 0x400 0x1>,
>> + <&dmamux1 74 0x400 0x1>;
>> + dma-names = "rx", "tx";
>> + st,syscfg-fmp = <&syscfg 0x4 0x4>;
>> + i2c-analog-filter;
>> + feature-domains = <&etzpc 20>;
>> + status = "disabled";
>> + };
>> +
>> + i2c4: i2c@...05000 {
>> + compatible = "st,stm32mp13-i2c";
>> + reg = <0x4c005000 0x400>;
>> + interrupt-names = "event", "error";
>> + interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,
>> + <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&rcc I2C4_K>;
>> + resets = <&rcc I2C4_R>;
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + dmas = <&dmamux1 75 0x400 0x1>,
>> + <&dmamux1 76 0x400 0x1>;
>> + dma-names = "rx", "tx";
>> + st,syscfg-fmp = <&syscfg 0x4 0x8>;
>> + i2c-analog-filter;
>> + feature-domains = <&etzpc 21>;
>> + status = "disabled";
>> + };
>> +
>> + i2c5: i2c@...06000 {
>> + compatible = "st,stm32mp13-i2c";
>> + reg = <0x4c006000 0x400>;
>> + interrupt-names = "event", "error";
>> + interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,
>> + <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&rcc I2C5_K>;
>> + resets = <&rcc I2C5_R>;
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + dmas = <&dmamux1 115 0x400 0x1>,
>> + <&dmamux1 116 0x400 0x1>;
>> + dma-names = "rx", "tx";
>> + st,syscfg-fmp = <&syscfg 0x4 0x10>;
>> + i2c-analog-filter;
>> + feature-domains = <&etzpc 22>;
>> + status = "disabled";
>> + };
>> +
>> + sdmmc1: mmc@...05000 {
>> + compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell";
>> + arm,primecell-periphid = <0x20253180>;
>> + reg = <0x58005000 0x1000>, <0x58006000 0x1000>;
>> + interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&rcc SDMMC1_K>;
>> + clock-names = "apb_pclk";
>> + resets = <&rcc SDMMC1_R>;
>> + cap-sd-highspeed;
>> + cap-mmc-highspeed;
>> + max-frequency = <130000000>;
>> + feature-domains = <&etzpc 50>;
>> + status = "disabled";
>> + };
>> +
>> + sdmmc2: mmc@...07000 {
>> + compatible = "st,stm32-sdmmc2", "arm,pl18x", "arm,primecell";
>> + arm,primecell-periphid = <0x20253180>;
>> + reg = <0x58007000 0x1000>, <0x58008000 0x1000>;
>> + interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&rcc SDMMC2_K>;
>> + clock-names = "apb_pclk";
>> + resets = <&rcc SDMMC2_R>;
>> + cap-sd-highspeed;
>> + cap-mmc-highspeed;
>> + max-frequency = <130000000>;
>> + feature-domains = <&etzpc 51>;
>> + status = "disabled";
>> + };
>> +
>> + usbphyc: usbphyc@...06000 {
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + #clock-cells = <0>;
>> + compatible = "st,stm32mp1-usbphyc";
>> + reg = <0x5a006000 0x1000>;
>> + clocks = <&rcc USBPHY_K>;
>> + resets = <&rcc USBPHY_R>;
>> + vdda1v1-supply = <®11>;
>> + vdda1v8-supply = <®18>;
>> + feature-domains = <&etzpc 5>;
>> + status = "disabled";
>> +
>> + usbphyc_port0: usb-phy@0 {
>> + #phy-cells = <0>;
>> + reg = <0>;
>> + };
>> +
>> + usbphyc_port1: usb-phy@1 {
>> + #phy-cells = <1>;
>> + reg = <1>;
>> + };
>> + };
>> +
>> + };
>> +
>> /*
>> * Break node order to solve dependency probe issue between
>> * pinctrl and exti.
>> diff --git a/arch/arm/boot/dts/stm32mp133.dtsi b/arch/arm/boot/dts/stm32mp133.dtsi
>> index df451c3c2a26..be6061552683 100644
>> --- a/arch/arm/boot/dts/stm32mp133.dtsi
>> +++ b/arch/arm/boot/dts/stm32mp133.dtsi
>> @@ -33,35 +33,38 @@ m_can2: can@...0f000 {
>> bosch,mram-cfg = <0x1400 0 0 32 0 0 2 2>;
>> status = "disabled";
>> };
>> + };
>> +};
>>
>> - adc_1: adc@...03000 {
>> - compatible = "st,stm32mp13-adc-core";
>> - reg = <0x48003000 0x400>;
>> - interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
>> - clocks = <&rcc ADC1>, <&rcc ADC1_K>;
>> - clock-names = "bus", "adc";
>> - interrupt-controller;
>> - #interrupt-cells = <1>;
>> +&etzpc {
>> + adc_1: adc@...03000 {
>> + compatible = "st,stm32mp13-adc-core";
>> + reg = <0x48003000 0x400>;
>> + interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&rcc ADC1>, <&rcc ADC1_K>;
>> + clock-names = "bus", "adc";
>> + interrupt-controller;
>> + #interrupt-cells = <1>;
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + feature-domains = <&etzpc 32>;
>> + status = "disabled";
>> +
>> + adc1: adc@0 {
>> + compatible = "st,stm32mp13-adc";
>> + #io-channel-cells = <1>;
>> #address-cells = <1>;
>> #size-cells = <0>;
>> + reg = <0x0>;
>> + interrupt-parent = <&adc_1>;
>> + interrupts = <0>;
>> + dmas = <&dmamux1 9 0x400 0x80000001>;
>> + dma-names = "rx";
>> status = "disabled";
>>
>> - adc1: adc@0 {
>> - compatible = "st,stm32mp13-adc";
>> - #io-channel-cells = <1>;
>> - #address-cells = <1>;
>> - #size-cells = <0>;
>> - reg = <0x0>;
>> - interrupt-parent = <&adc_1>;
>> - interrupts = <0>;
>> - dmas = <&dmamux1 9 0x400 0x80000001>;
>> - dma-names = "rx";
>> - status = "disabled";
>> -
>> - channel@18 {
>> - reg = <18>;
>> - label = "vrefint";
>> - };
>> + channel@18 {
>> + reg = <18>;
>> + label = "vrefint";
>> };
>> };
>> };
>> diff --git a/arch/arm/boot/dts/stm32mp13xc.dtsi b/arch/arm/boot/dts/stm32mp13xc.dtsi
>> index 4d00e7592882..a1a7a40c2a3e 100644
>> --- a/arch/arm/boot/dts/stm32mp13xc.dtsi
>> +++ b/arch/arm/boot/dts/stm32mp13xc.dtsi
>> @@ -4,15 +4,14 @@
>> * Author: Alexandre Torgue <alexandre.torgue@...s.st.com> for STMicroelectronics.
>> */
>>
>> -/ {
>> - soc {
>> - cryp: crypto@...02000 {
>> - compatible = "st,stm32mp1-cryp";
>> - reg = <0x54002000 0x400>;
>> - interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
>> - clocks = <&rcc CRYP1>;
>> - resets = <&rcc CRYP1_R>;
>> - status = "disabled";
>> - };
>> +&etzpc {
>> + cryp: crypto@...02000 {
>> + compatible = "st,stm32mp1-cryp";
>> + reg = <0x54002000 0x400>;
>> + interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&rcc CRYP1>;
>> + resets = <&rcc CRYP1_R>;
>> + feature-domains = <&etzpc 42>;
>> + status = "disabled";
>> };
>> };
>> diff --git a/arch/arm/boot/dts/stm32mp13xf.dtsi b/arch/arm/boot/dts/stm32mp13xf.dtsi
>> index 4d00e7592882..b9fb071a1471 100644
>> --- a/arch/arm/boot/dts/stm32mp13xf.dtsi
>> +++ b/arch/arm/boot/dts/stm32mp13xf.dtsi
>> @@ -4,15 +4,13 @@
>> * Author: Alexandre Torgue <alexandre.torgue@...s.st.com> for STMicroelectronics.
>> */
>>
>> -/ {
>> - soc {
>> - cryp: crypto@...02000 {
>> - compatible = "st,stm32mp1-cryp";
>> - reg = <0x54002000 0x400>;
>> - interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
>> - clocks = <&rcc CRYP1>;
>> - resets = <&rcc CRYP1_R>;
>> - status = "disabled";
>> - };
>> +&etzpc {
>> + cryp: crypto@...02000 {
>> + compatible = "st,stm32mp1-cryp";
>> + reg = <0x54002000 0x400>;
>> + interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
>> + clocks = <&rcc CRYP1>;
>> + resets = <&rcc CRYP1_R>;
>> + status = "disabled";
>> };
>> };
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Powered by blists - more mailing lists