Commit ec3171d7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-drivers-5.14' of... 

Merge tag 'imx-drivers-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/drivers

i.MX drivers update for 5.14:

- A patch series from Lucas Stach and Peng Fan adding i.MX8MM power
  domains support into i.MX GPCv2 driver.
- A couple of patches from Adam Ford adding i.MX8MN power domains on top
  of i.MX8MM power domain support.

* tag 'imx-drivers-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  soc: imx: gpcv2: add support for i.MX8MN power domains
  dt-bindings: add defines for i.MX8MN power domains
  soc: imx: gpcv2: move reset assert after requesting domain power up
  soc: imx: gpcv2: Add support for missing i.MX8MM VPU/DISPMIX power domains
  soc: imx: gpcv2: add support for i.MX8MM power domains
  dt-bindings: power: add defines for i.MX8MM power domains
  soc: imx: gpcv2: add support for optional resets
  soc: imx: gpcv2: allow domains without power-sequence control
  soc: imx: gpcv2: add runtime PM support for power-domains
  soc: imx: gpcv2: wait for ADB400 handshake
  soc: imx: gpcv2: split power up and power down sequence control
  soc: imx: gpcv2: switch to clk_bulk_* API
  soc: imx: gpcv2: move domain mapping to domain driver probe
  soc: imx: gpcv2: move to more ideomatic error handling in probe

Link: https://lore.kernel.org/r/20210613082544.16067-1-shawnguo@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents eac7b3b7 2a53b9d4

Documentation/devicetree/bindings/power/fsl,imx-gpcv2.yaml

+3 −0
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ properties: 
  compatible:

    enum:

      - fsl,imx7d-gpc

      - fsl,imx8mn-gpc

      - fsl,imx8mq-gpc

      - fsl,imx8mm-gpc



  reg:

    maxItems: 1
@@ -54,6 +56,7 @@ properties: 
              Power domain index. Valid values are defined in

              include/dt-bindings/power/imx7-power.h for fsl,imx7d-gpc and

              include/dt-bindings/power/imx8m-power.h for fsl,imx8mq-gpc

              include/dt-bindings/power/imx8mm-power.h for fsl,imx8mm-gpc

            maxItems: 1



          clocks:

drivers/soc/imx/gpcv2.c

+519 −115

File changed.

Preview size limit exceeded, changes collapsed.

include/dt-bindings/power/imx8mm-power.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */

/*

 *  Copyright (C) 2020 Pengutronix, Lucas Stach <kernel@pengutronix.de>

 */



#ifndef __DT_BINDINGS_IMX8MM_POWER_H__

#define __DT_BINDINGS_IMX8MM_POWER_H__



#define IMX8MM_POWER_DOMAIN_HSIOMIX	0

#define IMX8MM_POWER_DOMAIN_PCIE	1

#define IMX8MM_POWER_DOMAIN_OTG1	2

#define IMX8MM_POWER_DOMAIN_OTG2	3

#define IMX8MM_POWER_DOMAIN_GPUMIX	4

#define IMX8MM_POWER_DOMAIN_GPU		5

#define IMX8MM_POWER_DOMAIN_VPUMIX	6

#define IMX8MM_POWER_DOMAIN_VPUG1	7

#define IMX8MM_POWER_DOMAIN_VPUG2	8

#define IMX8MM_POWER_DOMAIN_VPUH1	9

#define IMX8MM_POWER_DOMAIN_DISPMIX	10

#define IMX8MM_POWER_DOMAIN_MIPI	11



#endif

include/dt-bindings/power/imx8mn-power.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */

/*

 *  Copyright (C) 2020 Compass Electronics Group, LLC

 */



#ifndef __DT_BINDINGS_IMX8MN_POWER_H__

#define __DT_BINDINGS_IMX8MN_POWER_H__



#define IMX8MN_POWER_DOMAIN_HSIOMIX	0

#define IMX8MN_POWER_DOMAIN_OTG1	1

#define IMX8MN_POWER_DOMAIN_GPUMIX	2

#define IMX8MN_POWER_DOMAIN_DISPMIX	3

#define IMX8MN_POWER_DOMAIN_MIPI	4



#endif