projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
uniphier-common32.dtsi
diff --git
a/arch/arm/boot/dts/uniphier-common32.dtsi
b/arch/arm/boot/dts/uniphier-common32.dtsi
index
c46a58a
..
8c8a851
100644
(file)
--- a/
arch/arm/boot/dts/uniphier-common32.dtsi
+++ b/
arch/arm/boot/dts/uniphier-common32.dtsi
@@
-171,7
+171,8
@@
};
soc-glue@5f800000 {
- compatible = "simple-mfd", "syscon";
+ compatible = "socionext,uniphier-soc-glue",
+ "simple-mfd", "syscon";
reg = <0x5f800000 0x2000>;
pinctrl: pinctrl {