From 3f9bc4e1a94ecadb77de5c29ac2d0d9784c57d5a Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 5 Sep 2018 17:03:57 +0200 Subject: [PATCH] Slice: move linux patches to device specific directories These patches are Slice specific hacks and should not be applied to the RPi kernels. Signed-off-by: Matthias Reichl --- .../linux/linux-04-rtc-pcf8523-c.patch | 0 .../patches/linux/linux-05-cs4265-c.patch | 0 .../linux/linux-04-rtc-pcf8523-c.patch | 17 ++++++++++++++++ .../patches/linux/linux-05-cs4265-c.patch | 20 +++++++++++++++++++ 4 files changed, 37 insertions(+) rename projects/RPi/{ => devices/Slice}/patches/linux/linux-04-rtc-pcf8523-c.patch (100%) rename projects/RPi/{ => devices/Slice}/patches/linux/linux-05-cs4265-c.patch (100%) create mode 100644 projects/RPi/devices/Slice3/patches/linux/linux-04-rtc-pcf8523-c.patch create mode 100644 projects/RPi/devices/Slice3/patches/linux/linux-05-cs4265-c.patch diff --git a/projects/RPi/patches/linux/linux-04-rtc-pcf8523-c.patch b/projects/RPi/devices/Slice/patches/linux/linux-04-rtc-pcf8523-c.patch similarity index 100% rename from projects/RPi/patches/linux/linux-04-rtc-pcf8523-c.patch rename to projects/RPi/devices/Slice/patches/linux/linux-04-rtc-pcf8523-c.patch diff --git a/projects/RPi/patches/linux/linux-05-cs4265-c.patch b/projects/RPi/devices/Slice/patches/linux/linux-05-cs4265-c.patch similarity index 100% rename from projects/RPi/patches/linux/linux-05-cs4265-c.patch rename to projects/RPi/devices/Slice/patches/linux/linux-05-cs4265-c.patch 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 new file mode 100644 index 0000000000..da7593ed7e --- /dev/null +++ b/projects/RPi/devices/Slice3/patches/linux/linux-04-rtc-pcf8523-c.patch @@ -0,0 +1,17 @@ +--- 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/patches/linux/linux-05-cs4265-c.patch b/projects/RPi/devices/Slice3/patches/linux/linux-05-cs4265-c.patch new file mode 100644 index 0000000000..51939528a9 --- /dev/null +++ b/projects/RPi/devices/Slice3/patches/linux/linux-05-cs4265-c.patch @@ -0,0 +1,20 @@ +--- linux-4.4-rc7-old/sound/soc/codecs/cs4265.c 2016-01-13 20:56:05.637652775 +0000 ++++ linux-4.4-rc7/sound/soc/codecs/cs4265.c 2016-01-17 11:21:16.977652775 +0000 +@@ -157,7 +157,7 @@ + SOC_SINGLE("Validity Bit Control Switch", CS4265_SPDIF_CTL2, + 3, 1, 0), + SOC_ENUM("SPDIF Mono/Stereo", spdif_mono_stereo_enum), +- SOC_SINGLE("MMTLR Data Switch", 0, ++ SOC_SINGLE("MMTLR Data Switch", CS4265_SPDIF_CTL2, + 1, 1, 0), + SOC_ENUM("Mono Channel Select", spdif_mono_select_enum), + SND_SOC_BYTES("C Data Buffer", CS4265_C_DATA_BUFF, 24), +@@ -199,8 +199,6 @@ + SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_AIF_IN("DIN2", NULL, 0, + SND_SOC_NOPM, 0, 0), +- SND_SOC_DAPM_AIF_IN("TXIN", NULL, 0, +- CS4265_SPDIF_CTL2, 5, 1), + + SND_SOC_DAPM_OUTPUT("LINEOUTL"), + SND_SOC_DAPM_OUTPUT("LINEOUTR"),