diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/fsl-ls1046a-rdb.dts | 8 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx6.c | 13 |
2 files changed, 11 insertions, 10 deletions
diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts index 32b3f40769..23e43701f3 100644 --- a/arch/arm/dts/fsl-ls1046a-rdb.dts +++ b/arch/arm/dts/fsl-ls1046a-rdb.dts @@ -129,14 +129,6 @@ }; }; -&qflash0 { - compatible = "jedec,spi-nor"; -}; - -&qflash1 { - compatible = "jedec,spi-nor"; -}; - &usb0 { dr_mode = "host"; }; diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c index 719bfa8a39..8f949534b8 100644 --- a/arch/arm/mach-imx/imx6.c +++ b/arch/arm/mach-imx/imx6.c @@ -113,14 +113,23 @@ static void imx6_init_lowlevel(void) } } +static bool imx6_has_ipu(void) +{ + if (cpu_mx6_is_mx6qp() || cpu_mx6_is_mx6dp() || + cpu_mx6_is_mx6q() || cpu_mx6_is_mx6d() || + cpu_mx6_is_mx6dl() || cpu_mx6_is_mx6s()) + return true; + + return false; +} + static void imx6_setup_ipu_qos(void) { void __iomem *iomux = (void *)MX6_IOMUXC_BASE_ADDR; void __iomem *fast2 = (void *)MX6_FAST2_BASE_ADDR; uint32_t val; - if (!cpu_mx6_is_mx6q() && !cpu_mx6_is_mx6d() && - !cpu_mx6_is_mx6dl() && !cpu_mx6_is_mx6s()) + if (!imx6_has_ipu()) return; val = readl(iomux + IOMUXC_GPR4); |