mbox series

[GIT,PULL] arm64: dts: Xilinx ZynqMP SoC changes for v5.2

Message ID 2bb66114-c976-9c44-6db3-33a5dd12edde@monstr.eu
State New
Headers show
Series [GIT,PULL] arm64: dts: Xilinx ZynqMP SoC changes for v5.2 | expand

Pull-request

https://github.com/Xilinx/linux-xlnx.git tags/zynqmp-soc-for-v5.2

Message

Michal Simek April 15, 2019, 8:39 a.m. UTC
Hi,

please pull these patches to your tree. I have also taken fpga series
based on agreement with Moritz and Alan because it requires changes in
firmware interface. It is the same what we have done last time with
reset and nvmem.

Thanks,
Michal


The following changes since commit 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b:

  Linux 5.1-rc1 (2019-03-17 14:22:26 -0700)

are available in the git repository at:

  https://github.com/Xilinx/linux-xlnx.git tags/zynqmp-soc-for-v5.2

for you to fetch changes up to c09f7471127e9debf3e814ffef4f4012c31a5a3d:

  fpga manager: Adding FPGA Manager support for Xilinx zynqmp
(2019-04-15 10:23:18 +0200)

----------------------------------------------------------------
arm64: zynqmp: SoC changes for v5.2

- Add support for ZynqMP fpga manager
- Defer some probes which depends on firmware driver to be ready
- Debugfs fix

----------------------------------------------------------------
Jann Horn (1):
      firmware: xilinx: fix debugfs write handler

Nava kishore Manne (3):
      firmware: xilinx: Add fpga API's
      dt-bindings: fpga: Add bindings for ZynqMP fpga driver
      fpga manager: Adding FPGA Manager support for Xilinx zynqmp

Rajan Vaja (1):
      drivers: Defer probe if firmware is not ready

 Documentation/devicetree/bindings/fpga/xlnx,zynqmp-pcap-fpga.txt |  25
++++++++++++++++++++++
 Documentation/xilinx/eemi.txt                                    |   4 ++--
 drivers/clk/zynqmp/clkc.c                                        |   4 ++--
 drivers/firmware/xilinx/zynqmp-debug.c                           |  18
++++------------
 drivers/firmware/xilinx/zynqmp.c                                 |  56
++++++++++++++++++++++++++++++++++++++++++++++++-
 drivers/fpga/Kconfig                                             |   9
++++++++
 drivers/fpga/Makefile                                            |   1 +
 drivers/fpga/zynqmp-fpga.c                                       | 159
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/nvmem/zynqmp_nvmem.c                                     |  10
++++++---
 drivers/reset/reset-zynqmp.c                                     |   8
+++----
 drivers/soc/xilinx/zynqmp_pm_domains.c                           |  18
+++++++++-------
 drivers/soc/xilinx/zynqmp_power.c                                |  10
+++++----
 drivers/spi/spi-zynqmp-gqspi.c                                   |   5
+++++
 include/linux/firmware/xlnx-zynqmp.h                             |  14
++++++++++++-
 14 files changed, 302 insertions(+), 39 deletions(-)
 create mode 100644
Documentation/devicetree/bindings/fpga/xlnx,zynqmp-pcap-fpga.txt
 create mode 100644 drivers/fpga/zynqmp-fpga.c

Comments

Olof Johansson April 29, 2019, 6:07 a.m. UTC | #1
On Mon, Apr 15, 2019 at 10:39:04AM +0200, Michal Simek wrote:
> Hi,
> 
> please pull these patches to your tree. I have also taken fpga series
> based on agreement with Moritz and Alan because it requires changes in
> firmware interface. It is the same what we have done last time with
> reset and nvmem.
> 
> Thanks,
> Michal
> 
> 
> The following changes since commit 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b:
> 
>   Linux 5.1-rc1 (2019-03-17 14:22:26 -0700)
> 
> are available in the git repository at:
> 
>   https://github.com/Xilinx/linux-xlnx.git tags/zynqmp-soc-for-v5.2
> 
> for you to fetch changes up to c09f7471127e9debf3e814ffef4f4012c31a5a3d:
> 
>   fpga manager: Adding FPGA Manager support for Xilinx zynqmp
> (2019-04-15 10:23:18 +0200)
> 
> ----------------------------------------------------------------
> arm64: zynqmp: SoC changes for v5.2
> 
> - Add support for ZynqMP fpga manager
> - Defer some probes which depends on firmware driver to be ready
> - Debugfs fix

Merged, thanks.


-Olof
Olof Johansson April 29, 2019, 4:20 p.m. UTC | #2
On Mon, Apr 15, 2019 at 10:39:04AM +0200, Michal Simek wrote:
> Hi,
> 
> please pull these patches to your tree. I have also taken fpga series
> based on agreement with Moritz and Alan because it requires changes in
> firmware interface. It is the same what we have done last time with
> reset and nvmem.
> 
> Thanks,
> Michal
> 
> 
> The following changes since commit 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b:
> 
>   Linux 5.1-rc1 (2019-03-17 14:22:26 -0700)
> 
> are available in the git repository at:
> 
>   https://github.com/Xilinx/linux-xlnx.git tags/zynqmp-soc-for-v5.2
> 
> for you to fetch changes up to c09f7471127e9debf3e814ffef4f4012c31a5a3d:
> 
>   fpga manager: Adding FPGA Manager support for Xilinx zynqmp
> (2019-04-15 10:23:18 +0200)
> 
> ----------------------------------------------------------------
> arm64: zynqmp: SoC changes for v5.2
> 
> - Add support for ZynqMP fpga manager
> - Defer some probes which depends on firmware driver to be ready
> - Debugfs fix
> 
> ----------------------------------------------------------------
> Jann Horn (1):
>       firmware: xilinx: fix debugfs write handler
> 
> Nava kishore Manne (3):
>       firmware: xilinx: Add fpga API's
>       dt-bindings: fpga: Add bindings for ZynqMP fpga driver
>       fpga manager: Adding FPGA Manager support for Xilinx zynqmp
> 
> Rajan Vaja (1):
>       drivers: Defer probe if firmware is not ready

So, this branch has not been in -next, since it introduced previously
not seen build errors. :(

Patched up locally, following up with patch here for visibility (already
applied).


-Olof
Michal Simek April 29, 2019, 4:28 p.m. UTC | #3
On 29. 04. 19 9:22, Olof Johansson wrote:
> Missing include:
> drivers/spi/spi-zynqmp-gqspi.c:1025:13: error: implicit declaration of
>   function 'zynqmp_pm_get_eemi_ops'; did you mean
>   'zynqmp_process_dma_irq'? [-Werror=implicit-function-declaration]
> 
> Fixes: 3d0313786470a ('drivers: Defer probe if firmware is not ready')
> Cc: Rajan Vaja <rajan.vaja@xilinx.com>
> Cc: Jolly Shah <jollys@xilinx.com>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Signed-off-by: Olof Johansson <olof@lixom.net>
> ---
>  drivers/spi/spi-zynqmp-gqspi.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c
> index d07b6f940f9f..9850a0efe85a 100644
> --- a/drivers/spi/spi-zynqmp-gqspi.c
> +++ b/drivers/spi/spi-zynqmp-gqspi.c
> @@ -14,6 +14,7 @@
>  #include <linux/delay.h>
>  #include <linux/dma-mapping.h>
>  #include <linux/dmaengine.h>
> +#include <linux/firmware/xlnx-zynqmp.h>
>  #include <linux/interrupt.h>
>  #include <linux/io.h>
>  #include <linux/module.h>
> 


Acked-by: Michal Simek <michal.simek@xilinx.com>

Thanks,
Michal
Mark Brown May 21, 2019, 9:08 p.m. UTC | #4
On Mon, Apr 29, 2019 at 09:22:46AM -0700, Olof Johansson wrote:
> Missing include:
> drivers/spi/spi-zynqmp-gqspi.c:1025:13: error: implicit declaration of
>   function 'zynqmp_pm_get_eemi_ops'; did you mean
>   'zynqmp_process_dma_irq'? [-Werror=implicit-function-declaration]
> 
> Fixes: 3d0313786470a ('drivers: Defer probe if firmware is not ready')

Please copy maintainers on patches so they aren't surprised when they
get mails saying they accepted patches they never heard of before!