projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
fsl-ls1012a-rdb.dtsi
diff --git
a/arch/arm/dts/fsl-ls1012a-rdb.dtsi
b/arch/arm/dts/fsl-ls1012a-rdb.dtsi
index bf407aeb94c32937fa85fcc75a5667e5f1131756..55155fd32139b415f6e55d5dde78cd55c19ef5ab 100644
(file)
--- a/
arch/arm/dts/fsl-ls1012a-rdb.dtsi
+++ b/
arch/arm/dts/fsl-ls1012a-rdb.dtsi
@@
-1,11
+1,8
@@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
/*
* Device Tree Include file for Freescale Layerscape-1012A family SoC.
*
* Copyright 2016, Freescale Semiconductor
/*
* Device Tree Include file for Freescale Layerscape-1012A family SoC.
*
* Copyright 2016, Freescale Semiconductor
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
*/
/include/ "fsl-ls1012a.dtsi"
*/
/include/ "fsl-ls1012a.dtsi"
@@
-17,6
+14,10
@@
};
};
};
};
+&esdhc1 {
+ mmc-hs200-1_8v;
+};
+
&qspi {
bus-num = <0>;
status = "okay";
&qspi {
bus-num = <0>;
status = "okay";
@@
-24,7
+25,7
@@
qflash0: s25fl128s@0 {
#address-cells = <1>;
#size-cells = <1>;
qflash0: s25fl128s@0 {
#address-cells = <1>;
#size-cells = <1>;
- compatible = "
spi-flash
";
+ compatible = "
jedec,spi-nor
";
spi-max-frequency = <20000000>;
reg = <0>;
};
spi-max-frequency = <20000000>;
reg = <0>;
};
@@
-37,3
+38,7
@@
&duart0 {
status = "okay";
};
&duart0 {
status = "okay";
};
+
+&sata {
+ status = "okay";
+};