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

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

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

Pull char/misc driver updates from Greg KH:
 "Here's the big set of driver patches for char/misc drivers.  Nothing
  major in here, the shortlog goes into the details.  All have been in
  the linux-next tree for a while with no issues"

* tag 'char-misc-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (80 commits)
  mei: mei_txe_fw_sts can be static
  mei: fix kernel-doc warnings
  mei: fix KDoc documentation formatting
  mei: drop me_client_presentation_num
  mei: trivial: fix errors in prints in comments
  mei: remove include to pci header from mei module files
  mei: push pci cfg structure me hw
  mei: remove the reference to pdev from mei_device
  mei: move fw_status back to hw ops handlers
  mei: get rid of most of the pci dependencies in mei
  mei: push all standard settings into mei_device_init
  mei: move mei_hbm_hdr function from hbm.h the hbm.c
  mei: kill error message for allocation failure
  mei: nfc: fix style warning
  mei: fix style warning: Missing a blank line after declarations
  mei: pg: fix cat and paste error in comments
  mei: debugfs: add single buffer indicator
  mei: debugfs: adjust print buffer
  mei: add hbm and pg state in devstate debugfs print
  Drivers: hv: vmbus: Enable interrupt driven flow control
  ...
parents 3fc1479c 480bd3c4

Documentation/devicetree/bindings/extcon/extcon-rt8973a.txt

0 → 100644
+25 −0
Original line number Original line Diff line number Diff line 


* Richtek RT8973A - Micro USB Switch device



The Richtek RT8973A is Micro USB Switch with OVP and I2C interface. The RT8973A

is a USB port accessory detector and switch that is optimized to protect low

voltage system from abnormal high input voltage (up to 28V) and supports high

speed USB operation. Also, RT8973A support 'auto-configuration' mode.

If auto-configuration mode is enabled, RT8973A would control internal h/w patch

for USB D-/D+ switching.



Required properties:

- compatible: Should be "richtek,rt8973a-muic"

- reg: Specifies the I2C slave address of the MUIC block. It should be 0x14

- interrupt-parent: Specifies the phandle of the interrupt controller to which

  the interrupts from rt8973a are delivered to.

- interrupts: Interrupt specifiers for detection interrupt sources.



Example:



	rt8973a@14 {

		compatible = "richtek,rt8973a-muic";

		interrupt-parent = <&gpx1>;

		interrupts = <5 0>;

		reg = <0x14>;

	};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -150,6 +150,7 @@ winbond Winbond Electronics corp. 
wlf	Wolfson Microelectronics

wlf	Wolfson Microelectronics

wm	Wondermedia Technologies, Inc.

wm	Wondermedia Technologies, Inc.

xes	Extreme Engineering Solutions (X-ES)

xes	Extreme Engineering Solutions (X-ES)

xillybus	Xillybus Ltd.

xlnx	Xilinx

xlnx	Xilinx

zyxel	ZyXEL Communications Corp.

zyxel	ZyXEL Communications Corp.

zarlink	Zarlink Semiconductor
 
zarlink	Zarlink Semiconductor

drivers/char/i8k.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -651,6 +651,7 @@ struct i8k_config_data { 




enum i8k_configs {

enum i8k_configs {

	DELL_LATITUDE_D520,

	DELL_LATITUDE_D520,

	DELL_LATITUDE_E6540,

	DELL_PRECISION_490,

	DELL_PRECISION_490,

	DELL_STUDIO,

	DELL_STUDIO,

	DELL_XPS_M140,

	DELL_XPS_M140,
@@ -661,6 +662,10 @@ static const struct i8k_config_data i8k_config_data[] = { 
		.fan_mult = 1,

		.fan_mult = 1,

		.fan_max = I8K_FAN_TURBO,

		.fan_max = I8K_FAN_TURBO,

	},

	},

	[DELL_LATITUDE_E6540] = {

		.fan_mult = 1,

		.fan_max = I8K_FAN_HIGH,

	},

	[DELL_PRECISION_490] = {

	[DELL_PRECISION_490] = {

		.fan_mult = 1,

		.fan_mult = 1,

		.fan_max = I8K_FAN_TURBO,

		.fan_max = I8K_FAN_TURBO,
@@ -705,6 +710,14 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = { 
		},

		},

		.driver_data = (void *)&i8k_config_data[DELL_LATITUDE_D520],

		.driver_data = (void *)&i8k_config_data[DELL_LATITUDE_D520],

	},

	},

	{

		.ident = "Dell Latitude E6540",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6540"),

		},

		.driver_data = (void *)&i8k_config_data[DELL_LATITUDE_E6540],

	},

	{

	{

		.ident = "Dell Latitude 2",

		.ident = "Dell Latitude 2",

		.matches = {

		.matches = {

drivers/char/xilinx_hwicap/xilinx_hwicap.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -843,7 +843,6 @@ static struct platform_driver hwicap_platform_driver = { 
	.probe = hwicap_drv_probe,

	.probe = hwicap_drv_probe,

	.remove = hwicap_drv_remove,

	.remove = hwicap_drv_remove,

	.driver = {

	.driver = {

		.owner = THIS_MODULE,

		.name = DRIVER_NAME,

		.name = DRIVER_NAME,

		.of_match_table = hwicap_of_match,

		.of_match_table = hwicap_of_match,

	},

	},

drivers/extcon/Kconfig

+13 −0
Original line number Original line Diff line number Diff line
@@ -70,8 +70,21 @@ config EXTCON_PALMAS 
	  Say Y here to enable support for USB peripheral and USB host

	  Say Y here to enable support for USB peripheral and USB host

	  detection by palmas usb.

	  detection by palmas usb.





config EXTCON_RT8973A

	tristate "RT8973A EXTCON support"

	depends on I2C

	select IRQ_DOMAIN

	select REGMAP_I2C

	select REGMAP_IRQ

	help

	  If you say yes here you get support for the MUIC device of

	  Richtek RT8973A. The RT8973A is a USB port accessory detector

	  and switch that is optimized to protect low voltage system

	  from abnormal high input voltage (up to 28V).



config EXTCON_SM5502

config EXTCON_SM5502

	tristate "SM5502 EXTCON support"

	tristate "SM5502 EXTCON support"

	depends on I2C

	select IRQ_DOMAIN

	select IRQ_DOMAIN

	select REGMAP_I2C

	select REGMAP_I2C

	select REGMAP_IRQ

	select REGMAP_IRQ