Commit d02cac15 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v5.1' of... 

Merge tag 'asoc-v5.1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v5.1

Lots and lots of new drivers so far, a highlight being the MediaTek
BTCVSD which is a driver for a Bluetooth radio chip - the first such
driver we've had upstream.  Hopefully we will soon also see a baseband
with an upstream driver!

 - Support for only powering up channels that are actively being used.
 - Quite a few improvements to simplify the generic card drivers,
   especially the merge of the SCU cards into the main generic drivers.
 - Lots of fixes for probing on Intel systems, trying to rationalize
   things to look more standard from a framework point of view.
 - New drivers for Asahi Kasei Microdevices AK4497, Cirrus Logic CS4341,
   Google ChromeOS embedded controllers, Ingenic JZ4725B, MediaTek
   BTCVSD, MT8183 and MT6358, NXP MICFIL, Rockchip RK3328, Spreadtrum
   DMA controllers, Qualcomm WCD9335, Xilinx S/PDIF and PCM formatters.
parents 36e4617c a50e3269

.clang-format

+42 −1
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ ForEachMacros: 
  - 'apei_estatus_for_each_section'

  - 'ata_for_each_dev'

  - 'ata_for_each_link'

  - '__ata_qc_for_each'

  - 'ata_qc_for_each'

  - 'ata_qc_for_each_raw'

  - 'ata_qc_for_each_with_internal'

  - 'ax25_for_each'

  - 'ax25_uid_for_each'

  - 'bio_for_each_integrity_vec'
@@ -85,6 +89,7 @@ ForEachMacros: 
  - 'blk_queue_for_each_rl'

  - 'bond_for_each_slave'

  - 'bond_for_each_slave_rcu'

  - 'bpf_for_each_spilled_reg'

  - 'btree_for_each_safe128'

  - 'btree_for_each_safe32'

  - 'btree_for_each_safe64'
@@ -103,6 +108,8 @@ ForEachMacros: 
  - 'drm_atomic_crtc_for_each_plane'

  - 'drm_atomic_crtc_state_for_each_plane'

  - 'drm_atomic_crtc_state_for_each_plane_state'

  - 'drm_atomic_for_each_plane_damage'

  - 'drm_connector_for_each_possible_encoder'

  - 'drm_for_each_connector_iter'

  - 'drm_for_each_crtc'

  - 'drm_for_each_encoder'
@@ -121,11 +128,21 @@ ForEachMacros: 
  - 'for_each_bio'

  - 'for_each_board_func_rsrc'

  - 'for_each_bvec'

  - 'for_each_card_components'

  - 'for_each_card_links'

  - 'for_each_card_links_safe'

  - 'for_each_card_prelinks'

  - 'for_each_card_rtds'

  - 'for_each_card_rtds_safe'

  - 'for_each_cgroup_storage_type'

  - 'for_each_child_of_node'

  - 'for_each_clear_bit'

  - 'for_each_clear_bit_from'

  - 'for_each_cmsghdr'

  - 'for_each_compatible_node'

  - 'for_each_component_dais'

  - 'for_each_component_dais_safe'

  - 'for_each_comp_order'

  - 'for_each_console'

  - 'for_each_cpu'

  - 'for_each_cpu_and'
@@ -133,6 +150,10 @@ ForEachMacros: 
  - 'for_each_cpu_wrap'

  - 'for_each_dev_addr'

  - 'for_each_dma_cap_mask'

  - 'for_each_dpcm_be'

  - 'for_each_dpcm_be_rollback'

  - 'for_each_dpcm_be_safe'

  - 'for_each_dpcm_fe'

  - 'for_each_drhd_unit'

  - 'for_each_dss_dev'

  - 'for_each_efi_memory_desc'
@@ -149,6 +170,7 @@ ForEachMacros: 
  - 'for_each_iommu'

  - 'for_each_ip_tunnel_rcu'

  - 'for_each_irq_nr'

  - 'for_each_link_codecs'

  - 'for_each_lru'

  - 'for_each_matching_node'

  - 'for_each_matching_node_and_match'
@@ -160,6 +182,7 @@ ForEachMacros: 
  - 'for_each_mem_range_rev'

  - 'for_each_migratetype_order'

  - 'for_each_msi_entry'

  - 'for_each_msi_entry_safe'

  - 'for_each_net'

  - 'for_each_netdev'

  - 'for_each_netdev_continue'
@@ -183,12 +206,14 @@ ForEachMacros: 
  - 'for_each_node_with_property'

  - 'for_each_of_allnodes'

  - 'for_each_of_allnodes_from'

  - 'for_each_of_cpu_node'

  - 'for_each_of_pci_range'

  - 'for_each_old_connector_in_state'

  - 'for_each_old_crtc_in_state'

  - 'for_each_oldnew_connector_in_state'

  - 'for_each_oldnew_crtc_in_state'

  - 'for_each_oldnew_plane_in_state'

  - 'for_each_oldnew_plane_in_state_reverse'

  - 'for_each_oldnew_private_obj_in_state'

  - 'for_each_old_plane_in_state'

  - 'for_each_old_private_obj_in_state'
@@ -206,14 +231,17 @@ ForEachMacros: 
  - 'for_each_process'

  - 'for_each_process_thread'

  - 'for_each_property_of_node'

  - 'for_each_registered_fb'

  - 'for_each_reserved_mem_region'

  - 'for_each_resv_unavail_range'

  - 'for_each_rtd_codec_dai'

  - 'for_each_rtd_codec_dai_rollback'

  - 'for_each_rtdcom'

  - 'for_each_rtdcom_safe'

  - 'for_each_set_bit'

  - 'for_each_set_bit_from'

  - 'for_each_sg'

  - 'for_each_sg_page'

  - 'for_each_sibling_event'

  - '__for_each_thread'

  - 'for_each_thread'

  - 'for_each_zone'
@@ -251,6 +279,8 @@ ForEachMacros: 
  - 'hlist_nulls_for_each_entry_from'

  - 'hlist_nulls_for_each_entry_rcu'

  - 'hlist_nulls_for_each_entry_safe'

  - 'i3c_bus_for_each_i2cdev'

  - 'i3c_bus_for_each_i3cdev'

  - 'ide_host_for_each_port'

  - 'ide_port_for_each_dev'

  - 'ide_port_for_each_present_dev'
@@ -267,11 +297,14 @@ ForEachMacros: 
  - 'kvm_for_each_memslot'

  - 'kvm_for_each_vcpu'

  - 'list_for_each'

  - 'list_for_each_codec'

  - 'list_for_each_codec_safe'

  - 'list_for_each_entry'

  - 'list_for_each_entry_continue'

  - 'list_for_each_entry_continue_rcu'

  - 'list_for_each_entry_continue_reverse'

  - 'list_for_each_entry_from'

  - 'list_for_each_entry_from_rcu'

  - 'list_for_each_entry_from_reverse'

  - 'list_for_each_entry_lockless'

  - 'list_for_each_entry_rcu'
@@ -291,6 +324,7 @@ ForEachMacros: 
  - 'media_device_for_each_intf'

  - 'media_device_for_each_link'

  - 'media_device_for_each_pad'

  - 'nanddev_io_for_each_page'

  - 'netdev_for_each_lower_dev'

  - 'netdev_for_each_lower_private'

  - 'netdev_for_each_lower_private_rcu'
@@ -357,12 +391,14 @@ ForEachMacros: 
  - 'sk_nulls_for_each'

  - 'sk_nulls_for_each_from'

  - 'sk_nulls_for_each_rcu'

  - 'snd_array_for_each'

  - 'snd_pcm_group_for_each_entry'

  - 'snd_soc_dapm_widget_for_each_path'

  - 'snd_soc_dapm_widget_for_each_path_safe'

  - 'snd_soc_dapm_widget_for_each_sink_path'

  - 'snd_soc_dapm_widget_for_each_source_path'

  - 'tb_property_for_each'

  - 'tcf_exts_for_each_action'

  - 'udp_portaddr_for_each_entry'

  - 'udp_portaddr_for_each_entry_rcu'

  - 'usb_hub_for_each_child'
@@ -371,6 +407,11 @@ ForEachMacros: 
  - 'v4l2_m2m_for_each_dst_buf_safe'

  - 'v4l2_m2m_for_each_src_buf'

  - 'v4l2_m2m_for_each_src_buf_safe'

  - 'virtio_device_for_each_vq'

  - 'xa_for_each'

  - 'xas_for_each'

  - 'xas_for_each_conflict'

  - 'xas_for_each_marked'

  - 'zorro_for_each_dev'



#IncludeBlocks: Preserve # Unknown to clang-format-5.0

Documentation/ABI/testing/sysfs-block

+9 −0
Original line number Diff line number Diff line
@@ -279,3 +279,12 @@ Description: 
		size in 512B sectors of the zones of the device, with

		the eventual exception of the last zone of the device

		which may be smaller.



What:		/sys/block/<disk>/queue/io_timeout

Date:		November 2018

Contact:	Weiping Zhang <zhangweiping@didiglobal.com>

Description:

		io_timeout is the request timeout in milliseconds. If a request

		does not complete in this time then the block driver timeout

		handler is invoked. That timeout handler can decide to retry

		the request, to fail it or to start a device recovery strategy.

Documentation/ABI/testing/sysfs-block-zram

+9 −2
Original line number Diff line number Diff line
@@ -122,11 +122,18 @@ Description: 
		statistics (bd_count, bd_reads, bd_writes) in a format

		similar to block layer statistics file format.



What:		/sys/block/zram<id>/writeback_limit_enable

Date:		November 2018

Contact:	Minchan Kim <minchan@kernel.org>

Description:

		The writeback_limit_enable file is read-write and specifies

		eanbe of writeback_limit feature. "1" means eable the feature.

		No limit "0" is the initial state.



What:		/sys/block/zram<id>/writeback_limit

Date:		November 2018

Contact:	Minchan Kim <minchan@kernel.org>

Description:

		The writeback_limit file is read-write and specifies the maximum

		amount of writeback ZRAM can do. The limit could be changed

		in run time and "0" means disable the limit.

		No limit is the initial state.
 
		in run time.

Documentation/block/bfq-iosched.txt

+7 −0
Original line number Diff line number Diff line
@@ -357,6 +357,13 @@ video playing/streaming, a very low drop rate may be more important 
than maximum throughput. In these cases, consider setting the

strict_guarantees parameter.



slice_idle_us

-------------



Controls the same tuning parameter as slice_idle, but in microseconds.

Either tunable can be used to set idling behavior.  Afterwards, the

other tunable will reflect the newly set value in sysfs.



strict_guarantees

-----------------

Documentation/block/null_blk.txt

+2 −1
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ shared_tags=[0/1]: Default: 0 


zoned=[0/1]: Default: 0

  0: Block device is exposed as a random-access block device.

  1: Block device is exposed as a host-managed zoned block device.

  1: Block device is exposed as a host-managed zoned block device. Requires

     CONFIG_BLK_DEV_ZONED.



zone_size=[MB]: Default: 256

  Per zone size when exposed as a zoned block device. Must be a power of two.

CRA Git | Maintained and supported by SUSTech CRA and CCSE