Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

af82455f · Linus Torvalds <[email protected]> · 2017-05-04 19:07:10 -07:00

Pull char/misc driver updates from Greg KH:
 "Here is the big set of new char/misc driver drivers and features for
  4.12-rc1.

  There's lots of new drivers added this time around, new firmware
  drivers from Google, more auxdisplay drivers, extcon drivers, fpga
  drivers, and a bunch of other driver updates. Nothing major, except if
  you happen to have the hardware for these drivers, and then you will
  be happy :)

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (136 commits)
  firmware: google memconsole: Fix return value check in platform_memconsole_init()
  firmware: Google VPD: Fix return value check in vpd_platform_init()
  goldfish_pipe: fix build warning about using too much stack.
  goldfish_pipe: An implementation of more parallel pipe
  fpga fr br: update supported version numbers
  fpga: region: release FPGA region reference in error path
  fpga altera-hps2fpga: disable/unprepare clock on error in alt_fpga_bridge_probe()
  mei: drop the TODO from samples
  firmware: Google VPD sysfs driver
  firmware: Google VPD: import lib_vpd source files
  misc: lkdtm: Add volatile to intentional NULL pointer reference
  eeprom: idt_89hpesx: Add OF device ID table
  misc: ds1682: Add OF device ID table
  misc: tsl2550: Add OF device ID table
  w1: Remove unneeded use of assert() and remove w1_log.h
  w1: Use kernel common min() implementation
  uio_mf624: Align memory regions to page size and set correct offsets
  uio_mf624: Refactor memory info initialization
  uio: Allow handling of non page-aligned memory regions
  hangcheck-timer: Fix typo in comment
  ...

Commit: af82455f7dbd9dc20244d80d033721b30d22c065
Parents: 0be75179 · 2a76f89f

Merge commit. Changes below are compared with the first parent: 0be75179.

Changes

166 files changed · +8064 −3259

File	Status	Add	Del	Content
Documentation/DocBook/rapidio.tmpl	modified	+0	−3	View file
Documentation/devicetree/bindings/auxdisplay/hit,hd44780.txt	added	+45	−0	View file
Documentation/devicetree/bindings/firmware/coreboot.txt	added	+33	−0	View file
Documentation/devicetree/bindings/fpga/altera-pr-ip.txt	added	+12	−0	View file
Documentation/devicetree/bindings/fpga/fpga-region.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/fpga/lattice-ice40-fpga-mgr.txt	added	+21	−0	View file
Documentation/devicetree/bindings/fpga/xilinx-slave-serial.txt	added	+44	−0	View file
Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt	modified	+5	−1	View file
Documentation/devicetree/bindings/nvmem/imx-iim.txt	added	+22	−0	View file
Documentation/devicetree/bindings/nvmem/imx-ocotp.txt	modified	+5	−0	View file
Documentation/driver-api/vme.rst	modified	+93	−270	View file
Documentation/extcon/porting-android-switch-class	deleted	+0	−123	View before deletion
Documentation/w1/slaves/00-INDEX	modified	+4	−0	View file
Documentation/w1/slaves/w1_ds2413	added	+50	−0	View file
Documentation/w1/slaves/w1_ds2438	added	+63	−0	View file
MAINTAINERS	modified	+4	−4	View file
arch/arm/mach-ep93xx/ts72xx.c	modified	+26	−0	View file
arch/x86/hyperv/hv_init.c	modified	+1	−1	View file
arch/x86/include/uapi/asm/hyperv.h	modified	+6	−1	View file
arch/x86/kernel/cpu/mshyperv.c	modified	+3	−0	View file
drivers/android/Kconfig	modified	+1	−1	View file
drivers/auxdisplay/Kconfig	modified	+304	−0	View file
drivers/auxdisplay/Makefile	modified	+4	−0	View file
drivers/misc/arm-charlcd.c → drivers/auxdisplay/arm-charlcd.c	renamed	+0	−0	View file
drivers/auxdisplay/charlcd.c	added	+818	−0	View file
drivers/auxdisplay/hd44780.c	added	+326	−0	View file
drivers/auxdisplay/ht16k33.c	modified	+15	−5	View file
drivers/auxdisplay/img-ascii-lcd.c	modified	+1	−0	View file
drivers/misc/panel.c → drivers/auxdisplay/panel.c	renamed	+92	−735	View file
drivers/char/hangcheck-timer.c	modified	+1	−1	View file
drivers/char/hpet.c	modified	+1	−1	View file
drivers/char/misc.c	modified	+6	−5	View file
drivers/char/mspec.c	modified	+5	−4	View file
drivers/char/tpm/tpm-chip.c	modified	+14	−40	View file
drivers/char/virtio_console.c	modified	+1	−1	View file
drivers/dax/dax.c	modified	+16	−17	View file
drivers/extcon/Kconfig	modified	+7	−0	View file
drivers/extcon/Makefile	modified	+1	−0	View file
drivers/extcon/extcon-arizona.c	modified	+46	−0	View file
drivers/extcon/extcon-intel-cht-wc.c	added	+395	−0	View file
drivers/extcon/extcon-palmas.c	modified	+6	−0	View file
drivers/extcon/extcon-usb-gpio.c	modified	+4	−6	View file
drivers/extcon/extcon.c	modified	+1	−21	View file
drivers/firewire/core-topology.c	modified	+1	−1	View file
drivers/firewire/core.h	modified	+4	−4	View file
drivers/firmware/google/Kconfig	modified	+51	−8	View file
drivers/firmware/google/Makefile	modified	+9	−1	View file
drivers/firmware/google/coreboot_table-acpi.c	added	+88	−0	View file
drivers/firmware/google/coreboot_table-of.c	added	+82	−0	View file
drivers/firmware/google/coreboot_table.c	added	+94	−0	View file
drivers/firmware/google/coreboot_table.h	added	+50	−0	View file
drivers/firmware/google/memconsole-coreboot.c	added	+109	−0	View file
drivers/firmware/google/memconsole-x86-legacy.c	added	+153	−0	View file
drivers/firmware/google/memconsole.c	modified	+23	−132	View file
drivers/firmware/google/memconsole.h	added	+43	−0	View file
drivers/firmware/google/vpd.c	added	+332	−0	View file
drivers/firmware/google/vpd_decode.c	added	+99	−0	View file
drivers/firmware/google/vpd_decode.h	added	+58	−0	View file
drivers/fpga/Kconfig	modified	+42	−0	View file
drivers/fpga/Makefile	modified	+6	−0	View file
drivers/fpga/altera-freeze-bridge.c	modified	+20	−12	View file
drivers/fpga/altera-hps2fpga.c	modified	+9	−6	View file
drivers/fpga/altera-pr-ip-core-plat.c	added	+68	−0	View file
drivers/fpga/altera-pr-ip-core.c	added	+220	−0	View file
drivers/fpga/fpga-bridge.c	modified	+5	−12	View file
drivers/fpga/fpga-mgr.c	modified	+1	−1	View file
drivers/fpga/fpga-region.c	modified	+12	−3	View file
drivers/fpga/ice40-spi.c	added	+207	−0	View file
drivers/fpga/ts73xx-fpga.c	added	+156	−0	View file
drivers/fpga/xilinx-pr-decoupler.c	added	+161	−0	View file
drivers/fpga/xilinx-spi.c	added	+198	−0	View file
drivers/fpga/zynq-fpga.c	modified	+25	−3	View file
drivers/gpio/gpiolib.c	modified	+8	−15	View file
drivers/hv/channel.c	modified	+5	−5	View file
drivers/hv/channel_mgmt.c	modified	+24	−24	View file
drivers/hv/connection.c	modified	+34	−31	View file
drivers/hv/hv.c	modified	+4	−1	View file
drivers/hv/hv_balloon.c	modified	+0	−2	View file
drivers/hv/hv_fcopy.c	modified	+0	−2	View file
drivers/hv/hv_kvp.c	modified	+5	−7	View file
drivers/hv/hv_snapshot.c	modified	+0	−2	View file
drivers/hv/hyperv_vmbus.h	modified	+9	−20	View file
drivers/hv/ring_buffer.c	modified	+8	−14	View file
drivers/hv/vmbus_drv.c	modified	+1	−3	View file
drivers/hwtracing/coresight/of_coresight.c	modified	+1	−1	View file
drivers/iio/industrialio-core.c	modified	+4	−11	View file
drivers/infiniband/core/ucm.c	modified	+18	−17	View file
drivers/infiniband/core/user_mad.c	modified	+2	−2	View file
drivers/infiniband/core/uverbs_main.c	modified	+1	−1	View file
drivers/infiniband/hw/hfi1/device.c	modified	+1	−1	View file
drivers/input/evdev.c	modified	+2	−9	View file
drivers/input/joydev.c	modified	+2	−9	View file
drivers/input/mousedev.c	modified	+2	−9	View file
drivers/media/cec/cec-core.c	modified	+4	−12	View file
drivers/media/media-devnode.c	modified	+5	−15	View file
drivers/misc/Kconfig	modified	+6	−287	View file
drivers/misc/Makefile	modified	+3	−2	View file
drivers/misc/aspeed-lpc-ctrl.c	added	+266	−0	View file
drivers/misc/ds1682.c	modified	+7	−0	View file
drivers/misc/eeprom/idt_89hpesx.c	modified	+57	−0	View file
drivers/misc/lkdtm.h	modified	+1	−0	View file
drivers/misc/lkdtm_bugs.c	modified	+12	−1	View file
drivers/misc/lkdtm_core.c	modified	+1	−0	View file
drivers/misc/mei/Makefile	modified	+0	−1	View file
drivers/misc/mei/amthif.c	deleted	+0	−340	View before deletion
drivers/misc/mei/bus-fixup.c	modified	+5	−4	View file
drivers/misc/mei/bus.c	modified	+0	−6	View file
drivers/misc/mei/client.c	modified	+5	−9	View file
drivers/misc/mei/client.h	modified	+0	−5	View file
drivers/misc/mei/hbm.c	modified	+14	−15	View file
drivers/misc/mei/init.c	modified	+1	−13	View file
drivers/misc/mei/interrupt.c	modified	+7	−31	View file
drivers/misc/mei/main.c	modified	+74	−51	View file
drivers/misc/mei/mei_dev.h	modified	+0	−51	View file
drivers/misc/mei/pci-me.c	modified	+29	−2	View file
drivers/misc/mei/pci-txe.c	modified	+28	−1	View file
drivers/misc/tsl2550.c	modified	+7	−0	View file
drivers/mtd/ubi/build.c	modified	+17	−74	View file
drivers/mtd/ubi/vmt.c	modified	+16	−33	View file
drivers/nvmem/Kconfig	modified	+11	−0	View file
drivers/nvmem/Makefile	modified	+2	−0	View file
drivers/nvmem/core.c	modified	+2	−1	View file
drivers/nvmem/imx-iim.c	added	+173	−0	View file
drivers/nvmem/imx-ocotp.c	modified	+249	−5	View file
drivers/nvmem/sunxi_sid.c	modified	+85	−4	View file
drivers/platform/chrome/cros_ec_dev.c	modified	+7	−24	View file
drivers/platform/goldfish/goldfish_pipe.c	modified	+641	−329	View file
drivers/pps/pps.c	modified	+92	−31	View file
drivers/rapidio/devices/rio_mport_cdev.c	modified	+8	−16	View file
drivers/rapidio/rio-sysfs.c	modified	+33	−43	View file
drivers/rapidio/rio.c	modified	+0	−3	View file
drivers/rapidio/rio.h	modified	+0	−2	View file
drivers/rtc/class.c	modified	+10	−4	View file
drivers/rtc/rtc-core.h	modified	+0	−10	View file
drivers/rtc/rtc-dev.c	modified	+0	−17	View file
drivers/scsi/osd/osd_uld.c	modified	+21	−38	View file
drivers/uio/uio.c	modified	+1	−1	View file
drivers/uio/uio_mf624.c	modified	+22	−26	View file
drivers/vme/vme.c	modified	+438	−31	View file
drivers/w1/masters/matrox_w1.c	modified	+0	−6	View file
drivers/w1/slaves/Kconfig	modified	+6	−0	View file
drivers/w1/slaves/Makefile	modified	+1	−0	View file
drivers/w1/slaves/w1_ds2438.c	added	+390	−0	View file
drivers/w1/slaves/w1_ds2760.h	modified	+6	−4	View file
drivers/w1/w1.c	modified	+0	−1	View file
drivers/w1/w1_family.h	modified	+1	−0	View file
drivers/w1/w1_int.c	modified	+0	−1	View file
drivers/w1/w1_io.c	modified	+0	−1	View file
drivers/w1/w1_log.h	deleted	+0	−31	View before deletion
drivers/w1/w1_netlink.c	modified	+1	−4	View file
drivers/zorro/zorro-driver.c	modified	+9	−6	View file
drivers/zorro/zorro-sysfs.c	modified	+40	−36	View file
drivers/zorro/zorro.c	modified	+0	−3	View file
drivers/zorro/zorro.h	modified	+1	−2	View file
fs/char_dev.c	modified	+86	−0	View file
include/linux/cdev.h	modified	+5	−0	View file
include/linux/fpga/altera-pr-ip-core.h	added	+29	−0	View file
include/linux/fpga/fpga-mgr.h	modified	+4	−0	View file
include/linux/hyperv.h	modified	+23	−8	View file
include/linux/uio_driver.h	modified	+8	−5	View file
include/linux/vme.h	modified	+11	−1	View file
include/misc/charlcd.h	added	+42	−0	View file
include/uapi/linux/aspeed-lpc-ctrl.h	added	+61	−0	View file
include/uapi/linux/pps.h	modified	+19	−0	View file
samples/mei/TODO	deleted	+0	−2	View before deletion
scripts/ver_linux	modified	+1	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/DocBook/rapidio.tmpl

View file

diff --git a/Documentation/DocBook/rapidio.tmpl b/Documentation/DocBook/rapidio.tmpl
index 5047936..ac3cca3 100644
--- a/Documentation/DocBook/rapidio.tmpl
+++ b/Documentation/DocBook/rapidio.tmpl
@@ -129,9 +129,6 @@
      <sect1 id="Device_model_support"><title>Device model support</title>
 !Idrivers/rapidio/rio-driver.c
      </sect1>
-     <sect1 id="Sysfs_support"><title>Sysfs support</title>
-!Idrivers/rapidio/rio-sysfs.c
-     </sect1>
      <sect1 id="PPC32_support"><title>PPC32 support</title>
 !Iarch/powerpc/sysdev/fsl_rio.c
      </sect1>

Documentation/devicetree/bindings/auxdisplay/hit,hd44780.txt

View file

diff --git a/Documentation/devicetree/bindings/auxdisplay/hit,hd44780.txt b/Documentation/devicetree/bindings/auxdisplay/hit,hd44780.txt
new file mode 100644
index 0000000..2aa24b8
--- /dev/null
+++ b/Documentation/devicetree/bindings/auxdisplay/hit,hd44780.txt
@@ -0,0 +1,45 @@
+DT bindings for the Hitachi HD44780 Character LCD Controller
+
+The Hitachi HD44780 Character LCD Controller is commonly used on character LCDs
+that can display one or more lines of text. It exposes an M6800 bus interface,
+which can be used in either 4-bit or 8-bit mode.
+
+Required properties:
+  - compatible: Must contain "hit,hd44780",
+  - data-gpios: Must contain an array of either 4 or 8 GPIO specifiers,
+    referring to the GPIO pins connected to the data signal lines DB0-DB7
+    (8-bit mode) or DB4-DB7 (4-bit mode) of the LCD Controller's bus interface,
+  - enable-gpios: Must contain a GPIO specifier, referring to the GPIO pin
+    connected to the "E" (Enable) signal line of the LCD Controller's bus
+    interface,
+  - rs-gpios: Must contain a GPIO specifier, referring to the GPIO pin
+    connected to the "RS" (Register Select) signal line of the LCD Controller's
+    bus interface,
+  - display-height-chars: Height of the display, in character cells,
+  - display-width-chars: Width of the display, in character cells.
+
+Optional properties:
+  - rw-gpios: Must contain a GPIO specifier, referring to the GPIO pin
+    connected to the "RW" (Read/Write) signal line of the LCD Controller's bus
+    interface,
+  - backlight-gpios: Must contain a GPIO specifier, referring to the GPIO pin
+    used for enabling the LCD's backlight,
+  - internal-buffer-width: Internal buffer width (default is 40 for displays
+    with 1 or 2 lines, and display-width-chars for displays with more than 2
+    lines).
+
+Example:
+
+	auxdisplay {
+		compatible = "hit,hd44780";
+
+		data-gpios = <&hc595 0 GPIO_ACTIVE_HIGH>,
+			     <&hc595 1 GPIO_ACTIVE_HIGH>,
+			     <&hc595 2 GPIO_ACTIVE_HIGH>,
+			     <&hc595 3 GPIO_ACTIVE_HIGH>;
+		enable-gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
+		rs-gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
+
+		display-height-chars = <2>;
+		display-width-chars = <16>;
+	};

Documentation/devicetree/bindings/firmware/coreboot.txt

View file

diff --git a/Documentation/devicetree/bindings/firmware/coreboot.txt b/Documentation/devicetree/bindings/firmware/coreboot.txt
new file mode 100644
index 0000000..4c95570
--- /dev/null
+++ b/Documentation/devicetree/bindings/firmware/coreboot.txt
@@ -0,0 +1,33 @@
+COREBOOT firmware information
+
+The device tree node to communicate the location of coreboot's memory-resident
+bookkeeping structures to the kernel. Since coreboot itself cannot boot a
+device-tree-based kernel (yet), this node needs to be inserted by a
+second-stage bootloader (a coreboot "payload").
+
+Required properties:
+ - compatible: Should be "coreboot"
+ - reg: Address and length of the following two memory regions, in order:
+	1.) The coreboot table. This is a list of variable-sized descriptors
+	that contain various compile- and run-time generated firmware
+	parameters. It is identified by the magic string "LBIO" in its first
+	four bytes.
+	See coreboot's src/commonlib/include/commonlib/coreboot_tables.h for
+	details.
+	2.) The CBMEM area. This is a downward-growing memory region used by
+	coreboot to dynamically allocate data structures that remain resident.
+	It may or may not include the coreboot table as one of its members. It
+	is identified by a root node descriptor with the magic number
+	0xc0389481 that resides in the topmost 8 bytes of the area.
+	See coreboot's src/include/imd.h for details.
+
+Example:
+	firmware {
+		ranges;
+
+		coreboot {
+			compatible = "coreboot";
+			reg = <0xfdfea000 0x264>,
+			      <0xfdfea000 0x16000>;
+		}
+	};

Documentation/devicetree/bindings/fpga/altera-pr-ip.txt

View file

diff --git a/Documentation/devicetree/bindings/fpga/altera-pr-ip.txt b/Documentation/devicetree/bindings/fpga/altera-pr-ip.txt
new file mode 100644
index 0000000..52a294c
--- /dev/null
+++ b/Documentation/devicetree/bindings/fpga/altera-pr-ip.txt
@@ -0,0 +1,12 @@
+Altera Arria10 Partial Reconfiguration IP
+
+Required properties:
+- compatible : should contain "altr,a10-pr-ip"
+- reg        : base address and size for memory mapped io.
+
+Example:
+
+	fpga_mgr: fpga-mgr@ff20c000 {
+		compatible = "altr,a10-pr-ip";
+		reg = <0xff20c000 0x10>;
+	};

Documentation/devicetree/bindings/fpga/fpga-region.txt

View file

diff --git a/Documentation/devicetree/bindings/fpga/fpga-region.txt b/Documentation/devicetree/bindings/fpga/fpga-region.txt
index 3b32ba1..81bf3ad 100644
--- a/Documentation/devicetree/bindings/fpga/fpga-region.txt
+++ b/Documentation/devicetree/bindings/fpga/fpga-region.txt
@@ -186,6 +186,7 @@ Optional properties:
 	otherwise full reconfiguration is done.
 - external-fpga-config : boolean, set if the FPGA has already been configured
 	prior to OS boot up.
+- encrypted-fpga-config : boolean, set if the bitstream is encrypted
 - region-unfreeze-timeout-us : The maximum time in microseconds to wait for
 	bridges to successfully become enabled after the region has been
 	programmed.

Documentation/devicetree/bindings/fpga/lattice-ice40-fpga-mgr.txt

View file

diff --git a/Documentation/devicetree/bindings/fpga/lattice-ice40-fpga-mgr.txt b/Documentation/devicetree/bindings/fpga/lattice-ice40-fpga-mgr.txt
new file mode 100644
index 0000000..4dc4124
--- /dev/null
+++ b/Documentation/devicetree/bindings/fpga/lattice-ice40-fpga-mgr.txt
@@ -0,0 +1,21 @@
+Lattice iCE40 FPGA Manager
+
+Required properties:
+- compatible:		Should contain "lattice,ice40-fpga-mgr"
+- reg:			SPI chip select
+- spi-max-frequency:	Maximum SPI frequency (>=1000000, <=25000000)
+- cdone-gpios:		GPIO input connected to CDONE pin
+- reset-gpios:		Active-low GPIO output connected to CRESET_B pin. Note
+			that unless the GPIO is held low during startup, the
+			FPGA will enter Master SPI mode and drive SCK with a
+			clock signal potentially jamming other devices on the
+			bus until the firmware is loaded.
+
+Example:
+	fpga: fpga@0 {
+		compatible = "lattice,ice40-fpga-mgr";
+		reg = <0>;
+		spi-max-frequency = <1000000>;
+		cdone-gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
+	};

Documentation/devicetree/bindings/fpga/xilinx-slave-serial.txt

View file

diff --git a/Documentation/devicetree/bindings/fpga/xilinx-slave-serial.txt b/Documentation/devicetree/bindings/fpga/xilinx-slave-serial.txt
new file mode 100644
index 0000000..9766f74
--- /dev/null
+++ b/Documentation/devicetree/bindings/fpga/xilinx-slave-serial.txt
@@ -0,0 +1,44 @@
+Xilinx Slave Serial SPI FPGA Manager
+
+Xilinx Spartan-6 FPGAs support a method of loading the bitstream over
+what is referred to as "slave serial" interface.
+The slave serial link is not technically SPI, and might require extra
+circuits in order to play nicely with other SPI slaves on the same bus.
+
+See https://www.xilinx.com/support/documentation/user_guides/ug380.pdf
+
+Required properties:
+- compatible: should contain "xlnx,fpga-slave-serial"
+- reg: spi chip select of the FPGA
+- prog_b-gpios: config pin (referred to as PROGRAM_B in the manual)
+- done-gpios: config status pin (referred to as DONE in the manual)
+
+Example for full FPGA configuration:
+
+	fpga-region0 {
+		compatible = "fpga-region";
+		fpga-mgr = <&fpga_mgr_spi>;
+		#address-cells = <0x1>;
+		#size-cells = <0x1>;
+	};
+
+	spi1: spi@10680 {
+		compatible = "marvell,armada-xp-spi", "marvell,orion-spi";
+		pinctrl-0 = <&spi0_pins>;
+		pinctrl-names = "default";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		cell-index = <1>;
+		interrupts = <92>;
+		clocks = <&coreclk 0>;
+		status = "okay";
+
+		fpga_mgr_spi: fpga-mgr@0 {
+			compatible = "xlnx,fpga-slave-serial";
+			spi-max-frequency = <60000000>;
+			spi-cpha;
+			reg = <0>;
+			done-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
+			prog_b-gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
+		};
+	};

Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt

View file

diff --git a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
index d543ed3..ef06d06 100644
--- a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
+++ b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt
@@ -1,7 +1,11 @@
 Allwinner sunxi-sid
 
 Required properties:
-- compatible: "allwinner,sun4i-a10-sid" or "allwinner,sun7i-a20-sid"
+- compatible: Should be one of the following:
+  "allwinner,sun4i-a10-sid"
+  "allwinner,sun7i-a20-sid"
+  "allwinner,sun8i-h3-sid"
+
 - reg: Should contain registers location and length
 
 = Data cells =

Documentation/devicetree/bindings/nvmem/imx-iim.txt

View file

diff --git a/Documentation/devicetree/bindings/nvmem/imx-iim.txt b/Documentation/devicetree/bindings/nvmem/imx-iim.txt
new file mode 100644
index 0000000..1978c5b
--- /dev/null
+++ b/Documentation/devicetree/bindings/nvmem/imx-iim.txt
@@ -0,0 +1,22 @@
+Freescale i.MX IC Identification Module (IIM) device tree bindings
+
+This binding represents the IC Identification Module (IIM) found on
+i.MX25, i.MX27, i.MX31, i.MX35, i.MX51 and i.MX53 SoCs.
+
+Required properties:
+- compatible: should be one of
+	"fsl,imx25-iim", "fsl,imx27-iim",
+	"fsl,imx31-iim", "fsl,imx35-iim",
+	"fsl,imx51-iim", "fsl,imx53-iim",
+- reg: Should contain the register base and length.
+- interrupts: Should contain the interrupt for the IIM
+- clocks: Should contain a phandle pointing to the gated peripheral clock.
+
+Example:
+
+	iim: iim@63f98000 {
+		compatible = "fsl,imx53-iim", "fsl,imx27-iim";
+		reg = <0x63f98000 0x4000>;
+		interrupts = <69>;
+                clocks = <&clks IMX5_CLK_IIM_GATE>;
+	};

Documentation/devicetree/bindings/nvmem/imx-ocotp.txt

View file

diff --git a/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt b/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt
index 966a72e..70d791b 100644
--- a/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt
+++ b/Documentation/devicetree/bindings/nvmem/imx-ocotp.txt
@@ -9,14 +9,19 @@ Required properties:
 	"fsl,imx6sl-ocotp" (i.MX6SL), or
 	"fsl,imx6sx-ocotp" (i.MX6SX),
 	"fsl,imx6ul-ocotp" (i.MX6UL),
+	"fsl,imx7d-ocotp" (i.MX7D/S),
 	followed by "syscon".
 - reg: Should contain the register base and length.
 - clocks: Should contain a phandle pointing to the gated peripheral clock.
 
+Optional properties:
+- read-only: disable write access
+
 Example:
 
 	ocotp: ocotp@021bc000 {
 		compatible = "fsl,imx6q-ocotp", "syscon";
 		reg = <0x021bc000 0x4000>;
 		clocks = <&clks IMX6QDL_CLK_IIM>;
+		read-only;
 	};

Documentation/driver-api/vme.rst

View file

diff --git a/Documentation/driver-api/vme.rst b/Documentation/driver-api/vme.rst
index 89776fb..def139c 100644
--- a/Documentation/driver-api/vme.rst
+++ b/Documentation/driver-api/vme.rst
@@ -6,36 +6,15 @@ Driver registration
 
 As with other subsystems within the Linux kernel, VME device drivers register
 with the VME subsystem, typically called from the devices init routine.  This is
-achieved via a call to the following function:
+achieved via a call to :c:func:`vme_register_driver`.
 
-.. code-block:: c
-
-	int vme_register_driver (struct vme_driver *driver, unsigned int ndevs);
+A pointer to a structure of type :c:type:`struct vme_driver <vme_driver>` must
+be provided to the registration function. Along with the maximum number of
+devices your driver is able to support.
 
-If driver registration is successful this function returns zero, if an error
-occurred a negative error code will be returned.
-
-A pointer to a structure of type 'vme_driver' must be provided to the
-registration function. Along with ndevs, which is the number of devices your
-driver is able to support. The structure is as follows:
-
-.. code-block:: c
-
-	struct vme_driver {
-		struct list_head node;
-		const char *name;
-		int (*match)(struct vme_dev *);
-		int (*probe)(struct vme_dev *);
-		int (*remove)(struct vme_dev *);
-		void (*shutdown)(void);
-		struct device_driver driver;
-		struct list_head devices;
-		unsigned int ndev;
-	};
-
-At the minimum, the '.name', '.match' and '.probe' elements of this structure
-should be correctly set. The '.name' element is a pointer to a string holding
-the device driver's name.
+At the minimum, the '.name', '.match' and '.probe' elements of
+:c:type:`struct vme_driver <vme_driver>` should be correctly set. The '.name'
+element is a pointer to a string holding the device driver's name.
 
 The '.match' function allows control over which VME devices should be registered
 with the driver. The match function should return 1 if a device should be
@@ -54,29 +33,16 @@ the number of devices probed to one:
 	}
 
 The '.probe' element should contain a pointer to the probe routine. The
-probe routine is passed a 'struct vme_dev' pointer as an argument. The
-'struct vme_dev' structure looks like the following:
-
-.. code-block:: c
-
-	struct vme_dev {
-		int num;
-		struct vme_bridge *bridge;
-		struct device dev;
-		struct list_head drv_list;
-		struct list_head bridge_list;
-	};
+probe routine is passed a :c:type:`struct vme_dev <vme_dev>` pointer as an
+argument.
 
 Here, the 'num' field refers to the sequential device ID for this specific
 driver. The bridge number (or bus number) can be accessed using
 dev->bridge->num.
 
-A function is also provided to unregister the driver from the VME core and is
-usually called from the device driver's exit routine:
-
-.. code-block:: c
-
-	void vme_unregister_driver (struct vme_driver *driver);
+A function is also provided to unregister the driver from the VME core called
+:c:func:`vme_unregister_driver` and should usually be called from the device
+driver's exit routine.
 
 
 Resource management
@@ -90,47 +56,29 @@ driver is called. The probe routine is passed a pointer to the devices
 device structure. This pointer should be saved, it will be required for
 requesting VME resources.
 
-The driver can request ownership of one or more master windows, slave windows
-and/or dma channels. Rather than allowing the device driver to request a
-specific window or DMA channel (which may be used by a different driver) this
-driver allows a resource to be assigned based on the required attributes of the
-driver in question:
-
-.. code-block:: c
-
-	struct vme_resource * vme_master_request(struct vme_dev *dev,
-		u32 aspace, u32 cycle, u32 width);
-
-	struct vme_resource * vme_slave_request(struct vme_dev *dev, u32 aspace,
-		u32 cycle);
-
-	struct vme_resource *vme_dma_request(struct vme_dev *dev, u32 route);
-
-For slave windows these attributes are split into the VME address spaces that
-need to be accessed in 'aspace' and VME bus cycle types required in 'cycle'.
-Master windows add a further set of attributes in 'width' specifying the
-required data transfer widths. These attributes are defined as bitmasks and as
-such any combination of the attributes can be requested for a single window,
-the core will assign a window that meets the requirements, returning a pointer
-of type vme_resource that should be used to identify the allocated resource
-when it is used. For DMA controllers, the request function requires the
-potential direction of any transfers to be provided in the route attributes.
-This is typically VME-to-MEM and/or MEM-to-VME, though some hardware can
-support VME-to-VME and MEM-to-MEM transfers as well as test pattern generation.
-If an unallocated window fitting the requirements can not be found a NULL
-pointer will be returned.
+The driver can request ownership of one or more master windows
+(:c:func:`vme_master_request`), slave windows (:c:func:`vme_slave_request`)
+and/or dma channels (:c:func:`vme_dma_request`). Rather than allowing the device
+driver to request a specific window or DMA channel (which may be used by a
+different driver) the API allows a resource to be assigned based on the required
+attributes of the driver in question. For slave windows these attributes are
+split into the VME address spaces that need to be accessed in 'aspace' and VME
+bus cycle types required in 'cycle'. Master windows add a further set of
+attributes in 'width' specifying the required data transfer widths. These
+attributes are defined as bitmasks and as such any combination of the
+attributes can be requested for a single window, the core will assign a window
+that meets the requirements, returning a pointer of type vme_resource that
+should be used to identify the allocated resource when it is used. For DMA
+controllers, the request function requires the potential direction of any
+transfers to be provided in the route attributes. This is typically VME-to-MEM
+and/or MEM-to-VME, though some hardware can support VME-to-VME and MEM-to-MEM
+transfers as well as test pattern generation. If an unallocated window fitting
+the requirements can not be found a NULL pointer will be returned.
 
 Functions are also provided to free window allocations once they are no longer
-required. These functions should be passed the pointer to the resource provided
-during resource allocation:
-
-.. code-block:: c
-
-	void vme_master_free(struct vme_resource *res);
-
-	void vme_slave_free(struct vme_resource *res);
-
-	void vme_dma_free(struct vme_resource *res);
+required. These functions (:c:func:`vme_master_free`, :c:func:`vme_slave_free`
+and :c:func:`vme_dma_free`) should be passed the pointer to the resource
+provided during resource allocation.
 
 
 Master windows
@@ -144,61 +92,22 @@ the underlying chipset. A window must be configured before it can be used.
 Master window configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Once a master window has been assigned the following functions can be used to
-configure it and retrieve the current settings:
-
-.. code-block:: c
-
-	int vme_master_set (struct vme_resource *res, int enabled,
-		unsigned long long base, unsigned long long size, u32 aspace,
-		u32 cycle, u32 width);
-
-	int vme_master_get (struct vme_resource *res, int *enabled,
-		unsigned long long *base, unsigned long long *size, u32 *aspace,
-		u32 *cycle, u32 *width);
-
-The address spaces, transfer widths and cycle types are the same as described
+Once a master window has been assigned :c:func:`vme_master_set` can be used to
+configure it and :c:func:`vme_master_get` to retrieve the current settings. The
+address spaces, transfer widths and cycle types are the same as described
 under resource management, however some of the options are mutually exclusive.
 For example, only one address space may be specified.
 
-These functions return 0 on success or an error code should the call fail.
-
 
 Master window access
 ~~~~~~~~~~~~~~~~~~~~
 
-The following functions can be used to read from and write to configured master
-windows. These functions return the number of bytes copied:
-
-.. code-block:: c
-
-	ssize_t vme_master_read(struct vme_resource *res, void *buf,
-		size_t count, loff_t offset);
-
-	ssize_t vme_master_write(struct vme_resource *res, void *buf,
-		size_t count, loff_t offset);
-
-In addition to simple reads and writes, a function is provided to do a
-read-modify-write transaction. This function returns the original value of the
-VME bus location :
-
-.. code-block:: c
-
-	unsigned int vme_master_rmw (struct vme_resource *res,
-		unsigned int mask, unsigned int compare, unsigned int swap,
-		loff_t offset);
-
-This functions by reading the offset, applying the mask. If the bits selected in
-the mask match with the values of the corresponding bits in the compare field,
-the value of swap is written the specified offset.
-
-Parts of a VME window can be mapped into user space memory using the following
-function:
+The function :c:func:`vme_master_read` can be used to read from and
+:c:func:`vme_master_write` used to write to configured master windows.
 
-.. code-block:: c
-
-	int vme_master_mmap(struct vme_resource *resource,
-		struct vm_area_struct *vma)
+In addition to simple reads and writes, :c:func:`vme_master_rmw` is provided to
+do a read-modify-write transaction. Parts of a VME window can also be mapped
+into user space memory using :c:func:`vme_master_mmap`.
 
 
 Slave windows
@@ -213,41 +122,23 @@ it can be used.
 Slave window configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Once a slave window has been assigned the following functions can be used to
-configure it and retrieve the current settings:
-
-.. code-block:: c
-
-	int vme_slave_set (struct vme_resource *res, int enabled,
-		unsigned long long base, unsigned long long size,
-		dma_addr_t mem, u32 aspace, u32 cycle);
-
-	int vme_slave_get (struct vme_resource *res, int *enabled,
-		unsigned long long *base, unsigned long long *size,
-		dma_addr_t *mem, u32 *aspace, u32 *cycle);
+Once a slave window has been assigned :c:func:`vme_slave_set` can be used to
+configure it and :c:func:`vme_slave_get` to retrieve the current settings.
 
 The address spaces, transfer widths and cycle types are the same as described
 under resource management, however some of the options are mutually exclusive.
 For example, only one address space may be specified.
 
-These functions return 0 on success or an error code should the call fail.
-
 
 Slave window buffer allocation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Functions are provided to allow the user to allocate and free a contiguous
-buffers which will be accessible by the VME bridge. These functions do not have
-to be used, other methods can be used to allocate a buffer, though care must be
-taken to ensure that they are contiguous and accessible by the VME bridge:
-
-.. code-block:: c
-
-	void * vme_alloc_consistent(struct vme_resource *res, size_t size,
-		dma_addr_t *mem);
-
-	void vme_free_consistent(struct vme_resource *res, size_t size,
-		void *virt,	dma_addr_t mem);
+Functions are provided to allow the user to allocate
+(:c:func:`vme_alloc_consistent`) and free (:c:func:`vme_free_consistent`)
+contiguous buffers which will be accessible by the VME bridge. These functions
+do not have to be used, other methods can be used to allocate a buffer, though
+care must be taken to ensure that they are contiguous and accessible by the VME
+bridge.
 
 
 Slave window access
@@ -269,29 +160,18 @@ executed, reused and destroyed.
 List Management
 ~~~~~~~~~~~~~~~
 
-The following functions are provided to create and destroy DMA lists. Execution
-of a list will not automatically destroy the list, thus enabling a list to be
-reused for repetitive tasks:
-
-.. code-block:: c
-
-	struct vme_dma_list *vme_new_dma_list(struct vme_resource *res);
-
-	int vme_dma_list_free(struct vme_dma_list *list);
+The function :c:func:`vme_new_dma_list` is provided to create and
+:c:func:`vme_dma_list_free` to destroy DMA lists. Execution of a list will not
+automatically destroy the list, thus enabling a list to be reused for repetitive
+tasks.
 
 
 List Population
 ~~~~~~~~~~~~~~~
 
-An item can be added to a list using the following function ( the source and
+An item can be added to a list using :c:func:`vme_dma_list_add` (the source and
 destination attributes need to be created before calling this function, this is
-covered under "Transfer Attributes"):
-
-.. code-block:: c
-
-	int vme_dma_list_add(struct vme_dma_list *list,
-		struct vme_dma_attr *src, struct vme_dma_attr *dest,
-		size_t count);
+covered under "Transfer Attributes").
 
 .. note::
 
@@ -310,41 +190,19 @@ an item to a list. This is due to the diverse attributes required for each type
 of source and destination. There are functions to create attributes for PCI, VME
 and pattern sources and destinations (where appropriate):
 
-Pattern source:
-
-.. code-block:: c
-
-	struct vme_dma_attr *vme_dma_pattern_attribute(u32 pattern, u32 type);
-
-PCI source or destination:
-