Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-20 11:34:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(stm32mp15-fdts): use /omit-if-no-ref/ for spi and i2c" into integration

Browse source
This commit is contained in:
Madhukar Pappireddy 2023-04-13 16:33:27 +02:00 • committed by TrustedFirmware Code Review
commit 9d124ecd56
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fdts/stm32mp15-bl2.dtsi
View file

@ -3,6 +3,9 @@
* Copyright (c) 2020-2023, STMicroelectronics - All Rights Reserved * Copyright (c) 2020-2023, STMicroelectronics - All Rights Reserved
*/ */
/omit-if-no-ref/ &i2c6;
/omit-if-no-ref/ &spi6;
/ { / {
#if !STM32MP_EMMC && !STM32MP_SDMMC #if !STM32MP_EMMC && !STM32MP_SDMMC
aliases { aliases {
@ -39,11 +42,9 @@
#if !STM32MP_USB_PROGRAMMER #if !STM32MP_USB_PROGRAMMER
/delete-node/ usbphyc@5a006000; /delete-node/ usbphyc@5a006000;
#endif #endif
/delete-node/ spi@5c001000;
/delete-node/ rtc@5c004000; /delete-node/ rtc@5c004000;
/delete-node/ etzpc@5c007000; /delete-node/ etzpc@5c007000;
/delete-node/ stgen@5c008000; /delete-node/ stgen@5c008000;
/delete-node/ i2c@5c009000;
/delete-node/ tamp@5c00a000; /delete-node/ tamp@5c00a000;
}; };

5
fdts/stm32mp15-bl32.dtsi
View file

@ -3,6 +3,9 @@
* Copyright (c) 2020-2023, STMicroelectronics - All Rights Reserved * Copyright (c) 2020-2023, STMicroelectronics - All Rights Reserved
*/ */
/omit-if-no-ref/ &i2c6;
/omit-if-no-ref/ &spi6;
/ { / {
aliases { aliases {
/delete-property/ mmc0; /delete-property/ mmc0;
@ -23,8 +26,6 @@
/delete-node/ mmc@58005000; /delete-node/ mmc@58005000;
/delete-node/ mmc@58007000; /delete-node/ mmc@58007000;
/delete-node/ usbphyc@5a006000; /delete-node/ usbphyc@5a006000;
/delete-node/ spi@5c001000;
/delete-node/ stgen@5c008000; /delete-node/ stgen@5c008000;
/delete-node/ i2c@5c009000;
}; };
}; };