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 branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
imx6qdl-phytec-phycore-som.dtsi
diff --git
a/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi
b/arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi
index
77d8713
..
a80aa08
100644
(file)
--- a/
arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi
+++ b/
arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi
@@
-84,11
+84,12
@@
status = "okay";
eeprom@50 {
status = "okay";
eeprom@50 {
- compatible = "atmel,24c32";
+ compatible = "st,24c32", "atmel,24c32";
+ pagesize = <32>;
reg = <0x50>;
};
reg = <0x50>;
};
- pmic@58 {
+ pmic
: pmic
@58 {
compatible = "dlg,da9062";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pmic>;
compatible = "dlg,da9062";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pmic>;
@@
-96,6
+97,8
@@
interrupt-parent = <&gpio1>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
interrupt-parent = <&gpio1>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
+ gpio-controller;
+ #gpio-cells = <2>;
da9062_rtc: rtc {
compatible = "dlg,da9062-rtc";
da9062_rtc: rtc {
compatible = "dlg,da9062-rtc";
@@
-107,6
+110,7
@@
watchdog {
compatible = "dlg,da9062-watchdog";
watchdog {
compatible = "dlg,da9062-watchdog";
+ dlg,use-sw-pm;
};
regulators {
};
regulators {