From abc4e5a9a4222295f5693fd316cafaf17e3a7368 Mon Sep 17 00:00:00 2001 From: David P Date: Sun, 15 Oct 2017 21:38:47 -0300 Subject: Update ARM patches for linux-libre-lts-apparmor --- ...RM-atags-add-support-for-Marvell-s-u-boot.patch | 8 ++-- ...dt-retrieve-MAC-addresses-from-Marvell-bo.patch | 8 ++-- .../0003-SMILE-Plug-device-tree-file.patch | 12 +++--- .../0004-fix-mvsdio-eMMC-timing.patch | 10 ++--- ...x-Allow-mac-address-to-be-set-as-a-parame.patch | 8 ++-- ...IC23-SoC-Audio-Codec-Fix-errors-reported-.patch | 49 ---------------------- .../0006-set-default-cubietruck-led-triggers.patch | 33 +++++++++++++++ ...odroid-set-higher-minimum-buck2-regulator.patch | 30 +++++++++++++ .../0007-set-default-cubietruck-led-triggers.patch | 33 --------------- ...odroid-set-higher-minimum-buck2-regulator.patch | 30 ------------- 10 files changed, 86 insertions(+), 135 deletions(-) delete mode 100644 kernels/linux-libre-lts-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch create mode 100644 kernels/linux-libre-lts-knock/0006-set-default-cubietruck-led-triggers.patch create mode 100644 kernels/linux-libre-lts-knock/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch delete mode 100644 kernels/linux-libre-lts-knock/0007-set-default-cubietruck-led-triggers.patch delete mode 100644 kernels/linux-libre-lts-knock/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch (limited to 'kernels') diff --git a/kernels/linux-libre-lts-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/kernels/linux-libre-lts-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch index 7ab3b23d7..47f149aa5 100644 --- a/kernels/linux-libre-lts-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch +++ b/kernels/linux-libre-lts-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch @@ -1,7 +1,7 @@ -From 001565916ddb8589ec7920b0d3c0d007225c79c4 Mon Sep 17 00:00:00 2001 +From 81e89a314fb1e70274c2ec72013ba0a076de55dd Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:59:28 +0100 -Subject: [PATCH 1/8] ARM: atags: add support for Marvell's u-boot +Subject: [PATCH 1/9] ARM: atags: add support for Marvell's u-boot Marvell uses a specific atag in its u-boot which includes among other information the MAC addresses for up to 4 network interfaces. @@ -12,7 +12,7 @@ Signed-off-by: Willy Tarreau 1 file changed, 17 insertions(+) diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h -index 979ff40..d1d0c19 100644 +index 979ff4016404..d1d0c1950fa4 100644 --- a/arch/arm/include/uapi/asm/setup.h +++ b/arch/arm/include/uapi/asm/setup.h @@ -143,6 +143,18 @@ struct tag_memclk { @@ -47,5 +47,5 @@ index 979ff40..d1d0c19 100644 }; -- -2.10.0 +2.13.0 diff --git a/kernels/linux-libre-lts-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/kernels/linux-libre-lts-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch index 719475bad..ccc42d67e 100644 --- a/kernels/linux-libre-lts-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch +++ b/kernels/linux-libre-lts-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -1,7 +1,7 @@ -From c25c95072f199e0d0a56cbd4db701ab5b36a9f0c Mon Sep 17 00:00:00 2001 +From e62b74b84f4b146e0b82d6acf1c043dc599ea884 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:56:58 +0100 -Subject: [PATCH 2/8] ARM: atags/fdt: retrieve MAC addresses from Marvell boot +Subject: [PATCH 2/9] ARM: atags/fdt: retrieve MAC addresses from Marvell boot loader The atags are parsed and if a Marvell atag is found, up to 4 MAC @@ -17,7 +17,7 @@ Signed-off-by: Willy Tarreau 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c -index 9448aa0..ac7b6ae 100644 +index 9448aa0c6686..ac7b6ae6c00f 100644 --- a/arch/arm/boot/compressed/atags_to_fdt.c +++ b/arch/arm/boot/compressed/atags_to_fdt.c @@ -18,7 +18,7 @@ static int node_offset(void *fdt, const char *node_path) @@ -43,5 +43,5 @@ index 9448aa0..ac7b6ae 100644 } -- -2.10.0 +2.13.0 diff --git a/kernels/linux-libre-lts-knock/0003-SMILE-Plug-device-tree-file.patch b/kernels/linux-libre-lts-knock/0003-SMILE-Plug-device-tree-file.patch index b686a3298..5976f1a80 100644 --- a/kernels/linux-libre-lts-knock/0003-SMILE-Plug-device-tree-file.patch +++ b/kernels/linux-libre-lts-knock/0003-SMILE-Plug-device-tree-file.patch @@ -1,7 +1,7 @@ -From 3822d03ac84e6581583c3e533eb0e015334242bd Mon Sep 17 00:00:00 2001 +From 8a920b8030a9a677dd6d38cf0305e7bf63617a61 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:41:19 -0600 -Subject: [PATCH 3/8] SMILE Plug device tree file +Subject: [PATCH 3/9] SMILE Plug device tree file This adds a dts file for the SMILE Plug, which only differs from the Mirabox dts with the LED definitions. @@ -14,10 +14,10 @@ Signed-off-by: Kevin Mihelich create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index befcd26..2be4c48 100644 +index 9c5e1d944d1c..342ed08ab225 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -906,6 +906,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ +@@ -985,6 +985,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ armada-370-db.dtb \ armada-370-dlink-dns327l.dtb \ armada-370-mirabox.dtb \ @@ -27,7 +27,7 @@ index befcd26..2be4c48 100644 armada-370-rd.dtb \ diff --git a/arch/arm/boot/dts/armada-370-smileplug.dts b/arch/arm/boot/dts/armada-370-smileplug.dts new file mode 100644 -index 0000000..d01308a +index 000000000000..d01308ab848b --- /dev/null +++ b/arch/arm/boot/dts/armada-370-smileplug.dts @@ -0,0 +1,173 @@ @@ -205,5 +205,5 @@ index 0000000..d01308a + }; +}; -- -2.10.0 +2.13.0 diff --git a/kernels/linux-libre-lts-knock/0004-fix-mvsdio-eMMC-timing.patch b/kernels/linux-libre-lts-knock/0004-fix-mvsdio-eMMC-timing.patch index 050e8a0e5..b9e969f7a 100644 --- a/kernels/linux-libre-lts-knock/0004-fix-mvsdio-eMMC-timing.patch +++ b/kernels/linux-libre-lts-knock/0004-fix-mvsdio-eMMC-timing.patch @@ -1,7 +1,7 @@ -From 51597a7978cb561ba33d2fe4f9fb3aa07f448cc4 Mon Sep 17 00:00:00 2001 +From 9ef8feb3e1a701eacd6979653511e1b13b095697 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:43:56 -0600 -Subject: [PATCH 4/8] fix mvsdio eMMC timing +Subject: [PATCH 4/9] fix mvsdio eMMC timing These changes from Globalscale change the MMC timing to allow the eMMC versions of the Mirabox and SMILE Plug to work. @@ -12,7 +12,7 @@ Signed-off-by: Kevin Mihelich 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c -index 42296e5..e5ce6d2 100644 +index 58d74b8d6c79..c9715530d676 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -93,7 +93,7 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data) @@ -24,7 +24,7 @@ index 42296e5..e5ce6d2 100644 tmout_index = MVSD_HOST_CTRL_TMOUT_MAX; dev_dbg(host->dev, "data %s at 0x%08x: blocks=%d blksz=%d tmout=%u (%d)\n", -@@ -615,6 +615,8 @@ static void mvsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) +@@ -614,6 +614,8 @@ static void mvsd_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) u32 m = DIV_ROUND_UP(host->base_clock, ios->clock) - 1; if (m > MVSD_BASE_DIV_MAX) m = MVSD_BASE_DIV_MAX; @@ -34,5 +34,5 @@ index 42296e5..e5ce6d2 100644 host->clock = ios->clock; host->ns_per_clk = 1000000000 / (host->base_clock / (m+1)); -- -2.10.0 +2.13.0 diff --git a/kernels/linux-libre-lts-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/kernels/linux-libre-lts-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index 09b889f59..0cbd821c5 100644 --- a/kernels/linux-libre-lts-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/kernels/linux-libre-lts-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,14 +1,14 @@ -From f0e29c8c8744317cfe946faf4f4ebae76f2c4eb1 Mon Sep 17 00:00:00 2001 +From d52a089f2564db419f6a9b4109ccda69e847793d Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Feb 2014 01:43:50 -0300 -Subject: [PATCH 5/8] net/smsc95xx: Allow mac address to be set as a parameter +Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter --- drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c -index 831aa33..0362554 100644 +index 765400b62168..ee3212f887e3 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -60,6 +60,7 @@ @@ -91,5 +91,5 @@ index 831aa33..0362554 100644 /* maybe the boot loader passed the MAC address in devicetree */ -- -2.10.0 +2.13.0 diff --git a/kernels/linux-libre-lts-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch b/kernels/linux-libre-lts-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch deleted file mode 100644 index 44e766b8d..000000000 --- a/kernels/linux-libre-lts-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 200fab4de6f535e626095b9782b56e0ed101409c Mon Sep 17 00:00:00 2001 -From: dobatog -Date: Thu, 26 Feb 2015 12:32:27 +0100 -Subject: [PATCH 6/8] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported - related to input routing signals. - -The following patch, based on stable v3.19, corrects the errors that are reported in the boot trace in reference to the Input Signals of the audio codec TLV320AIC23: - -tlv320aic23-codec 1-001a: Control not supported for path LLINEIN -> [NULL] -> Line Input -tlv320aic23-codec 1-001a: ASoC: no dapm match for LLINEIN --> NULL --> Line Input -tlv320aic23-codec 1-001a: ASoC: Failed to add route LLINEIN -> NULL -> Line Input -tlv320aic23-codec 1-001a: Control not supported for path RLINEIN -> [NULL] -> Line Input -tlv320aic23-codec 1-001a: ASoC: no dapm match for RLINEIN --> NULL --> Line Input -tlv320aic23-codec 1-001a: ASoC: Failed to add route RLINEIN -> NULL -> Line Input -tlv320aic23-codec 1-001a: Control not supported for path MICIN -> [NULL] -> Mic Input -tlv320aic23-codec 1-001a: ASoC: no dapm match for MICIN --> NULL --> Mic Input -tlv320aic23-codec 1-001a: ASoC: Failed to add route MICIN -> NULL -> Mic Input - -I am trying to set the sound system in a CM-510 (Compulab - SoM) based board with DT, using Simple-Card-Audio and the TLV320AIC23 audio codec included in the SoM . I faced this problem and thanks to the help of Sebastian Hesselbarth who noticed the possible error located in the structure snd_soc_dapm_route tlv320aic23_intercon[] , now errors are not reported. - -Tested on CM-510 (Compulab SoM Board). - -Signed-off-by: dobatog -Tested-by: Max Filippov ---- - sound/soc/codecs/tlv320aic23.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c -index 410cae0..0bb8e26 100644 ---- a/sound/soc/codecs/tlv320aic23.c -+++ b/sound/soc/codecs/tlv320aic23.c -@@ -174,10 +174,10 @@ static const struct snd_soc_dapm_route tlv320aic23_intercon[] = { - {"ROUT", NULL, "Output Mixer"}, - - /* Inputs */ -- {"Line Input", "NULL", "LLINEIN"}, -- {"Line Input", "NULL", "RLINEIN"}, -+ {"Line Input", NULL, "LLINEIN"}, -+ {"Line Input", NULL, "RLINEIN"}, - -- {"Mic Input", "NULL", "MICIN"}, -+ {"Mic Input", NULL, "MICIN"}, - - /* input mux */ - {"Capture Source", "Line", "Line Input"}, --- -2.10.0 - diff --git a/kernels/linux-libre-lts-knock/0006-set-default-cubietruck-led-triggers.patch b/kernels/linux-libre-lts-knock/0006-set-default-cubietruck-led-triggers.patch new file mode 100644 index 000000000..4a8965cae --- /dev/null +++ b/kernels/linux-libre-lts-knock/0006-set-default-cubietruck-led-triggers.patch @@ -0,0 +1,33 @@ +From 6a5a573951f166fdda2d2daa235207f32d9bec92 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +Date: Sat, 14 Feb 2015 12:32:27 +0100 +Subject: [PATCH 6/9] set default cubietruck led triggers + +Signed-off-by: Kevin Mihelich +--- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +index 102903e83bd2..40ce78704e8f 100644 +--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts ++++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +@@ -69,6 +69,7 @@ + blue { + label = "cubietruck:blue:usr"; + gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "heartbeat"; + }; + + orange { +@@ -84,6 +85,7 @@ + green { + label = "cubietruck:green:usr"; + gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "mmc0"; + }; + }; + +-- +2.13.0 + diff --git a/kernels/linux-libre-lts-knock/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/kernels/linux-libre-lts-knock/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch new file mode 100644 index 000000000..9c3f76760 --- /dev/null +++ b/kernels/linux-libre-lts-knock/0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch @@ -0,0 +1,30 @@ +From 65265b8379903a8dd95489616fde0126d10bd4ef Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +Date: Thu, 11 Aug 2016 00:42:37 -0600 +Subject: [PATCH 7/9] exynos4412-odroid: set higher minimum buck2 regulator + voltage + +Set a higher minimum voltage to help reboot issue. +http://www.spinics.net/lists/linux-samsung-soc/msg54434.html + +Signed-off-by: Kevin Mihelich +--- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +index 0f1ff792fe44..a6fc2a53522f 100644 +--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi ++++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +@@ -423,7 +423,7 @@ + + buck2_reg: BUCK2 { + regulator-name = "vdd_arm"; +- regulator-min-microvolt = <900000>; ++ regulator-min-microvolt = <1100000>; + regulator-max-microvolt = <1350000>; + regulator-always-on; + regulator-boot-on; +-- +2.13.0 + diff --git a/kernels/linux-libre-lts-knock/0007-set-default-cubietruck-led-triggers.patch b/kernels/linux-libre-lts-knock/0007-set-default-cubietruck-led-triggers.patch deleted file mode 100644 index 7464f8281..000000000 --- a/kernels/linux-libre-lts-knock/0007-set-default-cubietruck-led-triggers.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 011f5e6c9ef7350ac6e7bbd486318b1b96d78652 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Sat, 14 Feb 2015 12:32:27 +0100 -Subject: [PATCH 7/8] set default cubietruck led triggers - -Signed-off-by: Kevin Mihelich ---- - arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -index 83f39b0..15e9626 100644 ---- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts -@@ -70,6 +70,7 @@ - blue { - label = "cubietruck:blue:usr"; - gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "heartbeat"; - }; - - orange { -@@ -85,6 +86,7 @@ - green { - label = "cubietruck:green:usr"; - gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "mmc0"; - }; - }; - --- -2.10.0 - diff --git a/kernels/linux-libre-lts-knock/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/kernels/linux-libre-lts-knock/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch deleted file mode 100644 index 8f6952f19..000000000 --- a/kernels/linux-libre-lts-knock/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 21fd4defb20c41ae93e86c4a5e6adcb1afd36be9 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Thu, 11 Aug 2016 00:42:37 -0600 -Subject: [PATCH 8/8] exynos4412-odroid: set higher minimum buck2 regulator - voltage - -Set a higher minimum voltage to help reboot issue. -http://www.spinics.net/lists/linux-samsung-soc/msg54434.html - -Signed-off-by: Kevin Mihelich ---- - arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -index 8aa19ba..8e2d94e 100644 ---- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi -@@ -423,7 +423,7 @@ - - buck2_reg: BUCK2 { - regulator-name = "vdd_arm"; -- regulator-min-microvolt = <900000>; -+ regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1350000>; - regulator-always-on; - regulator-boot-on; --- -2.10.0 - -- cgit v1.2.3