| Message ID | 20210607084910.21024-1-krzysztof.kozlowski@canonical.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Headers | show |
| Series | [GIT,PULL] memory: Tegra memory controller for v5.14 | expand |
Hi Krzysztof, Thierry, On Mon, Jun 07, 2021 at 10:49:10AM +0200, Krzysztof Kozlowski wrote: > Hi Thierry and Will, > > This is the pull for you to base further SMMU aptches (prevent early SMMU > faults). This is a tonne of code for me to pull into the SMMU tree given that I only want one patch! Thierry, if I just stick: https://lore.kernel.org/r/20210603164632.1000458-4-thierry.reding@gmail.com on its own branch, can you stitch together whatever you need? Will
On Tue, Jun 08, 2021 at 01:01:29PM +0100, Will Deacon wrote: > Hi Krzysztof, Thierry, > > On Mon, Jun 07, 2021 at 10:49:10AM +0200, Krzysztof Kozlowski wrote: > > Hi Thierry and Will, > > > > This is the pull for you to base further SMMU aptches (prevent early SMMU > > faults). > > This is a tonne of code for me to pull into the SMMU tree given that I only > want one patch! > > Thierry, if I just stick: > > https://lore.kernel.org/r/20210603164632.1000458-4-thierry.reding@gmail.com > > on its own branch, can you stitch together whatever you need? I'm not sure I understand what you're proposing. For reference, here's the set of patches that I sent out: 1. memory: tegra: Implement SID override programming 2. dt-bindings: arm-smmu: Add Tegra186 compatible string 3. iommu/arm-smmu: Implement ->probe_finalize() 4. iommu/arm-smmu: tegra: Detect number of instances at runtime 5. iommu/arm-smmu: tegra: Implement SID override programming 6. iommu/arm-smmu: Use Tegra implementation on Tegra186 7. arm64: tegra: Use correct compatible string for Tegra186 SMMU 8. arm64: tegra: Hook up memory controller to SMMU on Tegra186 9. arm64: tegra: Enable SMMU support on Tegra194 Krzysztof already picked up patch 1 and I was assuming that you'd pick up 2-6 because they are to the ARM SMMU driver. However, if you're primarily interested in just patch 3, which is more "core" ARM SMMU than the rest, which are Tegra-specific, then I suppose what we could do is for you to give an Acked-by on the rest (2, 4-6) and then Krzysztof or I can pick them up and take them via ARM SoC, based on the stable branch from your tree that only has patch 3. Patch 6 touches arm-smmu-impl.c, though it's a two-line change that touches only the Tegra-specific matching bit in arm_smmu_impl_init(), so the likelihood of that conflicting with anything else is fairly small. Is that what you were proposing? Thierry
On Tue, Jun 08, 2021 at 04:38:48PM +0200, Thierry Reding wrote: > On Tue, Jun 08, 2021 at 01:01:29PM +0100, Will Deacon wrote: > > On Mon, Jun 07, 2021 at 10:49:10AM +0200, Krzysztof Kozlowski wrote: > > > This is the pull for you to base further SMMU aptches (prevent early SMMU > > > faults). > > > > This is a tonne of code for me to pull into the SMMU tree given that I only > > want one patch! > > > > Thierry, if I just stick: > > > > https://lore.kernel.org/r/20210603164632.1000458-4-thierry.reding@gmail.com > > > > on its own branch, can you stitch together whatever you need? > > I'm not sure I understand what you're proposing. For reference, here's > the set of patches that I sent out: > > 1. memory: tegra: Implement SID override programming > 2. dt-bindings: arm-smmu: Add Tegra186 compatible string > 3. iommu/arm-smmu: Implement ->probe_finalize() > 4. iommu/arm-smmu: tegra: Detect number of instances at runtime > 5. iommu/arm-smmu: tegra: Implement SID override programming > 6. iommu/arm-smmu: Use Tegra implementation on Tegra186 > 7. arm64: tegra: Use correct compatible string for Tegra186 SMMU > 8. arm64: tegra: Hook up memory controller to SMMU on Tegra186 > 9. arm64: tegra: Enable SMMU support on Tegra194 > > Krzysztof already picked up patch 1 and I was assuming that you'd pick > up 2-6 because they are to the ARM SMMU driver. However, if you're > primarily interested in just patch 3, which is more "core" ARM SMMU than > the rest, which are Tegra-specific, then I suppose what we could do is > for you to give an Acked-by on the rest (2, 4-6) and then Krzysztof or I > can pick them up and take them via ARM SoC, based on the stable branch > from your tree that only has patch 3. I think you previously said that patch 5 depends on patch 1, so I can't take 2-6 without also pulling in the memory controller queue. > Patch 6 touches arm-smmu-impl.c, though it's a two-line change that > touches only the Tegra-specific matching bit in arm_smmu_impl_init(), so > the likelihood of that conflicting with anything else is fairly small. > > Is that what you were proposing? I can queue as much or as little of 2-6 as you like, but I would like to avoid pulling in the memory controller queue into the arm smmu tree. But yes, whichever of those I take, I can put them on a separate branch so that you're not blocked for the later patches. You have a better handle on the dependencies, so please tell me what works for you. I just want to make sure that at least patch 3 lands in my tree, so we don't get late conflicts with other driver changes. Will
On 07/06/2021 10:49, Krzysztof Kozlowski wrote: > Hi Olof and Arnd, > > Tegra memory controller driver changes with necessary dependency from Thierry > (which you will also get from him): > 1. Dmitry's power domain work on Tegra MC drivers, > 2. Necessary clock and regulator dependencies for Dmitry's work. > Hi Olof and Arnd, Just FYI, the stable tag from Thierry which I pulled here (and you will get from him as well) might cause COMPILE_TEST failures on specific configurations. Regular defconfigs and allyes/allmod should not be affected. I am giving heads up in case this lands in Linus later... There will be two fixes for this, sent already by Thierry: https://lore.kernel.org/lkml/20210609112806.3565057-1-thierry.reding@gmail.com/ 1. reset controller stubs: going via reset tree, 2. reserved memory section: probably going via my tree later. Best regards, Krzysztof
On Tue, Jun 08, 2021 at 05:48:51PM +0100, Will Deacon wrote: > On Tue, Jun 08, 2021 at 04:38:48PM +0200, Thierry Reding wrote: > > On Tue, Jun 08, 2021 at 01:01:29PM +0100, Will Deacon wrote: > > > On Mon, Jun 07, 2021 at 10:49:10AM +0200, Krzysztof Kozlowski wrote: > > > > This is the pull for you to base further SMMU aptches (prevent early SMMU > > > > faults). > > > > > > This is a tonne of code for me to pull into the SMMU tree given that I only > > > want one patch! > > > > > > Thierry, if I just stick: > > > > > > https://lore.kernel.org/r/20210603164632.1000458-4-thierry.reding@gmail.com > > > > > > on its own branch, can you stitch together whatever you need? > > > > I'm not sure I understand what you're proposing. For reference, here's > > the set of patches that I sent out: > > > > 1. memory: tegra: Implement SID override programming > > 2. dt-bindings: arm-smmu: Add Tegra186 compatible string > > 3. iommu/arm-smmu: Implement ->probe_finalize() > > 4. iommu/arm-smmu: tegra: Detect number of instances at runtime > > 5. iommu/arm-smmu: tegra: Implement SID override programming > > 6. iommu/arm-smmu: Use Tegra implementation on Tegra186 > > 7. arm64: tegra: Use correct compatible string for Tegra186 SMMU > > 8. arm64: tegra: Hook up memory controller to SMMU on Tegra186 > > 9. arm64: tegra: Enable SMMU support on Tegra194 > > > > Krzysztof already picked up patch 1 and I was assuming that you'd pick > > up 2-6 because they are to the ARM SMMU driver. However, if you're > > primarily interested in just patch 3, which is more "core" ARM SMMU than > > the rest, which are Tegra-specific, then I suppose what we could do is > > for you to give an Acked-by on the rest (2, 4-6) and then Krzysztof or I > > can pick them up and take them via ARM SoC, based on the stable branch > > from your tree that only has patch 3. > > I think you previously said that patch 5 depends on patch 1, so I can't > take 2-6 without also pulling in the memory controller queue. > > > Patch 6 touches arm-smmu-impl.c, though it's a two-line change that > > touches only the Tegra-specific matching bit in arm_smmu_impl_init(), so > > the likelihood of that conflicting with anything else is fairly small. > > > > Is that what you were proposing? > > I can queue as much or as little of 2-6 as you like, but I would like to > avoid pulling in the memory controller queue into the arm smmu tree. But > yes, whichever of those I take, I can put them on a separate branch so > that you're not blocked for the later patches. > > You have a better handle on the dependencies, so please tell me what works > for you. I just want to make sure that at least patch 3 lands in my tree, > so we don't get late conflicts with other driver changes. Yes, if you could pick up patch 3 and send out a link with the stable branch, I think Krzysztof or I could pull in that branch and pick up the remaining patches. It'd be good if you could also ack the remaining SMMU patches so that ARM SoC knows that they've been sanctioned. Krzysztof: would you be okay with picking up patches 2 and 4-6 on top of your memory branch for v5.14? Thierry
On 10/06/2021 11:19, Thierry Reding wrote: > On Tue, Jun 08, 2021 at 05:48:51PM +0100, Will Deacon wrote: >> On Tue, Jun 08, 2021 at 04:38:48PM +0200, Thierry Reding wrote: >>> On Tue, Jun 08, 2021 at 01:01:29PM +0100, Will Deacon wrote: >>>> On Mon, Jun 07, 2021 at 10:49:10AM +0200, Krzysztof Kozlowski wrote: >>>>> This is the pull for you to base further SMMU aptches (prevent early SMMU >>>>> faults). >>>> >>>> This is a tonne of code for me to pull into the SMMU tree given that I only >>>> want one patch! >>>> >>>> Thierry, if I just stick: >>>> >>>> https://lore.kernel.org/r/20210603164632.1000458-4-thierry.reding@gmail.com >>>> >>>> on its own branch, can you stitch together whatever you need? >>> >>> I'm not sure I understand what you're proposing. For reference, here's >>> the set of patches that I sent out: >>> >>> 1. memory: tegra: Implement SID override programming >>> 2. dt-bindings: arm-smmu: Add Tegra186 compatible string >>> 3. iommu/arm-smmu: Implement ->probe_finalize() >>> 4. iommu/arm-smmu: tegra: Detect number of instances at runtime >>> 5. iommu/arm-smmu: tegra: Implement SID override programming >>> 6. iommu/arm-smmu: Use Tegra implementation on Tegra186 >>> 7. arm64: tegra: Use correct compatible string for Tegra186 SMMU >>> 8. arm64: tegra: Hook up memory controller to SMMU on Tegra186 >>> 9. arm64: tegra: Enable SMMU support on Tegra194 >>> >>> Krzysztof already picked up patch 1 and I was assuming that you'd pick >>> up 2-6 because they are to the ARM SMMU driver. However, if you're >>> primarily interested in just patch 3, which is more "core" ARM SMMU than >>> the rest, which are Tegra-specific, then I suppose what we could do is >>> for you to give an Acked-by on the rest (2, 4-6) and then Krzysztof or I >>> can pick them up and take them via ARM SoC, based on the stable branch >>> from your tree that only has patch 3. >> >> I think you previously said that patch 5 depends on patch 1, so I can't >> take 2-6 without also pulling in the memory controller queue. >> >>> Patch 6 touches arm-smmu-impl.c, though it's a two-line change that >>> touches only the Tegra-specific matching bit in arm_smmu_impl_init(), so >>> the likelihood of that conflicting with anything else is fairly small. >>> >>> Is that what you were proposing? >> >> I can queue as much or as little of 2-6 as you like, but I would like to >> avoid pulling in the memory controller queue into the arm smmu tree. But >> yes, whichever of those I take, I can put them on a separate branch so >> that you're not blocked for the later patches. >> >> You have a better handle on the dependencies, so please tell me what works >> for you. I just want to make sure that at least patch 3 lands in my tree, >> so we don't get late conflicts with other driver changes. > > Yes, if you could pick up patch 3 and send out a link with the stable > branch, I think Krzysztof or I could pull in that branch and pick up the > remaining patches. It'd be good if you could also ack the remaining SMMU > patches so that ARM SoC knows that they've been sanctioned. > > Krzysztof: would you be okay with picking up patches 2 and 4-6 on top of > your memory branch for v5.14? You mean the iommu patches? Yes, I can take them and later explain to Arnd/Olof why they come through me. Best regards, Krzysztof
On Thu, Jun 10, 2021 at 04:23:56PM +0200, Krzysztof Kozlowski wrote: > On 10/06/2021 11:19, Thierry Reding wrote: > > On Tue, Jun 08, 2021 at 05:48:51PM +0100, Will Deacon wrote: > >> On Tue, Jun 08, 2021 at 04:38:48PM +0200, Thierry Reding wrote: > >>> On Tue, Jun 08, 2021 at 01:01:29PM +0100, Will Deacon wrote: > >>>> On Mon, Jun 07, 2021 at 10:49:10AM +0200, Krzysztof Kozlowski wrote: > >>>>> This is the pull for you to base further SMMU aptches (prevent early SMMU > >>>>> faults). > >>>> > >>>> This is a tonne of code for me to pull into the SMMU tree given that I only > >>>> want one patch! > >>>> > >>>> Thierry, if I just stick: > >>>> > >>>> https://lore.kernel.org/r/20210603164632.1000458-4-thierry.reding@gmail.com > >>>> > >>>> on its own branch, can you stitch together whatever you need? > >>> > >>> I'm not sure I understand what you're proposing. For reference, here's > >>> the set of patches that I sent out: > >>> > >>> 1. memory: tegra: Implement SID override programming > >>> 2. dt-bindings: arm-smmu: Add Tegra186 compatible string > >>> 3. iommu/arm-smmu: Implement ->probe_finalize() > >>> 4. iommu/arm-smmu: tegra: Detect number of instances at runtime > >>> 5. iommu/arm-smmu: tegra: Implement SID override programming > >>> 6. iommu/arm-smmu: Use Tegra implementation on Tegra186 > >>> 7. arm64: tegra: Use correct compatible string for Tegra186 SMMU > >>> 8. arm64: tegra: Hook up memory controller to SMMU on Tegra186 > >>> 9. arm64: tegra: Enable SMMU support on Tegra194 > >>> > >>> Krzysztof already picked up patch 1 and I was assuming that you'd pick > >>> up 2-6 because they are to the ARM SMMU driver. However, if you're > >>> primarily interested in just patch 3, which is more "core" ARM SMMU than > >>> the rest, which are Tegra-specific, then I suppose what we could do is > >>> for you to give an Acked-by on the rest (2, 4-6) and then Krzysztof or I > >>> can pick them up and take them via ARM SoC, based on the stable branch > >>> from your tree that only has patch 3. > >> > >> I think you previously said that patch 5 depends on patch 1, so I can't > >> take 2-6 without also pulling in the memory controller queue. > >> > >>> Patch 6 touches arm-smmu-impl.c, though it's a two-line change that > >>> touches only the Tegra-specific matching bit in arm_smmu_impl_init(), so > >>> the likelihood of that conflicting with anything else is fairly small. > >>> > >>> Is that what you were proposing? > >> > >> I can queue as much or as little of 2-6 as you like, but I would like to > >> avoid pulling in the memory controller queue into the arm smmu tree. But > >> yes, whichever of those I take, I can put them on a separate branch so > >> that you're not blocked for the later patches. > >> > >> You have a better handle on the dependencies, so please tell me what works > >> for you. I just want to make sure that at least patch 3 lands in my tree, > >> so we don't get late conflicts with other driver changes. > > > > Yes, if you could pick up patch 3 and send out a link with the stable > > branch, I think Krzysztof or I could pull in that branch and pick up the > > remaining patches. It'd be good if you could also ack the remaining SMMU > > patches so that ARM SoC knows that they've been sanctioned. > > > > Krzysztof: would you be okay with picking up patches 2 and 4-6 on top of > > your memory branch for v5.14? > > You mean the iommu patches? Yes, I can take them and later explain to > Arnd/Olof why they come through me. Okay, great. Will, can you provide that stable branch? Or would you prefer if I prepared it and sent you a pull request? We're kind of running out of time, since for ARM SoC the cut-off point for new material is usually -rc6 and that's coming up pretty fast. Thierry
On Thu, Jun 10, 2021 at 05:05:27PM +0200, Thierry Reding wrote: > On Thu, Jun 10, 2021 at 04:23:56PM +0200, Krzysztof Kozlowski wrote: > > On 10/06/2021 11:19, Thierry Reding wrote: > > > On Tue, Jun 08, 2021 at 05:48:51PM +0100, Will Deacon wrote: > > >> I can queue as much or as little of 2-6 as you like, but I would like to > > >> avoid pulling in the memory controller queue into the arm smmu tree. But > > >> yes, whichever of those I take, I can put them on a separate branch so > > >> that you're not blocked for the later patches. > > >> > > >> You have a better handle on the dependencies, so please tell me what works > > >> for you. I just want to make sure that at least patch 3 lands in my tree, > > >> so we don't get late conflicts with other driver changes. > > > > > > Yes, if you could pick up patch 3 and send out a link with the stable > > > branch, I think Krzysztof or I could pull in that branch and pick up the > > > remaining patches. It'd be good if you could also ack the remaining SMMU > > > patches so that ARM SoC knows that they've been sanctioned. > > > > > > Krzysztof: would you be okay with picking up patches 2 and 4-6 on top of > > > your memory branch for v5.14? > > > > You mean the iommu patches? Yes, I can take them and later explain to > > Arnd/Olof why they come through me. > > Okay, great. > > Will, can you provide that stable branch? Or would you prefer if I > prepared it and sent you a pull request? We're kind of running out of > time, since for ARM SoC the cut-off point for new material is usually > -rc6 and that's coming up pretty fast. https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git/log/?h=for-thierry/arm-smmu Will
On 10/06/2021 19:29, Will Deacon wrote: > On Thu, Jun 10, 2021 at 05:05:27PM +0200, Thierry Reding wrote: >> On Thu, Jun 10, 2021 at 04:23:56PM +0200, Krzysztof Kozlowski wrote: >>> On 10/06/2021 11:19, Thierry Reding wrote: >>>> On Tue, Jun 08, 2021 at 05:48:51PM +0100, Will Deacon wrote: >>>>> I can queue as much or as little of 2-6 as you like, but I would like to >>>>> avoid pulling in the memory controller queue into the arm smmu tree. But >>>>> yes, whichever of those I take, I can put them on a separate branch so >>>>> that you're not blocked for the later patches. >>>>> >>>>> You have a better handle on the dependencies, so please tell me what works >>>>> for you. I just want to make sure that at least patch 3 lands in my tree, >>>>> so we don't get late conflicts with other driver changes. >>>> >>>> Yes, if you could pick up patch 3 and send out a link with the stable >>>> branch, I think Krzysztof or I could pull in that branch and pick up the >>>> remaining patches. It'd be good if you could also ack the remaining SMMU >>>> patches so that ARM SoC knows that they've been sanctioned. >>>> >>>> Krzysztof: would you be okay with picking up patches 2 and 4-6 on top of >>>> your memory branch for v5.14? >>> >>> You mean the iommu patches? Yes, I can take them and later explain to >>> Arnd/Olof why they come through me. >> >> Okay, great. >> >> Will, can you provide that stable branch? Or would you prefer if I >> prepared it and sent you a pull request? We're kind of running out of >> time, since for ARM SoC the cut-off point for new material is usually >> -rc6 and that's coming up pretty fast. > > https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git/log/?h=for-thierry/arm-smmu Merged, thanks. I'll take ARM/SMMU patches from Thierry's patchset: 2, 4-6. Best regards, Krzysztof
Hi Olof and Arnd, Tegra memory controller driver changes with necessary dependency from Thierry (which you will also get from him): 1. Dmitry's power domain work on Tegra MC drivers, 2. Necessary clock and regulator dependencies for Dmitry's work. Hi Thierry and Will, This is the pull for you to base further SMMU aptches (prevent early SMMU faults). Best regards, Krzysztof The following changes since commit 6efb943b8616ec53a5e444193dccf1af9ad627b5: Linux 5.13-rc1 (2021-05-09 14:17:44 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git tags/memory-controller-drv-tegra-5.14 for you to fetch changes up to 393d66fd2cacba3e6aa95d7bb38790bfb7b1cc3a: memory: tegra: Implement SID override programming (2021-06-03 21:50:43 +0200) ---------------------------------------------------------------- Memory controller drivers for v5.14 - Tegra SoC 1. Enable compile testing of Tegra memory controller drivers. 2. Unify Tegra memory controller drivers. From Thierry Reding: "This set of patches converges the feature sets of the pre-Tegra186 and the post-Tegra186 memory controller drivers such that newer chips can take advantage of some features that were previously only implemented on earlier chips." 3. Implement SID override programming as part of work to prevent early SMMU faults. 4. Some simplifications, e.g. use devm-helpers. This pulls dedicated tag from Thierry Reding with necessary changes to Tegra memory controller drivers, as a pre-requisite to series applied here. The changes from Thierry's tree also include their own dependencies: regulator and clock driver changes. ---------------------------------------------------------------- Dmitry Osipenko (18): clk: tegra30: Use 300MHz for video decoder by default clk: tegra: Fix refcounting of gate clocks clk: tegra: Ensure that PLLU configuration is applied properly clk: tegra: Halve SCLK rate on Tegra20 clk: tegra: Don't allow zero clock rate for PLLs clk: tegra: cclk: Handle thermal DIV2 CPU frequency throttling clk: tegra: Mark external clocks as not having reset control clk: tegra: Don't deassert reset on enabling clocks regulator: core: Add regulator_sync_voltage_rdev() soc/tegra: regulators: Bump voltages on system reboot soc/tegra: Add stub for soc_is_tegra() soc/tegra: Add devm_tegra_core_dev_init_opp_table() soc/tegra: fuse: Add stubs needed for compile-testing clk: tegra: Add stubs needed for compile-testing memory: tegra: Fix compilation warnings on 64bit platforms memory: tegra: Enable compile testing for all drivers memory: tegra20-emc: Use devm_tegra_core_dev_init_opp_table() memory: tegra30-emc: Use devm_tegra_core_dev_init_opp_table() Krzysztof Kozlowski (1): Merge tag 'tegra-for-5.14-memory' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into for-v5.14/tegra-mc Thierry Reding (16): Merge branch 'for-5.14/regulator' into for-5.14/soc Merge branch 'for-5.14/clk' into for-5.14/memory Merge branch 'for-5.14/soc' into for-5.14/memory memory: tegra: Consolidate register fields memory: tegra: Unify struct tegra_mc across SoC generations memory: tegra: Introduce struct tegra_mc_ops memory: tegra: Push suspend/resume into SoC drivers memory: tegra: Make per-SoC setup more generic memory: tegra: Extract setup code into callback memory: tegra: Parameterize interrupt handler memory: tegra: Make IRQ support opitonal memory: tegra: Only initialize reset controller if available memory: tegra: Unify drivers memory: tegra: Add memory client IDs to tables memory: tegra: Split Tegra194 data into separate file memory: tegra: Implement SID override programming drivers/clk/tegra/clk-periph-gate.c | 80 +- drivers/clk/tegra/clk-periph.c | 11 + drivers/clk/tegra/clk-pll.c | 12 +- drivers/clk/tegra/clk-tegra-periph.c | 6 +- drivers/clk/tegra/clk-tegra-super-cclk.c | 16 +- drivers/clk/tegra/clk-tegra20.c | 6 +- drivers/clk/tegra/clk-tegra30.c | 6 +- drivers/clk/tegra/clk.h | 4 - drivers/iommu/tegra-smmu.c | 16 +- drivers/memory/tegra/Kconfig | 18 +- drivers/memory/tegra/Makefile | 6 +- drivers/memory/tegra/mc.c | 321 +++--- drivers/memory/tegra/mc.h | 25 + drivers/memory/tegra/tegra114.c | 1245 ++++++++++++---------- drivers/memory/tegra/tegra124-emc.c | 4 +- drivers/memory/tegra/tegra124.c | 1306 ++++++++++++----------- drivers/memory/tegra/tegra186.c | 1679 +++++++++--------------------- drivers/memory/tegra/tegra194.c | 1351 ++++++++++++++++++++++++ drivers/memory/tegra/tegra20-emc.c | 48 +- drivers/memory/tegra/tegra20.c | 110 +- drivers/memory/tegra/tegra210.c | 1433 +++++++++++++------------ drivers/memory/tegra/tegra30-emc.c | 52 +- drivers/memory/tegra/tegra30.c | 1292 ++++++++++++----------- drivers/regulator/core.c | 23 + drivers/soc/tegra/common.c | 97 ++ drivers/soc/tegra/pmc.c | 5 - drivers/soc/tegra/regulators-tegra20.c | 75 +- drivers/soc/tegra/regulators-tegra30.c | 75 +- include/linux/clk/tegra.h | 100 +- include/linux/regulator/driver.h | 1 + include/soc/tegra/common.h | 31 + include/soc/tegra/fuse.h | 20 +- include/soc/tegra/mc.h | 65 +- 33 files changed, 5566 insertions(+), 3973 deletions(-) create mode 100644 drivers/memory/tegra/tegra194.c