dt-bindings: clock: axg-audio: unexpose controller inputs

Remove the bindings ID of the clock input of the controller. These
clocks are purely internal to the controller, exposing them was a
mistake. Actually, these should not even be in the provider and have
IDs to begin with.

Unexpose these IDs before:
 * someone starts using them (even if there no valid reason to do so)
 * the actual clocks are removed. The fact that they exist is just the
   result of an ugly hack. This will be resolved in CCF when we can
   reference DT directly in parent table.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Acked-by: Maxime Jourdan <mjourdan@baylibre.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://lkml.kernel.org/r/20190213095835.17448-1-jbrunet@baylibre.com

diff --git a/drivers/clk/meson/axg-audio.h b/drivers/clk/meson/axg-audio.h
index 7191b39..644f0b0 100644 (file)
--- a/drivers/clk/meson/axg-audio.h
+++ b/drivers/clk/meson/axg-audio.h
@@ -60,6 +60,26 @@
 #define AUD_CLKID_MST5                 6
 #define AUD_CLKID_MST6                 7
 #define AUD_CLKID_MST7                 8
+#define AUD_CLKID_SLV_SCLK0            9
+#define AUD_CLKID_SLV_SCLK1            10
+#define AUD_CLKID_SLV_SCLK2            11
+#define AUD_CLKID_SLV_SCLK3            12
+#define AUD_CLKID_SLV_SCLK4            13
+#define AUD_CLKID_SLV_SCLK5            14
+#define AUD_CLKID_SLV_SCLK6            15
+#define AUD_CLKID_SLV_SCLK7            16
+#define AUD_CLKID_SLV_SCLK8            17
+#define AUD_CLKID_SLV_SCLK9            18
+#define AUD_CLKID_SLV_LRCLK0           19
+#define AUD_CLKID_SLV_LRCLK1           20
+#define AUD_CLKID_SLV_LRCLK2           21
+#define AUD_CLKID_SLV_LRCLK3           22
+#define AUD_CLKID_SLV_LRCLK4           23
+#define AUD_CLKID_SLV_LRCLK5           24
+#define AUD_CLKID_SLV_LRCLK6           25
+#define AUD_CLKID_SLV_LRCLK7           26
+#define AUD_CLKID_SLV_LRCLK8           27
+#define AUD_CLKID_SLV_LRCLK9           28
 #define AUD_CLKID_MST_A_MCLK_SEL       59
 #define AUD_CLKID_MST_B_MCLK_SEL       60
 #define AUD_CLKID_MST_C_MCLK_SEL       61

diff --git a/include/dt-bindings/clock/axg-audio-clkc.h b/include/dt-bindings/clock/axg-audio-clkc.h
index fd9c362..eafb0de 100644 (file)
--- a/include/dt-bindings/clock/axg-audio-clkc.h
+++ b/include/dt-bindings/clock/axg-audio-clkc.h
@@ -7,26 +7,6 @@
 #ifndef __AXG_AUDIO_CLKC_BINDINGS_H
 #define __AXG_AUDIO_CLKC_BINDINGS_H
 
-#define AUD_CLKID_SLV_SCLK0            9
-#define AUD_CLKID_SLV_SCLK1            10
-#define AUD_CLKID_SLV_SCLK2            11
-#define AUD_CLKID_SLV_SCLK3            12
-#define AUD_CLKID_SLV_SCLK4            13
-#define AUD_CLKID_SLV_SCLK5            14
-#define AUD_CLKID_SLV_SCLK6            15
-#define AUD_CLKID_SLV_SCLK7            16
-#define AUD_CLKID_SLV_SCLK8            17
-#define AUD_CLKID_SLV_SCLK9            18
-#define AUD_CLKID_SLV_LRCLK0           19
-#define AUD_CLKID_SLV_LRCLK1           20
-#define AUD_CLKID_SLV_LRCLK2           21
-#define AUD_CLKID_SLV_LRCLK3           22
-#define AUD_CLKID_SLV_LRCLK4           23
-#define AUD_CLKID_SLV_LRCLK5           24
-#define AUD_CLKID_SLV_LRCLK6           25
-#define AUD_CLKID_SLV_LRCLK7           26
-#define AUD_CLKID_SLV_LRCLK8           27
-#define AUD_CLKID_SLV_LRCLK9           28
 #define AUD_CLKID_DDR_ARB              29
 #define AUD_CLKID_PDM                  30
 #define AUD_CLKID_TDMIN_A              31