[6.18] Rebase ARM commits from 4.14 kernel

Documentation/devicetree/bindings/auxdisplay/oel9m1027.txt

@@ -0,0 +1,15 @@
+Binding for OEL9M1027 OLED display module manufactured by Truly
+
+Required properties:
+  - compatible : Compatibility string. Must be "truly,oel9m1027".
+
+Example:
+
+	oleddriver@3C {
+		compatible = "sinowealth,sh1107";
+		reg = <0x3C>;
+
+		oledmodule {
+			compatible = "truly,oel9m1027";
+		};
+	};

Documentation/devicetree/bindings/auxdisplay/sh1107.txt

@@ -0,0 +1,12 @@
+Binding for Sinowealth OLED driver
+
+Required properties:
+  - compatible: Compatibility string. Must be "sinowealth,sh1107".
+  - reg : i2c address of Truly OLED module (0x3C or 0x3D)
+
+Example:
+
+	oleddriver@3C {
+		compatible = "sinowealth,sh1107";
+		reg = <0x3C>;
+	};

Documentation/devicetree/bindings/leds/leds-ni793x.txt

@@ -0,0 +1,21 @@
+LEDs connected to NI-793xR
+
+Required properties:
+- compatible : should be : "ni,led-793x".
+- reg: base address of LED control register space.
+
+The ni,led-793x device node only contains a single sub-node, 'user1'.
+
+LED sub-node properties:
+- label : (optional) see leds/common.txt
+- linux,default-trigger : (optional) see leds/common.txt
+
+Examples:
+
+leds-ni793x@4020F000 {
+        compatible = "ni,led-793x";
+        reg = <0x4020F000 4>;
+        user1 {
+                label = "nilrt:user1:green";
+        };
+};

Documentation/devicetree/bindings/misc/ni,cpld.txt

@@ -0,0 +1,156 @@
+National Instruments CPLD
+
+National Instruments (NI) boards often have CPLDs on them to handle
+board-specific tasks like LED control, board switches and buttons,
+power sequencing, and CPU-independent watchdogs.
+
+NI's CPLDs are connected over i2c. As such, 'nicpld' must be a child
+of an i2c node.
+
+nicpld properties:
+- compatible : (required)
+  Should be "ni,cpld"
+- reg: (required)
+  Address of the CPLD on the i2c bus
+
+Required sub-nodes:
+- watchdogs : A node containing sub-nodes describing watchdogs
+
+Optional sub-nodes:
+- switches : A node containing sub-nodes describing switches
+- leds : A node containing sub-nodes describing LEDs
+
+
+Watchdogs Child Node
+====================
+
+Each watchdog controlled by the CPLD is represented as a sub-node of
+the nicpld's 'watchdogs' node. Each sub-node of 'watchdogs' has the
+following properties.
+
+Required properties:
+- interrupts : Should be the CPLD watchdog interrupt specifier
+
+Optional properties:
+- label: A name for the CPLD switch
+
+
+Switches Child Node
+===================
+
+Each switch or button controlled by the CPLD is represented as a
+sub-node of the nicpld's 'switches' node. Each sub-node of 'switches'
+has the following properties.
+
+Required properties:
+- interrupts : The CPLD switch interrupt specifier
+
+
+LEDs Child Node
+===============
+
+Each LED controlled by the CPLD is represented as a sub-node of the
+nicpld's 'leds' node.  The name of each LED node corresponds to an
+LED type. The "-0" or "-1" suffixes specify an LED element (single
+color) within a multi-color LED.
+
+Possible LED types:
+- user1-0
+- user1-1
+- status-0
+- status-1
+- temp-alert-0
+- wifi-0
+- wifi-1
+- eth0-0
+- eth0-1
+- eth1-0
+- eth1-1
+
+Different CPLDs support different LED types. The set of LEDs that
+various CPLDs support can be determined by examining their product
+code. The product code for a CPLD can be determined by reading the
+"NICPLD_PRODUCT" (0x1D) register of the CPLD over i2c. Below is a
+list of which CPLDs support which LED types.
+
+CPLD Products 0x00 and 0x01
+---------------------------
+user1-0
+user1-1
+status-0
+status-1
+wifi-0
+wifi-1
+eth0-0
+eth0-1
+eth1-0
+eth1-1
+
+CPLD Product 0x02
+-----------------
+status-0
+temp-alert-0
+eth0-0
+eth0-1
+eth1-0
+eth1-1
+
+CPLD Products 0x03 and 0x04
+---------------------------
+user1-0
+status-0
+eth0-0
+eth0-1
+eth1-0
+eth1-1
+
+
+LED sub-node properties:
+- label :  (optional)
+  see bindings/leds/common.txt
+- max-brightness : (optional)
+  The number of possible special blinking patterns. Selecting a
+  brightness will pick the blink pattern.
+- linux,default-trigger :  (optional)
+  see bindings/leds/common.txt
+
+Example:
+
+nicpld@40 {
+	compatible = "ni,cpld";
+	reg = <0x40>;
+
+	watchdogs {
+		boot-watchdog {
+			interrupt-parent = <&gpio>;
+			interrupts = <24 0>;
+		};
+	};
+
+	switches {
+		wifi-switch {
+			interrupt-parent = <&gpio>;
+			interrupts = <25 0>;
+		};
+	};
+
+	leds {
+		user1-0 {
+			label = "nilrt:user1:green";
+		};
+		status-0 {
+			label = "nilrt:status:yellow";
+			max-brightness = <0xFFFF>;
+		};
+		eth0-0 {
+			label = "nilrt:eth0:green";
+			linux,default-trigger =
+				"e000b000.etherne:00:100Mb";
+		};
+		eth0-1 {
+			label = "nilrt:eth0:yellow";
+			linux,default-trigger =
+				"e000b000.etherne:00:Gb";
+		};
+	};
+};

MAINTAINERS

@@ -18763,6 +18763,14 @@ F:	drivers/misc/ocxl/
 F:	include/misc/ocxl*
 F:	include/uapi/misc/ocxl.h
 
+OEL9M1027 TRULY OLED MODULE DRIVER
+M:	Wilson Lee <wilson.lee@ni.com>
+S:	Maintained
+F:	Documentation/devicetree/bindings/auxdisplay/oel9m1027.txt
+F:	drivers/auxdisplay/oel9m1027.c
+F:	drivers/auxdisplay/oel9m1027fb.c
+F:	drivers/auxdisplay/oel9m1027.h
+
 OMAP AUDIO SUPPORT
 M:	Peter Ujfalusi <peter.ujfalusi@gmail.com>
 M:	Jarkko Nikula <jarkko.nikula@bitmer.com>
@@ -23452,6 +23460,13 @@ S:	Orphan
 F:	drivers/media/platform/renesas/sh_vou.c
 F:	include/media/drv-intf/sh_vou.h
 
+SH1107 OLED CONTROLLER DRIVER
+M:	Wilson Lee <wilson.lee@ni.com>
+S:	Maintained
+F:	Documentation/devicetree/bindings/auxdisplay/sh1107.txt
+F:	drivers/auxdisplay/sh1107.c
+F:	drivers/auxdisplay/sh1107.h
+
 SI2157 MEDIA DRIVER
 L:	linux-media@vger.kernel.org
 S:	Orphan

Makefile

@@ -1592,7 +1592,7 @@ endif # CONFIG_MODULES
 CLEAN_FILES += vmlinux.symvers modules-only.symvers \
 	       modules.builtin modules.builtin.modinfo modules.nsdeps \
 	       modules.builtin.ranges vmlinux.o.map vmlinux.unstripped \
-	       compile_commands.json rust/test \
+	       compile_commands.json rust/test ni-install \
 	       rust-project.json .vmlinux.objs .vmlinux.export.c \
                .builtin-dtbs-list .builtin-dtbs.S
 

arch/arm/boot/dts/xilinx/Makefile

@@ -14,4 +14,25 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \
 	zynq-zturn.dtb \
 	zynq-zturn-v5.dtb \
 	zynq-zybo.dtb \
-	zynq-zybo-z7.dtb
+	zynq-zybo-z7.dtb \
+	ni-762F.dtb \
+	ni-76D3.dtb \
+	ni-76D6.dtb \
+	ni-76F2.dtb \
+	ni-7740.dtb \
+	ni-7741.dtb \
+	ni-7742.dtb \
+	ni-7743.dtb \
+	ni-7744.dtb \
+	ni-774C.dtb \
+	ni-774E.dtb \
+	ni-775E.dtb \
+	ni-77AC.dtb \
+	ni-77B1.dtb \
+	ni-77B2.dtb \
+	ni-77D4.dtb \
+	ni-77D5.dtb \
+	ni-77D6.dtb \
+	ni-7885.dtb \
+	ni-793C.dtb \
+	ni-7AAE.dtb

arch/arm/boot/dts/xilinx/ni-762F.dts

@@ -0,0 +1,6 @@
+/dts-v1/;
+/include/ "ni-myrio.dtsi"
+
+/ {
+	model = "NI myRIO-1900";
+};

arch/arm/boot/dts/xilinx/ni-76D3.dts

@@ -0,0 +1,6 @@
+/dts-v1/;
+/include/ "ni-myrio.dtsi"
+
+/ {
+	model = "NI myRIO-1950";
+};