Merge "Merge android-5.4-stable.32 (724ffa0) into msm-5.4" (1f2a0ad6) · Commits · e / devices / android_kernel_fairphone_FP5

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	# SPDX-License-Identifier: GPL-2.0		# SPDX-License-Identifier: GPL-2.0
	VERSION = 5		VERSION = 5
	PATCHLEVEL = 4		PATCHLEVEL = 4
	SUBLEVEL = 30		SUBLEVEL = 32
	EXTRAVERSION =		EXTRAVERSION =
	NAME = Kleptomaniac Octopus		NAME = Kleptomaniac Octopus

abi_gki_aarch64.xml

+37509 −37378

File changed.

Preview size limit exceeded, changes collapsed.

abi_gki_aarch64_5cfdde5ea8.xml→abi_gki_aarch64_724ffa0096.xml

+47765 −47782

File changed and moved.

Preview size limit exceeded, changes collapsed.

abi_gki_aarch64_unisoc_whitelist

+119 −0

Original line number	Original line	Diff line number	Diff line
	@@ -98,6 +98,7 @@
	devm_free_irq		devm_free_irq
	devm_gpiochip_add_data		devm_gpiochip_add_data
	devm_gpiod_get		devm_gpiod_get
			devm_gpio_free
	devm_gpio_request		devm_gpio_request
	devm_hwspin_lock_request_specific		devm_hwspin_lock_request_specific
	__devm_iio_device_register		__devm_iio_device_register
	@@ -189,6 +190,7 @@
	gpiod_direction_output_raw		gpiod_direction_output_raw
	gpiod_get_raw_value		gpiod_get_raw_value
	gpiod_set_raw_value		gpiod_set_raw_value
			gpiod_set_raw_value_cansleep
	gpiod_to_chip		gpiod_to_chip
	gpiod_to_irq		gpiod_to_irq
	gpio_free		gpio_free
	@@ -199,6 +201,7 @@
	handle_level_irq		handle_level_irq
	i2c_del_driver		i2c_del_driver
	i2c_register_driver		i2c_register_driver
			i2c_transfer_buffer_flags
	i2c_smbus_read_byte_data		i2c_smbus_read_byte_data
	i2c_smbus_write_byte_data		i2c_smbus_write_byte_data
	ida_alloc_range		ida_alloc_range
	@@ -220,6 +223,33 @@
	input_register_device		input_register_device
	__ioremap		__ioremap
	iounmap		iounmap
			iommu_alloc_resv_region
			iommu_attach_device
			iommu_detach_device
			iommu_device_register
			iommu_device_unregister
			iommu_dma_get_resv_regions
			iommu_domain_alloc
			iommu_domain_free
			iommu_domain_get_attr
			iommu_domain_set_attr
			iommu_fwspec_add_ids
			iommu_fwspec_free
			iommu_get_dma_cookie
			iommu_get_domain_for_dev
			iommu_group_get
			iommu_group_get_for_dev
			iommu_group_get_iommudata
			iommu_group_put
			iommu_group_ref_get
			iommu_group_remove_device
			iommu_group_set_iommudata
			iommu_map
			iommu_map_sg
			iommu_present
			iommu_put_dma_cookie
			iommu_set_fault_handler
			iommu_unmap
	ip_route_output_flow		ip_route_output_flow
	irq_find_mapping		irq_find_mapping
	irq_get_irq_data		irq_get_irq_data
	@@ -263,6 +293,8 @@
	ktime_get_real_seconds		ktime_get_real_seconds
	ktime_get_real_ts64		ktime_get_real_ts64
	kzfree		kzfree
			__list_add_valid
			__list_del_entry_valid
	memcpy		memcpy
	memset		memset
	misc_deregister		misc_deregister
	@@ -435,6 +467,7 @@
	seq_putc		seq_putc
	seq_puts		seq_puts
	seq_read		seq_read
			set_normalized_timespec64
	set_user_nice		set_user_nice
	sg_init_table		sg_init_table
	sg_miter_next		sg_miter_next
	@@ -460,6 +493,7 @@
	snd_pcm_hw_constraint_minmax		snd_pcm_hw_constraint_minmax
	snd_pcm_lib_ioctl		snd_pcm_lib_ioctl
	snd_pcm_period_elapsed		snd_pcm_period_elapsed
			snd_soc_add_component_controls
	snd_soc_dapm_disable_pin		snd_soc_dapm_disable_pin
	snd_soc_dapm_enable_pin		snd_soc_dapm_enable_pin
	snd_soc_dapm_ignore_suspend		snd_soc_dapm_ignore_suspend
	@@ -826,6 +860,9 @@
	# required by microarray_fp.ko		# required by microarray_fp.ko
	cdev_alloc		cdev_alloc

			# required by mmc_hsq.ko
			mmc_cqe_request_done

	# required by musb_hdrc.ko		# required by musb_hdrc.ko
	device_wakeup_enable		device_wakeup_enable
	dev_printk		dev_printk
	@@ -947,6 +984,8 @@
	memcmp		memcmp
	mutex_is_locked		mutex_is_locked
	of_devfreq_cooling_register_power		of_devfreq_cooling_register_power
			of_hwspin_lock_get_id_byname
			of_modalias_node
	on_each_cpu		on_each_cpu
	prepare_to_wait		prepare_to_wait
	put_unused_fd		put_unused_fd
	@@ -1134,6 +1173,7 @@
	mmc_of_parse		mmc_of_parse
	mmc_regulator_set_vqmmc		mmc_regulator_set_vqmmc
	mmc_remove_host		mmc_remove_host
			mmc_request_done
	__sdhci_add_host		__sdhci_add_host
	sdhci_cleanup_host		sdhci_cleanup_host
	sdhci_enable_clk		sdhci_enable_clk
	@@ -1225,6 +1265,14 @@

	# required by sipc_core.ko		# required by sipc_core.ko
	gen_pool_destroy		gen_pool_destroy
			mbox_chan_received_data
			mbox_chan_txdone
			mbox_client_txdone
			mbox_controller_register
			mbox_controller_unregister
			mbox_free_channel
			mbox_request_channel
			mbox_send_message
	register_syscore_ops		register_syscore_ops

	# required by sipx.ko		# required by sipx.ko
	@@ -1233,6 +1281,15 @@
	hrtimer_start_range_ns		hrtimer_start_range_ns
	hrtimer_try_to_cancel		hrtimer_try_to_cancel

			# required by snd-soc-aw881xx.ko
			i2c_smbus_write_byte

			# required by snd-soc-akm4377.ko
			regcache_mark_dirty
			regcache_sync
			snd_soc_get_volsw
			snd_soc_put_volsw

	# required by snd-soc-sprd-audio-dma.ko		# required by snd-soc-sprd-audio-dma.ko
	dmam_alloc_attrs		dmam_alloc_attrs
	dmam_free_coherent		dmam_free_coherent
	@@ -1302,6 +1359,16 @@
	snd_ctl_boolean_mono_info		snd_ctl_boolean_mono_info
	snd_pcm_hw_constraint_list		snd_pcm_hw_constraint_list

			# required by snd-soc-tfa98xx.ko
			crc32_le
			device_create_bin_file
			device_remove_bin_file
			msleep_interruptible
			snd_pcm_format_width
			snd_pcm_hw_constraint_mask64
			snd_soc_dapm_add_routes
			snd_soc_dapm_new_controls

	# required by sprd-cpufreq-common.ko		# required by sprd-cpufreq-common.ko
	dev_pm_opp_remove		dev_pm_opp_remove

	@@ -1328,6 +1395,7 @@
	dma_get_sgtable_attrs		dma_get_sgtable_attrs
	dma_mmap_attrs		dma_mmap_attrs
	dma_set_coherent_mask		dma_set_coherent_mask
			drm_add_edid_modes
	drm_atomic_helper_async_commit		drm_atomic_helper_async_commit
	drm_atomic_helper_check		drm_atomic_helper_check
	drm_atomic_helper_cleanup_planes		drm_atomic_helper_cleanup_planes
	@@ -1350,17 +1418,33 @@
	__drm_atomic_helper_plane_destroy_state		__drm_atomic_helper_plane_destroy_state
	__drm_atomic_helper_plane_duplicate_state		__drm_atomic_helper_plane_duplicate_state
	drm_atomic_helper_prepare_planes		drm_atomic_helper_prepare_planes
			drm_atomic_helper_resume
	drm_atomic_helper_set_config		drm_atomic_helper_set_config
	drm_atomic_helper_shutdown		drm_atomic_helper_shutdown
			drm_atomic_helper_suspend
	drm_atomic_helper_swap_state		drm_atomic_helper_swap_state
			drm_atomic_helper_update_legacy_modeset_state
	drm_atomic_helper_update_plane		drm_atomic_helper_update_plane
	drm_atomic_helper_wait_for_dependencies		drm_atomic_helper_wait_for_dependencies
			drm_atomic_helper_wait_for_fences
			drm_atomic_helper_wait_for_vblanks
			drm_atomic_private_obj_fini
			drm_atomic_private_obj_init
			drm_atomic_set_crtc_for_connector
			drm_atomic_set_fence_for_plane
			drm_atomic_set_mode_for_crtc
			drm_atomic_state_alloc
			drm_atomic_state_clear
			drm_atomic_state_default_clear
			drm_atomic_state_default_release
	__drm_atomic_state_free		__drm_atomic_state_free
	drm_bridge_attach		drm_bridge_attach
			drm_connector_attach_content_protection_property
	drm_connector_attach_encoder		drm_connector_attach_encoder
	drm_connector_cleanup		drm_connector_cleanup
	drm_connector_init		drm_connector_init
	drm_connector_unregister		drm_connector_unregister
			drm_connector_update_edid_property
	drm_crtc_cleanup		drm_crtc_cleanup
	__drm_crtc_commit_free		__drm_crtc_commit_free
	drm_crtc_handle_vblank		drm_crtc_handle_vblank
	@@ -1370,9 +1454,21 @@
	drm_crtc_vblank_on		drm_crtc_vblank_on
	drm_display_mode_from_videomode		drm_display_mode_from_videomode
	drm_display_mode_to_videomode		drm_display_mode_to_videomode
			drm_dp_aux_register
			drm_dp_aux_unregister
			drm_dp_calc_pbn_mode
			drm_dp_channel_eq_ok
			drm_dp_clock_recovery_ok
			drm_dp_dpcd_read
			drm_dp_dpcd_read_link_status
			drm_dp_dpcd_write
	drm_encoder_cleanup		drm_encoder_cleanup
	drm_encoder_init		drm_encoder_init
	drm_format_info		drm_format_info
			drm_gem_cma_prime_get_sg_table
			drm_gem_cma_prime_mmap
			drm_gem_cma_prime_vmap
			drm_gem_cma_prime_vunmap
	drm_gem_cma_vm_ops		drm_gem_cma_vm_ops
	drm_gem_create_mmap_offset		drm_gem_create_mmap_offset
	drm_gem_fb_create		drm_gem_fb_create
	@@ -1383,12 +1479,19 @@
	drm_gem_object_init		drm_gem_object_init
	drm_gem_object_put_unlocked		drm_gem_object_put_unlocked
	drm_gem_object_release		drm_gem_object_release
			drm_gem_prime_export
	drm_gem_prime_fd_to_handle		drm_gem_prime_fd_to_handle
			drm_gem_prime_handle_to_fd
	drm_gem_prime_import		drm_gem_prime_import
	drm_gem_vm_close		drm_gem_vm_close
			drm_get_edid
			drm_hdcp_check_ksvs_revoked
			drm_hdcp_update_content_protection
			drm_helper_hpd_irq_event
	drm_helper_probe_single_connector_modes		drm_helper_probe_single_connector_modes
	drm_kms_helper_poll_fini		drm_kms_helper_poll_fini
	drm_kms_helper_poll_init		drm_kms_helper_poll_init
			drm_match_cea_mode
	drm_mode_config_reset		drm_mode_config_reset
	drm_mode_create		drm_mode_create
	drm_mode_crtc_set_gamma_size		drm_mode_crtc_set_gamma_size
	@@ -1628,7 +1731,22 @@
	free_percpu_irq		free_percpu_irq
	irq_create_of_mapping		irq_create_of_mapping
	panic_notifier_list		panic_notifier_list
			register_virtio_device
			register_virtio_driver
	__request_percpu_irq		__request_percpu_irq
			unregister_virtio_device
			unregister_virtio_driver
			virtqueue_add_inbuf
			virtqueue_add_outbuf
			virtqueue_detach_unused_buf
			virtqueue_get_buf
			virtqueue_get_vring_size
			virtqueue_kick
			virtqueue_kick_prepare
			virtqueue_notify
			vring_del_virtqueue
			vring_interrupt
			vring_new_virtqueue
	wait_woken		wait_woken
	woken_wake_function		woken_wake_function

	@@ -1757,3 +1875,4 @@
	of_usb_host_tpl_support		of_usb_host_tpl_support
	pci_bus_type		pci_bus_type
	__usb_create_hcd		__usb_create_hcd
			usb_hcd_platform_shutdown

arch/arm/mach-imx/Kconfig

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -520,6 +520,7 @@ config SOC_IMX6UL
	bool "i.MX6 UltraLite support"		bool "i.MX6 UltraLite support"
	select PINCTRL_IMX6UL		select PINCTRL_IMX6UL
	select SOC_IMX6		select SOC_IMX6
			select ARM_ERRATA_814220

	help		help
	This enables support for Freescale i.MX6 UltraLite processor.		This enables support for Freescale i.MX6 UltraLite processor.
	@@ -556,6 +557,7 @@ config SOC_IMX7D
	select PINCTRL_IMX7D		select PINCTRL_IMX7D
	select SOC_IMX7D_CA7 if ARCH_MULTI_V7		select SOC_IMX7D_CA7 if ARCH_MULTI_V7
	select SOC_IMX7D_CM4 if ARM_SINGLE_ARMV7M		select SOC_IMX7D_CM4 if ARM_SINGLE_ARMV7M
			select ARM_ERRATA_814220 if ARCH_MULTI_V7
	help		help
	This enables support for Freescale i.MX7 Dual processor.		This enables support for Freescale i.MX7 Dual processor.