summaryrefslogtreecommitdiffstats
path: root/include/dt-bindings
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2017-11-14 10:07:43 -0800
committerStephen Boyd <sboyd@codeaurora.org>2017-11-14 10:07:43 -0800
commiteed58151d606e81812448931d952ee39071d1f76 (patch)
tree32a70f4ab06ce59c37dc39050a491c53d791e9b5 /include/dt-bindings
parent8f620400861a313cfb59a43651a92f815de0da93 (diff)
parent259bc283069975004067c51cc09525a50db4b470 (diff)
downloadlinux-stable-eed58151d606e81812448931d952ee39071d1f76.tar.gz
linux-stable-eed58151d606e81812448931d952ee39071d1f76.tar.bz2
linux-stable-eed58151d606e81812448931d952ee39071d1f76.zip
Merge branch 'clk-imx' into clk-next
* clk-imx: clk: imx: imx7d: Remove ARM_M0 clock clk: imx: imx7d: Fix parent clock for OCRAM_CLK clk: imx: clk-imx6ul: allow lcdif_pre_sel to change parent rate clk: imx6: refine hdmi_isfr's parent to make HDMI work on i.MX6 SoCs w/o VPU
Diffstat (limited to 'include/dt-bindings')
-rw-r--r--include/dt-bindings/clock/imx7d-clock.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/dt-bindings/clock/imx7d-clock.h b/include/dt-bindings/clock/imx7d-clock.h
index de62a83b6c80..e2f99ae72d5c 100644
--- a/include/dt-bindings/clock/imx7d-clock.h
+++ b/include/dt-bindings/clock/imx7d-clock.h
@@ -80,10 +80,10 @@
#define IMX7D_ARM_M4_ROOT_SRC 67
#define IMX7D_ARM_M4_ROOT_CG 68
#define IMX7D_ARM_M4_ROOT_DIV 69
-#define IMX7D_ARM_M0_ROOT_CLK 70
-#define IMX7D_ARM_M0_ROOT_SRC 71
-#define IMX7D_ARM_M0_ROOT_CG 72
-#define IMX7D_ARM_M0_ROOT_DIV 73
+#define IMX7D_ARM_M0_ROOT_CLK 70 /* unused */
+#define IMX7D_ARM_M0_ROOT_SRC 71 /* unused */
+#define IMX7D_ARM_M0_ROOT_CG 72 /* unused */
+#define IMX7D_ARM_M0_ROOT_DIV 73 /* unused */
#define IMX7D_MAIN_AXI_ROOT_CLK 74
#define IMX7D_MAIN_AXI_ROOT_SRC 75
#define IMX7D_MAIN_AXI_ROOT_CG 76