[GIT PULL 1/2] memory: drivers for v5.17

[GIT PULL 1/2] memory: drivers for v5.17

[Krzysztof Kozlowski]

The following changes since commit fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf:

  Linux 5.16-rc1 (2021-11-14 13:56:52 -0800)

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-5.17

for you to fetch changes up to de369801658a9a54759ac011af770e8c01d9db7f:

  Merge branch 'for-v5.17/tegra-mc' into mem-ctrl-next (2021-12-22 12:59:03 +0100)

----------------------------------------------------------------
Memory controller drivers for v5.17

1. Minor improvements: Mediatek SMI, Freescale/NXP IFC, Tegra20 and
   Tegra30.
2. Convert Freescale/NXP IFC bindings to dtschema.

----------------------------------------------------------------
AngeloGioacchino Del Regno (1):
      memory: mtk-smi: Use ARRAY_SIZE to define MTK_SMI_CLK_NR_MAX

Dmitry Osipenko (2):
      memory: tegra30-emc: Print additional memory info
      memory: tegra20-emc: Correct memory device mask

Jason Wang (1):
      memory: brcmstb_dpfe: fix typo in a comment

Krzysztof Kozlowski (1):
      Merge branch 'for-v5.17/tegra-mc' into mem-ctrl-next

Li Yang (2):
      dt-bindings: memory: fsl: convert ifc binding to yaml schema
      memory: fsl_ifc: populate child devices without relying on simple-bus

Rikard Falkeborn (1):
      memory: tegra: Constify struct thermal_cooling_device_ops

 .../bindings/memory-controllers/fsl/fsl,ifc.yaml   | 113 ++++++++++++++++++
 .../bindings/memory-controllers/fsl/ifc.txt        |  82 -------------
 drivers/memory/brcmstb_dpfe.c                      |   2 +-
 drivers/memory/fsl_ifc.c                           |   9 ++
 drivers/memory/mtk-smi.c                           |   3 +-
 drivers/memory/tegra/Kconfig                       |   1 +
 drivers/memory/tegra/tegra20-emc.c                 |   2 +-
 drivers/memory/tegra/tegra210-emc-core.c           |   2 +-
 drivers/memory/tegra/tegra30-emc.c                 | 131 +++++++++++++++++++--
 9 files changed, 248 insertions(+), 97 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ifc.yaml
 delete mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt

[GIT PULL 2/2] memory: omap: drivers for v5.17

[Krzysztof Kozlowski]

Hi Arnd and Olof,

Separate topic branch for omap-gpmc driver. This includes changes to
mtd-nand-omap2 driver (acked by Miquel) *which will conflict NAND tree*:

1. The "of_device_id omap_nand_ids" is moved to header
   ../platform_data/mtd-nand-omap2.h.
2. New compatible is added to above "of_device_id omap_nand_ids".

One way to avoid pushing this conflict to Linus, would be if Miquel would
actually pull this request instead of soc tree.

Proper resolution looks like:
----------------------------------------------------------------
diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h
index 92f011805ad4..8c2f1f185353 100644
--- a/include/linux/platform_data/mtd-nand-omap2.h
+++ b/include/linux/platform_data/mtd-nand-omap2.h
@@ -65,6 +65,7 @@ struct gpmc_nand_regs {
 
 static const struct of_device_id omap_nand_ids[] = {
 	{ .compatible = "ti,omap2-nand", },
+	{ .compatible = "ti,am64-nand", },
 	{},
 };
----------------------------------------------------------------

Best regards,
Krzysztof


The following changes since commit fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf:

  Linux 5.16-rc1 (2021-11-14 13:56:52 -0800)

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-omap-5.17

for you to fetch changes up to dbcb124acebd8148e9e858a231f1798956dd3ca6:

  mtd: rawnand: omap2: Select GPMC device driver for ARCH_K3 (2021-12-22 16:51:43 +0100)

----------------------------------------------------------------
Memory controller drivers for v5.14 - OMAP GPMC

1. Add support for AM64 SoC.
2. Minor improvement: use platform_get_irq().

----------------------------------------------------------------
Lad Prabhakar (1):
      memory: omap-gpmc: Use platform_get_irq() to get the interrupt

Roger Quadros (4):
      dt-bindings: memory-controllers: ti,gpmc: Add compatible for AM64
      memory: omap-gpmc: Add support for GPMC on AM64 SoC
      memory: omap-gpmc: Use a compatible match table when checking for NAND controller
      mtd: rawnand: omap2: Select GPMC device driver for ARCH_K3

 .../bindings/memory-controllers/ti,gpmc.yaml       | 23 +++++++++-
 drivers/memory/omap-gpmc.c                         | 50 ++++++++++++++--------
 drivers/mtd/nand/raw/Kconfig                       |  1 +
 drivers/mtd/nand/raw/omap2.c                       |  5 +--
 include/linux/platform_data/mtd-nand-omap2.h       |  9 +++-
 5 files changed, 65 insertions(+), 23 deletions(-)

Re: [GIT PULL 2/2] memory: omap: drivers for v5.17

[Miquel Raynal]

Hi Krzysztof, Arnd, Olof,

krzysztof.kozlowski@canonical.com wrote on Fri, 24 Dec 2021 12:11:24
+0100:

> Hi Arnd and Olof,
> 
> Separate topic branch for omap-gpmc driver. This includes changes to
> mtd-nand-omap2 driver (acked by Miquel) *which will conflict NAND tree*:
> 
> 1. The "of_device_id omap_nand_ids" is moved to header
>    ../platform_data/mtd-nand-omap2.h.
> 2. New compatible is added to above "of_device_id omap_nand_ids".
> 
> One way to avoid pushing this conflict to Linus, would be if Miquel would
> actually pull this request instead of soc tree.

Sorry for the mess, I didn't spot the conflict when sending my Ack to
Krysztof.

I will pull this to simplify the handling.

Thanks,
Miquèl

> 
> Proper resolution looks like:
> ----------------------------------------------------------------
> diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h
> index 92f011805ad4..8c2f1f185353 100644
> --- a/include/linux/platform_data/mtd-nand-omap2.h
> +++ b/include/linux/platform_data/mtd-nand-omap2.h
> @@ -65,6 +65,7 @@ struct gpmc_nand_regs {
>  
>  static const struct of_device_id omap_nand_ids[] = {
>  	{ .compatible = "ti,omap2-nand", },
> +	{ .compatible = "ti,am64-nand", },
>  	{},
>  };
> ----------------------------------------------------------------
> 
> Best regards,
> Krzysztof
> 
> 
> The following changes since commit fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf:
> 
>   Linux 5.16-rc1 (2021-11-14 13:56:52 -0800)
> 
> 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-omap-5.17
> 
> for you to fetch changes up to dbcb124acebd8148e9e858a231f1798956dd3ca6:
> 
>   mtd: rawnand: omap2: Select GPMC device driver for ARCH_K3 (2021-12-22 16:51:43 +0100)
> 
> ----------------------------------------------------------------
> Memory controller drivers for v5.14 - OMAP GPMC
> 
> 1. Add support for AM64 SoC.
> 2. Minor improvement: use platform_get_irq().
> 
> ----------------------------------------------------------------
> Lad Prabhakar (1):
>       memory: omap-gpmc: Use platform_get_irq() to get the interrupt
> 
> Roger Quadros (4):
>       dt-bindings: memory-controllers: ti,gpmc: Add compatible for AM64
>       memory: omap-gpmc: Add support for GPMC on AM64 SoC
>       memory: omap-gpmc: Use a compatible match table when checking for NAND controller
>       mtd: rawnand: omap2: Select GPMC device driver for ARCH_K3
> 
>  .../bindings/memory-controllers/ti,gpmc.yaml       | 23 +++++++++-
>  drivers/memory/omap-gpmc.c                         | 50 ++++++++++++++--------
>  drivers/mtd/nand/raw/Kconfig                       |  1 +
>  drivers/mtd/nand/raw/omap2.c                       |  5 +--
>  include/linux/platform_data/mtd-nand-omap2.h       |  9 +++-
>  5 files changed, 65 insertions(+), 23 deletions(-)

Re: [GIT PULL 2/2] memory: omap: drivers for v5.17

[Miquel Raynal]

Hello,

miquel.raynal@bootlin.com wrote on Thu, 30 Dec 2021 16:49:01 +0100:

> Hi Krzysztof, Arnd, Olof,
> 
> krzysztof.kozlowski@canonical.com wrote on Fri, 24 Dec 2021 12:11:24
> +0100:
> 
> > Hi Arnd and Olof,
> > 
> > Separate topic branch for omap-gpmc driver. This includes changes to
> > mtd-nand-omap2 driver (acked by Miquel) *which will conflict NAND tree*:
> > 
> > 1. The "of_device_id omap_nand_ids" is moved to header
> >    ../platform_data/mtd-nand-omap2.h.
> > 2. New compatible is added to above "of_device_id omap_nand_ids".
> > 
> > One way to avoid pushing this conflict to Linus, would be if Miquel would
> > actually pull this request instead of soc tree.  
> 
> Sorry for the mess, I didn't spot the conflict when sending my Ack to
> Krysztof.
> 
> I will pull this to simplify the handling.

Pulled into nand/next, thanks!

Miquèl

Re: [GIT PULL 1/2] memory: drivers for v5.17

[patchwork-bot+linux-soc]

Hello:

This pull request was applied to soc/soc.git (for-next)
by Olof Johansson <olof@lixom.net>:

On Fri, 24 Dec 2021 12:11:23 +0100 you wrote:
> The following changes since commit fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf:
> 
>   Linux 5.16-rc1 (2021-11-14 13:56:52 -0800)
> 
> 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-5.17
> 
> [...]

Here is the summary with links:
  - [GIT,PULL,1/2] memory: drivers for v5.17
    https://git.kernel.org/soc/soc/c/734b4712a15f
  - [GIT,PULL,2/2] memory: omap: drivers for v5.17
    https://git.kernel.org/soc/soc/c/34e0929d14d0

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [GIT PULL 1/2] memory: drivers for v5.17

[Krzysztof Kozlowski]

On 24/12/2021 12:11, Krzysztof Kozlowski wrote:
> The following changes since commit fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf:
> 
>   Linux 5.16-rc1 (2021-11-14 13:56:52 -0800)
> 
> 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-5.17
> 
> for you to fetch changes up to de369801658a9a54759ac011af770e8c01d9db7f:
> 
>   Merge branch 'for-v5.17/tegra-mc' into mem-ctrl-next (2021-12-22 12:59:03 +0100)
> 
> ----------------------------------------------------------------
> Memory controller drivers for v5.17
> 
> 1. Minor improvements: Mediatek SMI, Freescale/NXP IFC, Tegra20 and
>    Tegra30.
> 2. Convert Freescale/NXP IFC bindings to dtschema.
> 
> ----------------------------------------------------------------
> AngeloGioacchino Del Regno (1):
>       memory: mtk-smi: Use ARRAY_SIZE to define MTK_SMI_CLK_NR_MAX
> 
> Dmitry Osipenko (2):
>       memory: tegra30-emc: Print additional memory info
>       memory: tegra20-emc: Correct memory device mask
> 
> Jason Wang (1):
>       memory: brcmstb_dpfe: fix typo in a comment
> 
> Krzysztof Kozlowski (1):
>       Merge branch 'for-v5.17/tegra-mc' into mem-ctrl-next
> 
> Li Yang (2):
>       dt-bindings: memory: fsl: convert ifc binding to yaml schema
>       memory: fsl_ifc: populate child devices without relying on simple-bus
> 
> Rikard Falkeborn (1):
>       memory: tegra: Constify struct thermal_cooling_device_ops
> 

Arnd, Olof,

I think this one was not pulled by you. Any chances of sending this to
Linus past 5.17-rc1? If not, could you pull it as v5.18 material?


Best regards,
Krzysztof

Re: [GIT PULL 1/2] memory: drivers for v5.17

[Krzysztof Kozlowski]

On 23/01/2022 13:00, Krzysztof Kozlowski wrote:
> On 24/12/2021 12:11, Krzysztof Kozlowski wrote:
>> The following changes since commit fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf:
>>
>>   Linux 5.16-rc1 (2021-11-14 13:56:52 -0800)
>>
>> 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-5.17
>>
>> for you to fetch changes up to de369801658a9a54759ac011af770e8c01d9db7f:
>>
>>   Merge branch 'for-v5.17/tegra-mc' into mem-ctrl-next (2021-12-22 12:59:03 +0100)
>>
>> ----------------------------------------------------------------
>> Memory controller drivers for v5.17
>>
>> 1. Minor improvements: Mediatek SMI, Freescale/NXP IFC, Tegra20 and
>>    Tegra30.
>> 2. Convert Freescale/NXP IFC bindings to dtschema.
>>
>> ----------------------------------------------------------------
>> AngeloGioacchino Del Regno (1):
>>       memory: mtk-smi: Use ARRAY_SIZE to define MTK_SMI_CLK_NR_MAX
>>
>> Dmitry Osipenko (2):
>>       memory: tegra30-emc: Print additional memory info
>>       memory: tegra20-emc: Correct memory device mask
>>
>> Jason Wang (1):
>>       memory: brcmstb_dpfe: fix typo in a comment
>>
>> Krzysztof Kozlowski (1):
>>       Merge branch 'for-v5.17/tegra-mc' into mem-ctrl-next
>>
>> Li Yang (2):
>>       dt-bindings: memory: fsl: convert ifc binding to yaml schema
>>       memory: fsl_ifc: populate child devices without relying on simple-bus
>>
>> Rikard Falkeborn (1):
>>       memory: tegra: Constify struct thermal_cooling_device_ops
>>
> 
> Arnd, Olof,
> 
> I think this one was not pulled by you. Any chances of sending this to
> Linus past 5.17-rc1? If not, could you pull it as v5.18 material?

I'll send all this as v5.18 material, so this pull-req can be skipped.


Best regards,
Krzysztof