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

Commit 070565ae authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common... 

Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common into linux-linaro-lsk-v3.18-android

* 'android-3.18' of https://android.googlesource.com/kernel/common: (26 commits)
  net: fix crash in tcp_nuke_addr()
  net: xt_qtaguid/xt_socket: fix refcount underflow and crash
  net: fix iterating over hashtable in tcp_nuke_addr()
  nf: IDLETIMER: fix lockdep warning
  ANDROID: usb: gadget: create F_midi device
  usb: gadget: midi: avoid redundant f_midi_set_alt() call
  usb: gadget: f_midi: fix error recovery path
  usb: gadget: f_midi: fix segfault when reading empty id
  usb: gadget: fix misspelling of current function in string
  usb: gadget: midi: f_midi_alloc() can be static
  usb: gadget: f_midi: add configfs support
  usb: gadget: f_midi: use usb_gstrings_attach
  usb: gadget: f_midi: remove compatibility layer
  usb: gadget: f_midi: convert to new function interface with backward compatibility
  usb: gadget: f_midi: check kstrdup() return value
  usb: gadget: f_midi: enable use of the index parameter
  usb: gadget: configfs: Fix interfaces array NULL-termination
  usb: gadget: Add device attribute to determine gadget state
  usb: phy: fix dual role sysfs build if kernel modules are supported
  ion: Handle the memory mapping correctly on x86
  ...

Conflicts:
	drivers/usb/gadget/Kconfig

	Linaro commit 0fdc146d (HACK: usb: gadget: fix android
	composite driver build) removed some Kconfig options causing
	add/remove conflicts with AOSP commits adding new options.

	Resolution: take both sides (removals and new additions)
parents 829e8333 3ac97f24

Documentation/ABI/testing/configfs-usb-gadget-midi

0 → 100644
+12 −0
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/midi.name

Date:		Nov 2014

KernelVersion:	3.19

Description:

		The attributes:



		index		- index value for the USB MIDI adapter

		id		- ID string for the USB MIDI adapter

		buflen		- MIDI buffer length

		qlen		- USB read request queue length

		in_ports	- number of MIDI input ports

		out_ports	- number of MIDI output ports

Documentation/ABI/testing/sysfs-class-dual-role-usb

0 → 100644
+71 −0
Original line number Diff line number Diff line 
What:		/sys/class/dual_role_usb/.../

Date:		June 2015

Contact:	Badhri Jagan Sridharan<badhri@google.com>

Description:

		Provide a generic interface to monitor and change

		the state of dual role usb ports. The name here

		refers to the name mentioned in the

		dual_role_phy_desc that is passed while registering

		the dual_role_phy_intstance through

		devm_dual_role_instance_register.



What:           /sys/class/dual_role_usb/.../supported_modes

Date:           June 2015

Contact:        Badhri Jagan Sridharan<badhri@google.com>

Description:

		This is a static node, once initialized this

		is not expected to change during runtime. "dfp"

		refers to "downstream facing port" i.e. port can

		only act as host. "ufp" refers to "upstream

		facing port" i.e. port can only act as device.

		"dfp ufp" refers to "dual role port" i.e. the port

		can either be a host port or a device port.



What:		/sys/class/dual_role_usb/.../mode

Date:		June 2015

Contact:	Badhri Jagan Sridharan<badhri@google.com>

Description:

		The mode node refers to the current mode in which the

		port is operating. "dfp" for host ports. "ufp" for device

		ports and "none" when cable is not connected.



		On devices where the USB mode is software-controllable,

		userspace can change the mode by writing "dfp" or "ufp".

		On devices where the USB mode is fixed in hardware,

		this attribute is read-only.



What:		/sys/class/dual_role_usb/.../power_role

Date:		June 2015

Contact:	Badhri Jagan Sridharan<badhri@google.com>

Description:

		The power_role node mentions whether the port

		is "sink"ing or "source"ing power. "none" if

		they are not connected.



		On devices implementing USB Power Delivery,

		userspace can control the power role by writing "sink" or

		"source". On devices without USB-PD, this attribute is

		read-only.



What:		/sys/class/dual_role_usb/.../data_role

Date:		June 2015

Contact:	Badhri Jagan Sridharan<badhri@google.com>

Description:

		The data_role node mentions whether the port

		is acting as "host" or "device" for USB data connection.

		"none" if there is no active data link.



		On devices implementing USB Power Delivery, userspace

		can control the data role by writing "host" or "device".

		On devices without USB-PD, this attribute is read-only



What:		/sys/class/dual_role_usb/.../powers_vconn

Date:		June 2015

Contact:	Badhri Jagan Sridharan<badhri@google.com>

Description:

		The powers_vconn node mentions whether the port

		is supplying power for VCONN pin.



		On devices with software control of VCONN,

		userspace can disable the power supply to VCONN by writing "n",

		or enable the power supply by writing "y".

arch/arm64/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ config MMU 
config NO_IOPORT_MAP

	def_bool y if !PCI



config ILLEGAL_POINTER_VALUE

	hex

	default 0xdead000000000000



config STACKTRACE_SUPPORT

	def_bool y

drivers/staging/android/ion/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -33,3 +33,10 @@ config ION_TEGRA 
	help

	  Choose this option if you wish to use ion on an nVidia Tegra.



config ION_POOL_CACHE_POLICY

	bool "Ion set page pool cache policy"

	depends on ION

	default y if X86

	help

	  Choose this option if need to explicity set cache policy of the

	  pages in the page pool.

drivers/staging/android/ion/ion_carveout_heap.c

100644 → 100755
+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ struct ion_heap *ion_carveout_heap_create(struct ion_platform_heap *heap_data) 
	if (!carveout_heap)

		return ERR_PTR(-ENOMEM);



	carveout_heap->pool = gen_pool_create(12, -1);

	carveout_heap->pool = gen_pool_create(PAGE_SHIFT, -1);

	if (!carveout_heap->pool) {

		kfree(carveout_heap);

		return ERR_PTR(-ENOMEM);