Merge branch 'master' into lumentum
Change-Id: I6032f6c6a0da254cf68ecce3e7cfa0c41638adcc
diff --git a/board/czechlight/clearfog/czechlight-clearfog.dts b/board/czechlight/clearfog/czechlight-clearfog.dts
index 211d348..296600e 100644
--- a/board/czechlight/clearfog/czechlight-clearfog.dts
+++ b/board/czechlight/clearfog/czechlight-clearfog.dts
@@ -65,7 +65,7 @@
};
&spi1 {
- cs-gpios = <0>, <&gpio0 22 GPIO_ACTIVE_HIGH>, <0>;
+ cs-gpios = <0>, <&gpio0 22 GPIO_ACTIVE_HIGH>, <0>, <&gpio1 16 GPIO_ACTIVE_HIGH>;
max14830: max14830@2 {
compatible = "maxim,max14830";
@@ -77,6 +77,25 @@
gpio-controller;
#gpio-cells = <2>;
spi-max-frequency = <26000000>;
+
+ gpio-line-names =
+ "EVM-GPIO0",
+ "",
+ "",
+ "EVM-LED1",
+ "EVM-GPIO4",
+ "",
+ "",
+ "EVM-LED2",
+ "EVM-GPIO8",
+ "",
+ "",
+ "EVM-LED3",
+ "EVM-GPIO12",
+ "",
+ "",
+ "EVM-LED4"
+ ;
};
gpio_spi_chips: gpio@1 {
@@ -92,5 +111,51 @@
microchip,irq-mirror;
microchip,irq-open-drain;
spi-max-frequency = <10000000>;
+
+ gpio-line-names =
+ "OCM-HS_out",
+ "OCM-HS_in",
+ "1-A2",
+ "1-A3",
+ "1-A4",
+ "1-A5",
+ "1-A6",
+ "1-A7",
+
+ "1-B0",
+ "1-B1",
+ "1-B2",
+ "1-B3",
+ "1-B4",
+ "1-B5",
+ "1-B6",
+ "1-B7",
+
+ "2-A0",
+ "2-A1",
+ "2-A2",
+ "2-A3",
+ "2-A4",
+ "2-A5",
+ "2-A6",
+ "2-A7",
+
+ "2-B0",
+ "2-B1",
+ "2-B2",
+ "2-B3",
+ "2-B4",
+ "2-B5",
+ "2-B6",
+ "2-B7"
+ ;
+ };
+
+ spidev@3 {
+ compatible = "spidev";
+ reg = <3>;
+ spi-max-frequency = <12000000>;
+ spi-cpol;
+ linux,spi-wdelay = /bits/ 16 <3>;
};
};
diff --git a/board/czechlight/clearfog/linux.fragment b/board/czechlight/clearfog/linux.fragment
index 83cd006..43a563b 100644
--- a/board/czechlight/clearfog/linux.fragment
+++ b/board/czechlight/clearfog/linux.fragment
@@ -20,3 +20,6 @@
# SPI GPIO expander
CONFIG_PINCTRL_MCP23S08=y
+
+# For the Lumentum OCM
+CONFIG_SPI_SPIDEV=y
diff --git a/board/czechlight/clearfog/overlay/etc/rauc/system.conf b/board/czechlight/clearfog/overlay/etc/rauc/system.conf
index 8fc94d4..eac1494 100644
--- a/board/czechlight/clearfog/overlay/etc/rauc/system.conf
+++ b/board/czechlight/clearfog/overlay/etc/rauc/system.conf
@@ -14,6 +14,7 @@
device=/dev/mmcblk0p2
type=ext4
parent=rootfs.0
+ignore-checksum=true
[slot.rootfs.1]
device=/dev/mmcblk0p3
@@ -24,3 +25,4 @@
device=/dev/mmcblk0p4
type=ext4
parent=rootfs.1
+ignore-checksum=true