Slice/Slice3: use upstream method to set xtal load capacitance

This fixes slice builds since upstream method to set xtal load capacitance
was backported in 4.19.82 stable

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2019-11-21 20:00:01 +01:00
parent 41bc6862e3
commit e089b59f30
4 changed files with 2 additions and 36 deletions

View File

@ -78,7 +78,7 @@
pcf8523@68 { pcf8523@68 {
compatible = "nxp,pcf8523"; compatible = "nxp,pcf8523";
reg = <0x68>; reg = <0x68>;
nxp,xtalcap-7pf; // set crystal load to 7pf quartz-load-femtofarads = <7000>;
status = "okay"; status = "okay";
}; };

View File

@ -1,17 +0,0 @@
--- a/drivers/rtc/rtc-pcf8523.c 2016-10-01 10:16:30.259771931 +0100
+++ b/drivers/rtc/rtc-pcf8523.c 2016-10-01 10:21:29.762638800 +0100
@@ -291,7 +291,13 @@ static int pcf8523_probe(struct i2c_clie
if (!pcf)
return -ENOMEM;
- err = pcf8523_select_capacitance(client, true);
+ if (of_property_read_bool(client->dev.of_node, "nxp,xtalcap-7pf")) {
+ printk(KERN_ERR "PCF8523 - set 7pF crystal load");
+ err = pcf8523_select_capacitance(client, false);
+ } else {
+ printk(KERN_ERR "PCF8523 - set 12pF crystal load");
+ err = pcf8523_select_capacitance(client, true);
+ }
if (err < 0)
return err;

View File

@ -78,7 +78,7 @@
pcf8523@68 { pcf8523@68 {
compatible = "nxp,pcf8523"; compatible = "nxp,pcf8523";
reg = <0x68>; reg = <0x68>;
nxp,xtalcap-7pf; // set crystal load to 7pf quartz-load-femtofarads = <7000>;
status = "okay"; status = "okay";
}; };

View File

@ -1,17 +0,0 @@
--- a/drivers/rtc/rtc-pcf8523.c 2016-10-01 10:16:30.259771931 +0100
+++ b/drivers/rtc/rtc-pcf8523.c 2016-10-01 10:21:29.762638800 +0100
@@ -291,7 +291,13 @@ static int pcf8523_probe(struct i2c_clie
if (!pcf)
return -ENOMEM;
- err = pcf8523_select_capacitance(client, true);
+ if (of_property_read_bool(client->dev.of_node, "nxp,xtalcap-7pf")) {
+ printk(KERN_ERR "PCF8523 - set 7pF crystal load");
+ err = pcf8523_select_capacitance(client, false);
+ } else {
+ printk(KERN_ERR "PCF8523 - set 12pF crystal load");
+ err = pcf8523_select_capacitance(client, true);
+ }
if (err < 0)
return err;