diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-29 16:49:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-29 16:49:04 +0200 |
| commit | 238ce9c4b5c03fb388e072500defaf256884dd05 (patch) | |
| tree | e6511a56d6e00a2861ad7249ebfe1bfdd674eb73 | |
| parent | 8870286856cb2b7bb646e9b20870d3fbbf73f2fd (diff) | |
| download | ltsi-kernel-238ce9c4b5c03fb388e072500defaf256884dd05.tar.gz | |
update KERNEL_VERSION to 4.9.97
136 files changed, 287 insertions, 947 deletions
diff --git a/patches.renesas/0003-arm64-dts-r8a7796-Add-I2C-for-DVFS-device-node.patch b/patches.renesas/0003-arm64-dts-r8a7796-Add-I2C-for-DVFS-device-node.patch index 8f0bb31778722..53da886b45df1 100644 --- a/patches.renesas/0003-arm64-dts-r8a7796-Add-I2C-for-DVFS-device-node.patch +++ b/patches.renesas/0003-arm64-dts-r8a7796-Add-I2C-for-DVFS-device-node.patch @@ -25,7 +25,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> }; psci { -@@ -269,6 +270,19 @@ +@@ -268,6 +269,19 @@ #power-domain-cells = <1>; }; diff --git a/patches.renesas/0011-arm64-dts-r8a7796-Use-rgmii-txid-phy-mode-for-Ethern.patch b/patches.renesas/0011-arm64-dts-r8a7796-Use-rgmii-txid-phy-mode-for-Ethern.patch index 3199034468e3c..a3ee3e42aa614 100644 --- a/patches.renesas/0011-arm64-dts-r8a7796-Use-rgmii-txid-phy-mode-for-Ethern.patch +++ b/patches.renesas/0011-arm64-dts-r8a7796-Use-rgmii-txid-phy-mode-for-Ethern.patch @@ -40,7 +40,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -483,7 +483,7 @@ +@@ -482,7 +482,7 @@ "ch24"; clocks = <&cpg CPG_MOD 812>; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; diff --git a/patches.renesas/0011-arm64-dts-r8a7796-add-SDHI-nodes.patch b/patches.renesas/0011-arm64-dts-r8a7796-add-SDHI-nodes.patch index c913a32014cd2..e030f4e00b01d 100644 --- a/patches.renesas/0011-arm64-dts-r8a7796-add-SDHI-nodes.patch +++ b/patches.renesas/0011-arm64-dts-r8a7796-add-SDHI-nodes.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -251,5 +251,45 @@ +@@ -250,5 +250,45 @@ power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; status = "disabled"; }; diff --git a/patches.renesas/0015-arm64-dts-r8a7796-dtsi-Add-all-HSCIF-nodes.patch b/patches.renesas/0015-arm64-dts-r8a7796-dtsi-Add-all-HSCIF-nodes.patch index 075c5c56ef229..c4d976679f4ed 100644 --- a/patches.renesas/0015-arm64-dts-r8a7796-dtsi-Add-all-HSCIF-nodes.patch +++ b/patches.renesas/0015-arm64-dts-r8a7796-dtsi-Add-all-HSCIF-nodes.patch @@ -19,7 +19,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -489,6 +489,76 @@ +@@ -488,6 +488,76 @@ status = "disabled"; }; diff --git a/patches.renesas/0016-arm64-dts-r8a7796-Add-all-SCIF-nodes.patch b/patches.renesas/0016-arm64-dts-r8a7796-Add-all-SCIF-nodes.patch index a4e49287a42b1..c1357008f2f42 100644 --- a/patches.renesas/0016-arm64-dts-r8a7796-Add-all-SCIF-nodes.patch +++ b/patches.renesas/0016-arm64-dts-r8a7796-Add-all-SCIF-nodes.patch @@ -17,7 +17,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -559,6 +559,32 @@ +@@ -558,6 +558,32 @@ status = "disabled"; }; @@ -50,7 +50,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> scif2: serial@e6e88000 { compatible = "renesas,scif-r8a7796", "renesas,rcar-gen3-scif", "renesas,scif"; -@@ -568,6 +594,45 @@ +@@ -567,6 +593,45 @@ <&cpg CPG_CORE R8A7796_CLK_S3D1>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; diff --git a/patches.renesas/0017-arm64-dts-r8a7796-Enable-SCIF-DMA.patch b/patches.renesas/0017-arm64-dts-r8a7796-Enable-SCIF-DMA.patch index 1f8d70cfe5cfd..1ba902769cbca 100644 --- a/patches.renesas/0017-arm64-dts-r8a7796-Enable-SCIF-DMA.patch +++ b/patches.renesas/0017-arm64-dts-r8a7796-Enable-SCIF-DMA.patch @@ -14,7 +14,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -568,6 +568,9 @@ +@@ -567,6 +567,9 @@ <&cpg CPG_CORE R8A7796_CLK_S3D1>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; @@ -24,7 +24,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; status = "disabled"; }; -@@ -581,6 +584,9 @@ +@@ -580,6 +583,9 @@ <&cpg CPG_CORE R8A7796_CLK_S3D1>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; @@ -34,7 +34,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; status = "disabled"; }; -@@ -607,6 +613,8 @@ +@@ -606,6 +612,8 @@ <&cpg CPG_CORE R8A7796_CLK_S3D1>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; @@ -43,7 +43,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; status = "disabled"; }; -@@ -620,6 +628,8 @@ +@@ -619,6 +627,8 @@ <&cpg CPG_CORE R8A7796_CLK_S3D1>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; @@ -52,7 +52,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; status = "disabled"; }; -@@ -633,6 +643,9 @@ +@@ -632,6 +642,9 @@ <&cpg CPG_CORE R8A7796_CLK_S3D1>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; diff --git a/patches.renesas/0019-arm64-dts-r8a7796-Enable-HSCIF-DMA.patch b/patches.renesas/0019-arm64-dts-r8a7796-Enable-HSCIF-DMA.patch index 0326b7f30a4be..05560b0513c58 100644 --- a/patches.renesas/0019-arm64-dts-r8a7796-Enable-HSCIF-DMA.patch +++ b/patches.renesas/0019-arm64-dts-r8a7796-Enable-HSCIF-DMA.patch @@ -14,7 +14,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -499,6 +499,9 @@ +@@ -498,6 +498,9 @@ <&cpg CPG_CORE R8A7796_CLK_S3D1>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; @@ -24,7 +24,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; status = "disabled"; }; -@@ -513,6 +516,9 @@ +@@ -512,6 +515,9 @@ <&cpg CPG_CORE R8A7796_CLK_S3D1>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; @@ -34,7 +34,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; status = "disabled"; }; -@@ -527,6 +533,9 @@ +@@ -526,6 +532,9 @@ <&cpg CPG_CORE R8A7796_CLK_S3D1>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; @@ -44,7 +44,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; status = "disabled"; }; -@@ -541,6 +550,8 @@ +@@ -540,6 +549,8 @@ <&cpg CPG_CORE R8A7796_CLK_S3D1>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; @@ -53,7 +53,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; status = "disabled"; }; -@@ -555,6 +566,8 @@ +@@ -554,6 +565,8 @@ <&cpg CPG_CORE R8A7796_CLK_S3D1>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; diff --git a/patches.renesas/0022-base-soc-Introduce-soc_device_match-interface.patch b/patches.renesas/0022-base-soc-Introduce-soc_device_match-interface.patch index 91b83054ff426..f7055d328c6d4 100644 --- a/patches.renesas/0022-base-soc-Introduce-soc_device_match-interface.patch +++ b/patches.renesas/0022-base-soc-Introduce-soc_device_match-interface.patch @@ -49,7 +49,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig -@@ -237,6 +237,7 @@ config GENERIC_CPU_AUTOPROBE +@@ -240,6 +240,7 @@ config GENERIC_CPU_VULNERABILITIES config SOC_BUS bool diff --git a/patches.renesas/0024-arm64-dts-r8a7796-Add-all-MSIOF-nodes.patch b/patches.renesas/0024-arm64-dts-r8a7796-Add-all-MSIOF-nodes.patch index 12475187b6eef..fe83b9cffd44e 100644 --- a/patches.renesas/0024-arm64-dts-r8a7796-Add-all-MSIOF-nodes.patch +++ b/patches.renesas/0024-arm64-dts-r8a7796-Add-all-MSIOF-nodes.patch @@ -15,7 +15,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -373,6 +373,60 @@ +@@ -372,6 +372,60 @@ status = "disabled"; }; diff --git a/patches.renesas/0025-arm64-dts-r8a7796-Add-CAN-external-clock-support.patch b/patches.renesas/0025-arm64-dts-r8a7796-Add-CAN-external-clock-support.patch index a147838efaaee..6288ff0574617 100644 --- a/patches.renesas/0025-arm64-dts-r8a7796-Add-CAN-external-clock-support.patch +++ b/patches.renesas/0025-arm64-dts-r8a7796-Add-CAN-external-clock-support.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -69,6 +69,13 @@ +@@ -68,6 +68,13 @@ clock-frequency = <0>; }; diff --git a/patches.renesas/0025-arm64-dts-r8a7796-Remove-unit-address-and-reg-from-i.patch b/patches.renesas/0025-arm64-dts-r8a7796-Remove-unit-address-and-reg-from-i.patch deleted file mode 100644 index cb7c31205901a..0000000000000 --- a/patches.renesas/0025-arm64-dts-r8a7796-Remove-unit-address-and-reg-from-i.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f187d3ef9f6d25d6afac8d6c401f567f4be85d48 Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven <geert+renesas@glider.be> -Date: Fri, 3 Mar 2017 14:18:17 +0100 -Subject: [PATCH 025/286] arm64: dts: r8a7796: Remove unit-address and reg from - integrated cache - -The Cortex-A57 cache controller is an integrated controller, and thus -the device node representing it should not have a unit-addresses or reg -property. - -Fixes: 1561f20760ec96db ("arm64: dts: r8a7796: Add Renesas R8A7796 SoC support") -Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -(cherry picked from commit 57a4fd420c6e8a04b6a87ff24d34250cd7c48f15) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - arch/arm64/boot/dts/renesas/r8a7796.dtsi | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi -+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -47,9 +47,8 @@ - enable-method = "psci"; - }; - -- L2_CA57: cache-controller@0 { -+ L2_CA57: cache-controller-0 { - compatible = "cache"; -- reg = <0>; - power-domains = <&sysc R8A7796_PD_CA57_SCU>; - cache-unified; - cache-level = <2>; diff --git a/patches.renesas/0026-arm64-dts-r8a7796-Add-CAN-support.patch b/patches.renesas/0026-arm64-dts-r8a7796-Add-CAN-support.patch index a27933632a392..b2c41e33ea1c1 100644 --- a/patches.renesas/0026-arm64-dts-r8a7796-Add-CAN-support.patch +++ b/patches.renesas/0026-arm64-dts-r8a7796-Add-CAN-support.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -367,6 +367,36 @@ +@@ -366,6 +366,36 @@ status = "disabled"; }; diff --git a/patches.renesas/0026-soc-renesas-Identify-SoC-and-register-with-the-SoC-b.patch b/patches.renesas/0026-soc-renesas-Identify-SoC-and-register-with-the-SoC-b.patch index f7c92602bad45..631eaa9c61fc5 100644 --- a/patches.renesas/0026-soc-renesas-Identify-SoC-and-register-with-the-SoC-b.patch +++ b/patches.renesas/0026-soc-renesas-Identify-SoC-and-register-with-the-SoC-b.patch @@ -46,7 +46,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms -@@ -143,6 +143,7 @@ config ARCH_RENESAS +@@ -145,6 +145,7 @@ config ARCH_RENESAS select PM select PM_GENERIC_DOMAINS select RENESAS_IRQC diff --git a/patches.renesas/0027-arm64-dts-r8a7796-Add-CAN-FD-support.patch b/patches.renesas/0027-arm64-dts-r8a7796-Add-CAN-FD-support.patch index 8db1d857d4178..7d29db9c6b990 100644 --- a/patches.renesas/0027-arm64-dts-r8a7796-Add-CAN-FD-support.patch +++ b/patches.renesas/0027-arm64-dts-r8a7796-Add-CAN-FD-support.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -397,6 +397,30 @@ +@@ -396,6 +396,30 @@ status = "disabled"; }; diff --git a/patches.renesas/0034-arm64-dts-r8a7796-Use-R-Car-Gen-3-fallback-binding-f.patch b/patches.renesas/0034-arm64-dts-r8a7796-Use-R-Car-Gen-3-fallback-binding-f.patch index 26608edbbfc98..7e4366fbb7d47 100644 --- a/patches.renesas/0034-arm64-dts-r8a7796-Use-R-Car-Gen-3-fallback-binding-f.patch +++ b/patches.renesas/0034-arm64-dts-r8a7796-Use-R-Car-Gen-3-fallback-binding-f.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -269,7 +269,8 @@ +@@ -268,7 +268,8 @@ i2c0: i2c@e6500000 { #address-cells = <1>; #size-cells = <0>; @@ -31,7 +31,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6500000 0 0x40>; interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 931>; -@@ -284,7 +285,8 @@ +@@ -283,7 +284,8 @@ i2c1: i2c@e6508000 { #address-cells = <1>; #size-cells = <0>; @@ -41,7 +41,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6508000 0 0x40>; interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 930>; -@@ -299,7 +301,8 @@ +@@ -298,7 +300,8 @@ i2c2: i2c@e6510000 { #address-cells = <1>; #size-cells = <0>; @@ -51,7 +51,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6510000 0 0x40>; interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 929>; -@@ -314,7 +317,8 @@ +@@ -313,7 +316,8 @@ i2c3: i2c@e66d0000 { #address-cells = <1>; #size-cells = <0>; @@ -61,7 +61,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe66d0000 0 0x40>; interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 928>; -@@ -328,7 +332,8 @@ +@@ -327,7 +331,8 @@ i2c4: i2c@e66d8000 { #address-cells = <1>; #size-cells = <0>; @@ -71,7 +71,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe66d8000 0 0x40>; interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 927>; -@@ -342,7 +347,8 @@ +@@ -341,7 +346,8 @@ i2c5: i2c@e66e0000 { #address-cells = <1>; #size-cells = <0>; @@ -81,7 +81,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe66e0000 0 0x40>; interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 919>; -@@ -356,7 +362,8 @@ +@@ -355,7 +361,8 @@ i2c6: i2c@e66e8000 { #address-cells = <1>; #size-cells = <0>; diff --git a/patches.renesas/0036-arm64-dts-renesas-r8a7796-Add-EthernetAVB-instance.patch b/patches.renesas/0036-arm64-dts-renesas-r8a7796-Add-EthernetAVB-instance.patch index b9e75eff0dcfd..cb54080e06610 100644 --- a/patches.renesas/0036-arm64-dts-renesas-r8a7796-Add-EthernetAVB-instance.patch +++ b/patches.renesas/0036-arm64-dts-renesas-r8a7796-Add-EthernetAVB-instance.patch @@ -15,7 +15,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -428,6 +428,49 @@ +@@ -427,6 +427,49 @@ }; }; diff --git a/patches.renesas/0038-arm64-dts-r8a7796-Use-R-Car-Gen-3-fallback-binding-f.patch b/patches.renesas/0038-arm64-dts-r8a7796-Use-R-Car-Gen-3-fallback-binding-f.patch index df67ff2ba3031..9aaa951c7322b 100644 --- a/patches.renesas/0038-arm64-dts-r8a7796-Use-R-Car-Gen-3-fallback-binding-f.patch +++ b/patches.renesas/0038-arm64-dts-r8a7796-Use-R-Car-Gen-3-fallback-binding-f.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -485,7 +485,8 @@ +@@ -484,7 +484,8 @@ }; msiof0: spi@e6e90000 { @@ -31,7 +31,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6e90000 0 0x0064>; interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 211>; -@@ -499,7 +500,8 @@ +@@ -498,7 +499,8 @@ }; msiof1: spi@e6ea0000 { @@ -41,7 +41,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6ea0000 0 0x0064>; interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 210>; -@@ -513,7 +515,8 @@ +@@ -512,7 +514,8 @@ }; msiof2: spi@e6c00000 { @@ -51,7 +51,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6c00000 0 0x0064>; interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 209>; -@@ -526,7 +529,8 @@ +@@ -525,7 +528,8 @@ }; msiof3: spi@e6c10000 { diff --git a/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch b/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch index af8a9204f6f06..cfefa7e6ca3e7 100644 --- a/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch +++ b/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch @@ -467,7 +467,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> drm_modeset_drop_locks(ctx); drm_modeset_acquire_fini(ctx); mutex_unlock(&dev->mode_config.mutex); -@@ -6878,7 +6880,7 @@ static void intel_crtc_disable_noatomic( +@@ -6879,7 +6881,7 @@ static void intel_crtc_disable_noatomic( dev_priv->display.crtc_disable(crtc_state, state); @@ -476,7 +476,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> DRM_DEBUG_KMS("[CRTC:%d:%s] hw state adjusted, was enabled, now disabled\n", crtc->base.id, crtc->name); -@@ -11286,8 +11288,8 @@ found: +@@ -11287,8 +11289,8 @@ found: return true; fail: @@ -487,7 +487,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> restore_state = state = NULL; if (ret == -EDEADLK) { -@@ -11316,10 +11318,9 @@ void intel_release_load_detect_pipe(stru +@@ -11317,10 +11319,9 @@ void intel_release_load_detect_pipe(stru return; ret = drm_atomic_commit(state); @@ -500,7 +500,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } static int i9xx_pll_refclk(struct drm_device *dev, -@@ -12392,8 +12393,7 @@ retry: +@@ -12393,8 +12394,7 @@ retry: goto retry; } @@ -510,7 +510,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (ret == 0 && event) { spin_lock_irq(&dev->event_lock); -@@ -14489,7 +14489,7 @@ static void intel_atomic_commit_tail(str +@@ -14490,7 +14490,7 @@ static void intel_atomic_commit_tail(str drm_atomic_helper_commit_cleanup_done(state); @@ -519,7 +519,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* As one of the primary mmio accessors, KMS has a high likelihood * of triggering bugs in unclaimed access. After we finish -@@ -14572,6 +14572,7 @@ static int intel_atomic_commit(struct dr +@@ -14573,6 +14573,7 @@ static int intel_atomic_commit(struct dr intel_shared_dpll_commit(state); intel_atomic_track_fbs(state); @@ -527,7 +527,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (nonblock) queue_work(system_unbound_wq, &state->commit_work); else -@@ -14613,9 +14614,8 @@ retry: +@@ -14614,9 +14615,8 @@ retry: goto retry; } @@ -538,7 +538,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } /* -@@ -16357,8 +16357,8 @@ retry: +@@ -16358,8 +16358,8 @@ retry: dev_priv->display.optimize_watermarks(cs); } @@ -548,7 +548,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); } -@@ -16996,10 +16996,9 @@ void intel_display_resume(struct drm_dev +@@ -16997,10 +16997,9 @@ void intel_display_resume(struct drm_dev drm_modeset_acquire_fini(&ctx); mutex_unlock(&dev->mode_config.mutex); diff --git a/patches.renesas/0042-drm-define-drm_compat_ioctl-NULL-on-CONFIG_COMPAT-n-.patch b/patches.renesas/0042-drm-define-drm_compat_ioctl-NULL-on-CONFIG_COMPAT-n-.patch index 284464efe59cf..b2541519f4885 100644 --- a/patches.renesas/0042-drm-define-drm_compat_ioctl-NULL-on-CONFIG_COMPAT-n-.patch +++ b/patches.renesas/0042-drm-define-drm_compat_ioctl-NULL-on-CONFIG_COMPAT-n-.patch @@ -250,7 +250,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c -@@ -2500,9 +2500,7 @@ static const struct file_operations i915 +@@ -2502,9 +2502,7 @@ static const struct file_operations i915 .mmap = drm_gem_mmap, .poll = drm_poll, .read = drm_read, diff --git a/patches.renesas/0043-arm64-dts-r8a7796-Add-R-Car-Gen3-thermal-support.patch b/patches.renesas/0043-arm64-dts-r8a7796-Add-R-Car-Gen3-thermal-support.patch index 164eda3a7caae..5abafffbc64ed 100644 --- a/patches.renesas/0043-arm64-dts-r8a7796-Add-R-Car-Gen3-thermal-support.patch +++ b/patches.renesas/0043-arm64-dts-r8a7796-Add-R-Car-Gen3-thermal-support.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -680,5 +680,63 @@ +@@ -679,5 +679,63 @@ power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; status = "disabled"; }; diff --git a/patches.renesas/0043-drm-Make-the-connector-.detect-callback-optional.patch b/patches.renesas/0043-drm-Make-the-connector-.detect-callback-optional.patch index ec5404300d0f6..d86cd3488bc03 100644 --- a/patches.renesas/0043-drm-Make-the-connector-.detect-callback-optional.patch +++ b/patches.renesas/0043-drm-Make-the-connector-.detect-callback-optional.patch @@ -158,7 +158,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c -@@ -1038,12 +1038,6 @@ err: +@@ -1042,12 +1042,6 @@ err: return ret; } @@ -171,7 +171,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> static void tc_bridge_pre_enable(struct drm_bridge *bridge) { struct tc_data *tc = bridge_to_tc(bridge); -@@ -1168,7 +1162,6 @@ static const struct drm_connector_helper +@@ -1175,7 +1169,6 @@ static const struct drm_connector_helper static const struct drm_connector_funcs tc_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .fill_modes = drm_helper_probe_single_connector_modes, @@ -237,7 +237,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (old_status != connector->status) { const char *old, *new; -@@ -575,7 +583,7 @@ bool drm_helper_hpd_irq_event(struct drm +@@ -595,7 +603,7 @@ bool drm_helper_hpd_irq_event(struct drm old_status = connector->status; diff --git a/patches.renesas/0045-arm64-dts-r8a7796-Link-ARM-GIC-to-clock-and-clock-do.patch b/patches.renesas/0045-arm64-dts-r8a7796-Link-ARM-GIC-to-clock-and-clock-do.patch index a75e4aa6d0f0b..73475c28424cf 100644 --- a/patches.renesas/0045-arm64-dts-r8a7796-Link-ARM-GIC-to-clock-and-clock-do.patch +++ b/patches.renesas/0045-arm64-dts-r8a7796-Link-ARM-GIC-to-clock-and-clock-do.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -101,6 +101,9 @@ +@@ -100,6 +100,9 @@ <0x0 0xf1060000 0 0x20000>; interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_HIGH)>; diff --git a/patches.renesas/0047-arm64-dts-r8a7796-Mark-EthernetAVB-device-node-disab.patch b/patches.renesas/0047-arm64-dts-r8a7796-Mark-EthernetAVB-device-node-disab.patch index f230e46cb606a..b8cbd2b8bf1ba 100644 --- a/patches.renesas/0047-arm64-dts-r8a7796-Mark-EthernetAVB-device-node-disab.patch +++ b/patches.renesas/0047-arm64-dts-r8a7796-Mark-EthernetAVB-device-node-disab.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -472,6 +472,7 @@ +@@ -471,6 +471,7 @@ phy-mode = "rgmii-id"; #address-cells = <1>; #size-cells = <0>; diff --git a/patches.renesas/0059-ARM-dts-r8a7791-Remove-unit-address-and-reg-from-int.patch b/patches.renesas/0059-ARM-dts-r8a7791-Remove-unit-address-and-reg-from-int.patch deleted file mode 100644 index e69753364b028..0000000000000 --- a/patches.renesas/0059-ARM-dts-r8a7791-Remove-unit-address-and-reg-from-int.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 00bcd74c3d7c10cf84a2b54391f03e8101ec94a4 Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven <geert+renesas@glider.be> -Date: Mon, 6 Mar 2017 17:40:40 +0100 -Subject: [PATCH 059/286] ARM: dts: r8a7791: Remove unit-address and reg from - integrated cache - -The Cortex-A15 cache controller is an integrated controller, and thus -the device node representing it should not have a unit-addresses or reg -property. - -Fixes: 6f9314ce258c8504 ("ARM: dts: r8a7791: Fix W=1 dtc warnings") -Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -(cherry picked from commit 5d6a2165abd4635ecf5ece3d02fe8677f00d32c5) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - arch/arm/boot/dts/r8a7791.dtsi | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/arch/arm/boot/dts/r8a7791.dtsi -+++ b/arch/arm/boot/dts/r8a7791.dtsi -@@ -74,9 +74,8 @@ - next-level-cache = <&L2_CA15>; - }; - -- L2_CA15: cache-controller@0 { -+ L2_CA15: cache-controller-0 { - compatible = "cache"; -- reg = <0>; - power-domains = <&sysc R8A7791_PD_CA15_SCU>; - cache-unified; - cache-level = <2>; diff --git a/patches.renesas/0060-ARM-dts-r8a7792-Remove-unit-address-and-reg-from-int.patch b/patches.renesas/0060-ARM-dts-r8a7792-Remove-unit-address-and-reg-from-int.patch deleted file mode 100644 index f0fa4b372d5e4..0000000000000 --- a/patches.renesas/0060-ARM-dts-r8a7792-Remove-unit-address-and-reg-from-int.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 30918d73bb8dbf1074a380a9d2db2913238420e6 Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven <geert+renesas@glider.be> -Date: Mon, 6 Mar 2017 17:40:41 +0100 -Subject: [PATCH 060/286] ARM: dts: r8a7792: Remove unit-address and reg from - integrated cache - -The Cortex-A15 cache controller is an integrated controller, and thus -the device node representing it should not have a unit-addresses or reg -property. - -Fixes: 7c4163aae3d8e5b9 ("ARM: dts: r8a7792: initial SoC device tree") -Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -(cherry picked from commit a0504f0880c11da301dc2b5a5135bd02376e367e) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - arch/arm/boot/dts/r8a7792.dtsi | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/arch/arm/boot/dts/r8a7792.dtsi -+++ b/arch/arm/boot/dts/r8a7792.dtsi -@@ -60,9 +60,8 @@ - next-level-cache = <&L2_CA15>; - }; - -- L2_CA15: cache-controller@0 { -+ L2_CA15: cache-controller-0 { - compatible = "cache"; -- reg = <0>; - cache-unified; - cache-level = <2>; - power-domains = <&sysc R8A7792_PD_CA15_SCU>; diff --git a/patches.renesas/0061-ARM-dts-r8a7793-Remove-unit-address-and-reg-from-int.patch b/patches.renesas/0061-ARM-dts-r8a7793-Remove-unit-address-and-reg-from-int.patch deleted file mode 100644 index 6f9810d9cb9af..0000000000000 --- a/patches.renesas/0061-ARM-dts-r8a7793-Remove-unit-address-and-reg-from-int.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 30af71d9a050783fde91edae2ac024bc29846bdf Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven <geert+renesas@glider.be> -Date: Mon, 6 Mar 2017 17:40:42 +0100 -Subject: [PATCH 061/286] ARM: dts: r8a7793: Remove unit-address and reg from - integrated cache - -The Cortex-A15 cache controller is an integrated controller, and thus -the device node representing it should not have a unit-addresses or reg -property. - -Fixes: ad53f5f00b095a0d ("ARM: dts: r8a7793: Fix W=1 dtc warnings") -Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -(cherry picked from commit beffa8872a3680ef804eb0320ec77037170f4686) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - arch/arm/boot/dts/r8a7793.dtsi | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/arch/arm/boot/dts/r8a7793.dtsi -+++ b/arch/arm/boot/dts/r8a7793.dtsi -@@ -65,9 +65,8 @@ - power-domains = <&sysc R8A7793_PD_CA15_CPU1>; - }; - -- L2_CA15: cache-controller@0 { -+ L2_CA15: cache-controller-0 { - compatible = "cache"; -- reg = <0>; - power-domains = <&sysc R8A7793_PD_CA15_SCU>; - cache-unified; - cache-level = <2>; diff --git a/patches.renesas/0061-ASoC-rsnd-amend-.probe-.remove-call-for-DPCM.patch b/patches.renesas/0061-ASoC-rsnd-amend-.probe-.remove-call-for-DPCM.patch index ee30e5d69b5ae..09aa73a51f3eb 100644 --- a/patches.renesas/0061-ASoC-rsnd-amend-.probe-.remove-call-for-DPCM.patch +++ b/patches.renesas/0061-ASoC-rsnd-amend-.probe-.remove-call-for-DPCM.patch @@ -113,8 +113,8 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> #define __rsnd_mod_call_start 0 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -703,7 +703,10 @@ static int rsnd_ssi_dma_remove(struct rs - int irq = ssi->irq; +@@ -724,7 +724,10 @@ static int rsnd_ssi_dma_remove(struct rs + return 0; /* PIO will request IRQ again */ - devm_free_irq(dev, irq, mod); diff --git a/patches.renesas/0062-ARM-dts-r8a7794-Remove-unit-address-and-reg-from-int.patch b/patches.renesas/0062-ARM-dts-r8a7794-Remove-unit-address-and-reg-from-int.patch deleted file mode 100644 index d578f448a7a7c..0000000000000 --- a/patches.renesas/0062-ARM-dts-r8a7794-Remove-unit-address-and-reg-from-int.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 768259cf227690716d59217c9237b3b788212d86 Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven <geert+renesas@glider.be> -Date: Mon, 6 Mar 2017 17:40:43 +0100 -Subject: [PATCH 062/286] ARM: dts: r8a7794: Remove unit-address and reg from - integrated cache - -The Cortex-A7 cache controller is an integrated controller, and thus the -device node representing it should not have a unit-addresses or reg -property. - -Fixes: 34ea4b4a827b4ee7 ("ARM: dts: r8a7794: Fix W=1 dtc warnings") -Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -(cherry picked from commit 65d0b7ed40f8a3a41a0ac5ed5ca4d1874c6aaf2d) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - arch/arm/boot/dts/r8a7794.dtsi | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- a/arch/arm/boot/dts/r8a7794.dtsi -+++ b/arch/arm/boot/dts/r8a7794.dtsi -@@ -56,9 +56,8 @@ - next-level-cache = <&L2_CA7>; - }; - -- L2_CA7: cache-controller@0 { -+ L2_CA7: cache-controller-0 { - compatible = "cache"; -- reg = <0>; - power-domains = <&sysc R8A7794_PD_CA7_SCU>; - cache-unified; - cache-level = <2>; diff --git a/patches.renesas/0063-ARM-dts-r8a7790-Tidyup-Audio-DMAC-channel-for-DVC.patch b/patches.renesas/0063-ARM-dts-r8a7790-Tidyup-Audio-DMAC-channel-for-DVC.patch index bf0908ffc0b3d..f213cd5299005 100644 --- a/patches.renesas/0063-ARM-dts-r8a7790-Tidyup-Audio-DMAC-channel-for-DVC.patch +++ b/patches.renesas/0063-ARM-dts-r8a7790-Tidyup-Audio-DMAC-channel-for-DVC.patch @@ -38,7 +38,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi -@@ -1738,11 +1738,11 @@ +@@ -1741,11 +1741,11 @@ rcar_sound,dvc { dvc0: dvc-0 { diff --git a/patches.renesas/0066-ASoC-rsnd-remove-non-DT-support-for-DMA.patch b/patches.renesas/0066-ASoC-rsnd-remove-non-DT-support-for-DMA.patch index f06e9a4588484..12ad95a1093ca 100644 --- a/patches.renesas/0066-ASoC-rsnd-remove-non-DT-support-for-DMA.patch +++ b/patches.renesas/0066-ASoC-rsnd-remove-non-DT-support-for-DMA.patch @@ -108,7 +108,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -674,7 +674,6 @@ static int rsnd_ssi_dma_probe(struct rsn +@@ -690,7 +690,6 @@ static int rsnd_ssi_dma_probe(struct rsn struct rsnd_priv *priv) { struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); @@ -116,7 +116,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> int ret; /* -@@ -689,7 +688,7 @@ static int rsnd_ssi_dma_probe(struct rsn +@@ -705,7 +704,7 @@ static int rsnd_ssi_dma_probe(struct rsn return ret; /* SSI probe might be called many times in MUX multi path */ diff --git a/patches.renesas/0067-ASoC-rsnd-don-t-use-devm_request_irq-for-SSI.patch b/patches.renesas/0067-ASoC-rsnd-don-t-use-devm_request_irq-for-SSI.patch index aab7765f484f2..828bd6348226c 100644 --- a/patches.renesas/0067-ASoC-rsnd-don-t-use-devm_request_irq-for-SSI.patch +++ b/patches.renesas/0067-ASoC-rsnd-don-t-use-devm_request_irq-for-SSI.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -649,10 +649,14 @@ static int rsnd_ssi_common_probe(struct +@@ -665,10 +665,14 @@ static int rsnd_ssi_common_probe(struct if (ret < 0) return ret; @@ -37,13 +37,17 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return ret; } -@@ -698,12 +702,9 @@ static int rsnd_ssi_dma_remove(struct rs - struct rsnd_priv *priv) +@@ -715,16 +719,13 @@ static int rsnd_ssi_dma_remove(struct rs { struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); + struct rsnd_mod *pure_ssi_mod = rsnd_io_to_mod_ssi(io); - struct device *dev = rsnd_priv_to_dev(priv); - int irq = ssi->irq; + /* Do nothing if non SSI (= SSI parent, multi SSI) mod */ + if (pure_ssi_mod != mod) + return 0; + /* PIO will request IRQ again */ - if (ssi->dma) - devm_free_irq(dev, irq, mod); diff --git a/patches.renesas/0068-ASoC-rsnd-remove-rsnd_dma_detach.patch b/patches.renesas/0068-ASoC-rsnd-remove-rsnd_dma_detach.patch index 8a0c319a11971..b0ffcfb4ee7c9 100644 --- a/patches.renesas/0068-ASoC-rsnd-remove-rsnd_dma_detach.patch +++ b/patches.renesas/0068-ASoC-rsnd-remove-rsnd_dma_detach.patch @@ -49,7 +49,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct rsnd_mod *mod, char *name); --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -706,8 +706,6 @@ static int rsnd_ssi_dma_remove(struct rs +@@ -727,8 +727,6 @@ static int rsnd_ssi_dma_remove(struct rs /* PIO will request IRQ again */ free_irq(ssi->irq, mod); diff --git a/patches.renesas/0070-ARM-dts-r8a7791-Tidyup-Audio-DMAC-channel-for-DVC.patch b/patches.renesas/0070-ARM-dts-r8a7791-Tidyup-Audio-DMAC-channel-for-DVC.patch index 52d1ddf7b6192..9ba770bfcabe6 100644 --- a/patches.renesas/0070-ARM-dts-r8a7791-Tidyup-Audio-DMAC-channel-for-DVC.patch +++ b/patches.renesas/0070-ARM-dts-r8a7791-Tidyup-Audio-DMAC-channel-for-DVC.patch @@ -38,7 +38,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi -@@ -1779,11 +1779,11 @@ +@@ -1782,11 +1782,11 @@ rcar_sound,dvc { dvc0: dvc-0 { diff --git a/patches.renesas/0070-ARM-dts-r8a7791-Use-renesas-rcar-gen2-usb-phy-fallba.patch b/patches.renesas/0070-ARM-dts-r8a7791-Use-renesas-rcar-gen2-usb-phy-fallba.patch index 6d1664b6e803a..a15f14557c4ad 100644 --- a/patches.renesas/0070-ARM-dts-r8a7791-Use-renesas-rcar-gen2-usb-phy-fallba.patch +++ b/patches.renesas/0070-ARM-dts-r8a7791-Use-renesas-rcar-gen2-usb-phy-fallba.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi -@@ -934,7 +934,8 @@ +@@ -933,7 +933,8 @@ }; usbphy: usb-phy@e6590100 { diff --git a/patches.renesas/0071-ARM-dts-r8a7793-Tidyup-Audio-DMAC-channel-for-DVC.patch b/patches.renesas/0071-ARM-dts-r8a7793-Tidyup-Audio-DMAC-channel-for-DVC.patch index 7b3132a64fc98..e560af5d46fa0 100644 --- a/patches.renesas/0071-ARM-dts-r8a7793-Tidyup-Audio-DMAC-channel-for-DVC.patch +++ b/patches.renesas/0071-ARM-dts-r8a7793-Tidyup-Audio-DMAC-channel-for-DVC.patch @@ -38,7 +38,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi -@@ -1425,11 +1425,11 @@ +@@ -1428,11 +1428,11 @@ rcar_sound,dvc { dvc0: dvc-0 { diff --git a/patches.renesas/0071-ARM-dts-r8a7794-Use-renesas-rcar-gen2-usb-phy-fallba.patch b/patches.renesas/0071-ARM-dts-r8a7794-Use-renesas-rcar-gen2-usb-phy-fallba.patch index e14890f42f343..123539f0467e7 100644 --- a/patches.renesas/0071-ARM-dts-r8a7794-Use-renesas-rcar-gen2-usb-phy-fallba.patch +++ b/patches.renesas/0071-ARM-dts-r8a7794-Use-renesas-rcar-gen2-usb-phy-fallba.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi -@@ -878,7 +878,8 @@ +@@ -877,7 +877,8 @@ }; usbphy: usb-phy@e6590100 { diff --git a/patches.renesas/0075-ARM-dts-r8a7791-Use-R-Car-Gen-2-fallback-binding-for.patch b/patches.renesas/0075-ARM-dts-r8a7791-Use-R-Car-Gen-2-fallback-binding-for.patch index 0e1a6293531c1..5c6896c27e5c4 100644 --- a/patches.renesas/0075-ARM-dts-r8a7791-Use-R-Car-Gen-2-fallback-binding-for.patch +++ b/patches.renesas/0075-ARM-dts-r8a7791-Use-R-Car-Gen-2-fallback-binding-for.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi -@@ -444,7 +444,7 @@ +@@ -443,7 +443,7 @@ i2c0: i2c@e6508000 { #address-cells = <1>; #size-cells = <0>; @@ -30,7 +30,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6508000 0 0x40>; interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7791_CLK_I2C0>; -@@ -456,7 +456,7 @@ +@@ -455,7 +455,7 @@ i2c1: i2c@e6518000 { #address-cells = <1>; #size-cells = <0>; @@ -39,7 +39,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6518000 0 0x40>; interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7791_CLK_I2C1>; -@@ -468,7 +468,7 @@ +@@ -467,7 +467,7 @@ i2c2: i2c@e6530000 { #address-cells = <1>; #size-cells = <0>; @@ -48,7 +48,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6530000 0 0x40>; interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7791_CLK_I2C2>; -@@ -480,7 +480,7 @@ +@@ -479,7 +479,7 @@ i2c3: i2c@e6540000 { #address-cells = <1>; #size-cells = <0>; @@ -57,7 +57,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6540000 0 0x40>; interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7791_CLK_I2C3>; -@@ -492,7 +492,7 @@ +@@ -491,7 +491,7 @@ i2c4: i2c@e6520000 { #address-cells = <1>; #size-cells = <0>; @@ -66,7 +66,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6520000 0 0x40>; interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7791_CLK_I2C4>; -@@ -505,7 +505,7 @@ +@@ -504,7 +504,7 @@ /* doesn't need pinmux */ #address-cells = <1>; #size-cells = <0>; diff --git a/patches.renesas/0076-ARM-dts-r8a7792-Use-R-Car-Gen-2-fallback-binding-for.patch b/patches.renesas/0076-ARM-dts-r8a7792-Use-R-Car-Gen-2-fallback-binding-for.patch index cc7d3965219ea..a6b9127876325 100644 --- a/patches.renesas/0076-ARM-dts-r8a7792-Use-R-Car-Gen-2-fallback-binding-for.patch +++ b/patches.renesas/0076-ARM-dts-r8a7792-Use-R-Car-Gen-2-fallback-binding-for.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7792.dtsi +++ b/arch/arm/boot/dts/r8a7792.dtsi -@@ -498,7 +498,8 @@ +@@ -497,7 +497,8 @@ /* I2C doesn't need pinmux */ i2c0: i2c@e6508000 { @@ -31,7 +31,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6508000 0 0x40>; interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7792_CLK_I2C0>; -@@ -510,7 +511,8 @@ +@@ -509,7 +510,8 @@ }; i2c1: i2c@e6518000 { @@ -41,7 +41,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6518000 0 0x40>; interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7792_CLK_I2C1>; -@@ -522,7 +524,8 @@ +@@ -521,7 +523,8 @@ }; i2c2: i2c@e6530000 { @@ -51,7 +51,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6530000 0 0x40>; interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7792_CLK_I2C2>; -@@ -534,7 +537,8 @@ +@@ -533,7 +536,8 @@ }; i2c3: i2c@e6540000 { @@ -61,7 +61,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6540000 0 0x40>; interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7792_CLK_I2C3>; -@@ -546,7 +550,8 @@ +@@ -545,7 +549,8 @@ }; i2c4: i2c@e6520000 { @@ -71,7 +71,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6520000 0 0x40>; interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7792_CLK_I2C4>; -@@ -558,7 +563,8 @@ +@@ -557,7 +562,8 @@ }; i2c5: i2c@e6528000 { diff --git a/patches.renesas/0077-ARM-dts-r8a7793-Use-R-Car-Gen-2-fallback-binding-for.patch b/patches.renesas/0077-ARM-dts-r8a7793-Use-R-Car-Gen-2-fallback-binding-for.patch index b9ce92d250d08..c219e39ba9aad 100644 --- a/patches.renesas/0077-ARM-dts-r8a7793-Use-R-Car-Gen-2-fallback-binding-for.patch +++ b/patches.renesas/0077-ARM-dts-r8a7793-Use-R-Car-Gen-2-fallback-binding-for.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi -@@ -411,7 +411,7 @@ +@@ -410,7 +410,7 @@ i2c0: i2c@e6508000 { #address-cells = <1>; #size-cells = <0>; @@ -30,7 +30,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6508000 0 0x40>; interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7793_CLK_I2C0>; -@@ -423,7 +423,7 @@ +@@ -422,7 +422,7 @@ i2c1: i2c@e6518000 { #address-cells = <1>; #size-cells = <0>; @@ -39,7 +39,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6518000 0 0x40>; interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7793_CLK_I2C1>; -@@ -435,7 +435,7 @@ +@@ -434,7 +434,7 @@ i2c2: i2c@e6530000 { #address-cells = <1>; #size-cells = <0>; @@ -48,7 +48,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6530000 0 0x40>; interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7793_CLK_I2C2>; -@@ -447,7 +447,7 @@ +@@ -446,7 +446,7 @@ i2c3: i2c@e6540000 { #address-cells = <1>; #size-cells = <0>; @@ -57,7 +57,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6540000 0 0x40>; interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7793_CLK_I2C3>; -@@ -459,7 +459,7 @@ +@@ -458,7 +458,7 @@ i2c4: i2c@e6520000 { #address-cells = <1>; #size-cells = <0>; @@ -66,7 +66,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6520000 0 0x40>; interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7793_CLK_I2C4>; -@@ -472,7 +472,7 @@ +@@ -471,7 +471,7 @@ /* doesn't need pinmux */ #address-cells = <1>; #size-cells = <0>; diff --git a/patches.renesas/0078-ARM-dts-r8a7794-Use-R-Car-Gen-2-fallback-binding-for.patch b/patches.renesas/0078-ARM-dts-r8a7794-Use-R-Car-Gen-2-fallback-binding-for.patch index 1b2e1bfaeb7bf..8b3cdcb7e72e7 100644 --- a/patches.renesas/0078-ARM-dts-r8a7794-Use-R-Car-Gen-2-fallback-binding-for.patch +++ b/patches.renesas/0078-ARM-dts-r8a7794-Use-R-Car-Gen-2-fallback-binding-for.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi -@@ -611,7 +611,7 @@ +@@ -610,7 +610,7 @@ /* The memory map in the User's Manual maps the cores to bus numbers */ i2c0: i2c@e6508000 { @@ -30,7 +30,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6508000 0 0x40>; interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7794_CLK_I2C0>; -@@ -623,7 +623,7 @@ +@@ -622,7 +622,7 @@ }; i2c1: i2c@e6518000 { @@ -39,7 +39,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6518000 0 0x40>; interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7794_CLK_I2C1>; -@@ -635,7 +635,7 @@ +@@ -634,7 +634,7 @@ }; i2c2: i2c@e6530000 { @@ -48,7 +48,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6530000 0 0x40>; interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7794_CLK_I2C2>; -@@ -647,7 +647,7 @@ +@@ -646,7 +646,7 @@ }; i2c3: i2c@e6540000 { @@ -57,7 +57,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6540000 0 0x40>; interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7794_CLK_I2C3>; -@@ -659,7 +659,7 @@ +@@ -658,7 +658,7 @@ }; i2c4: i2c@e6520000 { @@ -66,7 +66,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6520000 0 0x40>; interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7794_CLK_I2C4>; -@@ -671,7 +671,7 @@ +@@ -670,7 +670,7 @@ }; i2c5: i2c@e6528000 { diff --git a/patches.renesas/0080-ARM-dts-r8a7791-Use-R-Car-Gen-2-fallback-binding-for.patch b/patches.renesas/0080-ARM-dts-r8a7791-Use-R-Car-Gen-2-fallback-binding-for.patch index 71b64c2e655f8..031d08a911c72 100644 --- a/patches.renesas/0080-ARM-dts-r8a7791-Use-R-Car-Gen-2-fallback-binding-for.patch +++ b/patches.renesas/0080-ARM-dts-r8a7791-Use-R-Car-Gen-2-fallback-binding-for.patch @@ -22,7 +22,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi -@@ -518,7 +518,8 @@ +@@ -517,7 +517,8 @@ /* doesn't need pinmux */ #address-cells = <1>; #size-cells = <0>; @@ -32,7 +32,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe60b0000 0 0x425>; interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7791_CLK_IICDVFS>; -@@ -532,7 +533,8 @@ +@@ -531,7 +532,8 @@ i2c7: i2c@e6500000 { #address-cells = <1>; #size-cells = <0>; @@ -42,7 +42,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6500000 0 0x425>; interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7791_CLK_IIC0>; -@@ -546,7 +548,8 @@ +@@ -545,7 +547,8 @@ i2c8: i2c@e6510000 { #address-cells = <1>; #size-cells = <0>; diff --git a/patches.renesas/0080-ASoC-rsnd-tidyup-ssi-usrcnt-counter-check-in-hw_para.patch b/patches.renesas/0080-ASoC-rsnd-tidyup-ssi-usrcnt-counter-check-in-hw_para.patch index afa9e11f2832f..795848f71b68c 100644 --- a/patches.renesas/0080-ASoC-rsnd-tidyup-ssi-usrcnt-counter-check-in-hw_para.patch +++ b/patches.renesas/0080-ASoC-rsnd-tidyup-ssi-usrcnt-counter-check-in-hw_para.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -422,11 +422,14 @@ static int rsnd_ssi_hw_params(struct rsn +@@ -431,11 +431,14 @@ static int rsnd_ssi_hw_params(struct rsn int chan = params_channels(params); /* diff --git a/patches.renesas/0081-ARM-dts-r8a7793-Use-R-Car-Gen-2-fallback-binding-for.patch b/patches.renesas/0081-ARM-dts-r8a7793-Use-R-Car-Gen-2-fallback-binding-for.patch index 2dabae41bb610..a36a93e8b4946 100644 --- a/patches.renesas/0081-ARM-dts-r8a7793-Use-R-Car-Gen-2-fallback-binding-for.patch +++ b/patches.renesas/0081-ARM-dts-r8a7793-Use-R-Car-Gen-2-fallback-binding-for.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi -@@ -485,7 +485,8 @@ +@@ -484,7 +484,8 @@ /* doesn't need pinmux */ #address-cells = <1>; #size-cells = <0>; @@ -31,7 +31,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe60b0000 0 0x425>; interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp9_clks R8A7793_CLK_IICDVFS>; -@@ -499,7 +500,8 @@ +@@ -498,7 +499,8 @@ i2c7: i2c@e6500000 { #address-cells = <1>; #size-cells = <0>; @@ -41,7 +41,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6500000 0 0x425>; interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7793_CLK_IIC0>; -@@ -513,7 +515,8 @@ +@@ -512,7 +514,8 @@ i2c8: i2c@e6510000 { #address-cells = <1>; #size-cells = <0>; diff --git a/patches.renesas/0082-ARM-dts-r8a7794-Use-R-Car-Gen-2-fallback-binding-for.patch b/patches.renesas/0082-ARM-dts-r8a7794-Use-R-Car-Gen-2-fallback-binding-for.patch index 5fd47efb9487f..bc845a34a8b49 100644 --- a/patches.renesas/0082-ARM-dts-r8a7794-Use-R-Car-Gen-2-fallback-binding-for.patch +++ b/patches.renesas/0082-ARM-dts-r8a7794-Use-R-Car-Gen-2-fallback-binding-for.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi -@@ -683,7 +683,8 @@ +@@ -682,7 +682,8 @@ }; i2c6: i2c@e6500000 { @@ -31,7 +31,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6500000 0 0x425>; interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7794_CLK_IIC0>; -@@ -697,7 +698,8 @@ +@@ -696,7 +697,8 @@ }; i2c7: i2c@e6510000 { diff --git a/patches.renesas/0083-ARM-dts-r8a7791-Use-R-Car-Gen-2-fallback-binding-for.patch b/patches.renesas/0083-ARM-dts-r8a7791-Use-R-Car-Gen-2-fallback-binding-for.patch index 0bf6874d8b226..26c6879af5548 100644 --- a/patches.renesas/0083-ARM-dts-r8a7791-Use-R-Car-Gen-2-fallback-binding-for.patch +++ b/patches.renesas/0083-ARM-dts-r8a7791-Use-R-Car-Gen-2-fallback-binding-for.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi -@@ -1521,7 +1521,8 @@ +@@ -1523,7 +1523,8 @@ }; msiof0: spi@e6e20000 { @@ -31,7 +31,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6e20000 0 0x0064>; interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>; -@@ -1535,7 +1536,8 @@ +@@ -1537,7 +1538,8 @@ }; msiof1: spi@e6e10000 { @@ -41,7 +41,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6e10000 0 0x0064>; interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks R8A7791_CLK_MSIOF1>; -@@ -1549,7 +1551,8 @@ +@@ -1551,7 +1553,8 @@ }; msiof2: spi@e6e00000 { diff --git a/patches.renesas/0084-ARM-dts-r8a7792-Use-R-Car-Gen-2-fallback-binding-for.patch b/patches.renesas/0084-ARM-dts-r8a7792-Use-R-Car-Gen-2-fallback-binding-for.patch index 39dfd86e12eb5..31feaa782eb24 100644 --- a/patches.renesas/0084-ARM-dts-r8a7792-Use-R-Car-Gen-2-fallback-binding-for.patch +++ b/patches.renesas/0084-ARM-dts-r8a7792-Use-R-Car-Gen-2-fallback-binding-for.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7792.dtsi +++ b/arch/arm/boot/dts/r8a7792.dtsi -@@ -591,7 +591,8 @@ +@@ -590,7 +590,8 @@ }; msiof0: spi@e6e20000 { @@ -31,7 +31,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> reg = <0 0xe6e20000 0 0x0064>; interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp0_clks R8A7792_CLK_MSIOF0>; -@@ -605,7 +606,8 @@ +@@ -604,7 +605,8 @@ }; msiof1: spi@e6e10000 { diff --git a/patches.renesas/0092-ASoC-rcar-ssi-don-t-set-SSICR.CKDV-000-with-SSIWSR.C.patch b/patches.renesas/0092-ASoC-rcar-ssi-don-t-set-SSICR.CKDV-000-with-SSIWSR.C.patch index 5dc5d22482309..3ba05b1b5b145 100644 --- a/patches.renesas/0092-ASoC-rcar-ssi-don-t-set-SSICR.CKDV-000-with-SSIWSR.C.patch +++ b/patches.renesas/0092-ASoC-rcar-ssi-don-t-set-SSICR.CKDV-000-with-SSIWSR.C.patch @@ -21,8 +21,8 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -233,6 +233,15 @@ static int rsnd_ssi_master_clk_start(str - for (j = 0; j < ARRAY_SIZE(ssi_clk_mul_table); j++) { +@@ -242,6 +242,15 @@ static int rsnd_ssi_master_clk_start(str + continue; /* + * It will set SSIWSR.CONT here, but SSICR.CKDV = 000 diff --git a/patches.renesas/0098-ARM-DTS-Fix-register-map-for-virt-capable-GIC.patch b/patches.renesas/0098-ARM-DTS-Fix-register-map-for-virt-capable-GIC.patch index d68d481c077f3..b966bc39c5cd8 100644 --- a/patches.renesas/0098-ARM-DTS-Fix-register-map-for-virt-capable-GIC.patch +++ b/patches.renesas/0098-ARM-DTS-Fix-register-map-for-virt-capable-GIC.patch @@ -353,7 +353,7 @@ Conflicts: interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi -@@ -114,7 +114,7 @@ +@@ -113,7 +113,7 @@ #address-cells = <0>; interrupt-controller; reg = <0 0xf1001000 0 0x1000>, @@ -364,7 +364,7 @@ Conflicts: interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>; --- a/arch/arm/boot/dts/r8a7792.dtsi +++ b/arch/arm/boot/dts/r8a7792.dtsi -@@ -88,7 +88,7 @@ +@@ -87,7 +87,7 @@ #interrupt-cells = <3>; interrupt-controller; reg = <0 0xf1001000 0 0x1000>, @@ -375,7 +375,7 @@ Conflicts: interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi -@@ -105,7 +105,7 @@ +@@ -104,7 +104,7 @@ #address-cells = <0>; interrupt-controller; reg = <0 0xf1001000 0 0x1000>, @@ -386,7 +386,7 @@ Conflicts: interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>; --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi -@@ -71,7 +71,7 @@ +@@ -70,7 +70,7 @@ #address-cells = <0>; interrupt-controller; reg = <0 0xf1001000 0 0x1000>, diff --git a/patches.renesas/0102-ASoC-rsnd-don-t-use-PDTA-bit-for-24bit-on-SSI.patch b/patches.renesas/0102-ASoC-rsnd-don-t-use-PDTA-bit-for-24bit-on-SSI.patch index 61c9a534d15dc..59998475bf64e 100644 --- a/patches.renesas/0102-ASoC-rsnd-don-t-use-PDTA-bit-for-24bit-on-SSI.patch +++ b/patches.renesas/0102-ASoC-rsnd-don-t-use-PDTA-bit-for-24bit-on-SSI.patch @@ -28,7 +28,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/sh/rcar/cmd.c +++ b/sound/soc/sh/rcar/cmd.c -@@ -89,6 +89,7 @@ static int rsnd_cmd_init(struct rsnd_mod +@@ -92,6 +92,7 @@ static int rsnd_cmd_init(struct rsnd_mod dev_dbg(dev, "ctu/mix path = 0x%08x", data); rsnd_mod_write(mod, CMD_ROUTE_SLCT, data); @@ -166,7 +166,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> rsnd_adg_set_src_timesel_gen2(mod, io, fin, fout); --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -307,7 +307,7 @@ static void rsnd_ssi_config_init(struct +@@ -316,7 +316,7 @@ static void rsnd_ssi_config_init(struct * always use 32bit system word. * see also rsnd_ssi_master_clk_enable() */ diff --git a/patches.renesas/0103-ASoC-rsnd-don-t-call-free_irq-on-Parent-SSI.patch b/patches.renesas/0103-ASoC-rsnd-don-t-call-free_irq-on-Parent-SSI.patch index 5ce2a0862eee3..bbc1d1973be03 100644 --- a/patches.renesas/0103-ASoC-rsnd-don-t-call-free_irq-on-Parent-SSI.patch +++ b/patches.renesas/0103-ASoC-rsnd-don-t-call-free_irq-on-Parent-SSI.patch @@ -21,8 +21,8 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c -@@ -714,6 +714,11 @@ static int rsnd_ssi_dma_remove(struct rs - struct rsnd_priv *priv) +@@ -872,6 +872,11 @@ struct rsnd_mod *rsnd_ssi_mod_get(struct + int __rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod) { struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); + struct rsnd_mod *ssi_parent_mod = rsnd_io_to_mod_ssip(io); @@ -31,5 +31,5 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> + if (ssi_parent_mod == mod) + return 0; - /* PIO will request IRQ again */ - free_irq(ssi->irq, mod); + return !!(rsnd_ssi_mode_flags(ssi) & RSND_SSI_CLK_PIN_SHARE); + } diff --git a/patches.renesas/0104-ASoC-rsnd-SSI-PIO-adjust-to-24bit-mode.patch b/patches.renesas/0104-ASoC-rsnd-SSI-PIO-adjust-to-24bit-mode.patch deleted file mode 100644 index e956c0e5fdb2a..0000000000000 --- a/patches.renesas/0104-ASoC-rsnd-SSI-PIO-adjust-to-24bit-mode.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4432f39584367123bd0643e0f09d13f0c6653d01 Mon Sep 17 00:00:00 2001 -From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Date: Wed, 24 May 2017 01:17:10 +0000 -Subject: [PATCH 104/286] ASoC: rsnd: SSI PIO adjust to 24bit mode - -commit 90431eb49bff ("ASoC: rsnd: don't use PDTA bit for 24bit on SSI") -fixups 24bit mode data alignment, but PIO was not cared. -This patch fixes PIO mode 24bit data alignment - -Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Signed-off-by: Mark Brown <broonie@kernel.org> -(cherry picked from commit 7819a942de7b993771bd9377babc80485fe7606b) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - sound/soc/sh/rcar/ssi.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - ---- a/sound/soc/sh/rcar/ssi.c -+++ b/sound/soc/sh/rcar/ssi.c -@@ -555,6 +555,13 @@ static void __rsnd_ssi_interrupt(struct - struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); - u32 *buf = (u32 *)(runtime->dma_area + - rsnd_dai_pointer_offset(io, 0)); -+ int shift = 0; -+ -+ switch (runtime->sample_bits) { -+ case 32: -+ shift = 8; -+ break; -+ } - - /* - * 8/16/32 data can be assesse to TDR/RDR register -@@ -562,9 +569,9 @@ static void __rsnd_ssi_interrupt(struct - * see rsnd_ssi_init() - */ - if (rsnd_io_is_play(io)) -- rsnd_mod_write(mod, SSITDR, *buf); -+ rsnd_mod_write(mod, SSITDR, (*buf) << shift); - else -- *buf = rsnd_mod_read(mod, SSIRDR); -+ *buf = (rsnd_mod_read(mod, SSIRDR) >> shift); - - elapsed = rsnd_dai_pointer_update(io, sizeof(*buf)); - } diff --git a/patches.renesas/0104-serial-sh-sci-Fix-deadlock-caused-by-serial-output-r.patch b/patches.renesas/0104-serial-sh-sci-Fix-deadlock-caused-by-serial-output-r.patch index f4fa2880f12a3..e7dea942e4e00 100644 --- a/patches.renesas/0104-serial-sh-sci-Fix-deadlock-caused-by-serial-output-r.patch +++ b/patches.renesas/0104-serial-sh-sci-Fix-deadlock-caused-by-serial-output-r.patch @@ -22,7 +22,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -1141,11 +1141,8 @@ static int sci_dma_rx_push(struct sci_po +@@ -1143,11 +1143,8 @@ static int sci_dma_rx_push(struct sci_po int copied; copied = tty_insert_flip_string(tport, buf, count); @@ -35,7 +35,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> port->icount.rx += copied; -@@ -1160,8 +1157,6 @@ static int sci_dma_rx_find_active(struct +@@ -1162,8 +1159,6 @@ static int sci_dma_rx_find_active(struct if (s->active_rx == s->cookie_rx[i]) return i; @@ -44,7 +44,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return -1; } -@@ -1222,9 +1217,9 @@ static void sci_dma_rx_complete(void *ar +@@ -1224,9 +1219,9 @@ static void sci_dma_rx_complete(void *ar dma_async_issue_pending(chan); @@ -55,7 +55,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return; fail: -@@ -1272,8 +1267,6 @@ static void sci_submit_rx(struct sci_por +@@ -1274,8 +1269,6 @@ static void sci_submit_rx(struct sci_por if (dma_submit_error(s->cookie_rx[i])) goto fail; @@ -64,7 +64,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } s->active_rx = s->cookie_rx[0]; -@@ -1287,7 +1280,6 @@ fail: +@@ -1289,7 +1282,6 @@ fail: for (i = 0; i < 2; i++) s->cookie_rx[i] = -EINVAL; s->active_rx = -EINVAL; @@ -72,7 +72,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> sci_rx_dma_release(s, true); } -@@ -1357,10 +1349,10 @@ static void rx_timer_fn(unsigned long ar +@@ -1359,10 +1351,10 @@ static void rx_timer_fn(unsigned long ar int active, count; u16 scr; @@ -85,7 +85,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> active = sci_dma_rx_find_active(s); if (active < 0) { spin_unlock_irqrestore(&port->lock, flags); -@@ -1369,9 +1361,9 @@ static void rx_timer_fn(unsigned long ar +@@ -1371,9 +1363,9 @@ static void rx_timer_fn(unsigned long ar status = dmaengine_tx_status(s->chan_rx, s->active_rx, &state); if (status == DMA_COMPLETE) { @@ -96,7 +96,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* Let packet complete handler take care of the packet */ return; -@@ -1395,8 +1387,6 @@ static void rx_timer_fn(unsigned long ar +@@ -1397,8 +1389,6 @@ static void rx_timer_fn(unsigned long ar /* Handle incomplete DMA receive */ dmaengine_terminate_all(s->chan_rx); read = sg_dma_len(&s->sg_rx[active]) - state.residue; diff --git a/patches.renesas/0105-ASoC-constify-snd_soc_ops-structures.patch b/patches.renesas/0105-ASoC-constify-snd_soc_ops-structures.patch index 19d19b6bf6ddf..a0d3d17b06ad0 100644 --- a/patches.renesas/0105-ASoC-constify-snd_soc_ops-structures.patch +++ b/patches.renesas/0105-ASoC-constify-snd_soc_ops-structures.patch @@ -258,7 +258,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c -@@ -287,11 +287,11 @@ static int cht_aif1_startup(struct snd_p +@@ -294,11 +294,11 @@ static int cht_aif1_startup(struct snd_p SNDRV_PCM_HW_PARAM_RATE, 48000); } diff --git a/patches.renesas/0111-media-v4l-vsp1-Fix-module-autoload-for-OF-registrati.patch b/patches.renesas/0111-media-v4l-vsp1-Fix-module-autoload-for-OF-registrati.patch index 889243fb315f2..cba5b47054ff6 100644 --- a/patches.renesas/0111-media-v4l-vsp1-Fix-module-autoload-for-OF-registrati.patch +++ b/patches.renesas/0111-media-v4l-vsp1-Fix-module-autoload-for-OF-registrati.patch @@ -36,7 +36,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/media/platform/vsp1/vsp1_drv.c +++ b/drivers/media/platform/vsp1/vsp1_drv.c -@@ -770,6 +770,7 @@ static const struct of_device_id vsp1_of +@@ -782,6 +782,7 @@ static const struct of_device_id vsp1_of { .compatible = "renesas,vsp2" }, { }, }; diff --git a/patches.renesas/0112-sh_eth-Use-platform-device-for-printing-before-regis.patch b/patches.renesas/0112-sh_eth-Use-platform-device-for-printing-before-regis.patch deleted file mode 100644 index f1c99dc9b1642..0000000000000 --- a/patches.renesas/0112-sh_eth-Use-platform-device-for-printing-before-regis.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8b4fd81780bf8efb3940864f1cdb1b10313ba293 Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven <geert+renesas@glider.be> -Date: Thu, 18 May 2017 15:01:34 +0200 -Subject: [PATCH 112/286] sh_eth: Use platform device for printing before - register_netdev() - -The MDIO initialization failure message is printed using the network -device, before it has been registered, leading to: - - (null): failed to initialise MDIO - -Use the platform device instead to fix this: - - sh-eth ee700000.ethernet: failed to initialise MDIO - -Fixes: daacf03f0bbfefee ("sh_eth: Register MDIO bus before registering the network device") -Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> -Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> -Signed-off-by: David S. Miller <davem@davemloft.net> -(cherry picked from commit 5f5c5449acad0cd3322e53e1ac68c044483b0aa5) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/net/ethernet/renesas/sh_eth.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/ethernet/renesas/sh_eth.c -+++ b/drivers/net/ethernet/renesas/sh_eth.c -@@ -3222,7 +3222,7 @@ static int sh_eth_drv_probe(struct platf - /* MDIO bus init */ - ret = sh_mdio_init(mdp, pd); - if (ret) { -- dev_err(&ndev->dev, "failed to initialise MDIO\n"); -+ dev_err(&pdev->dev, "failed to initialise MDIO\n"); - goto out_release; - } - diff --git a/patches.renesas/0113-sh_eth-Do-not-print-an-error-message-for-probe-defer.patch b/patches.renesas/0113-sh_eth-Do-not-print-an-error-message-for-probe-defer.patch index 09fd689c67773..7d5adb72b307d 100644 --- a/patches.renesas/0113-sh_eth-Do-not-print-an-error-message-for-probe-defer.patch +++ b/patches.renesas/0113-sh_eth-Do-not-print-an-error-message-for-probe-defer.patch @@ -24,7 +24,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c -@@ -3222,7 +3222,8 @@ static int sh_eth_drv_probe(struct platf +@@ -3241,7 +3241,8 @@ static int sh_eth_drv_probe(struct platf /* MDIO bus init */ ret = sh_mdio_init(mdp, pd); if (ret) { diff --git a/patches.renesas/0124-arm64-renesas-r8a7796-add-SYS-DMAC-controller-nodes.patch b/patches.renesas/0124-arm64-renesas-r8a7796-add-SYS-DMAC-controller-nodes.patch index 9fa628075d330..7ebf108cd6eb5 100644 --- a/patches.renesas/0124-arm64-renesas-r8a7796-add-SYS-DMAC-controller-nodes.patch +++ b/patches.renesas/0124-arm64-renesas-r8a7796-add-SYS-DMAC-controller-nodes.patch @@ -15,7 +15,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -252,6 +252,105 @@ +@@ -251,6 +251,105 @@ status = "disabled"; }; diff --git a/patches.renesas/0125-arm64-dts-r8a7796-add-I2C-support.patch b/patches.renesas/0125-arm64-dts-r8a7796-add-I2C-support.patch index 9c41e31327c1e..9d5cca966f179 100644 --- a/patches.renesas/0125-arm64-dts-r8a7796-add-I2C-support.patch +++ b/patches.renesas/0125-arm64-dts-r8a7796-add-I2C-support.patch @@ -33,7 +33,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> psci { compatible = "arm,psci-0.2"; method = "smc"; -@@ -239,6 +249,90 @@ +@@ -238,6 +248,90 @@ #power-domain-cells = <1>; }; diff --git a/patches.renesas/0126-arm64-dts-r8a7796-Enable-I2C-DMA.patch b/patches.renesas/0126-arm64-dts-r8a7796-Enable-I2C-DMA.patch index 0d5c0d2acf7a5..e393cfa98685d 100644 --- a/patches.renesas/0126-arm64-dts-r8a7796-Enable-I2C-DMA.patch +++ b/patches.renesas/0126-arm64-dts-r8a7796-Enable-I2C-DMA.patch @@ -15,7 +15,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -257,6 +257,9 @@ +@@ -256,6 +256,9 @@ interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 931>; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; @@ -25,7 +25,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> i2c-scl-internal-delay-ns = <110>; status = "disabled"; }; -@@ -269,6 +272,9 @@ +@@ -268,6 +271,9 @@ interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 930>; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; @@ -35,7 +35,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> i2c-scl-internal-delay-ns = <6>; status = "disabled"; }; -@@ -281,6 +287,9 @@ +@@ -280,6 +286,9 @@ interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 929>; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; @@ -45,7 +45,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> i2c-scl-internal-delay-ns = <6>; status = "disabled"; }; -@@ -293,6 +302,8 @@ +@@ -292,6 +301,8 @@ interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 928>; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; @@ -54,7 +54,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> i2c-scl-internal-delay-ns = <110>; status = "disabled"; }; -@@ -305,6 +316,8 @@ +@@ -304,6 +315,8 @@ interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 927>; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; @@ -63,7 +63,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> i2c-scl-internal-delay-ns = <110>; status = "disabled"; }; -@@ -317,6 +330,8 @@ +@@ -316,6 +329,8 @@ interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 919>; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; @@ -72,7 +72,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> i2c-scl-internal-delay-ns = <110>; status = "disabled"; }; -@@ -329,6 +344,8 @@ +@@ -328,6 +343,8 @@ interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 918>; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; diff --git a/patches.renesas/0126-serial-sh-sci-Fix-hang-in-sci_reset.patch b/patches.renesas/0126-serial-sh-sci-Fix-hang-in-sci_reset.patch index 734a0c0526e4a..9b5009274ad85 100644 --- a/patches.renesas/0126-serial-sh-sci-Fix-hang-in-sci_reset.patch +++ b/patches.renesas/0126-serial-sh-sci-Fix-hang-in-sci_reset.patch @@ -36,7 +36,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -2159,10 +2159,6 @@ static void sci_reset(struct uart_port * +@@ -2172,10 +2172,6 @@ static void sci_reset(struct uart_port * unsigned int status; struct sci_port *s = to_sci_port(port); diff --git a/patches.renesas/0127-serial-sh-sci-Fix-late-enablement-of-AUTORTS.patch b/patches.renesas/0127-serial-sh-sci-Fix-late-enablement-of-AUTORTS.patch index a6e2f13ff2096..80a3507dfe0ad 100644 --- a/patches.renesas/0127-serial-sh-sci-Fix-late-enablement-of-AUTORTS.patch +++ b/patches.renesas/0127-serial-sh-sci-Fix-late-enablement-of-AUTORTS.patch @@ -28,7 +28,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -2372,6 +2372,10 @@ done: +@@ -2385,6 +2385,10 @@ done: serial_port_out(port, SCFCR, ctrl); } diff --git a/patches.renesas/0130-sh_eth-add-generic-wake-on-lan-support-via-magic-pac.patch b/patches.renesas/0130-sh_eth-add-generic-wake-on-lan-support-via-magic-pac.patch index 95a82e641d20c..b9bb53f1a7d5d 100644 --- a/patches.renesas/0130-sh_eth-add-generic-wake-on-lan-support-via-magic-pac.patch +++ b/patches.renesas/0130-sh_eth-add-generic-wake-on-lan-support-via-magic-pac.patch @@ -104,7 +104,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ndev->base_addr = res->start; spin_lock_init(&mdp->lock); -@@ -3123,6 +3159,9 @@ static int sh_eth_drv_probe(struct platf +@@ -3142,6 +3178,9 @@ static int sh_eth_drv_probe(struct platf if (ret) goto out_napi_del; @@ -114,7 +114,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* print device information */ netdev_info(ndev, "Base address at 0x%x, %pM, IRQ %d.\n", (u32)ndev->base_addr, ndev->dev_addr, ndev->irq); -@@ -3162,15 +3201,67 @@ static int sh_eth_drv_remove(struct plat +@@ -3181,15 +3220,67 @@ static int sh_eth_drv_remove(struct plat #ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP @@ -185,7 +185,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return ret; } -@@ -3178,14 +3269,21 @@ static int sh_eth_suspend(struct device +@@ -3197,14 +3288,21 @@ static int sh_eth_suspend(struct device static int sh_eth_resume(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); diff --git a/patches.renesas/0135-sh_eth-rename-EESIPR-bits.patch b/patches.renesas/0135-sh_eth-rename-EESIPR-bits.patch index 70235a14ae88e..14badff5bad4e 100644 --- a/patches.renesas/0135-sh_eth-rename-EESIPR-bits.patch +++ b/patches.renesas/0135-sh_eth-rename-EESIPR-bits.patch @@ -107,7 +107,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (intr_status & (EESR_RX_CHECK | cd->tx_check | EESR_ECI | cd->eesr_err_check)) ret = IRQ_HANDLED; -@@ -3213,7 +3213,7 @@ static int sh_eth_wol_setup(struct net_d +@@ -3232,7 +3232,7 @@ static int sh_eth_wol_setup(struct net_d /* Only allow ECI interrupts */ synchronize_irq(ndev->irq); napi_disable(&mdp->napi); diff --git a/patches.renesas/0138-sh_eth-align-usage-of-sh_eth_modify-with-rest-of-dri.patch b/patches.renesas/0138-sh_eth-align-usage-of-sh_eth_modify-with-rest-of-dri.patch index 008dff888234d..1a3bdb57bf265 100644 --- a/patches.renesas/0138-sh_eth-align-usage-of-sh_eth_modify-with-rest-of-dri.patch +++ b/patches.renesas/0138-sh_eth-align-usage-of-sh_eth_modify-with-rest-of-dri.patch @@ -24,7 +24,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c -@@ -3285,7 +3285,7 @@ static int sh_eth_wol_setup(struct net_d +@@ -3304,7 +3304,7 @@ static int sh_eth_wol_setup(struct net_d sh_eth_write(ndev, EESIPR_ECIIP, EESIPR); /* Enable MagicPacket */ diff --git a/patches.renesas/0140-media-v4l-vsp1-Clean-up-file-handle-in-open-error-pa.patch b/patches.renesas/0140-media-v4l-vsp1-Clean-up-file-handle-in-open-error-pa.patch index 2db49b994116b..9e49d119ab72b 100644 --- a/patches.renesas/0140-media-v4l-vsp1-Clean-up-file-handle-in-open-error-pa.patch +++ b/patches.renesas/0140-media-v4l-vsp1-Clean-up-file-handle-in-open-error-pa.patch @@ -19,7 +19,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/media/platform/vsp1/vsp1_video.c +++ b/drivers/media/platform/vsp1/vsp1_video.c -@@ -1050,6 +1050,7 @@ static int vsp1_video_open(struct file * +@@ -1063,6 +1063,7 @@ static int vsp1_video_open(struct file * ret = vsp1_device_get(video->vsp1); if (ret < 0) { v4l2_fh_del(vfh); diff --git a/patches.renesas/0142-arm64-dts-r8a7796-Add-device-node-for-PRR.patch b/patches.renesas/0142-arm64-dts-r8a7796-Add-device-node-for-PRR.patch index 53c47d5aecff4..fcdaecc1edd6d 100644 --- a/patches.renesas/0142-arm64-dts-r8a7796-Add-device-node-for-PRR.patch +++ b/patches.renesas/0142-arm64-dts-r8a7796-Add-device-node-for-PRR.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -243,6 +243,11 @@ +@@ -242,6 +242,11 @@ #power-domain-cells = <0>; }; diff --git a/patches.renesas/0142-media-v4l-vsp1-Prevent-multiple-streamon-race-commen.patch b/patches.renesas/0142-media-v4l-vsp1-Prevent-multiple-streamon-race-commen.patch deleted file mode 100644 index e8cd34d400733..0000000000000 --- a/patches.renesas/0142-media-v4l-vsp1-Prevent-multiple-streamon-race-commen.patch +++ /dev/null @@ -1,69 +0,0 @@ -From a30ea33c0959c27b2069168fec97eeb1c62ea66d Mon Sep 17 00:00:00 2001 -From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> -Date: Fri, 6 Jan 2017 10:15:28 -0200 -Subject: [PATCH 142/286] [media] v4l: vsp1: Prevent multiple streamon race - commencing pipeline early - -With multiple inputs through the BRU it is feasible for the streams to -race each other at stream-on. - -Multiple VIDIOC_STREAMON calls racing each other could have process -N-1 skipping over the pipeline setup section and then start the pipeline -early, if videobuf2 has already enqueued buffers to the driver for -process N but not called the .start_streaming() operation yet - -In the case of the video pipelines, this -can present two serious issues. - - 1) A null-dereference if the pipe->dl is committed at the same time as - the vsp1_video_setup_pipeline() is processing - - 2) A hardware hang, where a display list is committed without having - called vsp1_video_setup_pipeline() first - -Repair this issue, by ensuring that only the stream which configures the -pipeline is able to start it. - -Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> -Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> -Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> -(cherry picked from commit 4461c84b52b4a952c657505ef7e4e06b016783df) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/media/platform/vsp1/vsp1_video.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - ---- a/drivers/media/platform/vsp1/vsp1_video.c -+++ b/drivers/media/platform/vsp1/vsp1_video.c -@@ -797,6 +797,7 @@ static int vsp1_video_start_streaming(st - { - struct vsp1_video *video = vb2_get_drv_priv(vq); - struct vsp1_pipeline *pipe = video->rwpf->pipe; -+ bool start_pipeline = false; - unsigned long flags; - int ret; - -@@ -807,11 +808,23 @@ static int vsp1_video_start_streaming(st - mutex_unlock(&pipe->lock); - return ret; - } -+ -+ start_pipeline = true; - } - - pipe->stream_count++; - mutex_unlock(&pipe->lock); - -+ /* -+ * vsp1_pipeline_ready() is not sufficient to establish that all streams -+ * are prepared and the pipeline is configured, as multiple streams -+ * can race through streamon with buffers already queued; Therefore we -+ * don't even attempt to start the pipeline until the last stream has -+ * called through here. -+ */ -+ if (!start_pipeline) -+ return 0; -+ - spin_lock_irqsave(&pipe->irqlock, flags); - if (vsp1_pipeline_ready(pipe)) - vsp1_video_pipeline_run(pipe); diff --git a/patches.renesas/0147-media-v4l-vsp1-Register-pipe-with-output-WPF.patch b/patches.renesas/0147-media-v4l-vsp1-Register-pipe-with-output-WPF.patch deleted file mode 100644 index 85334403aa4a8..0000000000000 --- a/patches.renesas/0147-media-v4l-vsp1-Register-pipe-with-output-WPF.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3db01168e75ecf212a106b0a3cd94f7d56bbb41a Mon Sep 17 00:00:00 2001 -From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> -Date: Mon, 27 Feb 2017 10:40:34 -0300 -Subject: [PATCH 147/286] [media] v4l: vsp1: Register pipe with output WPF - -The DRM object does not register the pipe with the WPF object. This is -used internally throughout the driver as a means of accessing the pipe. -As such this breaks operations which require access to the pipe from WPF -interrupts. - -Register the pipe inside the WPF object after it has been declared as -the output. - -Fixes: ff7e97c94d9f ("[media] v4l: vsp1: Store pipeline pointer in rwpf") - -Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> -Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> -Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> -Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> -(cherry picked from commit 1531a208ed861e4bd287444f9466ffcf98383de2) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/media/platform/vsp1/vsp1_drm.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/media/platform/vsp1/vsp1_drm.c -+++ b/drivers/media/platform/vsp1/vsp1_drm.c -@@ -602,6 +602,7 @@ int vsp1_drm_init(struct vsp1_device *vs - pipe->bru = &vsp1->bru->entity; - pipe->lif = &vsp1->lif->entity; - pipe->output = vsp1->wpf[0]; -+ pipe->output->pipe = pipe; - - return 0; - } diff --git a/patches.renesas/0170-tty-serial-sh-sci-set-error-code-when-kasprintf-fail.patch b/patches.renesas/0170-tty-serial-sh-sci-set-error-code-when-kasprintf-fail.patch index 26f0089c97a61..9c09ce97b2857 100644 --- a/patches.renesas/0170-tty-serial-sh-sci-set-error-code-when-kasprintf-fail.patch +++ b/patches.renesas/0170-tty-serial-sh-sci-set-error-code-when-kasprintf-fail.patch @@ -23,7 +23,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -1742,8 +1742,10 @@ static int sci_request_irq(struct sci_po +@@ -1755,8 +1755,10 @@ static int sci_request_irq(struct sci_po desc = sci_irq_desc + i; port->irqstr[j] = kasprintf(GFP_KERNEL, "%s:%s", dev_name(up->dev), desc->desc); diff --git a/patches.renesas/0171-serial-sh-sci-Set-the-SCSCR-TE-and-RE-bits-in-the-dr.patch b/patches.renesas/0171-serial-sh-sci-Set-the-SCSCR-TE-and-RE-bits-in-the-dr.patch index a570e9d8d53be..0eb33395ac26d 100644 --- a/patches.renesas/0171-serial-sh-sci-Set-the-SCSCR-TE-and-RE-bits-in-the-dr.patch +++ b/patches.renesas/0171-serial-sh-sci-Set-the-SCSCR-TE-and-RE-bits-in-the-dr.patch @@ -19,7 +19,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -2344,7 +2344,8 @@ done: +@@ -2357,7 +2357,8 @@ done: serial_port_out(port, SCFCR, ctrl); } @@ -29,7 +29,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> dev_dbg(port->dev, "SCSCR 0x%x\n", scr_val); serial_port_out(port, SCSCR, scr_val); if ((srr + 1 == 5) && -@@ -2798,7 +2799,8 @@ static void serial_console_write(struct +@@ -2812,7 +2813,8 @@ static void serial_console_write(struct /* first save SCSCR then disable interrupts, keep clock source */ ctrl = serial_port_in(port, SCSCR); @@ -39,7 +39,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (ctrl & (SCSCR_CKE1 | SCSCR_CKE0)); serial_port_out(port, SCSCR, ctrl_temp); -@@ -3001,7 +3003,6 @@ sci_parse_dt(struct platform_device *pde +@@ -3015,7 +3017,6 @@ sci_parse_dt(struct platform_device *pde p->flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; p->type = SCI_OF_TYPE(match->data); p->regtype = SCI_OF_REGTYPE(match->data); @@ -47,7 +47,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (of_find_property(np, "uart-has-rtscts", NULL)) p->capabilities |= SCIx_HAVE_RTSCTS; -@@ -3169,9 +3170,9 @@ static int __init early_console_setup(st +@@ -3183,9 +3184,9 @@ static int __init early_console_setup(st sci_ports[0].cfg = &port_cfg; sci_ports[0].cfg->type = type; sci_probe_regmap(sci_ports[0].cfg); diff --git a/patches.renesas/0172-ARM-dts-r8a7790-Add-device-node-for-RST-module.patch b/patches.renesas/0172-ARM-dts-r8a7790-Add-device-node-for-RST-module.patch index 9c6faeb5990bf..d1b3a09bab308 100644 --- a/patches.renesas/0172-ARM-dts-r8a7790-Add-device-node-for-RST-module.patch +++ b/patches.renesas/0172-ARM-dts-r8a7790-Add-device-node-for-RST-module.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi -@@ -1471,6 +1471,11 @@ +@@ -1474,6 +1474,11 @@ }; }; diff --git a/patches.renesas/0172-serial-sh-sci-Don-t-rely-on-platform-data-flags-when.patch b/patches.renesas/0172-serial-sh-sci-Don-t-rely-on-platform-data-flags-when.patch index 6b16e0acf1ab1..0c5e7dd289bf3 100644 --- a/patches.renesas/0172-serial-sh-sci-Don-t-rely-on-platform-data-flags-when.patch +++ b/patches.renesas/0172-serial-sh-sci-Don-t-rely-on-platform-data-flags-when.patch @@ -22,7 +22,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -2460,7 +2460,7 @@ static int sci_remap_port(struct uart_po +@@ -2473,7 +2473,7 @@ static int sci_remap_port(struct uart_po if (port->membase) return 0; @@ -31,7 +31,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> port->membase = ioremap_nocache(port->mapbase, sport->reg_size); if (unlikely(!port->membase)) { dev_err(port->dev, "can't remap port#%d\n", port->line); -@@ -2482,7 +2482,7 @@ static void sci_release_port(struct uart +@@ -2495,7 +2495,7 @@ static void sci_release_port(struct uart { struct sci_port *sport = to_sci_port(port); @@ -40,7 +40,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> iounmap(port->membase); port->membase = NULL; } -@@ -2738,7 +2738,7 @@ static int sci_init_single(struct platfo +@@ -2752,7 +2752,7 @@ static int sci_init_single(struct platfo } port->type = p->type; @@ -49,7 +49,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> port->regshift = p->regshift; /* -@@ -3000,7 +3000,6 @@ sci_parse_dt(struct platform_device *pde +@@ -3014,7 +3014,6 @@ sci_parse_dt(struct platform_device *pde *dev_id = id; diff --git a/patches.renesas/0173-ARM-dts-r8a7791-Add-device-node-for-RST-module.patch b/patches.renesas/0173-ARM-dts-r8a7791-Add-device-node-for-RST-module.patch index 5194067d55479..54d4a0626b359 100644 --- a/patches.renesas/0173-ARM-dts-r8a7791-Add-device-node-for-RST-module.patch +++ b/patches.renesas/0173-ARM-dts-r8a7791-Add-device-node-for-RST-module.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi -@@ -1482,6 +1482,11 @@ +@@ -1484,6 +1484,11 @@ }; }; diff --git a/patches.renesas/0174-ARM-dts-r8a7792-Add-device-node-for-RST-module.patch b/patches.renesas/0174-ARM-dts-r8a7792-Add-device-node-for-RST-module.patch index c2a856ad34ddc..e13283207221e 100644 --- a/patches.renesas/0174-ARM-dts-r8a7792-Add-device-node-for-RST-module.patch +++ b/patches.renesas/0174-ARM-dts-r8a7792-Add-device-node-for-RST-module.patch @@ -15,7 +15,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7792.dtsi +++ b/arch/arm/boot/dts/r8a7792.dtsi -@@ -118,6 +118,11 @@ +@@ -117,6 +117,11 @@ IRQ_TYPE_LEVEL_LOW)>; }; diff --git a/patches.renesas/0175-ARM-dts-r8a7793-Add-device-node-for-RST-module.patch b/patches.renesas/0175-ARM-dts-r8a7793-Add-device-node-for-RST-module.patch index a29692a021d3e..be4d66aac18c4 100644 --- a/patches.renesas/0175-ARM-dts-r8a7793-Add-device-node-for-RST-module.patch +++ b/patches.renesas/0175-ARM-dts-r8a7793-Add-device-node-for-RST-module.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi -@@ -1279,6 +1279,11 @@ +@@ -1281,6 +1281,11 @@ }; }; diff --git a/patches.renesas/0175-serial-sh-sci-Replace-regmap-array-with-port-paramet.patch b/patches.renesas/0175-serial-sh-sci-Replace-regmap-array-with-port-paramet.patch index f231648a43d0f..9eea24c96b907 100644 --- a/patches.renesas/0175-serial-sh-sci-Replace-regmap-array-with-port-paramet.patch +++ b/patches.renesas/0175-serial-sh-sci-Replace-regmap-array-with-port-paramet.patch @@ -391,7 +391,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* * The "offset" here is rather misleading, in that it refers to an enum -@@ -2563,6 +2592,8 @@ static int sci_init_single(struct platfo +@@ -2577,6 +2606,8 @@ static int sci_init_single(struct platfo return ret; } @@ -400,7 +400,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> switch (p->type) { case PORT_SCIFB: port->fifosize = 256; -@@ -3075,6 +3106,7 @@ static int __init early_console_setup(st +@@ -3089,6 +3120,7 @@ static int __init early_console_setup(st sci_ports[0].cfg = &port_cfg; sci_ports[0].cfg->type = type; sci_probe_regmap(sci_ports[0].cfg); diff --git a/patches.renesas/0176-ARM-dts-r8a7794-Add-device-node-for-RST-module.patch b/patches.renesas/0176-ARM-dts-r8a7794-Add-device-node-for-RST-module.patch index df5806280047b..e5438de7419a5 100644 --- a/patches.renesas/0176-ARM-dts-r8a7794-Add-device-node-for-RST-module.patch +++ b/patches.renesas/0176-ARM-dts-r8a7794-Add-device-node-for-RST-module.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi -@@ -1374,6 +1374,11 @@ +@@ -1375,6 +1375,11 @@ }; }; diff --git a/patches.renesas/0176-serial-sh-sci-Constify-platform-data.patch b/patches.renesas/0176-serial-sh-sci-Constify-platform-data.patch index 32645e2d1a4e7..7abc2b555022e 100644 --- a/patches.renesas/0176-serial-sh-sci-Constify-platform-data.patch +++ b/patches.renesas/0176-serial-sh-sci-Constify-platform-data.patch @@ -68,7 +68,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> static void sci_port_enable(struct sci_port *sci_port) { unsigned int i; -@@ -2547,9 +2512,50 @@ found: +@@ -2561,9 +2526,50 @@ found: return 0; } @@ -120,7 +120,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { struct uart_port *port = &sci_port->port; const struct resource *res; -@@ -2586,13 +2592,9 @@ static int sci_init_single(struct platfo +@@ -2600,13 +2606,9 @@ static int sci_init_single(struct platfo sci_port->irqs[3] = sci_port->irqs[0]; } @@ -137,7 +137,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> switch (p->type) { case PORT_SCIFB: -@@ -2812,7 +2814,7 @@ static char early_serial_buf[32]; +@@ -2826,7 +2828,7 @@ static char early_serial_buf[32]; static int sci_probe_earlyprintk(struct platform_device *pdev) { @@ -146,7 +146,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (early_serial_console.data) return -EEXIST; -@@ -3103,10 +3105,9 @@ static int __init early_console_setup(st +@@ -3117,10 +3119,9 @@ static int __init early_console_setup(st device->port.serial_out = sci_serial_out; device->port.type = type; memcpy(&sci_ports[0].port, &device->port, sizeof(struct uart_port)); diff --git a/patches.renesas/0177-serial-sh-sci-Extend-sci_port_params-with-more-port-.patch b/patches.renesas/0177-serial-sh-sci-Extend-sci_port_params-with-more-port-.patch index dfffd28416801..9e49a4afda5b2 100644 --- a/patches.renesas/0177-serial-sh-sci-Extend-sci_port_params-with-more-port-.patch +++ b/patches.renesas/0177-serial-sh-sci-Extend-sci_port_params-with-more-port-.patch @@ -244,7 +244,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return (serial_port_in(port, SCxSR) & SCxSR_RDxF(port)) != 0; } -@@ -879,7 +957,7 @@ static int sci_handle_errors(struct uart +@@ -881,7 +959,7 @@ static int sci_handle_errors(struct uart struct sci_port *s = to_sci_port(port); /* Handle overruns */ @@ -253,7 +253,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> port->icount.overrun++; /* overrun error */ -@@ -945,14 +1023,14 @@ static int sci_handle_fifo_overrun(struc +@@ -947,14 +1025,14 @@ static int sci_handle_fifo_overrun(struc int copied = 0; u16 status; @@ -273,7 +273,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> port->icount.overrun++; -@@ -1541,12 +1619,10 @@ static irqreturn_t sci_mpxed_interrupt(i +@@ -1554,12 +1632,10 @@ static irqreturn_t sci_mpxed_interrupt(i ssr_status = serial_port_in(port, SCxSR); scr_status = serial_port_in(port, SCSCR); @@ -289,7 +289,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> err_enabled = scr_status & port_rx_irq_mask(port); -@@ -1572,7 +1648,7 @@ static irqreturn_t sci_mpxed_interrupt(i +@@ -1585,7 +1661,7 @@ static irqreturn_t sci_mpxed_interrupt(i ret = sci_br_interrupt(irq, ptr); /* Overrun Interrupt */ @@ -298,7 +298,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> sci_handle_fifo_overrun(port); ret = IRQ_HANDLED; } -@@ -2596,51 +2672,13 @@ static int sci_init_single(struct platfo +@@ -2610,51 +2686,13 @@ static int sci_init_single(struct platfo if (unlikely(sci_port->params == NULL)) return -EINVAL; @@ -353,7 +353,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (!early) { ret = sci_init_clocks(sci_port, &dev->dev); -@@ -2656,29 +2694,10 @@ static int sci_init_single(struct platfo +@@ -2670,29 +2708,10 @@ static int sci_init_single(struct platfo sci_port->break_timer.function = sci_break_timer; init_timer(&sci_port->break_timer); diff --git a/patches.renesas/0178-arm64-renesas-r8a7796-dtsi-Add-device-node-for-RST-m.patch b/patches.renesas/0178-arm64-renesas-r8a7796-dtsi-Add-device-node-for-RST-m.patch index d326c6b77b8ec..4fbcec6d47824 100644 --- a/patches.renesas/0178-arm64-renesas-r8a7796-dtsi-Add-device-node-for-RST-m.patch +++ b/patches.renesas/0178-arm64-renesas-r8a7796-dtsi-Add-device-node-for-RST-m.patch @@ -20,7 +20,7 @@ Conflicts: --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -243,6 +243,11 @@ +@@ -242,6 +242,11 @@ #power-domain-cells = <0>; }; diff --git a/patches.renesas/0178-serial-sh-sci-Remove-the-platform-data-dma-slave-rx-.patch b/patches.renesas/0178-serial-sh-sci-Remove-the-platform-data-dma-slave-rx-.patch index 9c8e72893856f..7cbe3dc051e82 100644 --- a/patches.renesas/0178-serial-sh-sci-Remove-the-platform-data-dma-slave-rx-.patch +++ b/patches.renesas/0178-serial-sh-sci-Remove-the-platform-data-dma-slave-rx-.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -1387,20 +1387,14 @@ static void rx_timer_fn(unsigned long ar +@@ -1389,20 +1389,14 @@ static void rx_timer_fn(unsigned long ar } static struct dma_chan *sci_request_dma_chan(struct uart_port *port, @@ -44,7 +44,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (!chan) { dev_warn(port->dev, "dma_request_slave_channel_compat failed\n"); -@@ -1436,12 +1430,11 @@ static void sci_request_dma(struct uart_ +@@ -1438,12 +1432,11 @@ static void sci_request_dma(struct uart_ dev_dbg(port->dev, "%s: port %d\n", __func__, port->line); @@ -59,7 +59,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> dev_dbg(port->dev, "%s: TX: got channel %p\n", __func__, chan); if (chan) { s->chan_tx = chan; -@@ -1463,7 +1456,7 @@ static void sci_request_dma(struct uart_ +@@ -1465,7 +1458,7 @@ static void sci_request_dma(struct uart_ INIT_WORK(&s->work_tx, work_fn_tx); } @@ -68,7 +68,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> dev_dbg(port->dev, "%s: RX: got channel %p\n", __func__, chan); if (chan) { unsigned int i; -@@ -2712,10 +2705,6 @@ static int sci_init_single(struct platfo +@@ -2726,10 +2719,6 @@ static int sci_init_single(struct platfo port->serial_in = sci_serial_in; port->serial_out = sci_serial_out; diff --git a/patches.renesas/0181-clk-renesas-rcar-gen2-Obtain-mode-pin-values-using-R.patch b/patches.renesas/0181-clk-renesas-rcar-gen2-Obtain-mode-pin-values-using-R.patch index 8c03176824fe8..c7ae9675bb1b1 100644 --- a/patches.renesas/0181-clk-renesas-rcar-gen2-Obtain-mode-pin-values-using-R.patch +++ b/patches.renesas/0181-clk-renesas-rcar-gen2-Obtain-mode-pin-values-using-R.patch @@ -28,7 +28,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct rcar_gen2_cpg { struct clk_onecell_data data; -@@ -364,6 +365,23 @@ rcar_gen2_cpg_register_clock(struct devi +@@ -379,6 +380,23 @@ rcar_gen2_cpg_register_clock(struct devi 4, 0, table, &cpg->lock); } @@ -52,7 +52,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> static void __init rcar_gen2_cpg_clocks_init(struct device_node *np) { const struct cpg_pll_config *config; -@@ -372,6 +390,13 @@ static void __init rcar_gen2_cpg_clocks_ +@@ -387,6 +405,13 @@ static void __init rcar_gen2_cpg_clocks_ unsigned int i; int num_clks; diff --git a/patches.renesas/0190-clk-renesas-rcar-gen2-Remove-obsolete-rcar_gen2_cloc.patch b/patches.renesas/0190-clk-renesas-rcar-gen2-Remove-obsolete-rcar_gen2_cloc.patch index d66eb182675e1..deba2c042d249 100644 --- a/patches.renesas/0190-clk-renesas-rcar-gen2-Remove-obsolete-rcar_gen2_cloc.patch +++ b/patches.renesas/0190-clk-renesas-rcar-gen2-Remove-obsolete-rcar_gen2_cloc.patch @@ -17,7 +17,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/clk/renesas/clk-rcar-gen2.c +++ b/drivers/clk/renesas/clk-rcar-gen2.c -@@ -445,10 +445,3 @@ static void __init rcar_gen2_cpg_clocks_ +@@ -460,10 +460,3 @@ static void __init rcar_gen2_cpg_clocks_ } CLK_OF_DECLARE(rcar_gen2_cpg_clks, "renesas,rcar-gen2-cpg-clocks", rcar_gen2_cpg_clocks_init); diff --git a/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch b/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch index c413910741916..7e355af88e660 100644 --- a/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch +++ b/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch @@ -34,7 +34,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> for (i = LAST_EP_INDEX; i > 0; i--) { --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2633,7 +2633,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2634,7 +2634,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, return 0; fail: diff --git a/patches.renesas/0192-usb-host-xhci-change-pre-increments-to-post-incremen.patch b/patches.renesas/0192-usb-host-xhci-change-pre-increments-to-post-incremen.patch index f685ed5ce6106..bf18fa9b2a334 100644 --- a/patches.renesas/0192-usb-host-xhci-change-pre-increments-to-post-incremen.patch +++ b/patches.renesas/0192-usb-host-xhci-change-pre-increments-to-post-incremen.patch @@ -121,7 +121,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (dev->eps[i].ring) xhci_ring_free(xhci, dev->eps[i].ring); if (dev->eps[i].stream_info) -@@ -1612,7 +1612,7 @@ void xhci_update_bw_info(struct xhci_hcd +@@ -1613,7 +1613,7 @@ void xhci_update_bw_info(struct xhci_hcd unsigned int ep_type; int i; @@ -130,7 +130,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> bw_info = &virt_dev->eps[i].bw_info; /* We can't tell what endpoint type is being dropped, but -@@ -2597,9 +2597,9 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2598,9 +2598,9 @@ int xhci_mem_init(struct xhci_hcd *xhci, * something other than the default (~1ms minimum between interrupts). * See section 5.5.1.2. */ diff --git a/patches.renesas/0200-ARM-dts-r8a7791-set-maximum-frequency-for-SDHI-clock.patch b/patches.renesas/0200-ARM-dts-r8a7791-set-maximum-frequency-for-SDHI-clock.patch index 2a19094906539..6f1b8fc7809be 100644 --- a/patches.renesas/0200-ARM-dts-r8a7791-set-maximum-frequency-for-SDHI-clock.patch +++ b/patches.renesas/0200-ARM-dts-r8a7791-set-maximum-frequency-for-SDHI-clock.patch @@ -15,7 +15,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi -@@ -584,6 +584,7 @@ +@@ -583,6 +583,7 @@ dmas = <&dmac0 0xcd>, <&dmac0 0xce>, <&dmac1 0xcd>, <&dmac1 0xce>; dma-names = "tx", "rx", "tx", "rx"; @@ -23,7 +23,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> power-domains = <&sysc R8A7791_PD_ALWAYS_ON>; status = "disabled"; }; -@@ -596,6 +597,7 @@ +@@ -595,6 +596,7 @@ dmas = <&dmac0 0xc1>, <&dmac0 0xc2>, <&dmac1 0xc1>, <&dmac1 0xc2>; dma-names = "tx", "rx", "tx", "rx"; @@ -31,7 +31,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> power-domains = <&sysc R8A7791_PD_ALWAYS_ON>; status = "disabled"; }; -@@ -608,6 +610,7 @@ +@@ -607,6 +609,7 @@ dmas = <&dmac0 0xd3>, <&dmac0 0xd4>, <&dmac1 0xd3>, <&dmac1 0xd4>; dma-names = "tx", "rx", "tx", "rx"; diff --git a/patches.renesas/0200-usb-host-plat-Enable-xHCI-plat-runtime-PM.patch b/patches.renesas/0200-usb-host-plat-Enable-xHCI-plat-runtime-PM.patch index 9bcf411cef6c8..1c39cfd54b80c 100644 --- a/patches.renesas/0200-usb-host-plat-Enable-xHCI-plat-runtime-PM.patch +++ b/patches.renesas/0200-usb-host-plat-Enable-xHCI-plat-runtime-PM.patch @@ -114,8 +114,8 @@ Conflicts: static const struct acpi_device_id usb_xhci_acpi_match[] = { /* XHCI-compliant USB Controller */ -@@ -349,7 +388,7 @@ static struct platform_driver usb_xhci_d - .shutdown = usb_hcd_platform_shutdown, +@@ -348,7 +387,7 @@ static struct platform_driver usb_xhci_d + .remove = xhci_plat_remove, .driver = { .name = "xhci-hcd", - .pm = DEV_PM_OPS, diff --git a/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch b/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch index 835592f39e1e9..e247431ecd8c1 100644 --- a/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch +++ b/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2448,7 +2448,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2449,7 +2449,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, writel(val, &xhci->op_regs->config_reg); /* diff --git a/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch b/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch index 37f21e2a9fce4..94e09440b5501 100644 --- a/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch +++ b/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1735,36 +1735,27 @@ static int scratchpad_alloc(struct xhci_ +@@ -1736,36 +1736,27 @@ static int scratchpad_alloc(struct xhci_ if (!xhci->scratchpad->sp_buffers) goto fail_sp3; @@ -58,7 +58,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> kfree(xhci->scratchpad->sp_buffers); fail_sp3: -@@ -1794,9 +1785,8 @@ static void scratchpad_free(struct xhci_ +@@ -1795,9 +1786,8 @@ static void scratchpad_free(struct xhci_ for (i = 0; i < num_sp; i++) { dma_free_coherent(dev, xhci->page_size, xhci->scratchpad->sp_buffers[i], diff --git a/patches.renesas/0207-media-v4l-Add-metadata-buffer-type-and-format.patch b/patches.renesas/0207-media-v4l-Add-metadata-buffer-type-and-format.patch index 019841fc662e6..e682ec8bb7d32 100644 --- a/patches.renesas/0207-media-v4l-Add-metadata-buffer-type-and-format.patch +++ b/patches.renesas/0207-media-v4l-Add-metadata-buffer-type-and-format.patch @@ -23,14 +23,14 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Documentation/media/uapi/v4l/devices.rst | 1 Documentation/media/uapi/v4l/vidioc-querycap.rst | 3 + Documentation/media/videodev2.h.rst.exceptions | 2 - drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 19 +++++++ + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 21 ++++++++ drivers/media/v4l2-core/v4l2-dev.c | 16 +++--- drivers/media/v4l2-core/v4l2-ioctl.c | 34 +++++++++++++ drivers/media/v4l2-core/videobuf2-v4l2.c | 3 + include/media/v4l2-ioctl.h | 17 ++++++ include/trace/events/v4l2.h | 1 include/uapi/linux/videodev2.h | 13 +++++ - 12 files changed, 164 insertions(+), 6 deletions(-) + 12 files changed, 166 insertions(+), 6 deletions(-) create mode 100644 Documentation/media/uapi/v4l/dev-meta.rst --- a/Documentation/media/uapi/v4l/buffer.rst @@ -145,7 +145,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> replace define V4L2_CAP_STREAMING device-capabilities --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c -@@ -161,6 +161,20 @@ static inline int put_v4l2_sdr_format(st +@@ -130,6 +130,20 @@ static int put_v4l2_window32(struct v4l2 return 0; } @@ -166,7 +166,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct v4l2_format32 { __u32 type; /* enum v4l2_buf_type */ union { -@@ -170,6 +184,7 @@ struct v4l2_format32 { +@@ -139,6 +153,7 @@ struct v4l2_format32 { struct v4l2_vbi_format vbi; struct v4l2_sliced_vbi_format sliced; struct v4l2_sdr_format sdr; @@ -174,24 +174,26 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> __u8 raw_data[200]; /* user-defined */ } fmt; }; -@@ -216,6 +231,8 @@ static int __get_v4l2_format32(struct v4 - case V4L2_BUF_TYPE_SDR_CAPTURE: +@@ -226,6 +241,9 @@ static int __get_v4l2_format32(struct v4 case V4L2_BUF_TYPE_SDR_OUTPUT: - return get_v4l2_sdr_format(&kp->fmt.sdr, &up->fmt.sdr); + return copy_in_user(&kp->fmt.sdr, &up->fmt.sdr, + sizeof(kp->fmt.sdr)) ? -EFAULT : 0; + case V4L2_BUF_TYPE_META_CAPTURE: -+ return get_v4l2_meta_format(&kp->fmt.meta, &up->fmt.meta); ++ return copy_in_user(&kp->fmt.meta, &up->fmt.meta, ++ sizeof(kb->fmt.meta)) ? -EFAULT : 0; default: - pr_info("compat_ioctl32: unexpected VIDIOC_FMT type %d\n", - kp->type); -@@ -263,6 +280,8 @@ static int __put_v4l2_format32(struct v4 - case V4L2_BUF_TYPE_SDR_CAPTURE: + return -EINVAL; + } +@@ -292,6 +310,9 @@ static int __put_v4l2_format32(struct v4 case V4L2_BUF_TYPE_SDR_OUTPUT: - return put_v4l2_sdr_format(&kp->fmt.sdr, &up->fmt.sdr); + return copy_in_user(&up->fmt.sdr, &kp->fmt.sdr, + sizeof(kp->fmt.sdr)) ? -EFAULT : 0; + case V4L2_BUF_TYPE_META_CAPTURE: -+ return put_v4l2_meta_format(&kp->fmt.meta, &up->fmt.meta); ++ return copy_in_user(&up->fmt.meta, &kp->fmt.meta, ++ sizeof(kp->fmt.sdr)) ? -EFAULT : 0; default: - pr_info("compat_ioctl32: unexpected VIDIOC_FMT type %d\n", - kp->type); + return -EINVAL; + } --- a/drivers/media/v4l2-core/v4l2-dev.c +++ b/drivers/media/v4l2-core/v4l2-dev.c @@ -575,30 +575,34 @@ static void determine_valid_ioctls(struc diff --git a/patches.renesas/0208-usb-host-xhci-convert-several-if-to-a-single-switch-.patch b/patches.renesas/0208-usb-host-xhci-convert-several-if-to-a-single-switch-.patch index c80c70d21cb2a..598f08c12474b 100644 --- a/patches.renesas/0208-usb-host-xhci-convert-several-if-to-a-single-switch-.patch +++ b/patches.renesas/0208-usb-host-xhci-convert-several-if-to-a-single-switch-.patch @@ -19,7 +19,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1428,14 +1428,16 @@ static u32 xhci_get_endpoint_type(struct +@@ -1429,14 +1429,16 @@ static u32 xhci_get_endpoint_type(struct in = usb_endpoint_dir_in(&ep->desc); diff --git a/patches.renesas/0209-usb-host-xhci-add-xhci_virt_device-tracer.patch b/patches.renesas/0209-usb-host-xhci-add-xhci_virt_device-tracer.patch index 2a8fe7be8f2ee..b753d37edd65c 100644 --- a/patches.renesas/0209-usb-host-xhci-add-xhci_virt_device-tracer.patch +++ b/patches.renesas/0209-usb-host-xhci-add-xhci_virt_device-tracer.patch @@ -50,8 +50,8 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> + return 1; fail: - -@@ -1263,6 +1268,8 @@ int xhci_setup_addressable_virt_dev(stru + if (dev->eps[0].ring) +@@ -1264,6 +1269,8 @@ int xhci_setup_addressable_virt_dev(stru ep0_ctx->deq = cpu_to_le64(dev->eps[0].ring->first_seg->dma | dev->eps[0].ring->cycle_state); diff --git a/patches.renesas/0211-ARM-dts-r8a7794-set-maximum-frequency-for-SDHI-clock.patch b/patches.renesas/0211-ARM-dts-r8a7794-set-maximum-frequency-for-SDHI-clock.patch index 8c7b88a0e8aa7..7b8da979f3ad7 100644 --- a/patches.renesas/0211-ARM-dts-r8a7794-set-maximum-frequency-for-SDHI-clock.patch +++ b/patches.renesas/0211-ARM-dts-r8a7794-set-maximum-frequency-for-SDHI-clock.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi -@@ -731,6 +731,7 @@ +@@ -730,6 +730,7 @@ dmas = <&dmac0 0xcd>, <&dmac0 0xce>, <&dmac1 0xcd>, <&dmac1 0xce>; dma-names = "tx", "rx", "tx", "rx"; @@ -24,7 +24,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> power-domains = <&sysc R8A7794_PD_ALWAYS_ON>; status = "disabled"; }; -@@ -743,6 +744,7 @@ +@@ -742,6 +743,7 @@ dmas = <&dmac0 0xc1>, <&dmac0 0xc2>, <&dmac1 0xc1>, <&dmac1 0xc2>; dma-names = "tx", "rx", "tx", "rx"; @@ -32,7 +32,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> power-domains = <&sysc R8A7794_PD_ALWAYS_ON>; status = "disabled"; }; -@@ -755,6 +757,7 @@ +@@ -754,6 +756,7 @@ dmas = <&dmac0 0xd3>, <&dmac0 0xd4>, <&dmac1 0xd3>, <&dmac1 0xd4>; dma-names = "tx", "rx", "tx", "rx"; diff --git a/patches.renesas/0212-media-v4l-vsp1-Add-HGO-support.patch b/patches.renesas/0212-media-v4l-vsp1-Add-HGO-support.patch index a92dcd4de39f2..485234e8056ee 100644 --- a/patches.renesas/0212-media-v4l-vsp1-Add-HGO-support.patch +++ b/patches.renesas/0212-media-v4l-vsp1-Add-HGO-support.patch @@ -108,7 +108,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* * The LIF is only supported when used in conjunction with the DU, in * which case the userspace API is disabled. If the userspace API is -@@ -568,8 +590,8 @@ static const struct vsp1_device_info vsp +@@ -580,8 +602,8 @@ static const struct vsp1_device_info vsp .version = VI6_IP_VERSION_MODEL_VSPS_H2, .model = "VSP1-S", .gen = 2, @@ -119,7 +119,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .rpf_count = 5, .uds_count = 3, .wpf_count = 4, -@@ -589,7 +611,8 @@ static const struct vsp1_device_info vsp +@@ -601,7 +623,8 @@ static const struct vsp1_device_info vsp .version = VI6_IP_VERSION_MODEL_VSPD_GEN2, .model = "VSP1-D", .gen = 2, @@ -129,7 +129,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .rpf_count = 4, .uds_count = 1, .wpf_count = 1, -@@ -599,8 +622,8 @@ static const struct vsp1_device_info vsp +@@ -611,8 +634,8 @@ static const struct vsp1_device_info vsp .version = VI6_IP_VERSION_MODEL_VSPS_M2, .model = "VSP1-S", .gen = 2, @@ -140,7 +140,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .rpf_count = 5, .uds_count = 1, .wpf_count = 4, -@@ -632,8 +655,9 @@ static const struct vsp1_device_info vsp +@@ -644,8 +667,9 @@ static const struct vsp1_device_info vsp .version = VI6_IP_VERSION_MODEL_VSPI_GEN3, .model = "VSP2-I", .gen = 3, @@ -152,7 +152,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .rpf_count = 1, .uds_count = 1, .wpf_count = 1, -@@ -651,8 +675,8 @@ static const struct vsp1_device_info vsp +@@ -663,8 +687,8 @@ static const struct vsp1_device_info vsp .version = VI6_IP_VERSION_MODEL_VSPBC_GEN3, .model = "VSP2-BC", .gen = 3, diff --git a/patches.renesas/0212-xhci-simplify-how-we-store-TDs-in-urb-private-data.patch b/patches.renesas/0212-xhci-simplify-how-we-store-TDs-in-urb-private-data.patch index 343cef2381ee2..1934a1375e6a6 100644 --- a/patches.renesas/0212-xhci-simplify-how-we-store-TDs-in-urb-private-data.patch +++ b/patches.renesas/0212-xhci-simplify-how-we-store-TDs-in-urb-private-data.patch @@ -32,7 +32,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1842,10 +1842,7 @@ struct xhci_command *xhci_alloc_command( +@@ -1843,10 +1843,7 @@ struct xhci_command *xhci_alloc_command( void xhci_urb_free_priv(struct urb_priv *urb_priv) { diff --git a/patches.renesas/0214-ARM-dts-r8a7791-Correct-SCIFB-reg-properties-to-cove.patch b/patches.renesas/0214-ARM-dts-r8a7791-Correct-SCIFB-reg-properties-to-cove.patch index b8f0c4415f54c..bb3d141067dd5 100644 --- a/patches.renesas/0214-ARM-dts-r8a7791-Correct-SCIFB-reg-properties-to-cove.patch +++ b/patches.renesas/0214-ARM-dts-r8a7791-Correct-SCIFB-reg-properties-to-cove.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi -@@ -702,7 +702,7 @@ +@@ -701,7 +701,7 @@ scifb0: serial@e6c20000 { compatible = "renesas,scifb-r8a7791", "renesas,rcar-gen2-scifb", "renesas,scifb"; @@ -30,7 +30,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks R8A7791_CLK_SCIFB0>; clock-names = "fck"; -@@ -716,7 +716,7 @@ +@@ -715,7 +715,7 @@ scifb1: serial@e6c30000 { compatible = "renesas,scifb-r8a7791", "renesas,rcar-gen2-scifb", "renesas,scifb"; @@ -39,7 +39,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks R8A7791_CLK_SCIFB1>; clock-names = "fck"; -@@ -730,7 +730,7 @@ +@@ -729,7 +729,7 @@ scifb2: serial@e6ce0000 { compatible = "renesas,scifb-r8a7791", "renesas,rcar-gen2-scifb", "renesas,scifb"; diff --git a/patches.renesas/0214-media-v4l-vsp1-Add-HGT-support.patch b/patches.renesas/0214-media-v4l-vsp1-Add-HGT-support.patch index d7c385fca8f1c..d6fc1033883bd 100644 --- a/patches.renesas/0214-media-v4l-vsp1-Add-HGT-support.patch +++ b/patches.renesas/0214-media-v4l-vsp1-Add-HGT-support.patch @@ -114,7 +114,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* * The LIF is only supported when used in conjunction with the DU, in * which case the userspace API is disabled. If the userspace API is -@@ -591,7 +613,8 @@ static const struct vsp1_device_info vsp +@@ -603,7 +625,8 @@ static const struct vsp1_device_info vsp .model = "VSP1-S", .gen = 2, .features = VSP1_HAS_BRU | VSP1_HAS_CLU | VSP1_HAS_HGO @@ -124,7 +124,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .rpf_count = 5, .uds_count = 3, .wpf_count = 4, -@@ -623,7 +646,8 @@ static const struct vsp1_device_info vsp +@@ -635,7 +658,8 @@ static const struct vsp1_device_info vsp .model = "VSP1-S", .gen = 2, .features = VSP1_HAS_BRU | VSP1_HAS_CLU | VSP1_HAS_HGO @@ -134,7 +134,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .rpf_count = 5, .uds_count = 1, .wpf_count = 4, -@@ -655,8 +679,8 @@ static const struct vsp1_device_info vsp +@@ -667,8 +691,8 @@ static const struct vsp1_device_info vsp .version = VI6_IP_VERSION_MODEL_VSPI_GEN3, .model = "VSP2-I", .gen = 3, diff --git a/patches.renesas/0215-ARM-dts-r8a7793-Correct-SCIFB-reg-properties-to-cove.patch b/patches.renesas/0215-ARM-dts-r8a7793-Correct-SCIFB-reg-properties-to-cove.patch index f7167fc607e73..cc5a627ba55ae 100644 --- a/patches.renesas/0215-ARM-dts-r8a7793-Correct-SCIFB-reg-properties-to-cove.patch +++ b/patches.renesas/0215-ARM-dts-r8a7793-Correct-SCIFB-reg-properties-to-cove.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi -@@ -666,7 +666,7 @@ +@@ -665,7 +665,7 @@ scifb0: serial@e6c20000 { compatible = "renesas,scifb-r8a7793", "renesas,rcar-gen2-scifb", "renesas,scifb"; @@ -30,7 +30,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks R8A7793_CLK_SCIFB0>; clock-names = "fck"; -@@ -680,7 +680,7 @@ +@@ -679,7 +679,7 @@ scifb1: serial@e6c30000 { compatible = "renesas,scifb-r8a7793", "renesas,rcar-gen2-scifb", "renesas,scifb"; @@ -39,7 +39,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks R8A7793_CLK_SCIFB1>; clock-names = "fck"; -@@ -694,7 +694,7 @@ +@@ -693,7 +693,7 @@ scifb2: serial@e6ce0000 { compatible = "renesas,scifb-r8a7793", "renesas,rcar-gen2-scifb", "renesas,scifb"; diff --git a/patches.renesas/0216-ARM-dts-r8a7794-Correct-SCIFB-reg-properties-to-cove.patch b/patches.renesas/0216-ARM-dts-r8a7794-Correct-SCIFB-reg-properties-to-cove.patch index 66066855999fe..76eafea33cefa 100644 --- a/patches.renesas/0216-ARM-dts-r8a7794-Correct-SCIFB-reg-properties-to-cove.patch +++ b/patches.renesas/0216-ARM-dts-r8a7794-Correct-SCIFB-reg-properties-to-cove.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi -@@ -411,7 +411,7 @@ +@@ -410,7 +410,7 @@ scifb0: serial@e6c20000 { compatible = "renesas,scifb-r8a7794", "renesas,rcar-gen2-scifb", "renesas,scifb"; @@ -30,7 +30,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks R8A7794_CLK_SCIFB0>; clock-names = "fck"; -@@ -425,7 +425,7 @@ +@@ -424,7 +424,7 @@ scifb1: serial@e6c30000 { compatible = "renesas,scifb-r8a7794", "renesas,rcar-gen2-scifb", "renesas,scifb"; @@ -39,7 +39,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> interrupts = <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks R8A7794_CLK_SCIFB1>; clock-names = "fck"; -@@ -439,7 +439,7 @@ +@@ -438,7 +438,7 @@ scifb2: serial@e6ce0000 { compatible = "renesas,scifb-r8a7794", "renesas,rcar-gen2-scifb", "renesas,scifb"; diff --git a/patches.renesas/0218-ARM-dts-r8a7792-add-MSIOF-clocks.patch b/patches.renesas/0218-ARM-dts-r8a7792-add-MSIOF-clocks.patch index 7639ef6a734fd..f9f80ef8086b1 100644 --- a/patches.renesas/0218-ARM-dts-r8a7792-add-MSIOF-clocks.patch +++ b/patches.renesas/0218-ARM-dts-r8a7792-add-MSIOF-clocks.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7792.dtsi +++ b/arch/arm/boot/dts/r8a7792.dtsi -@@ -768,6 +768,13 @@ +@@ -767,6 +767,13 @@ clock-div = <48>; clock-mult = <1>; }; @@ -34,7 +34,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> m2_clk: m2 { compatible = "fixed-factor-clock"; clocks = <&cpg_clocks R8A7792_CLK_PLL1>; -@@ -798,6 +805,15 @@ +@@ -797,6 +804,15 @@ }; /* Gate clocks */ @@ -50,7 +50,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> mstp1_clks: mstp1_clks@e6150134 { compatible = "renesas,r8a7792-mstp-clocks", "renesas,cpg-mstp-clocks"; -@@ -816,12 +832,13 @@ +@@ -815,12 +831,13 @@ compatible = "renesas,r8a7792-mstp-clocks", "renesas,cpg-mstp-clocks"; reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>; diff --git a/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch b/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch index a4439e869a245..0fd36cbdd1d44 100644 --- a/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch +++ b/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2324,10 +2324,11 @@ static int xhci_setup_port_arrays(struct +@@ -2325,10 +2325,11 @@ static int xhci_setup_port_arrays(struct /* Place limits on the number of roothub ports so that the hub * descriptors aren't longer than the USB core will allocate. */ diff --git a/patches.renesas/0219-ARM-dts-r8a7792-add-MSIOF-support.patch b/patches.renesas/0219-ARM-dts-r8a7792-add-MSIOF-support.patch index e4f8b71e2d748..45168142289c3 100644 --- a/patches.renesas/0219-ARM-dts-r8a7792-add-MSIOF-support.patch +++ b/patches.renesas/0219-ARM-dts-r8a7792-add-MSIOF-support.patch @@ -28,7 +28,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> vin0 = &vin0; vin1 = &vin1; vin2 = &vin2; -@@ -575,6 +577,34 @@ +@@ -574,6 +576,34 @@ #address-cells = <1>; #size-cells = <0>; status = "disabled"; diff --git a/patches.renesas/0221-ASoC-simple-card-use-devm_get_clk_from_child.patch b/patches.renesas/0221-ASoC-simple-card-use-devm_get_clk_from_child.patch index 9eb4ab4a5d0e3..9c8db64e91c7c 100644 --- a/patches.renesas/0221-ASoC-simple-card-use-devm_get_clk_from_child.patch +++ b/patches.renesas/0221-ASoC-simple-card-use-devm_get_clk_from_child.patch @@ -69,7 +69,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c -@@ -278,11 +278,11 @@ static int asoc_simple_card_dai_link_of( +@@ -284,11 +284,11 @@ static int asoc_simple_card_dai_link_of( if (ret < 0) goto dai_link_of_err; diff --git a/patches.renesas/0222-media-v4l-vsp1-Add-VIDIOC_EXPBUF-support.patch b/patches.renesas/0222-media-v4l-vsp1-Add-VIDIOC_EXPBUF-support.patch index 164b454d2e1c5..aec8d21f74a2b 100644 --- a/patches.renesas/0222-media-v4l-vsp1-Add-VIDIOC_EXPBUF-support.patch +++ b/patches.renesas/0222-media-v4l-vsp1-Add-VIDIOC_EXPBUF-support.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/media/platform/vsp1/vsp1_video.c +++ b/drivers/media/platform/vsp1/vsp1_video.c -@@ -1021,6 +1021,7 @@ static const struct v4l2_ioctl_ops vsp1_ +@@ -1034,6 +1034,7 @@ static const struct v4l2_ioctl_ops vsp1_ .vidioc_querybuf = vb2_ioctl_querybuf, .vidioc_qbuf = vb2_ioctl_qbuf, .vidioc_dqbuf = vb2_ioctl_dqbuf, diff --git a/patches.renesas/0223-ARM-dts-r8a7794-Fix-W-1-dtc-warnings.patch b/patches.renesas/0223-ARM-dts-r8a7794-Fix-W-1-dtc-warnings.patch index c9ecfbcb5a645..509b4e2be3984 100644 --- a/patches.renesas/0223-ARM-dts-r8a7794-Fix-W-1-dtc-warnings.patch +++ b/patches.renesas/0223-ARM-dts-r8a7794-Fix-W-1-dtc-warnings.patch @@ -43,7 +43,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi -@@ -1495,62 +1495,62 @@ +@@ -1496,62 +1496,62 @@ status = "disabled"; rcar_sound,dvc { @@ -125,7 +125,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; dmas = <&audma0 0x91>, <&audma0 0xb4>; dma-names = "rx", "tx"; -@@ -1558,61 +1558,61 @@ +@@ -1559,61 +1559,61 @@ }; rcar_sound,ssi { diff --git a/patches.renesas/0224-serial-sh-sci-Remove-manual-break-debouncing.patch b/patches.renesas/0224-serial-sh-sci-Remove-manual-break-debouncing.patch index a54e3849fb941..5862eeea9551e 100644 --- a/patches.renesas/0224-serial-sh-sci-Remove-manual-break-debouncing.patch +++ b/patches.renesas/0224-serial-sh-sci-Remove-manual-break-debouncing.patch @@ -117,7 +117,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (uart_handle_sysrq_char(port, c)) { count--; i--; continue; -@@ -918,37 +871,6 @@ static void sci_receive_chars(struct uar +@@ -920,37 +873,6 @@ static void sci_receive_chars(struct uar } } @@ -155,7 +155,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> static int sci_handle_errors(struct uart_port *port) { int copied = 0; -@@ -968,35 +890,13 @@ static int sci_handle_errors(struct uart +@@ -970,35 +892,13 @@ static int sci_handle_errors(struct uart } if (status & SCxSR_FER(port)) { @@ -196,7 +196,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } if (status & SCxSR_PER(port)) { -@@ -1049,17 +949,11 @@ static int sci_handle_breaks(struct uart +@@ -1051,17 +951,11 @@ static int sci_handle_breaks(struct uart int copied = 0; unsigned short status = serial_port_in(port, SCxSR); struct tty_port *tport = &port->state->port; @@ -215,7 +215,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> port->icount.brk++; /* Notify of BREAK */ -@@ -2683,10 +2577,6 @@ static int sci_init_single(struct platfo +@@ -2697,10 +2591,6 @@ static int sci_init_single(struct platfo pm_runtime_enable(&dev->dev); } diff --git a/patches.renesas/0225-serial-sh-sci-Remove-unused-platform-data-capabiliti.patch b/patches.renesas/0225-serial-sh-sci-Remove-unused-platform-data-capabiliti.patch index 48e71ba7bc478..a9625a74121a9 100644 --- a/patches.renesas/0225-serial-sh-sci-Remove-unused-platform-data-capabiliti.patch +++ b/patches.renesas/0225-serial-sh-sci-Remove-unused-platform-data-capabiliti.patch @@ -36,7 +36,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* RTS# is output, driven 1 */ ctrl |= SCPCR_RTSC; serial_port_out(port, SCPDR, -@@ -1738,7 +1739,7 @@ static void sci_set_mctrl(struct uart_po +@@ -1751,7 +1752,7 @@ static void sci_set_mctrl(struct uart_po mctrl_gpio_set(s->gpios, mctrl); @@ -45,7 +45,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return; if (!(mctrl & TIOCM_RTS)) { -@@ -2815,6 +2816,7 @@ sci_parse_dt(struct platform_device *pde +@@ -2829,6 +2830,7 @@ sci_parse_dt(struct platform_device *pde struct device_node *np = pdev->dev.of_node; const struct of_device_id *match; struct plat_sci_port *p; @@ -53,7 +53,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> int id; if (!IS_ENABLED(CONFIG_OF) || !np) -@@ -2835,13 +2837,14 @@ sci_parse_dt(struct platform_device *pde +@@ -2849,13 +2851,14 @@ sci_parse_dt(struct platform_device *pde return NULL; } @@ -69,7 +69,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return p; } -@@ -2869,7 +2872,7 @@ static int sci_probe_single(struct platf +@@ -2883,7 +2886,7 @@ static int sci_probe_single(struct platf if (IS_ERR(sciport->gpios) && PTR_ERR(sciport->gpios) != -ENOSYS) return PTR_ERR(sciport->gpios); diff --git a/patches.renesas/0226-serial-sh-sci-Compute-the-regshift-value-for-SCI-por.patch b/patches.renesas/0226-serial-sh-sci-Compute-the-regshift-value-for-SCI-por.patch index a15f61d5c66f3..c40d5f3a189a4 100644 --- a/patches.renesas/0226-serial-sh-sci-Compute-the-regshift-value-for-SCI-por.patch +++ b/patches.renesas/0226-serial-sh-sci-Compute-the-regshift-value-for-SCI-por.patch @@ -80,7 +80,7 @@ Conflicts: DEFINE_RES_IRQ(evt2irq(0xc40)), --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -2580,9 +2580,15 @@ static int sci_init_single(struct platfo +@@ -2594,9 +2594,15 @@ static int sci_init_single(struct platfo port->type = p->type; port->flags = UPF_FIXED_PORT | UPF_BOOT_AUTOCONF | p->flags; diff --git a/patches.renesas/0227-serial-sh-sci-Reformat-sci_parse_dt-for-git-diff.patch b/patches.renesas/0227-serial-sh-sci-Reformat-sci_parse_dt-for-git-diff.patch index bf560d25900f4..21ef33f966a88 100644 --- a/patches.renesas/0227-serial-sh-sci-Reformat-sci_parse_dt-for-git-diff.patch +++ b/patches.renesas/0227-serial-sh-sci-Reformat-sci_parse_dt-for-git-diff.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -2816,8 +2816,8 @@ static const struct of_device_id of_sci_ +@@ -2830,8 +2830,8 @@ static const struct of_device_id of_sci_ }; MODULE_DEVICE_TABLE(of, of_sci_match); diff --git a/patches.renesas/0228-ARM-dts-r8a7793-Enable-VIN0-VIN2.patch b/patches.renesas/0228-ARM-dts-r8a7793-Enable-VIN0-VIN2.patch index fd583160c3c99..d5d72d76fa103 100644 --- a/patches.renesas/0228-ARM-dts-r8a7793-Enable-VIN0-VIN2.patch +++ b/patches.renesas/0228-ARM-dts-r8a7793-Enable-VIN0-VIN2.patch @@ -15,7 +15,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi -@@ -852,6 +852,33 @@ +@@ -851,6 +851,33 @@ status = "disabled"; }; diff --git a/patches.renesas/0230-serial-sh-sci-implement-FIFO-threshold-register-sett.patch b/patches.renesas/0230-serial-sh-sci-implement-FIFO-threshold-register-sett.patch index e0452bd8794e1..27f66bebc2a35 100644 --- a/patches.renesas/0230-serial-sh-sci-implement-FIFO-threshold-register-sett.patch +++ b/patches.renesas/0230-serial-sh-sci-implement-FIFO-threshold-register-sett.patch @@ -17,7 +17,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -974,6 +974,65 @@ static int sci_handle_breaks(struct uart +@@ -976,6 +976,65 @@ static int sci_handle_breaks(struct uart return copied; } diff --git a/patches.renesas/0231-serial-sh-sci-increase-RX-FIFO-trigger-defaults-for-.patch b/patches.renesas/0231-serial-sh-sci-increase-RX-FIFO-trigger-defaults-for-.patch index 71e14789c691b..9f2e27e35b596 100644 --- a/patches.renesas/0231-serial-sh-sci-increase-RX-FIFO-trigger-defaults-for-.patch +++ b/patches.renesas/0231-serial-sh-sci-increase-RX-FIFO-trigger-defaults-for-.patch @@ -35,7 +35,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .overrun_reg = SCxSR, .overrun_mask = SCIFA_ORER, .sampling_rate_mask = SCI_SR(16), -@@ -2064,6 +2065,7 @@ static void sci_reset(struct uart_port * +@@ -2077,6 +2078,7 @@ static void sci_reset(struct uart_port * { const struct plat_sci_reg *reg; unsigned int status; @@ -43,7 +43,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> do { status = serial_port_in(port, SCxSR); -@@ -2083,6 +2085,9 @@ static void sci_reset(struct uart_port * +@@ -2096,6 +2098,9 @@ static void sci_reset(struct uart_port * status &= ~(SCLSR_TO | SCLSR_ORER); serial_port_out(port, SCLSR, status); } @@ -53,7 +53,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } static void sci_set_termios(struct uart_port *port, struct ktermios *termios, -@@ -2621,6 +2626,28 @@ static int sci_init_single(struct platfo +@@ -2635,6 +2640,28 @@ static int sci_init_single(struct platfo if (unlikely(sci_port->params == NULL)) return -EINVAL; diff --git a/patches.renesas/0232-serial-sh-sci-SCIFA-B-RX-FIFO-software-timeout.patch b/patches.renesas/0232-serial-sh-sci-SCIFA-B-RX-FIFO-software-timeout.patch index 40a7e320bbb2a..2c630167da3fb 100644 --- a/patches.renesas/0232-serial-sh-sci-SCIFA-B-RX-FIFO-software-timeout.patch +++ b/patches.renesas/0232-serial-sh-sci-SCIFA-B-RX-FIFO-software-timeout.patch @@ -31,7 +31,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> bool has_rtscts; bool autorts; -@@ -1034,6 +1037,24 @@ static int scif_set_rtrg(struct uart_por +@@ -1036,6 +1039,24 @@ static int scif_set_rtrg(struct uart_por return rx_trig; } @@ -56,7 +56,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> #ifdef CONFIG_SERIAL_SH_SCI_DMA static void sci_dma_tx_complete(void *arg) { -@@ -1473,10 +1494,10 @@ static inline void sci_free_dma(struct u +@@ -1486,10 +1507,10 @@ static inline void sci_free_dma(struct u static irqreturn_t sci_rx_interrupt(int irq, void *ptr) { @@ -68,7 +68,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (s->chan_rx) { u16 scr = serial_port_in(port, SCSCR); u16 ssr = serial_port_in(port, SCxSR); -@@ -1501,6 +1522,14 @@ static irqreturn_t sci_rx_interrupt(int +@@ -1514,6 +1535,14 @@ static irqreturn_t sci_rx_interrupt(int } #endif @@ -83,7 +83,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* I think sci_receive_chars has to be called irrespective * of whether the I_IXOFF is set, otherwise, how is the interrupt * to be disabled? -@@ -2086,14 +2115,21 @@ static void sci_reset(struct uart_port * +@@ -2099,14 +2128,21 @@ static void sci_reset(struct uart_port * serial_port_out(port, SCLSR, status); } @@ -108,7 +108,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> unsigned int brr = 255, cks = 0, srr = 15, dl = 0, sccks = 0; unsigned int brr1 = 255, cks1 = 0, srr1 = 15, dl1 = 0; struct sci_port *s = to_sci_port(port); -@@ -2293,7 +2329,6 @@ done: +@@ -2306,7 +2342,6 @@ done: sci_set_mctrl(port, port->mctrl); } @@ -116,7 +116,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* * Calculate delay for 2 DMA buffers (4 FIFO). * See serial_core.c::uart_update_timeout(). -@@ -2304,36 +2339,34 @@ done: +@@ -2317,36 +2352,34 @@ done: * value obtained by this formula is too small. Therefore, if the value * is smaller than 20ms, use 20ms as the timeout value for DMA. */ @@ -179,7 +179,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> #endif if ((termios->c_cflag & CREAD) != 0) -@@ -2648,6 +2681,8 @@ static int sci_init_single(struct platfo +@@ -2662,6 +2695,8 @@ static int sci_init_single(struct platfo break; } diff --git a/patches.renesas/0233-serial-sh-sci-make-RX-FIFO-parameters-tunable-via-sy.patch b/patches.renesas/0233-serial-sh-sci-make-RX-FIFO-parameters-tunable-via-sy.patch index 44e4ee5fccc32..31dcddcd2500c 100644 --- a/patches.renesas/0233-serial-sh-sci-make-RX-FIFO-parameters-tunable-via-sy.patch +++ b/patches.renesas/0233-serial-sh-sci-make-RX-FIFO-parameters-tunable-via-sy.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -1055,6 +1055,66 @@ static void rx_fifo_timer_fn(unsigned lo +@@ -1057,6 +1057,66 @@ static void rx_fifo_timer_fn(unsigned lo scif_set_rtrg(port, 1); } @@ -85,7 +85,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> #ifdef CONFIG_SERIAL_SH_SCI_DMA static void sci_dma_tx_complete(void *arg) { -@@ -2892,6 +2952,15 @@ static int sci_remove(struct platform_de +@@ -2906,6 +2966,15 @@ static int sci_remove(struct platform_de sci_cleanup_single(port); @@ -101,7 +101,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return 0; } -@@ -3057,6 +3126,24 @@ static int sci_probe(struct platform_dev +@@ -3071,6 +3140,24 @@ static int sci_probe(struct platform_dev if (ret) return ret; diff --git a/patches.renesas/0234-serial-sh-sci-fix-hardware-RX-trigger-level-setting.patch b/patches.renesas/0234-serial-sh-sci-fix-hardware-RX-trigger-level-setting.patch index 3c16d3165f19d..cc35dd4a160dd 100644 --- a/patches.renesas/0234-serial-sh-sci-fix-hardware-RX-trigger-level-setting.patch +++ b/patches.renesas/0234-serial-sh-sci-fix-hardware-RX-trigger-level-setting.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -1076,8 +1076,11 @@ static ssize_t rx_trigger_store(struct d +@@ -1078,8 +1078,11 @@ static ssize_t rx_trigger_store(struct d if (kstrtol(buf, 0, &r) == -EINVAL) return -EINVAL; @@ -34,7 +34,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return count; } -@@ -2181,7 +2184,11 @@ static void sci_reset(struct uart_port * +@@ -2194,7 +2197,11 @@ static void sci_reset(struct uart_port * setup_timer(&s->rx_fifo_timer, rx_fifo_timer_fn, (unsigned long)s); } else { diff --git a/patches.renesas/0249-drm-rcar-du-Handle-event-when-disabling-CRTCs.patch b/patches.renesas/0249-drm-rcar-du-Handle-event-when-disabling-CRTCs.patch index 24e538a35e9df..a17ebcff0c32f 100644 --- a/patches.renesas/0249-drm-rcar-du-Handle-event-when-disabling-CRTCs.patch +++ b/patches.renesas/0249-drm-rcar-du-Handle-event-when-disabling-CRTCs.patch @@ -17,9 +17,9 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c -@@ -488,6 +488,13 @@ static void rcar_du_crtc_disable(struct - rcar_du_crtc_stop(rcrtc); - rcar_du_crtc_put(rcrtc); +@@ -519,6 +519,13 @@ static void rcar_du_crtc_disable(struct + } + spin_unlock_irq(&crtc->dev->event_lock); + spin_lock_irq(&crtc->dev->event_lock); + if (crtc->state->event) { diff --git a/patches.renesas/0250-drm-rcar-du-Clear-handled-event-pointer-in-CRTC-stat.patch b/patches.renesas/0250-drm-rcar-du-Clear-handled-event-pointer-in-CRTC-stat.patch index fb32bbc7220a5..6446c46efbece 100644 --- a/patches.renesas/0250-drm-rcar-du-Clear-handled-event-pointer-in-CRTC-stat.patch +++ b/patches.renesas/0250-drm-rcar-du-Clear-handled-event-pointer-in-CRTC-stat.patch @@ -17,7 +17,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c -@@ -501,16 +501,16 @@ static void rcar_du_crtc_disable(struct +@@ -532,16 +532,16 @@ static void rcar_du_crtc_disable(struct static void rcar_du_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_crtc_state *old_crtc_state) { diff --git a/patches.renesas/0262-ARM-dts-r8a7790-Add-device-node-for-PRR.patch b/patches.renesas/0262-ARM-dts-r8a7790-Add-device-node-for-PRR.patch index 75149877e9631..936ceee376e39 100644 --- a/patches.renesas/0262-ARM-dts-r8a7790-Add-device-node-for-PRR.patch +++ b/patches.renesas/0262-ARM-dts-r8a7790-Add-device-node-for-PRR.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi -@@ -1471,6 +1471,11 @@ +@@ -1474,6 +1474,11 @@ }; }; diff --git a/patches.renesas/0263-ARM-dts-r8a7791-Add-device-node-for-PRR.patch b/patches.renesas/0263-ARM-dts-r8a7791-Add-device-node-for-PRR.patch index f235922c4de9e..4c8084cb3c60b 100644 --- a/patches.renesas/0263-ARM-dts-r8a7791-Add-device-node-for-PRR.patch +++ b/patches.renesas/0263-ARM-dts-r8a7791-Add-device-node-for-PRR.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi -@@ -1485,6 +1485,11 @@ +@@ -1487,6 +1487,11 @@ }; }; diff --git a/patches.renesas/0264-ARM-dts-r8a7792-Add-device-node-for-PRR.patch b/patches.renesas/0264-ARM-dts-r8a7792-Add-device-node-for-PRR.patch index eae5e11bf989c..10e0589e8133d 100644 --- a/patches.renesas/0264-ARM-dts-r8a7792-Add-device-node-for-PRR.patch +++ b/patches.renesas/0264-ARM-dts-r8a7792-Add-device-node-for-PRR.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7792.dtsi +++ b/arch/arm/boot/dts/r8a7792.dtsi -@@ -125,6 +125,11 @@ +@@ -124,6 +124,11 @@ reg = <0 0xe6160000 0 0x0100>; }; diff --git a/patches.renesas/0264-drm-rcar-du-Add-HDMI-outputs-to-R8A7795-device-descr.patch b/patches.renesas/0264-drm-rcar-du-Add-HDMI-outputs-to-R8A7795-device-descr.patch index 271a733e59e9a..80d032adc7b7b 100644 --- a/patches.renesas/0264-drm-rcar-du-Add-HDMI-outputs-to-R8A7795-device-descr.patch +++ b/patches.renesas/0264-drm-rcar-du-Add-HDMI-outputs-to-R8A7795-device-descr.patch @@ -26,7 +26,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> * * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com) * -@@ -61,6 +61,8 @@ enum rcar_du_output { +@@ -69,6 +69,8 @@ enum rcar_du_output { RCAR_DU_OUTPUT_DPAD1, RCAR_DU_OUTPUT_LVDS0, RCAR_DU_OUTPUT_LVDS1, diff --git a/patches.renesas/0265-ARM-dts-r8a7793-Add-device-node-for-PRR.patch b/patches.renesas/0265-ARM-dts-r8a7793-Add-device-node-for-PRR.patch index 9f9d88374c9b3..dc82d428919f3 100644 --- a/patches.renesas/0265-ARM-dts-r8a7793-Add-device-node-for-PRR.patch +++ b/patches.renesas/0265-ARM-dts-r8a7793-Add-device-node-for-PRR.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi -@@ -1311,6 +1311,11 @@ +@@ -1313,6 +1313,11 @@ reg = <0 0xe6160000 0 0x0100>; }; diff --git a/patches.renesas/0266-ARM-dts-r8a7794-Add-device-node-for-PRR.patch b/patches.renesas/0266-ARM-dts-r8a7794-Add-device-node-for-PRR.patch index 31bc7e34ac75b..5047621e1f13c 100644 --- a/patches.renesas/0266-ARM-dts-r8a7794-Add-device-node-for-PRR.patch +++ b/patches.renesas/0266-ARM-dts-r8a7794-Add-device-node-for-PRR.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi -@@ -1382,6 +1382,11 @@ +@@ -1383,6 +1383,11 @@ reg = <0 0xe6160000 0 0x0100>; }; diff --git a/patches.renesas/0268-ARM-dts-r8a7794-Add-DU1-clock-to-device-tree.patch b/patches.renesas/0268-ARM-dts-r8a7794-Add-DU1-clock-to-device-tree.patch deleted file mode 100644 index c50a87275b64d..0000000000000 --- a/patches.renesas/0268-ARM-dts-r8a7794-Add-DU1-clock-to-device-tree.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 3f8647c4d9036e7c01c7ed719c227b343db15893 Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven <geert+renesas@glider.be> -Date: Tue, 28 Mar 2017 12:45:30 +0200 -Subject: [PATCH 268/286] ARM: dts: r8a7794: Add DU1 clock to device tree - -Add the missing module clock for the second channel of the display unit. - -Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> -Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -(cherry picked from commit 1764f8081f1524bf629e0744b277db751281ff56) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - arch/arm/boot/dts/r8a7794.dtsi | 8 +++++--- - include/dt-bindings/clock/r8a7794-clock.h | 1 + - 2 files changed, 6 insertions(+), 3 deletions(-) - ---- a/arch/arm/boot/dts/r8a7794.dtsi -+++ b/arch/arm/boot/dts/r8a7794.dtsi -@@ -1270,19 +1270,21 @@ - clocks = <&mp_clk>, <&hp_clk>, - <&zs_clk>, <&p_clk>, <&p_clk>, <&zs_clk>, - <&zs_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, -- <&zx_clk>; -+ <&zx_clk>, <&zx_clk>; - #clock-cells = <1>; - clock-indices = < - R8A7794_CLK_EHCI R8A7794_CLK_HSUSB - R8A7794_CLK_HSCIF2 R8A7794_CLK_SCIF5 - R8A7794_CLK_SCIF4 R8A7794_CLK_HSCIF1 R8A7794_CLK_HSCIF0 - R8A7794_CLK_SCIF3 R8A7794_CLK_SCIF2 R8A7794_CLK_SCIF1 -- R8A7794_CLK_SCIF0 R8A7794_CLK_DU0 -+ R8A7794_CLK_SCIF0 -+ R8A7794_CLK_DU1 R8A7794_CLK_DU0 - >; - clock-output-names = - "ehci", "hsusb", - "hscif2", "scif5", "scif4", "hscif1", "hscif0", -- "scif3", "scif2", "scif1", "scif0", "du0"; -+ "scif3", "scif2", "scif1", "scif0", -+ "du1", "du0"; - }; - mstp8_clks: mstp8_clks@e6150990 { - compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks"; ---- a/include/dt-bindings/clock/r8a7794-clock.h -+++ b/include/dt-bindings/clock/r8a7794-clock.h -@@ -82,6 +82,7 @@ - #define R8A7794_CLK_SCIF2 19 - #define R8A7794_CLK_SCIF1 20 - #define R8A7794_CLK_SCIF0 21 -+#define R8A7794_CLK_DU1 23 - #define R8A7794_CLK_DU0 24 - - /* MSTP8 */ diff --git a/patches.renesas/0269-ARM-dts-r8a7794-Correct-clock-of-DU1.patch b/patches.renesas/0269-ARM-dts-r8a7794-Correct-clock-of-DU1.patch deleted file mode 100644 index efd78494a4886..0000000000000 --- a/patches.renesas/0269-ARM-dts-r8a7794-Correct-clock-of-DU1.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 947c7b557720636aa4578af4df216d2b7132b5b8 Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven <geert+renesas@glider.be> -Date: Tue, 28 Mar 2017 12:45:31 +0200 -Subject: [PATCH 269/286] ARM: dts: r8a7794: Correct clock of DU1 - -The second channel of the display unit uses a different module clock -than the first channel. - -Fixes: 46c4f13d04d729fa ("ARM: shmobile: r8a7794: Add DU node to device tree") -Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> -Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -(cherry picked from commit 89675f36c9e17512812b9d14d9824f8ef92782c3) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - arch/arm/boot/dts/r8a7794.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm/boot/dts/r8a7794.dtsi -+++ b/arch/arm/boot/dts/r8a7794.dtsi -@@ -925,7 +925,7 @@ - interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&mstp7_clks R8A7794_CLK_DU0>, -- <&mstp7_clks R8A7794_CLK_DU0>; -+ <&mstp7_clks R8A7794_CLK_DU1>; - clock-names = "du.0", "du.1"; - status = "disabled"; - diff --git a/patches.renesas/0271-ARM-dts-silk-Correct-clock-of-DU1.patch b/patches.renesas/0271-ARM-dts-silk-Correct-clock-of-DU1.patch deleted file mode 100644 index 7ae6b71a13e43..0000000000000 --- a/patches.renesas/0271-ARM-dts-silk-Correct-clock-of-DU1.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f7ec308c7284327d220af81f5c3fafb23db3f3b2 Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven <geert+renesas@glider.be> -Date: Tue, 28 Mar 2017 12:45:33 +0200 -Subject: [PATCH 271/286] ARM: dts: silk: Correct clock of DU1 - -The second channel of the display unit uses a different module clock -than the first channel. - -Fixes: 84e734f497cd48f6 ("ARM: dts: silk: add DU DT support") -Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> -Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -(cherry picked from commit 403fe77e22eb72c962c3889efc9d4fa62e454737) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - arch/arm/boot/dts/r8a7794-silk.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm/boot/dts/r8a7794-silk.dts -+++ b/arch/arm/boot/dts/r8a7794-silk.dts -@@ -424,7 +424,7 @@ - status = "okay"; - - clocks = <&mstp7_clks R8A7794_CLK_DU0>, -- <&mstp7_clks R8A7794_CLK_DU0>, -+ <&mstp7_clks R8A7794_CLK_DU1>, - <&x2_clk>, <&x3_clk>; - clock-names = "du.0", "du.1", "dclkin.0", "dclkin.1"; - diff --git a/patches.renesas/0272-ARM-dts-r7s72100-fix-ethernet-clock-parent.patch b/patches.renesas/0272-ARM-dts-r7s72100-fix-ethernet-clock-parent.patch deleted file mode 100644 index 044e954b5720c..0000000000000 --- a/patches.renesas/0272-ARM-dts-r7s72100-fix-ethernet-clock-parent.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c1bee37fcaf3a0b95972ed5705c16f9f643d1211 Mon Sep 17 00:00:00 2001 -From: Chris Brandt <chris.brandt@renesas.com> -Date: Thu, 30 Mar 2017 14:16:09 -0700 -Subject: [PATCH 272/286] ARM: dts: r7s72100: fix ethernet clock parent - -Technically, the Ethernet block is run off the 133MHz Bus (B) clock, not -the 33MHz Peripheral 0 (P0) clock. - -Fixes: 969244f9c720 ("ARM: dts: r7s72100: add ethernet clock to device tree") -Signed-off-by: Chris Brandt <chris.brandt@renesas.com> -Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -(cherry picked from commit 91a7c50cb4fabfba218549dfa84356069918bfbf) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - arch/arm/boot/dts/r7s72100.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm/boot/dts/r7s72100.dtsi -+++ b/arch/arm/boot/dts/r7s72100.dtsi -@@ -121,7 +121,7 @@ - #clock-cells = <1>; - compatible = "renesas,r7s72100-mstp-clocks", "renesas,cpg-mstp-clocks"; - reg = <0xfcfe0430 4>; -- clocks = <&p0_clk>; -+ clocks = <&b_clk>; - clock-indices = <R7S72100_CLK_ETHER>; - clock-output-names = "ether"; - }; diff --git a/patches.renesas/0272-usb-host-xhci-make-use-of-new-usb_endpoint_maxp_mult.patch b/patches.renesas/0272-usb-host-xhci-make-use-of-new-usb_endpoint_maxp_mult.patch index ed0b16f5935e5..438cb3ca847d7 100644 --- a/patches.renesas/0272-usb-host-xhci-make-use-of-new-usb_endpoint_maxp_mult.patch +++ b/patches.renesas/0272-usb-host-xhci-make-use-of-new-usb_endpoint_maxp_mult.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1418,7 +1418,7 @@ static u32 xhci_get_endpoint_max_burst(s +@@ -1419,7 +1419,7 @@ static u32 xhci_get_endpoint_max_burst(s if (udev->speed == USB_SPEED_HIGH && (usb_endpoint_xfer_isoc(&ep->desc) || usb_endpoint_xfer_int(&ep->desc))) @@ -27,7 +27,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return 0; } -@@ -1464,9 +1464,9 @@ static u32 xhci_get_max_esit_payload(str +@@ -1465,9 +1465,9 @@ static u32 xhci_get_max_esit_payload(str return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval); max_packet = GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc)); diff --git a/patches.renesas/0273-ARM-dts-r8a7790-Correct-parent-of-SSI-0-9-clocks.patch b/patches.renesas/0273-ARM-dts-r8a7790-Correct-parent-of-SSI-0-9-clocks.patch deleted file mode 100644 index dd0c0b3e687cf..0000000000000 --- a/patches.renesas/0273-ARM-dts-r8a7790-Correct-parent-of-SSI-0-9-clocks.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c5483018b947d49e2a2b94ea9557da10cf1d1894 Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven <geert+renesas@glider.be> -Date: Mon, 3 Apr 2017 11:45:41 +0200 -Subject: [PATCH 273/286] ARM: dts: r8a7790: Correct parent of SSI[0-9] clocks - -The SSI-ALL gate clock is located in between the P clock and the -individual SSI[0-9] clocks, hence the former should be listed as their -parent. - -Fixes: bcde372254386872 ("ARM: shmobile: r8a7790: add MSTP10 support on DTSI") -Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -(cherry picked from commit d13d4e063d4a08eb1686e890e9183dde709871bf) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - arch/arm/boot/dts/r8a7790.dtsi | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/arch/arm/boot/dts/r8a7790.dtsi -+++ b/arch/arm/boot/dts/r8a7790.dtsi -@@ -1443,8 +1443,11 @@ - compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks"; - reg = <0 0xe6150998 0 4>, <0 0xe61509a8 0 4>; - clocks = <&p_clk>, -- <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, -- <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, -+ <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>, -+ <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>, -+ <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>, -+ <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>, -+ <&mstp10_clks R8A7790_CLK_SSI_ALL>, <&mstp10_clks R8A7790_CLK_SSI_ALL>, - <&p_clk>, - <&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>, - <&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>, diff --git a/patches.renesas/0273-usb-host-xhci-purge-GET_MAX_PACKET.patch b/patches.renesas/0273-usb-host-xhci-purge-GET_MAX_PACKET.patch index 6e5bd05b6d7e9..95a2a72d19ef0 100644 --- a/patches.renesas/0273-usb-host-xhci-purge-GET_MAX_PACKET.patch +++ b/patches.renesas/0273-usb-host-xhci-purge-GET_MAX_PACKET.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1463,7 +1463,7 @@ static u32 xhci_get_max_esit_payload(str +@@ -1464,7 +1464,7 @@ static u32 xhci_get_max_esit_payload(str else if (udev->speed >= USB_SPEED_SUPER) return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval); @@ -29,7 +29,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> max_burst = usb_endpoint_maxp_mult(&ep->desc); /* A 0 in max burst means 1 transfer per ESIT */ return max_packet * max_burst; -@@ -1520,7 +1520,7 @@ int xhci_endpoint_init(struct xhci_hcd * +@@ -1521,7 +1521,7 @@ int xhci_endpoint_init(struct xhci_hcd * } mult = xhci_get_endpoint_mult(udev, ep); diff --git a/patches.renesas/0274-ARM-dts-r8a7791-Correct-parent-of-SSI-0-9-clocks.patch b/patches.renesas/0274-ARM-dts-r8a7791-Correct-parent-of-SSI-0-9-clocks.patch deleted file mode 100644 index 457b96a233cd3..0000000000000 --- a/patches.renesas/0274-ARM-dts-r8a7791-Correct-parent-of-SSI-0-9-clocks.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d0d6f55d7423bc18a7bf61c23a7cf65153e25f12 Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven <geert+renesas@glider.be> -Date: Mon, 3 Apr 2017 11:45:42 +0200 -Subject: [PATCH 274/286] ARM: dts: r8a7791: Correct parent of SSI[0-9] clocks - -The SSI-ALL gate clock is located in between the P clock and the -individual SSI[0-9] clocks, hence the former should be listed as their -parent. - -Fixes: ee9141522dcf13f8 ("ARM: shmobile: r8a7791: add MSTP10 support on DTSI") -Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -(cherry picked from commit 16fe68dcab5702a024d85229ff7e98979cb701a5) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - arch/arm/boot/dts/r8a7791.dtsi | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/arch/arm/boot/dts/r8a7791.dtsi -+++ b/arch/arm/boot/dts/r8a7791.dtsi -@@ -1447,8 +1447,11 @@ - compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks"; - reg = <0 0xe6150998 0 4>, <0 0xe61509a8 0 4>; - clocks = <&p_clk>, -- <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, -- <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, -+ <&mstp10_clks R8A7791_CLK_SSI_ALL>, <&mstp10_clks R8A7791_CLK_SSI_ALL>, -+ <&mstp10_clks R8A7791_CLK_SSI_ALL>, <&mstp10_clks R8A7791_CLK_SSI_ALL>, -+ <&mstp10_clks R8A7791_CLK_SSI_ALL>, <&mstp10_clks R8A7791_CLK_SSI_ALL>, -+ <&mstp10_clks R8A7791_CLK_SSI_ALL>, <&mstp10_clks R8A7791_CLK_SSI_ALL>, -+ <&mstp10_clks R8A7791_CLK_SSI_ALL>, <&mstp10_clks R8A7791_CLK_SSI_ALL>, - <&p_clk>, - <&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>, - <&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>, diff --git a/patches.renesas/0275-ARM-dts-r8a7793-Correct-parent-of-SSI-0-9-clocks.patch b/patches.renesas/0275-ARM-dts-r8a7793-Correct-parent-of-SSI-0-9-clocks.patch deleted file mode 100644 index 1381821853903..0000000000000 --- a/patches.renesas/0275-ARM-dts-r8a7793-Correct-parent-of-SSI-0-9-clocks.patch +++ /dev/null @@ -1,34 +0,0 @@ -From bb124ff17ad8c8612b4c4cf8d094e898cdc6bfd2 Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven <geert+renesas@glider.be> -Date: Mon, 3 Apr 2017 11:45:43 +0200 -Subject: [PATCH 275/286] ARM: dts: r8a7793: Correct parent of SSI[0-9] clocks - -The SSI-ALL gate clock is located in between the P clock and the -individual SSI[0-9] clocks, hence the former should be listed as their -parent. - -Fixes: 072d326542e49187 ("ARM: dts: r8a7793: add MSTP10 clocks to device tree") -Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> -(cherry picked from commit 1cd9028027c7a7c10b774df698c3cfafec6aa67d) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - arch/arm/boot/dts/r8a7793.dtsi | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/arch/arm/boot/dts/r8a7793.dtsi -+++ b/arch/arm/boot/dts/r8a7793.dtsi -@@ -1269,8 +1269,11 @@ - compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp-clocks"; - reg = <0 0xe6150998 0 4>, <0 0xe61509a8 0 4>; - clocks = <&p_clk>, -- <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, -- <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>, -+ <&mstp10_clks R8A7793_CLK_SSI_ALL>, <&mstp10_clks R8A7793_CLK_SSI_ALL>, -+ <&mstp10_clks R8A7793_CLK_SSI_ALL>, <&mstp10_clks R8A7793_CLK_SSI_ALL>, -+ <&mstp10_clks R8A7793_CLK_SSI_ALL>, <&mstp10_clks R8A7793_CLK_SSI_ALL>, -+ <&mstp10_clks R8A7793_CLK_SSI_ALL>, <&mstp10_clks R8A7793_CLK_SSI_ALL>, -+ <&mstp10_clks R8A7793_CLK_SSI_ALL>, <&mstp10_clks R8A7793_CLK_SSI_ALL>, - <&p_clk>, - <&mstp10_clks R8A7793_CLK_SCU_ALL>, <&mstp10_clks R8A7793_CLK_SCU_ALL>, - <&mstp10_clks R8A7793_CLK_SCU_ALL>, <&mstp10_clks R8A7793_CLK_SCU_ALL>, diff --git a/patches.renesas/0278-ARM-dts-koelsch-Correct-clock-frequency-of-X2-DU-clo.patch b/patches.renesas/0278-ARM-dts-koelsch-Correct-clock-frequency-of-X2-DU-clo.patch index b54213172f4df..6e71d393f436c 100644 --- a/patches.renesas/0278-ARM-dts-koelsch-Correct-clock-frequency-of-X2-DU-clo.patch +++ b/patches.renesas/0278-ARM-dts-koelsch-Correct-clock-frequency-of-X2-DU-clo.patch @@ -23,12 +23,12 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts -@@ -292,7 +292,7 @@ - x2_clk: x2-clock { +@@ -298,7 +298,7 @@ + x13_clk: x13-clock { compatible = "fixed-clock"; #clock-cells = <0>; - clock-frequency = <148500000>; + clock-frequency = <74250000>; }; - x13_clk: x13-clock { + gpioi2c1: i2c-9 { diff --git a/patches.renesas/0292-usb-xhci-remove-the-use-of-xhci-addr_dev.patch b/patches.renesas/0292-usb-xhci-remove-the-use-of-xhci-addr_dev.patch index 89150b3f5be9a..c74f49c8d33d7 100644 --- a/patches.renesas/0292-usb-xhci-remove-the-use-of-xhci-addr_dev.patch +++ b/patches.renesas/0292-usb-xhci-remove-the-use-of-xhci-addr_dev.patch @@ -23,7 +23,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2597,7 +2597,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2598,7 +2598,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, * something other than the default (~1ms minimum between interrupts). * See section 5.5.1.2. */ diff --git a/patches.socfpga/0079-EDAC-altera-Fix-peripheral-warnings-for-Cyclone5.patch b/patches.socfpga/0079-EDAC-altera-Fix-peripheral-warnings-for-Cyclone5.patch deleted file mode 100644 index 7f6e80c1bf5f1..0000000000000 --- a/patches.socfpga/0079-EDAC-altera-Fix-peripheral-warnings-for-Cyclone5.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5a77f16dd47f75102d12d86a6ad7bb230b256077 Mon Sep 17 00:00:00 2001 -From: Thor Thayer <thor.thayer@linux.intel.com> -Date: Wed, 5 Apr 2017 13:01:02 -0500 -Subject: [PATCH 079/103] EDAC, altera: Fix peripheral warnings for Cyclone5 - -The peripherals' RAS functionality only exist on the Arria10 SoCFPGA. -The Cyclone5 initialization generates EDAC warnings when the peripherals -aren't found in the device tree. Fix by checking for Arria10 in the init -functions. - -Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com> -Cc: linux-edac <linux-edac@vger.kernel.org> -Link: http://lkml.kernel.org/r/1491415262-5018-1-git-send-email-thor.thayer@linux.intel.com -Signed-off-by: Borislav Petkov <bp@suse.de> ---- - drivers/edac/altera_edac.c | 22 ++++++++++++++++++---- - 1 file changed, 18 insertions(+), 4 deletions(-) - ---- a/drivers/edac/altera_edac.c -+++ b/drivers/edac/altera_edac.c -@@ -1024,13 +1024,23 @@ out: - return ret; - } - -+static int socfpga_is_a10(void) -+{ -+ return of_machine_is_compatible("altr,socfpga-arria10"); -+} -+ - static int validate_parent_available(struct device_node *np); - static const struct of_device_id altr_edac_a10_device_of_match[]; - static int __init __maybe_unused altr_init_a10_ecc_device_type(char *compat) - { - int irq; -- struct device_node *child, *np = of_find_compatible_node(NULL, NULL, -- "altr,socfpga-a10-ecc-manager"); -+ struct device_node *child, *np; -+ -+ if (!socfpga_is_a10()) -+ return -ENODEV; -+ -+ np = of_find_compatible_node(NULL, NULL, -+ "altr,socfpga-a10-ecc-manager"); - if (!np) { - edac_printk(KERN_ERR, EDAC_DEVICE, "ECC Manager not found\n"); - return -ENODEV; -@@ -1546,8 +1556,12 @@ static const struct edac_device_prv_data - static int __init socfpga_init_sdmmc_ecc(void) - { - int rc = -ENODEV; -- struct device_node *child = of_find_compatible_node(NULL, NULL, -- "altr,socfpga-sdmmc-ecc"); -+ struct device_node *child; -+ -+ if (!socfpga_is_a10()) -+ return -ENODEV; -+ -+ child = of_find_compatible_node(NULL, NULL, "altr,socfpga-sdmmc-ecc"); - if (!child) { - edac_printk(KERN_WARNING, EDAC_DEVICE, "SDMMC node not found\n"); - return -ENODEV; @@ -576,7 +576,6 @@ patches.renesas/0021-arm64-dts-r8a7795-Add-Cortex-A53-PMU-node.patch patches.renesas/0022-arm64-dts-r8a7795-Upgrade-to-PSCI-v1.0-to-support-Su.patch patches.renesas/0023-arm64-dts-r8a7796-Upgrade-to-PSCI-v1.0-to-support-Su.patch patches.renesas/0024-arm64-dts-r8a7795-Remove-unit-addresses-and-regs-fro.patch -patches.renesas/0025-arm64-dts-r8a7796-Remove-unit-address-and-reg-from-i.patch patches.renesas/0026-arm64-dts-r8a7795-salvator-x-Set-drive-strength-for-.patch patches.renesas/0027-arm64-dts-r8a7795-Tidyup-Audio-DMAC-channel-for-DVC.patch patches.renesas/0028-arm64-defconfig-enable-MVNETA.patch @@ -610,10 +609,6 @@ patches.renesas/0055-ARM-dts-r8a73a4-Remove-unit-addresses-and-regs-from-.patch patches.renesas/0056-ARM-dts-r8a7743-Remove-unit-address-and-reg-from-int.patch patches.renesas/0057-ARM-dts-r8a7745-Remove-unit-address-and-reg-from-int.patch patches.renesas/0058-ARM-dts-r8a7790-Remove-unit-addresses-and-regs-from-.patch -patches.renesas/0059-ARM-dts-r8a7791-Remove-unit-address-and-reg-from-int.patch -patches.renesas/0060-ARM-dts-r8a7792-Remove-unit-address-and-reg-from-int.patch -patches.renesas/0061-ARM-dts-r8a7793-Remove-unit-address-and-reg-from-int.patch -patches.renesas/0062-ARM-dts-r8a7794-Remove-unit-address-and-reg-from-int.patch patches.renesas/0063-ARM-dts-r8a7790-Tidyup-Audio-DMAC-channel-for-DVC.patch patches.renesas/0064-ARM-dts-r7s72100-Add-watchdog-timer.patch patches.renesas/0065-ARM-dts-r8a73a4-Add-INTC-SYS-clock-to-device-tree.patch @@ -655,7 +650,6 @@ patches.renesas/0100-ASoC-rsnd-fix-semicolon.cocci-warnings.patch patches.renesas/0101-ASoC-rsnd-Fix-possible-NULL-pointer-dereference.patch patches.renesas/0102-ASoC-rsnd-don-t-use-PDTA-bit-for-24bit-on-SSI.patch patches.renesas/0103-ASoC-rsnd-don-t-call-free_irq-on-Parent-SSI.patch -patches.renesas/0104-ASoC-rsnd-SSI-PIO-adjust-to-24bit-mode.patch patches.renesas/0105-ASoC-rsnd-fixup-parent_clk_name-of-AUDIO_CLKOUTx.patch patches.renesas/0106-soc-renesas-Identify-RZ-G1H.patch patches.renesas/0107-soc-renesas-Identify-RZ-G1N.patch @@ -663,7 +657,6 @@ patches.renesas/0108-soc-renesas-Register-SoC-device-early.patch patches.renesas/0109-ata-sata_rcar-Handle-return-value-of-clk_prepare_ena.patch patches.renesas/0110-clocksource-sh_cmt-Compute-rate-before-registration-.patch patches.renesas/0111-clockevents-drivers-sh_cmt-Set-min_delta_ticks-and-m.patch -patches.renesas/0112-sh_eth-Use-platform-device-for-printing-before-regis.patch patches.renesas/0113-sh_eth-Do-not-print-an-error-message-for-probe-defer.patch patches.renesas/0114-mmc-sh_mmcif-Document-r7s72100-DT-bindings.patch patches.renesas/0115-media-sh_mobile_ceu_camera-use-module_platform_drive.patch @@ -693,12 +686,10 @@ patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch patches.renesas/0139-media-v4l-vsp1-Fix-format-info-documentation.patch patches.renesas/0140-media-v4l-vsp1-Clean-up-file-handle-in-open-error-pa.patch patches.renesas/0141-media-v4l-vsp1-Fix-RPF-WPF-U-V-order-in-3-planar-for.patch -patches.renesas/0142-media-v4l-vsp1-Prevent-multiple-streamon-race-commen.patch patches.renesas/0143-media-v4l-vsp1-Remove-redundant-pipe-dl-usage-from-d.patch patches.renesas/0144-media-v4l-vsp1-Fix-multi-line-comment-style.patch patches.renesas/0145-media-v4l-vsp1-Disable-HSV-formats-on-Gen3-hardware.patch patches.renesas/0146-media-v4l-vsp1-Fix-struct-vsp1_drm-documentation.patch -patches.renesas/0147-media-v4l-vsp1-Register-pipe-with-output-WPF.patch patches.renesas/0148-media-v4l-vsp1-wpf-Implement-rotation-support.patch patches.renesas/0149-ASoC-wm8978-Add-OF-device-ID-table.patch patches.renesas/0150-clk-renesas-r8a7795-Add-IMR-clocks.patch @@ -812,14 +803,7 @@ patches.renesas/0264-drm-rcar-du-Add-HDMI-outputs-to-R8A7795-device-descr.patch patches.renesas/0265-ARM-dts-r8a7743-Add-reset-control-properties.patch patches.renesas/0266-ARM-dts-r8a7745-Add-reset-control-properties.patch patches.renesas/0267-ARM-dts-r7s72100-add-power-domains-to-sdhi.patch -patches.renesas/0268-ARM-dts-r8a7794-Add-DU1-clock-to-device-tree.patch -patches.renesas/0269-ARM-dts-r8a7794-Correct-clock-of-DU1.patch patches.renesas/0270-ARM-dts-alt-Correct-clock-of-DU1.patch -patches.renesas/0271-ARM-dts-silk-Correct-clock-of-DU1.patch -patches.renesas/0272-ARM-dts-r7s72100-fix-ethernet-clock-parent.patch -patches.renesas/0273-ARM-dts-r8a7790-Correct-parent-of-SSI-0-9-clocks.patch -patches.renesas/0274-ARM-dts-r8a7791-Correct-parent-of-SSI-0-9-clocks.patch -patches.renesas/0275-ARM-dts-r8a7793-Correct-parent-of-SSI-0-9-clocks.patch patches.renesas/0276-ARM-dts-r8a7792-Correct-Z-clock.patch patches.renesas/0277-ARM-dts-r8a7794-Add-Z2-clock.patch patches.renesas/0278-ARM-dts-koelsch-Correct-clock-frequency-of-X2-DU-clo.patch @@ -927,7 +911,6 @@ patches.socfpga/0075-gpio-altera-a10sr-Set-gpio_chip-parent-property.patch patches.socfpga/0076-dt-bindings-reset-a10sr-Add-Arria10-SR-Reset-Control.patch patches.socfpga/0077-reset-Add-Altera-Arria10-SR-Reset-Controller.patch patches.socfpga/0078-ARM-dts-socfpga-Add-Devkit-A10-SR-Reset-Controller.patch -patches.socfpga/0079-EDAC-altera-Fix-peripheral-warnings-for-Cyclone5.patch patches.socfpga/0080-mfd-altr_a10sr-Add-Arria10-DevKit-Reset-Controller.patch patches.socfpga/0081-dt-bindings-mfd-Add-Altera-Arria10-SR-Reset-Controll.patch patches.socfpga/0082-ARM-socfpga-defconfig-enable-qspi.patch |