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-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...
[platform/kernel/u-boot.git]
/
arch
/
arm
/
dts
/
r8a7790-stout.dts
diff --git
a/arch/arm/dts/r8a7790-stout.dts
b/arch/arm/dts/r8a7790-stout.dts
index
a13a92c
..
a315ba7
100644
(file)
--- a/
arch/arm/dts/r8a7790-stout.dts
+++ b/
arch/arm/dts/r8a7790-stout.dts
@@
-19,7
+19,7
@@
};
chosen {
};
chosen {
- bootargs = "ignore_loglevel rw root=/dev/nfs ip=
dhcp
";
+ bootargs = "ignore_loglevel rw root=/dev/nfs ip=
on
";
stdout-path = "serial0:115200n8";
};
stdout-path = "serial0:115200n8";
};
@@
-94,9
+94,8
@@
status = "okay";
clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 722>,
status = "okay";
clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&cpg CPG_MOD 722>,
- <&cpg CPG_MOD 726>, <&cpg CPG_MOD 725>,
<&osc1_clk>;
<&osc1_clk>;
- clock-names = "du.0", "du.1", "du.2", "
lvds.0", "lvds.1", "
dclkin.0";
+ clock-names = "du.0", "du.1", "du.2", "dclkin.0";
ports {
port@0 {
ports {
port@0 {
@@
-104,11
+103,21
@@
remote-endpoint = <&adv7511_in>;
};
};
remote-endpoint = <&adv7511_in>;
};
};
+ };
+};
+
+&lvds0 {
+ ports {
port@1 {
lvds_connector0: endpoint {
};
};
port@1 {
lvds_connector0: endpoint {
};
};
- port@2 {
+ };
+};
+
+&lvds1 {
+ ports {
+ port@1 {
lvds_connector1: endpoint {
};
};
lvds_connector1: endpoint {
};
};
@@
-170,6
+179,11
@@
function = "iic3";
};
function = "iic3";
};
+ pmic_irq_pins: pmicirq {
+ groups = "intc_irq2";
+ function = "intc";
+ };
+
usb0_pins: usb0 {
groups = "usb0";
function = "usb0";
usb0_pins: usb0 {
groups = "usb0";
function = "usb0";
@@
-308,7
+322,7
@@
&iic3 {
pinctrl-names = "default";
&iic3 {
pinctrl-names = "default";
- pinctrl-0 = <&iic3_pins>;
+ pinctrl-0 = <&iic3_pins
&pmic_irq_pins
>;
status = "okay";
pmic@58 {
status = "okay";
pmic@58 {
@@
-318,6
+332,10
@@
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
+ onkey {
+ compatible = "dlg,da9063-onkey";
+ };
+
rtc {
compatible = "dlg,da9063-rtc";
};
rtc {
compatible = "dlg,da9063-rtc";
};