projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...
[platform/kernel/u-boot.git]
/
arch
/
arm
/
dts
/
stm32746g-eval-u-boot.dtsi
diff --git
a/arch/arm/dts/stm32746g-eval-u-boot.dtsi
b/arch/arm/dts/stm32746g-eval-u-boot.dtsi
index
d5fb927
..
f2195a6
100644
(file)
--- a/
arch/arm/dts/stm32746g-eval-u-boot.dtsi
+++ b/
arch/arm/dts/stm32746g-eval-u-boot.dtsi
@@
-165,7
+165,7
@@
};
};
};
};
- usart1_pins_a: usart1
@
0 {
+ usart1_pins_a: usart1
-
0 {
u-boot,dm-pre-reloc;
pins1 {
u-boot,dm-pre-reloc;
u-boot,dm-pre-reloc;
pins1 {
u-boot,dm-pre-reloc;
@@
-178,7
+178,7
@@
&qspi {
reg = <0xA0001000 0x1000>, <0x90000000 0x4000000>;
&qspi {
reg = <0xA0001000 0x1000>, <0x90000000 0x4000000>;
- qflash0: n25q512a {
+ qflash0: n25q512a
@0
{
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";