diff options
| author | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2023-04-13 16:33:27 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-04-13 16:33:27 +0200 |
| commit | 9d124ecd56e8f2d4b71ca872e7e9221e64c3f53c (patch) | |
| tree | 007106dac8aa5779fb618d56cde3ab5a9fb5677b /fdts | |
| parent | 15b0a94bb59e3082c4423750e4ff55b72d7e7982 (diff) | |
| parent | d480df2116fc0d629d52f654bc218ee36251cb33 (diff) | |
| download | arm-trusted-firmware-9d124ecd56e8f2d4b71ca872e7e9221e64c3f53c.tar.gz | |
Merge "fix(stm32mp15-fdts): use /omit-if-no-ref/ for spi and i2c" into integration
Diffstat (limited to 'fdts')
| -rw-r--r-- | fdts/stm32mp15-bl2.dtsi | 5 | ||||
| -rw-r--r-- | fdts/stm32mp15-bl32.dtsi | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/fdts/stm32mp15-bl2.dtsi b/fdts/stm32mp15-bl2.dtsi index f956b0577..18a4ba932 100644 --- a/fdts/stm32mp15-bl2.dtsi +++ b/fdts/stm32mp15-bl2.dtsi @@ -3,6 +3,9 @@ * Copyright (c) 2020-2023, STMicroelectronics - All Rights Reserved */ +/omit-if-no-ref/ &i2c6; +/omit-if-no-ref/ &spi6; + / { #if !STM32MP_EMMC && !STM32MP_SDMMC aliases { @@ -39,11 +42,9 @@ #if !STM32MP_USB_PROGRAMMER /delete-node/ usbphyc@5a006000; #endif - /delete-node/ spi@5c001000; /delete-node/ rtc@5c004000; /delete-node/ etzpc@5c007000; /delete-node/ stgen@5c008000; - /delete-node/ i2c@5c009000; /delete-node/ tamp@5c00a000; }; diff --git a/fdts/stm32mp15-bl32.dtsi b/fdts/stm32mp15-bl32.dtsi index c5a815e22..688222498 100644 --- a/fdts/stm32mp15-bl32.dtsi +++ b/fdts/stm32mp15-bl32.dtsi @@ -3,6 +3,9 @@ * Copyright (c) 2020-2023, STMicroelectronics - All Rights Reserved */ +/omit-if-no-ref/ &i2c6; +/omit-if-no-ref/ &spi6; + / { aliases { /delete-property/ mmc0; @@ -23,8 +26,6 @@ /delete-node/ mmc@58005000; /delete-node/ mmc@58007000; /delete-node/ usbphyc@5a006000; - /delete-node/ spi@5c001000; /delete-node/ stgen@5c008000; - /delete-node/ i2c@5c009000; }; }; |