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

Commit 1d1fdd95 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc patches from Greg KH:
 "Here is the big char/misc driver pull request for 3.12-rc1

  Lots of driver updates all over the char/misc tree, full details in
  the shortlog"

* tag 'char-misc-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (62 commits)
  drivers: uio: Kconfig: add MMU dependancy for UIO
  drivers: uio: Add driver for Humusoft MF624 DAQ PCI card
  drivers: uio_pdrv_genirq: use dev_get_platdata()
  drivers: uio_pruss: use dev_get_platdata()
  drivers: uio_dmem_genirq: use dev_get_platdata()
  drivers: parport: Kconfig: exclude h8300 for PARPORT_PC
  drivers: misc: ti-st: fix potential race if st_kim_start fails
  Drivers: hv: vmbus: Do not attempt to negoatiate a new version prematurely
  misc: vmw_balloon: Remove braces to fix build for clang.
  Drivers: hv: vmbus: Fix a bug in the handling of channel offers
  vme: vme_ca91cx42.c: fix to pass correct device identity to free_irq()
  VMCI: Add support for virtual IOMMU
  VMCI: Remove non-blocking/pinned queuepair support
  uio: uio_pruss: remove unnecessary platform_set_drvdata()
  parport: amiga: remove unnecessary platform_set_drvdata()
  vme: vme_vmivme7805.c: add missing __iomem annotation
  vme: vme_ca91cx42.c: add missing __iomem annotation
  vme: vme_tsi148.c: add missing __iomem annotation
  drivers/misc/hpilo: Correct panic when an AUX iLO is detected
  uio: drop unused vma_count member in uio_device struct
  ...
parents b3b49114 3cc1f952

Documentation/devicetree/bindings/extcon/extcon-twl.txt→Documentation/devicetree/bindings/extcon/extcon-palmas.txt

+3 −3
Original line number Diff line number Diff line 
EXTCON FOR TWL CHIPS

EXTCON FOR PALMAS/TWL CHIPS



PALMAS USB COMPARATOR

Required Properties:

 - compatible : Should be "ti,palmas-usb" or "ti,twl6035-usb"

 - vbus-supply : phandle to the regulator device tree node.



Optional Properties:

 - ti,wakeup : To enable the wakeup comparator in probe

 - ti,enable-id-detection: Perform ID detection.

 - ti,enable-vbus-detection: Perform VBUS detection.



palmas-usb {

       compatible = "ti,twl6035-usb", "ti,palmas-usb";

       vbus-supply = <&smps10_reg>;

       ti,wakeup;

};

Documentation/devicetree/bindings/usb/omap-usb.txt

+5 −0
Original line number Diff line number Diff line
@@ -53,6 +53,11 @@ OMAP DWC3 GLUE 
   It should be set to "1" for HW mode and "2" for SW mode.

 - ranges: the child address space are mapped 1:1 onto the parent address space



Optional Properties:

 - extcon : phandle for the extcon device omap dwc3 uses to detect

   connect/disconnect events.

 - vbus-supply : phandle to the regulator device tree node if needed.



Sub-nodes:

The dwc3 core should be added as subnode to omap dwc3 glue.

- dwc3 :

drivers/char/pcmcia/synclink_cs.c

+13 −13
Original line number Diff line number Diff line
@@ -1182,14 +1182,14 @@ static irqreturn_t mgslpc_isr(int dummy, void *dev_id) 
		}

		count++;



		if (gis & (BIT1 + BIT0)) {

		if (gis & (BIT1 | BIT0)) {

			isr = read_reg16(info, CHB + ISR);

			if (isr & IRQ_DCD)

				dcd_change(info, tty);

			if (isr & IRQ_CTS)

				cts_change(info, tty);

		}

		if (gis & (BIT3 + BIT2))

		if (gis & (BIT3 | BIT2))

		{

			isr = read_reg16(info, CHA + ISR);

			if (isr & IRQ_TIMER) {
@@ -1210,7 +1210,7 @@ static irqreturn_t mgslpc_isr(int dummy, void *dev_id) 
			if (isr & IRQ_RXTIME) {

				issue_command(info, CHA, CMD_RXFIFO_READ);

			}

			if (isr & (IRQ_RXEOM + IRQ_RXFIFO)) {

			if (isr & (IRQ_RXEOM | IRQ_RXFIFO)) {

				if (info->params.mode == MGSL_MODE_HDLC)

					rx_ready_hdlc(info, isr & IRQ_RXEOM);

				else
@@ -3031,11 +3031,11 @@ static void loopback_enable(MGSLPC_INFO *info) 
	unsigned char val;



	/* CCR1:02..00  CM[2..0] Clock Mode = 111 (clock mode 7) */

	val = read_reg(info, CHA + CCR1) | (BIT2 + BIT1 + BIT0);

	val = read_reg(info, CHA + CCR1) | (BIT2 | BIT1 | BIT0);

	write_reg(info, CHA + CCR1, val);



	/* CCR2:04 SSEL Clock source select, 1=submode b */

	val = read_reg(info, CHA + CCR2) | (BIT4 + BIT5);

	val = read_reg(info, CHA + CCR2) | (BIT4 | BIT5);

	write_reg(info, CHA + CCR2, val);



	/* set LinkSpeed if available, otherwise default to 2Mbps */
@@ -3125,10 +3125,10 @@ static void hdlc_mode(MGSLPC_INFO *info) 
		val |= BIT4;

		break;		// FM0

	case HDLC_ENCODING_BIPHASE_MARK:

		val |= BIT4 + BIT2;

		val |= BIT4 | BIT2;

		break;		// FM1

	case HDLC_ENCODING_BIPHASE_LEVEL:

		val |= BIT4 + BIT3;

		val |= BIT4 | BIT3;

		break;		// Manchester

	}

	write_reg(info, CHA + CCR0, val);
@@ -3185,7 +3185,7 @@ static void hdlc_mode(MGSLPC_INFO *info) 
	 */

	val = 0x00;

	if (info->params.crc_type == HDLC_CRC_NONE)

		val |= BIT2 + BIT1;

		val |= BIT2 | BIT1;

	if (info->params.preamble != HDLC_PREAMBLE_PATTERN_NONE)

		val |= BIT5;

	switch (info->params.preamble_length)
@@ -3197,7 +3197,7 @@ static void hdlc_mode(MGSLPC_INFO *info) 
		val |= BIT6;

		break;

	case HDLC_PREAMBLE_LENGTH_64BITS:

		val |= BIT7 + BIT6;

		val |= BIT7 | BIT6;

		break;

	}

	write_reg(info, CHA + CCR3, val);
@@ -3264,8 +3264,8 @@ static void hdlc_mode(MGSLPC_INFO *info) 
		clear_reg_bits(info, CHA + PVR, BIT3);



	irq_enable(info, CHA,

			 IRQ_RXEOM + IRQ_RXFIFO + IRQ_ALLSENT +

			 IRQ_UNDERRUN + IRQ_TXFIFO);

			 IRQ_RXEOM | IRQ_RXFIFO | IRQ_ALLSENT |

			 IRQ_UNDERRUN | IRQ_TXFIFO);

	issue_command(info, CHA, CMD_TXRESET + CMD_RXRESET);

	wait_command_complete(info, CHA);

	read_reg16(info, CHA + ISR);	/* clear pending IRQs */
@@ -3582,8 +3582,8 @@ static void async_mode(MGSLPC_INFO *info) 
	} else

		clear_reg_bits(info, CHA + PVR, BIT3);

	irq_enable(info, CHA,

			  IRQ_RXEOM + IRQ_RXFIFO + IRQ_BREAK_ON + IRQ_RXTIME +

			  IRQ_ALLSENT + IRQ_TXFIFO);

			  IRQ_RXEOM | IRQ_RXFIFO | IRQ_BREAK_ON | IRQ_RXTIME |

			  IRQ_ALLSENT | IRQ_TXFIFO);

	issue_command(info, CHA, CMD_TXRESET + CMD_RXRESET);

	wait_command_complete(info, CHA);

	read_reg16(info, CHA + ISR);	/* clear pending IRQs */

drivers/extcon/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ if EXTCON 


comment "Extcon Device Drivers"



config OF_EXTCON

	def_tristate y

	depends on OF



config EXTCON_GPIO

	tristate "GPIO extcon support"

	depends on GPIOLIB

drivers/extcon/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# Makefile for external connector class (extcon) devices

#



obj-$(CONFIG_OF_EXTCON)		+= of_extcon.o



obj-$(CONFIG_EXTCON)		+= extcon-class.o

obj-$(CONFIG_EXTCON_GPIO)	+= extcon-gpio.o

obj-$(CONFIG_EXTCON_ADC_JACK)	+= extcon-adc-jack.o