Merge branch 'next/bindings' into next/drivers

3 files changed, 47 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt b/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
index 786dc39ca904..3a880528030e 100644
--- a/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
+++ b/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
@@ -9,6 +9,7 @@ Required Properties:
         - GXBB (S905) : "amlogic,meson-gxbb-aoclkc"
         - GXL (S905X, S905D) : "amlogic,meson-gxl-aoclkc"
         - GXM (S912) : "amlogic,meson-gxm-aoclkc"
+        - AXG (A113D, A113X) : "amlogic,meson-axg-aoclkc"
         followed by the common "amlogic,meson-gx-aoclkc"
 
 - #clock-cells: should be 1.
diff --git a/include/dt-bindings/clock/axg-aoclkc.h b/include/dt-bindings/clock/axg-aoclkc.h
new file mode 100644
index 000000000000..61955016a55b
--- /dev/null
+++ b/include/dt-bindings/clock/axg-aoclkc.h
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
+/*
+ * Copyright (c) 2016 BayLibre, SAS
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ *
+ * Copyright (c) 2018 Amlogic, inc.
+ * Author: Qiufang Dai <qiufang.dai@amlogic.com>
+ */
+
+#ifndef DT_BINDINGS_CLOCK_AMLOGIC_MESON_AXG_AOCLK
+#define DT_BINDINGS_CLOCK_AMLOGIC_MESON_AXG_AOCLK
+
+#define CLKID_AO_REMOTE         0
+#define CLKID_AO_I2C_MASTER     1
+#define CLKID_AO_I2C_SLAVE      2
+#define CLKID_AO_UART1          3
+#define CLKID_AO_UART2          4
+#define CLKID_AO_IR_BLASTER     5
+#define CLKID_AO_SAR_ADC        6
+#define CLKID_AO_CLK81          7
+#define CLKID_AO_SAR_ADC_SEL    8
+#define CLKID_AO_SAR_ADC_DIV    9
+#define CLKID_AO_SAR_ADC_CLK    10
+#define CLKID_AO_ALT_XTAL       11
+
+#endif
diff --git a/include/dt-bindings/reset/axg-aoclkc.h b/include/dt-bindings/reset/axg-aoclkc.h
new file mode 100644
index 000000000000..d342c0b6b2a7
--- /dev/null
+++ b/include/dt-bindings/reset/axg-aoclkc.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
+/*
+ * Copyright (c) 2016 BayLibre, SAS
+ * Author: Neil Armstrong <narmstrong@baylibre.com>
+ *
+ * Copyright (c) 2018 Amlogic, inc.
+ * Author: Qiufang Dai <qiufang.dai@amlogic.com>
+ */
+
+#ifndef DT_BINDINGS_RESET_AMLOGIC_MESON_AXG_AOCLK
+#define DT_BINDINGS_RESET_AMLOGIC_MESON_AXG_AOCLK
+
+#define RESET_AO_REMOTE         0
+#define RESET_AO_I2C_MASTER     1
+#define RESET_AO_I2C_SLAVE      2
+#define RESET_AO_UART1          3
+#define RESET_AO_UART2          4
+#define RESET_AO_IR_BLASTER     5
+
+#endif