projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'riscv-for-linus-5.15-mw0' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
rk3188.dtsi
diff --git
a/arch/arm/boot/dts/rk3188.dtsi
b/arch/arm/boot/dts/rk3188.dtsi
index
793a1b9
..
2c60649
100644
(file)
--- a/
arch/arm/boot/dts/rk3188.dtsi
+++ b/
arch/arm/boot/dts/rk3188.dtsi
@@
-275,15
+275,15
@@
#interrupt-cells = <2>;
};
#interrupt-cells = <2>;
};
- pcfg_pull_up: pcfg
_pull_
up {
+ pcfg_pull_up: pcfg
-pull-
up {
bias-pull-up;
};
bias-pull-up;
};
- pcfg_pull_down: pcfg
_pull_
down {
+ pcfg_pull_down: pcfg
-pull-
down {
bias-pull-down;
};
bias-pull-down;
};
- pcfg_pull_none: pcfg
_pull_
none {
+ pcfg_pull_none: pcfg
-pull-
none {
bias-disable;
};
bias-disable;
};
@@
-638,9
+638,14
@@
power-domains = <&power RK3188_PD_GPU>;
};
power-domains = <&power RK3188_PD_GPU>;
};
-&grf{
+&grf
{
compatible = "rockchip,rk3188-grf", "syscon", "simple-mfd";
compatible = "rockchip,rk3188-grf", "syscon", "simple-mfd";
+ io_domains: io-domains {
+ compatible = "rockchip,rk3188-io-voltage-domain";
+ status = "disabled";
+ };
+
usbphy: usbphy {
compatible = "rockchip,rk3188-usb-phy",
"rockchip,rk3288-usb-phy";
usbphy: usbphy {
compatible = "rockchip,rk3188-usb-phy",
"rockchip,rk3288-usb-phy";