summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-02-17 16:06:59 -0500
committerTom Rini <trini@konsulko.com>2018-02-17 16:06:59 -0500
commit02b0895c215e252cff50d9edf53a972d2bbbfd30 (patch)
tree5b466b914ccb2eb740bdc1740986c6c9c91ec892 /arch
parentbd650cd404b6dc870b6cc220025f35da4b31d0f4 (diff)
parent25f6dc8955bdf97bfb16ef19de7ce4abe76aaee4 (diff)
Merge git://git.denx.de/u-boot-sh
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/r8a7791-porter-u-boot.dts4
-rw-r--r--arch/arm/dts/r8a7791-porter.dts6
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/dts/r8a7791-porter-u-boot.dts b/arch/arm/dts/r8a7791-porter-u-boot.dts
index 987d0e4035..922024883c 100644
--- a/arch/arm/dts/r8a7791-porter-u-boot.dts
+++ b/arch/arm/dts/r8a7791-porter-u-boot.dts
@@ -8,3 +8,7 @@
#include "r8a7791-porter.dts"
#include "r8a7791-u-boot.dtsi"
+
+&scif0 {
+ u-boot,dm-pre-reloc;
+};
diff --git a/arch/arm/dts/r8a7791-porter.dts b/arch/arm/dts/r8a7791-porter.dts
index 3d47daa08b..0592aa7f49 100644
--- a/arch/arm/dts/r8a7791-porter.dts
+++ b/arch/arm/dts/r8a7791-porter.dts
@@ -214,7 +214,6 @@
&scif0 {
pinctrl-0 = <&scif0_pins>;
pinctrl-names = "default";
- u-boot,dm-pre-reloc;
status = "okay";
};
@@ -352,6 +351,11 @@
};
};
+&i2c6 {
+ status = "okay";
+ clock-frequency = <400000>;
+};
+
&sata0 {
status = "okay";
};