From: Greg Kroah-Hartman Date: Fri, 4 Sep 2020 11:38:39 +0000 (+0200) Subject: 5.8-stable patches X-Git-Tag: v5.4.63~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47cd49506c35cb9201b689c87e5390c66d6f4ea2;p=thirdparty%2Fkernel%2Fstable-queue.git 5.8-stable patches added patches: dt-bindings-mmc-tegra-add-tmclk-for-tegra210-and-later.patch --- diff --git a/queue-5.8/dt-bindings-mmc-tegra-add-tmclk-for-tegra210-and-later.patch b/queue-5.8/dt-bindings-mmc-tegra-add-tmclk-for-tegra210-and-later.patch new file mode 100644 index 00000000000..52ac85f7a73 --- /dev/null +++ b/queue-5.8/dt-bindings-mmc-tegra-add-tmclk-for-tegra210-and-later.patch @@ -0,0 +1,84 @@ +From f7f86e8ac0ad7cd6792a80137f5a550924966916 Mon Sep 17 00:00:00 2001 +From: Sowjanya Komatineni +Date: Thu, 27 Aug 2020 10:20:57 -0700 +Subject: dt-bindings: mmc: tegra: Add tmclk for Tegra210 and later + +From: Sowjanya Komatineni + +commit f7f86e8ac0ad7cd6792a80137f5a550924966916 upstream. + +commit b5a84ecf025a ("mmc: tegra: Add Tegra210 support") + +Tegra210 and later uses separate SDMMC_LEGACY_TM clock for data +timeout. + +So, this patch adds "tmclk" to Tegra sdhci clock property in the +device tree binding. + +Fixes: b5a84ecf025a ("mmc: tegra: Add Tegra210 support") +Cc: stable # 5.4 +Reviewed-by: Jon Hunter +Signed-off-by: Sowjanya Komatineni +Link: https://lore.kernel.org/r/1598548861-32373-4-git-send-email-skomatineni@nvidia.com +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt | 32 +++++++++- + 1 file changed, 29 insertions(+), 3 deletions(-) + +--- a/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt ++++ b/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt +@@ -15,8 +15,15 @@ Required properties: + - "nvidia,tegra210-sdhci": for Tegra210 + - "nvidia,tegra186-sdhci": for Tegra186 + - "nvidia,tegra194-sdhci": for Tegra194 +-- clocks : Must contain one entry, for the module clock. +- See ../clocks/clock-bindings.txt for details. ++- clocks: For Tegra210, Tegra186 and Tegra194 must contain two entries. ++ One for the module clock and one for the timeout clock. ++ For all other Tegra devices, must contain a single entry for ++ the module clock. See ../clocks/clock-bindings.txt for details. ++- clock-names: For Tegra210, Tegra186 and Tegra194 must contain the ++ strings 'sdhci' and 'tmclk' to represent the module and ++ the timeout clocks, respectively. ++ For all other Tegra devices must contain the string 'sdhci' ++ to represent the module clock. + - resets : Must contain an entry for each entry in reset-names. + See ../reset/reset.txt for details. + - reset-names : Must include the following entries: +@@ -99,7 +106,7 @@ Optional properties for Tegra210, Tegra1 + + Example: + sdhci@700b0000 { +- compatible = "nvidia,tegra210-sdhci", "nvidia,tegra124-sdhci"; ++ compatible = "nvidia,tegra124-sdhci"; + reg = <0x0 0x700b0000 0x0 0x200>; + interrupts = ; + clocks = <&tegra_car TEGRA210_CLK_SDMMC1>; +@@ -107,6 +114,25 @@ sdhci@700b0000 { + resets = <&tegra_car 14>; + reset-names = "sdhci"; + pinctrl-names = "sdmmc-3v3", "sdmmc-1v8"; ++ pinctrl-0 = <&sdmmc1_3v3>; ++ pinctrl-1 = <&sdmmc1_1v8>; ++ nvidia,pad-autocal-pull-up-offset-3v3 = <0x00>; ++ nvidia,pad-autocal-pull-down-offset-3v3 = <0x7d>; ++ nvidia,pad-autocal-pull-up-offset-1v8 = <0x7b>; ++ nvidia,pad-autocal-pull-down-offset-1v8 = <0x7b>; ++ status = "disabled"; ++}; ++ ++sdhci@700b0000 { ++ compatible = "nvidia,tegra210-sdhci"; ++ reg = <0x0 0x700b0000 0x0 0x200>; ++ interrupts = ; ++ clocks = <&tegra_car TEGRA210_CLK_SDMMC1>, ++ <&tegra_car TEGRA210_CLK_SDMMC_LEGACY>; ++ clock-names = "sdhci", "tmclk"; ++ resets = <&tegra_car 14>; ++ reset-names = "sdhci"; ++ pinctrl-names = "sdmmc-3v3", "sdmmc-1v8"; + pinctrl-0 = <&sdmmc1_3v3>; + pinctrl-1 = <&sdmmc1_1v8>; + nvidia,pad-autocal-pull-up-offset-3v3 = <0x00>; diff --git a/queue-5.8/kvm-arm64-add-kvm_extable-for-vaxorcism-code.patch b/queue-5.8/kvm-arm64-add-kvm_extable-for-vaxorcism-code.patch index 42ab0d17259..1b15b4cb615 100644 --- a/queue-5.8/kvm-arm64-add-kvm_extable-for-vaxorcism-code.patch +++ b/queue-5.8/kvm-arm64-add-kvm_extable-for-vaxorcism-code.patch @@ -24,8 +24,8 @@ with four entries, half of which correspond with code that isn't mapped. Signed-off-by: James Morse Reviewed-by: Marc Zyngier Signed-off-by: Catalin Marinas +Signed-off-by: Andre Przywara Signed-off-by: Greg Kroah-Hartman - --- arch/arm64/include/asm/kvm_asm.h | 15 +++++++++++ arch/arm64/kernel/vmlinux.lds.S | 8 ++++++ diff --git a/queue-5.8/kvm-arm64-survive-synchronous-exceptions-caused-by-at-instructions.patch b/queue-5.8/kvm-arm64-survive-synchronous-exceptions-caused-by-at-instructions.patch index 66b249a40bc..23a21e8324c 100644 --- a/queue-5.8/kvm-arm64-survive-synchronous-exceptions-caused-by-at-instructions.patch +++ b/queue-5.8/kvm-arm64-survive-synchronous-exceptions-caused-by-at-instructions.patch @@ -39,8 +39,8 @@ Cc: stable@vger.kernel.org # Reviewed-by: Marc Zyngier Signed-off-by: Catalin Marinas +Signed-off-by: Andre Przywara Signed-off-by: Greg Kroah-Hartman - --- arch/arm64/include/asm/kvm_asm.h | 28 ++++++++++++++++++++++++++++ arch/arm64/kvm/hyp/hyp-entry.S | 14 ++++++++++---- diff --git a/queue-5.8/series b/queue-5.8/series index 5afbbab9818..2814ba544c6 100644 --- a/queue-5.8/series +++ b/queue-5.8/series @@ -7,3 +7,4 @@ perf-record-stat-explicitly-call-out-event-modifiers-in-the-documentation.patch media-media-v4l2-core-fix-kernel-infoleak-in-video_put_user.patch kvm-arm64-add-kvm_extable-for-vaxorcism-code.patch kvm-arm64-survive-synchronous-exceptions-caused-by-at-instructions.patch +dt-bindings-mmc-tegra-add-tmclk-for-tegra210-and-later.patch