]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
MLK-10169 GPU: fix kernel booting issue on iMX6sx SOC without GPU
authorShawn Xiao <b49994@freescale.com>
Wed, 28 Jan 2015 08:39:16 +0000 (16:39 +0800)
committerShawn Xiao <b49994@freescale.com>
Mon, 2 Feb 2015 07:57:01 +0000 (15:57 +0800)
Add checking GPU module logic in qos init. This prevents kernel
booting issue in the iMX6sx SOC where there is no GPU module.

Signed-off-by: Shawn Xiao <b49994@freescale.com>
arch/arm/mach-imx/mach-imx6sx.c

index 3b3da5242c70af9d0b4d2a9c0d9c43087cf424ad..7f5188f51b19e17a7a40eaf626ab89e82a351f04 100755 (executable)
@@ -239,6 +239,10 @@ static inline void imx6sx_qos_init(void)
        struct device_node *np;
        void   __iomem *src_base;
 
+       np = of_find_compatible_node(NULL, NULL, "fsl,imx6sx-gpu");
+       if (!np || !of_device_is_available(np))
+               return;
+
        np = of_find_compatible_node(NULL, NULL, "fsl,imx6sx-qosc");
        if (!np)
                return;