summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2018-06-28 18:29:05 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2018-06-29 14:49:55 +0200
commit76ad005fe3b03f3ba332af8858efcfd627db112f (patch)
tree296c5b55acdc6318108deb7ea6efeb2d497b9056
parentfe040e0977fab29216f5039e8f9b04e6dbec859a (diff)
downloadbarebox-76ad005fe3b03f3ba332af8858efcfd627db112f.tar.gz
barebox-76ad005fe3b03f3ba332af8858efcfd627db112f.tar.xz
ARM: imx6qp: fix NoC QoS passthrough for new cpu type functions.
On i.MX6QP/DP cpu_mx6_is_mx6q/d do not return true anymore. Use the new cpu_mx6_is_mx6qp/dp to reenable NoC regulator bypass. Fixes: d4c05d29d484 ("ARM: i.MX6: Add cpu type for 'plus' variants") Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-imx/imx6.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c
index eaf9f2e413..3d95c9e374 100644
--- a/arch/arm/mach-imx/imx6.c
+++ b/arch/arm/mach-imx/imx6.c
@@ -140,8 +140,7 @@ static void imx6_setup_ipu_qos(void)
* On i.MX6 QP/DP the NoC regulator for the IPU ports needs to be in
* bypass mode for the above settings to take effect.
*/
- if ((cpu_mx6_is_mx6q() || cpu_mx6_is_mx6d()) &&
- imx_silicon_revision() >= IMX_CHIP_REV_2_0) {
+ if (cpu_mx6_is_mx6qp() || cpu_mx6_is_mx6dp()) {
writel(0x2, fast2 + 0xb048c);
writel(0x2, fast2 + 0xb050c);
}