summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorShawn Xiao <b49994@freescale.com>2015-01-28 16:39:16 +0800
committerShawn Xiao <b49994@freescale.com>2015-02-02 15:57:01 +0800
commit7fe4c7e7f9fe7c92fef1c3f42da62bfc571e3f57 (patch)
tree38d93bf05089cd2f868ed3306c202c6e306ea1a7 /arch
parent3a4ac722a1b6755cda43dba778cfd59497842ed2 (diff)
MLK-10169 GPU: fix kernel booting issue on iMX6sx SOC without GPU
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>
Diffstat (limited to 'arch')
-rwxr-xr-xarch/arm/mach-imx/mach-imx6sx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c
index 3b3da5242c70..7f5188f51b19 100755
--- a/arch/arm/mach-imx/mach-imx6sx.c
+++ b/arch/arm/mach-imx/mach-imx6sx.c
@@ -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;