From e089b59f3080fc6ea005d336454a5233ca66b90d Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 21 Nov 2019 20:00:01 +0100 Subject: [PATCH] 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 --- .../RPi/devices/Slice/config/slice-overlay.dts | 2 +- .../patches/linux/linux-04-rtc-pcf8523-c.patch | 17 ----------------- .../RPi/devices/Slice3/config/slice-overlay.dts | 2 +- .../patches/linux/linux-04-rtc-pcf8523-c.patch | 17 ----------------- 4 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 projects/RPi/devices/Slice/patches/linux/linux-04-rtc-pcf8523-c.patch delete mode 100644 projects/RPi/devices/Slice3/patches/linux/linux-04-rtc-pcf8523-c.patch diff --git a/projects/RPi/devices/Slice/config/slice-overlay.dts b/projects/RPi/devices/Slice/config/slice-overlay.dts index a13e86478e..add8098b65 100644 --- a/projects/RPi/devices/Slice/config/slice-overlay.dts +++ b/projects/RPi/devices/Slice/config/slice-overlay.dts @@ -78,7 +78,7 @@ pcf8523@68 { compatible = "nxp,pcf8523"; reg = <0x68>; - nxp,xtalcap-7pf; // set crystal load to 7pf + quartz-load-femtofarads = <7000>; status = "okay"; }; diff --git a/projects/RPi/devices/Slice/patches/linux/linux-04-rtc-pcf8523-c.patch b/projects/RPi/devices/Slice/patches/linux/linux-04-rtc-pcf8523-c.patch deleted file mode 100644 index da7593ed7e..0000000000 --- a/projects/RPi/devices/Slice/patches/linux/linux-04-rtc-pcf8523-c.patch +++ /dev/null @@ -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; - diff --git a/projects/RPi/devices/Slice3/config/slice-overlay.dts b/projects/RPi/devices/Slice3/config/slice-overlay.dts index a13e86478e..add8098b65 100644 --- a/projects/RPi/devices/Slice3/config/slice-overlay.dts +++ b/projects/RPi/devices/Slice3/config/slice-overlay.dts @@ -78,7 +78,7 @@ pcf8523@68 { compatible = "nxp,pcf8523"; reg = <0x68>; - nxp,xtalcap-7pf; // set crystal load to 7pf + quartz-load-femtofarads = <7000>; status = "okay"; }; diff --git a/projects/RPi/devices/Slice3/patches/linux/linux-04-rtc-pcf8523-c.patch b/projects/RPi/devices/Slice3/patches/linux/linux-04-rtc-pcf8523-c.patch deleted file mode 100644 index da7593ed7e..0000000000 --- a/projects/RPi/devices/Slice3/patches/linux/linux-04-rtc-pcf8523-c.patch +++ /dev/null @@ -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; -