MLK-14280: gpc: gpc driver not probed

The GPC controller driver is handling two sections: interrupts and PGC
(Power Gate Controller). The interrupts are handled in imx_gpcv2_init
function, and the PGC is handled in imx_gpcv2_probe function.
In kernel 4.9, the driver is probed by it's compatible entry in:
OF_DECLARE_2(irqchip, imx_gpcv2, "fsl,imx7d-gpc", imx_gpcv2_init);

Because the driver is already probed, imx_gpcv2_probe function is not
called, since it is registered with the same compatible name.
In order to separate the interrupts from PGC, this patch moves the
regulator entrys in DTS to a new node: pgc. And, assign the probe
function to this new node.
Also, added DeviceTree documentation about the new added node. Since GPC
(the block containing the PGC) didn't have any documentation, documented
GPC too.

Signed-off-by: Robert Chiras <robert.chiras@nxp.com>

diff --git a/Documentation/devicetree/bindings/soc/fsl/gpc.txt b/Documentation/devicetree/bindings/soc/fsl/gpc.txt
new file mode 100644 (file)
index 0000000..a7d2928
--- /dev/null
+++ b/Documentation/devicetree/bindings/soc/fsl/gpc.txt
@@ -0,0 +1,56 @@
+* General Power Controller (GPC)
+-------------------------------------------
+The General Power Controller (GPC) module controls the following functions:
+  - Provide low power mode control for A7 and M4 platform
+  - Provide Power domain management all ARM and SOC power domain
+  - Provide domain control mechanism based on A7 and M4 CPU domain
+  - Provide handshake with CCM for clock management in low power mode
+  - Provide handshake with SRC for power down and power up sequence
+  - Provide handshake with Analog for Deep Sleep Mode control
+
+Required properties:
+  - reg : Offset and length of the register set of the GPC block.
+  - compatible : Must contain a chip-specific GPC block compatible string
+       and (if applicable) may contain a chassis-version GPC compatible
+       string. Chip-specific strings are of the form "fsl,<chip>-gpc",
+       such as:
+       * "fsl,imx7d-gpc"
+       * "fsl,imx7s-gpc"
+  - interrupt-controller : Specifies that this is an interrupt controller
+
+Example:
+The GPC node for imx7d:
+       gpc: gpc@303a0000 {
+               compatible = "fsl,imx7d-gpc";
+               reg = <0x303a0000 0x1000>;
+               interrupt-controller;
+               interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
+               #interrupt-cells = <3>;
+               interrupt-parent = <&intc>;
+               fsl,mf-mix-wakeup-irq = <0x54010000 0xc00 0x0 0x1040640>;
+       };
+
+* Power Gating Controller (PGC)
+-------------------------------------------
+The Power Gating Controller (PGC) is a power management component that controls the
+power-down and power-up sequencing of individual subsystems.
+The PGC block is found inside GPC, and share the same register.
+
+Required properties:
+  - compatible : Must contain a chip-specific PGC block compatible string
+       and (if applicable) may contain a chassis-version PGC compatible
+       string. Chip-specific strings are of the form "fsl,<chip>-pgc",
+       such as:
+       * "fsl,imx7d-pgc"
+       * "fsl,imx7s-pgc"
+  - *-supply : Specifies the regulators that can be managed by this PGC. For exampe:
+       * "mipi-phy-supply = <&reg_1p0d>;"
+
+Example:
+The PGC node for imx7d:
+       pgc {
+               compatible = "fsl,imx7d-pgc";
+               mipi-phy-supply = <&reg_1p0d>;
+               pcie-phy-supply = <&reg_1p0d>;
+               vcc-supply = <&reg_1p2>;
+       };

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index b063854..6e598c5 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -320,12 +320,16 @@
 
                        gpc: gpc@303a0000 {
                                compatible = "fsl,imx7d-gpc";
-                               reg = <0x303a0000 0x10000>;
+                               reg = <0x303a0000 0x1000>;
                                interrupt-controller;
                                interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
                                #interrupt-cells = <3>;
                                interrupt-parent = <&intc>;
                                fsl,mf-mix-wakeup-irq = <0x54010000 0xc00 0x0 0x1040640>;
+                       };
+
+                       pgc {
+                               compatible = "fsl,imx7d-pgc";
                                mipi-phy-supply = <&reg_1p0d>;
                                pcie-phy-supply = <&reg_1p0d>;
                                vcc-supply = <&reg_1p2>;

diff --git a/arch/arm/mach-imx/gpcv2.c b/arch/arm/mach-imx/gpcv2.c
index ef16e55..60070e5 100644 (file)
--- a/arch/arm/mach-imx/gpcv2.c
+++ b/arch/arm/mach-imx/gpcv2.c
@@ -1032,7 +1032,7 @@ static int imx_gpcv2_probe(struct platform_device *pdev)
 }
 
 static struct of_device_id imx_gpcv2_dt_ids[] = {
-       { .compatible = "fsl,imx7d-gpc" },
+       { .compatible = "fsl,imx7d-pgc" },
        { }
 };