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 tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git]
/
arch
/
arm
/
dts
/
r8a7791-porter.dts
diff --git
a/arch/arm/dts/r8a7791-porter.dts
b/arch/arm/dts/r8a7791-porter.dts
index f02036e5de015a95feec05c47ead06e91cb3daee..f9ece7ab2010679a942b987c00c45b85775f529d 100644
(file)
--- a/
arch/arm/dts/r8a7791-porter.dts
+++ b/
arch/arm/dts/r8a7791-porter.dts
@@
-31,7
+31,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";
};
@@
-63,8
+63,7
@@
gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>;
gpios-states = <1>;
gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>;
gpios-states = <1>;
- states = <3300000 1
- 1800000 0>;
+ states = <3300000 1>, <1800000 0>;
};
vcc_sdhi2: regulator-vcc-sdhi2 {
};
vcc_sdhi2: regulator-vcc-sdhi2 {
@@
-85,8
+84,7
@@
gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
gpios-states = <1>;
gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
gpios-states = <1>;
- states = <3300000 1
- 1800000 0>;
+ states = <3300000 1>, <1800000 0>;
};
hdmi-out {
};
hdmi-out {
@@
-228,6
+226,11
@@
function = "intc";
};
function = "intc";
};
+ pmic_irq_pins: pmicirq {
+ groups = "intc_irq2";
+ function = "intc";
+ };
+
sdhi0_pins: sd0 {
groups = "sdhi0_data4", "sdhi0_ctrl";
function = "sdhi0";
sdhi0_pins: sd0 {
groups = "sdhi0_data4", "sdhi0_ctrl";
function = "sdhi0";
@@
-373,6
+376,8
@@
};
&i2c6 {
};
&i2c6 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pmic_irq_pins>;
status = "okay";
clock-frequency = <100000>;
status = "okay";
clock-frequency = <100000>;
@@
-482,8
+487,6
@@
};
&lvds0 {
};
&lvds0 {
- status = "okay";
-
ports {
port@1 {
lvds_connector: endpoint {
ports {
port@1 {
lvds_connector: endpoint {