raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

BCM270X_DT: Fix the tinylcd35 overlay RTC support

Browse Source 
Now that overlay parameters are applied before the merge (a requirement
for kernel runtime overlays) it is illegal for parameters/overrides to
target nodes in the base DTB. Solve the problem of only enabling I2C
when an RTC option is used by making the RTC fragments conditional,
and including the required status="okay" within the fragments.

Signed-off-by: Phil Elwell <phil@raspberrypi.org>
This commit is contained in:
Phil Elwell
2016-05-12 09:04:20 +01:00
committed by popcornmix
parent 6b1013bd10
commit db0adb0ef6
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
View File

@@ -132,28 +132,32 @@
fragment@5 {
target = <&i2c1>;
__overlay__ {
__dormant__ {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
pcf8563: pcf8563@51 {
compatible = "nxp,pcf8563";
reg = <0x51>;
status = "disabled";
status = "okay";
};
};
};
fragment@6 {
target = <&i2c1>;
__overlay__ {
__dormant__ {
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
ds1307: ds1307@68 {
compatible = "maxim,ds1307";
reg = <0x68>;
status = "disabled";
status = "okay";
};
};
};
@@ -213,10 +217,8 @@
<&tinylcd35_ts>,"interrupts:0",
<&tinylcd35_ts>,"pendown-gpio:4";
xohms = <&tinylcd35_ts>,"ti,x-plate-ohms;0";
rtc-pcf = <&i2c1>,"status",
<&pcf8563>,"status";
rtc-ds = <&i2c1>,"status",
<&ds1307>,"status";
rtc-pcf = <0>,"=5";
rtc-ds = <0>,"=6";
keypad = <&keypad>,"status";
};
};