Line/Degree ROADM: output VOA
...and a dep resync, too.
Change-Id: Iedc361aa0feb51c1b1939cb75492c662fc56cc1c
Depends-on: https://cesnet-gerrit-czechlight/c/CzechLight/cla-sysrepo/+/2051
Depends-on: https://gerrit.cesnet.cz/c/CzechLight/cla-sysrepo/+/2051
diff --git a/board/czechlight/clearfog/clearfog-output-voa.dtsi b/board/czechlight/clearfog/clearfog-output-voa.dtsi
new file mode 100644
index 0000000..b2582e3
--- /dev/null
+++ b/board/czechlight/clearfog/clearfog-output-voa.dtsi
@@ -0,0 +1,77 @@
+#include <dt-bindings/iio/adi,ad5592r.h>
+
+&i2c1 {
+ eeprom@54 {
+ compatible = "atmel,24c128";
+ reg = <0x54>;
+ pagesize = <64>;
+ };
+
+ ad5593r@11 {
+ #size-cells = <0>;
+ #address-cells = <1>;
+ #gpio-cells = <2>;
+ compatible = "adi,ad5593r";
+ reg = <0x11>;
+ gpio-controller;
+
+ gpio-line-names =
+ "VOA0_DAC",
+ "VOA1_DAC",
+ "SWITCH1_ON",
+ "SWITCH2_ON",
+ "ST1_34",
+ "ST1_78",
+ "ST2_34",
+ "ST2_78"
+ ;
+
+ channel@0 {
+ reg = <0>;
+ adi,mode = <CH_MODE_DAC_AND_ADC>;
+ adi,off-state = <CH_OFFSTATE_PULLDOWN>;
+ };
+
+ channel@1 {
+ reg = <1>;
+ adi,mode = <CH_MODE_DAC_AND_ADC>;
+ adi,off-state = <CH_OFFSTATE_PULLDOWN>;
+ };
+
+ channel@2 {
+ reg = <2>;
+ adi,mode = <CH_MODE_GPIO>;
+ adi,off-state = <CH_OFFSTATE_PULLDOWN>;
+ };
+
+ channel@3 {
+ reg = <3>;
+ adi,mode = <CH_MODE_GPIO>;
+ adi,off-state = <CH_OFFSTATE_PULLDOWN>;
+ };
+
+ channel@4 {
+ reg = <4>;
+ adi,mode = <CH_MODE_GPIO>;
+ adi,off-state = <CH_OFFSTATE_OUT_TRISTATE>;
+ };
+
+ channel@5 {
+ reg = <5>;
+ adi,mode = <CH_MODE_GPIO>;
+ adi,off-state = <CH_OFFSTATE_OUT_TRISTATE>;
+ };
+
+ channel@6 {
+ reg = <6>;
+ adi,mode = <CH_MODE_GPIO>;
+ adi,off-state = <CH_OFFSTATE_OUT_TRISTATE>;
+ };
+
+ channel@7 {
+ reg = <7>;
+ adi,mode = <CH_MODE_GPIO>;
+ adi,off-state = <CH_OFFSTATE_OUT_TRISTATE>;
+ };
+ };
+};
diff --git a/board/czechlight/clearfog/sdn-inline-clearfog.dts b/board/czechlight/clearfog/sdn-inline-clearfog.dts
index b11a5c6..2e9e648 100644
--- a/board/czechlight/clearfog/sdn-inline-clearfog.dts
+++ b/board/czechlight/clearfog/sdn-inline-clearfog.dts
@@ -1,82 +1,6 @@
-#include <dt-bindings/iio/adi,ad5592r.h>
#include "sdn-roadm-clearfog.dtsi"
+#include "clearfog-output-voa.dtsi"
&lumentum_ocm {
status = "disabled";
};
-
-&i2c1 {
- eeprom@54 {
- compatible = "atmel,24c128";
- reg = <0x54>;
- pagesize = <64>;
- };
-
- ad5593r@11 {
- #size-cells = <0>;
- #address-cells = <1>;
- #gpio-cells = <2>;
- compatible = "adi,ad5593r";
- reg = <0x11>;
- gpio-controller;
-
- gpio-line-names =
- "VOA0_DAC",
- "VOA1_DAC",
- "SWITCH1_ON",
- "SWITCH2_ON",
- "ST1_34",
- "ST1_78",
- "ST2_34",
- "ST2_78"
- ;
-
- channel@0 {
- reg = <0>;
- adi,mode = <CH_MODE_DAC_AND_ADC>;
- adi,off-state = <CH_OFFSTATE_PULLDOWN>;
- };
-
- channel@1 {
- reg = <1>;
- adi,mode = <CH_MODE_DAC_AND_ADC>;
- adi,off-state = <CH_OFFSTATE_PULLDOWN>;
- };
-
- channel@2 {
- reg = <2>;
- adi,mode = <CH_MODE_GPIO>;
- adi,off-state = <CH_OFFSTATE_PULLDOWN>;
- };
-
- channel@3 {
- reg = <3>;
- adi,mode = <CH_MODE_GPIO>;
- adi,off-state = <CH_OFFSTATE_PULLDOWN>;
- };
-
- channel@4 {
- reg = <4>;
- adi,mode = <CH_MODE_GPIO>;
- adi,off-state = <CH_OFFSTATE_OUT_TRISTATE>;
- };
-
- channel@5 {
- reg = <5>;
- adi,mode = <CH_MODE_GPIO>;
- adi,off-state = <CH_OFFSTATE_OUT_TRISTATE>;
- };
-
- channel@6 {
- reg = <6>;
- adi,mode = <CH_MODE_GPIO>;
- adi,off-state = <CH_OFFSTATE_OUT_TRISTATE>;
- };
-
- channel@7 {
- reg = <7>;
- adi,mode = <CH_MODE_GPIO>;
- adi,off-state = <CH_OFFSTATE_OUT_TRISTATE>;
- };
- };
-};
diff --git a/board/czechlight/clearfog/sdn-roadm-line-clearfog.dts b/board/czechlight/clearfog/sdn-roadm-line-clearfog.dts
index 39f5e7a..ca833c6 100644
--- a/board/czechlight/clearfog/sdn-roadm-line-clearfog.dts
+++ b/board/czechlight/clearfog/sdn-roadm-line-clearfog.dts
@@ -1 +1,2 @@
#include "sdn-roadm-clearfog.dtsi"
+#include "clearfog-output-voa.dtsi"
diff --git a/configs/czechlight_clearfog_defconfig b/configs/czechlight_clearfog_defconfig
index 1a2119c..cd9ce8c 100644
--- a/configs/czechlight_clearfog_defconfig
+++ b/configs/czechlight_clearfog_defconfig
@@ -30,7 +30,7 @@
BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v7"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/linux.fragment $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/common/linux.fragment"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/czechlight-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/CL-ROADMv2-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-clearfog.dtsi $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-line-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-add-drop-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-coherent-a-d-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-inline-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-testing-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/bare-cfb-base-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/bare-cfb-pro-clearfog.dts"
+BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/czechlight-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/CL-ROADMv2-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-clearfog.dtsi $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-line-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-add-drop-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-coherent-a-d-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-inline-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/sdn-roadm-testing-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/bare-cfb-base-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/bare-cfb-pro-clearfog.dts $(BR2_EXTERNAL_CZECHLIGHT_PATH)/board/czechlight/clearfog/clearfog-output-voa.dtsi"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_LINUX_TOOLS_GPIO=y
BR2_PACKAGE_LINUX_TOOLS_IIO=y
diff --git a/submodules/cla-sysrepo b/submodules/cla-sysrepo
index a0a4c4c..166e84c 160000
--- a/submodules/cla-sysrepo
+++ b/submodules/cla-sysrepo
@@ -1 +1 @@
-Subproject commit a0a4c4cc8fd44837759dfc46fbf74c3d3479bd16
+Subproject commit 166e84c086ccd6caa62eb3af7e4c540809a665d1
diff --git a/submodules/netconf-cli b/submodules/netconf-cli
index e315ce2..1ce4b32 160000
--- a/submodules/netconf-cli
+++ b/submodules/netconf-cli
@@ -1 +1 @@
-Subproject commit e315ce20b434caeb28291cf7398db8933d77cba1
+Subproject commit 1ce4b32b8f89cc512182d433d432981415af9930