MLK-16833 ARM64: dts: freescale: imx8mq: enable over-drive mode by default

As all the EVK boards except A0 support over-drive mode,
so enable it in default EVK board dtb and remove over
drive mode dtb.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Bai Ping <ping.bai@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index 5292e2a..7df6643 100644 (file)
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -38,7 +38,6 @@ dtb-$(CONFIG_ARCH_FSL_IMX8QXP) += fsl-imx8qxp-lpddr4-arm2.dtb \
                                  fsl-imx8qxp-lpddr4-arm2-dsi-adv7535.dtb \
                                  fsl-imx8qxp-lpddr4-arm2-dsi-rm67191.dtb
 dtb-$(CONFIG_ARCH_FSL_IMX8MQ) += fsl-imx8mq-evk.dtb \
-                                fsl-imx8mq-evk-od.dtb \
                                 fsl-imx8mq-evk-4k.dtb \
                                 fsl-imx8mq-evk-drm.dtb \
                                 fsl-imx8mq-evk-lcdif-dsi.dtb \

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-od.dts b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-od.dts
deleted file mode 100644 (file)
index 3722a3b..0000000
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-od.dts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2016 Freescale Semiconductor, Inc.
- * Copyright 2017 NXP
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "fsl-imx8mq-evk.dts"
-
-/ {
-       regulators {
-               reg_gpio_dvfs: regulator-gpio {
-                       compatible = "regulator-gpio";
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_dvfs>;
-                       regulator-min-microvolt = <900000>;
-                       regulator-max-microvolt = <1000000>;
-                       regulator-name = "gpio_dvfs";
-                       regulator-type = "voltage";
-                       gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
-                       states = <900000 0x1 1000000 0x0>;
-               };
-       };
-
-       pwmleds {
-               status = "disabled";
-       };
-};
-
-&pwm2 {
-       status = "disabled";
-};
-
-&A53_0 {
-       operating-points = <
-               /* kHz    uV */
-               1500000 1000000
-               1300000 1000000
-               1000000 900000
-               800000  900000
-       >;
-       dc-supply = <&reg_gpio_dvfs>;
-};

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk.dts b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk.dts
index c77e1c6..f127d85 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk.dts
@@ -45,6 +45,18 @@
                        gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>;
                        enable-active-high;
                };
+
+               reg_gpio_dvfs: regulator-gpio {
+                       compatible = "regulator-gpio";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_dvfs>;
+                       regulator-min-microvolt = <900000>;
+                       regulator-max-microvolt = <1000000>;
+                       regulator-name = "gpio_dvfs";
+                       regulator-type = "voltage";
+                       gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+                       states = <900000 0x1 1000000 0x0>;
+               };
        };
 
        modem_reset: modem-reset {
@@ -86,16 +98,6 @@
                spdif-out;
                spdif-in;
        };
-
-       pwmleds {
-               compatible = "pwm-leds";
-
-               ledpwm2 {
-                       label = "PWM2";
-                       pwms = <&pwm2 0 50000>;
-                       max-brightness = <255>;
-               };
-       };
 };
 
 &clk {
@@ -158,12 +160,6 @@
                        >;
                };
 
-               pinctrl_pwm2: pwm2grp {
-                       fsl,pins = <
-                               MX8MQ_IOMUXC_GPIO1_IO13_PWM2_OUT        0x16
-                       >;
-               };
-
                pinctrl_dvfs: dvfsgrp {
                        fsl,pins = <
                                MX8MQ_IOMUXC_GPIO1_IO13_GPIO1_IO13      0x16
@@ -499,12 +495,6 @@
        status = "okay";
 };
 
-&pwm2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_pwm2>;
-       status = "okay";
-};
-
 &uart1 { /* console */
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart1>;
@@ -697,3 +687,14 @@
        reg = <0x0 0xb8000000 0x0 0x10000>;
        status = "okay";
 };
+
+&A53_0 {
+       operating-points = <
+               /* kHz    uV */
+               1500000 1000000
+               1300000 1000000
+               1000000 900000
+               800000  900000
+       >;
+       dc-supply = <&reg_gpio_dvfs>;
+};