Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e30aee9e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc driver updates from Greg KH:
 "Here is the big char/misc driver patchset for 4.11-rc1.

  Lots of different driver subsystems updated here: rework for the
  hyperv subsystem to handle new platforms better, mei and w1 and extcon
  driver updates, as well as a number of other "minor" driver updates.

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

* tag 'char-misc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (169 commits)
  goldfish: Sanitize the broken interrupt handler
  x86/platform/goldfish: Prevent unconditional loading
  vmbus: replace modulus operation with subtraction
  vmbus: constify parameters where possible
  vmbus: expose hv_begin/end_read
  vmbus: remove conditional locking of vmbus_write
  vmbus: add direct isr callback mode
  vmbus: change to per channel tasklet
  vmbus: put related per-cpu variable together
  vmbus: callback is in softirq not workqueue
  binder: Add support for file-descriptor arrays
  binder: Add support for scatter-gather
  binder: Add extra size to allocator
  binder: Refactor binder_transact()
  binder: Support multiple /dev instances
  binder: Deal with contexts in debugfs
  binder: Support multiple context managers
  binder: Split flat_binder_object
  auxdisplay: ht16k33: remove private workqueue
  auxdisplay: ht16k33: rework input device initialization
  ...
parents 8ff546b8 6cf18e69

Documentation/DocBook/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ DOCBOOKS := z8530book.xml \ 
	    writing_usb_driver.xml networking.xml \

	    kernel-api.xml filesystems.xml lsm.xml kgdb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    genericirq.xml s390-drivers.xml scsi.xml \

	    sh.xml regulator.xml w1.xml \

	    writing_musb_glue_layer.xml iio.xml

Documentation/DocBook/uio-howto.tmpl

deleted100644 → 0
+0 −1112

File deleted.

Preview size limit exceeded, changes collapsed.

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -1195,6 +1195,10 @@ 
			When zero, profiling data is discarded and associated

			debugfs files are removed at module unload time.



	goldfish	[X86] Enable the goldfish android emulator platform.

			Don't use this when you are not running on the

			android emulator



	gpt		[EFI] Forces disk with valid GPT signature but

			invalid Protective MBR to be treated as GPT. If the

			primary GPT is corrupted, it enables the backup/alternate

Documentation/devicetree/bindings/misc/idt_89hpesx.txt

0 → 100644
+44 −0
Original line number Diff line number Diff line 
EEPROM / CSR SMBus-slave interface of IDT 89HPESx devices



Required properties:

  - compatible : should be "<manufacturer>,<type>"

		 Basically there is only one manufacturer: idt, but some

		 compatible devices may be produced in future. Following devices

		 are supported: 89hpes8nt2, 89hpes12nt3, 89hpes24nt6ag2,

		 89hpes32nt8ag2, 89hpes32nt8bg2, 89hpes12nt12g2, 89hpes16nt16g2,

		 89hpes24nt24g2, 89hpes32nt24ag2, 89hpes32nt24bg2;

		 89hpes12n3, 89hpes12n3a, 89hpes24n3, 89hpes24n3a;

		 89hpes32h8, 89hpes32h8g2, 89hpes48h12, 89hpes48h12g2,

		 89hpes48h12ag2, 89hpes16h16, 89hpes22h16, 89hpes22h16g2,

		 89hpes34h16, 89hpes34h16g2, 89hpes64h16, 89hpes64h16g2,

		 89hpes64h16ag2;

		 89hpes12t3g2, 89hpes24t3g2, 89hpes16t4, 89hpes4t4g2,

		 89hpes10t4g2, 89hpes16t4g2, 89hpes16t4ag2, 89hpes5t5,

		 89hpes6t5, 89hpes8t5, 89hpes8t5a, 89hpes24t6, 89hpes6t6g2,

		 89hpes24t6g2, 89hpes16t7, 89hpes32t8, 89hpes32t8g2,

		 89hpes48t12, 89hpes48t12g2.

  - reg :	 I2C address of the IDT 89HPESx device.



Optionally there can be EEPROM-compatible subnode:

  - compatible:  There are five EEPROM devices supported: 24c32, 24c64, 24c128,

		 24c256 and 24c512 differed by size.

  - reg:         Custom address of EEPROM device (If not specified IDT 89HPESx

    (optional)	 device will try to communicate with EEPROM sited by default

		 address - 0x50)

  - read-only :	 Parameterless property disables writes to the EEPROM

    (optional)



Example:

	idt@60 {

		compatible = "idt,89hpes32nt8ag2";

		reg = <0x74>;

		#address-cells = <1>;

		#size-cells = <0>;



		eeprom@50 {

			compatible = "onsemi,24c64";

			reg = <0x50>;

			read-only;

		};

	};

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

+4 −2
Original line number Diff line number Diff line 
Freescale i.MX6 On-Chip OTP Controller (OCOTP) device tree bindings



This binding represents the on-chip eFuse OTP controller found on

i.MX6Q/D, i.MX6DL/S, i.MX6SL, and i.MX6SX SoCs.

i.MX6Q/D, i.MX6DL/S, i.MX6SL, i.MX6SX and i.MX6UL SoCs.



Required properties:

- compatible: should be one of

	"fsl,imx6q-ocotp" (i.MX6Q/D/DL/S),

	"fsl,imx6sl-ocotp" (i.MX6SL), or

	"fsl,imx6sx-ocotp" (i.MX6SX), followed by "syscon".

	"fsl,imx6sx-ocotp" (i.MX6SX),

	"fsl,imx6ul-ocotp" (i.MX6UL),

	followed by "syscon".

- reg: Should contain the register base and length.

- clocks: Should contain a phandle pointing to the gated peripheral clock.