Merge "broadcast: move broadcast drivers to a new folder" (bcdeac4f) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/broadcast/Kconfig

+22 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,17 @@
		# MSM Broadcast subsystem drivers
		#

		config TSPP
		depends on ARCH_MSM
		tristate "TSPP (Transport Stream Packet Processor) Support"
		---help---
		Transport Stream Packet Processor v1 is used to offload the
		processing of MPEG transport streams from the main processor.
		It is used to process incoming transport streams from TSIF
		to supports use-cases such as transport stream live play
		and recording.
		This can also be compiled as a loadable module.

		config TSPP2
		depends on ARCH_MPQ8092
		tristate "TSPP2 (Transport Stream Packet Processor v2) Support"
		@@ -13,3 +24,14 @@ config TSPP2
		playback from memory and recording.
		This can also be compiled as a loadable module.

		config CI_BRIDGE_SPI
		depends on SPI_QUP
		tristate "CI Bridge SPI Driver Support"
		---help---
		This driver provides a simple SPI read/write interface to
		an external CI bridge. It implements a character device
		driver interface which allows making SPI transactions
		using the Linux SPI framework.

		To compile this driver as module, choose M here.

+2 −0

Original line number	Diff line number	Diff line
		@@ -2,4 +2,6 @@
		# Makefile for MSM Broadcast subsystem drivers.
		#

		obj-$(CONFIG_TSPP) += tspp.o
		obj-$(CONFIG_TSPP2) += tspp2.o
		obj-$(CONFIG_CI_BRIDGE_SPI) += ci-bridge-spi.o

+1 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and

+3 −3

Original line number	Diff line number	Diff line
		@@ -2054,7 +2054,7 @@ EXPORT_SYMBOL(tspp_set_key);
		*
		* @dev: TSPP device (up to TSPP_MAX_DEVICES)
		* @channel_id: Channel ID number (up to TSPP_NUM_CHANNELS)
		* @pNotify: notification function
		* @notify: notification function
		* @userdata: user data to pass to notification function
		* @timer_ms: notification for partially filled buffers
		*
		@@ -2062,7 +2062,7 @@ EXPORT_SYMBOL(tspp_set_key);
		*
		*/
		int tspp_register_notification(u32 dev, u32 channel_id,
		tspp_notifier pNotify, void userdata, u32 timer_ms)
		tspp_notifier notify, void userdata, u32 timer_ms)
		{
		struct tspp_channel *channel;
		struct tspp_device *pdev;
		@@ -2077,7 +2077,7 @@ int tspp_register_notification(u32 dev, u32 channel_id,
		return -ENODEV;
		}
		channel = &pdev->channels[channel_id];
		channel->notifier = pNotify;
		channel->notifier = notify;
		channel->notify_data = userdata;
		channel->expiration_period_ms = timer_ms;

+0 −19

Original line number	Diff line number	Diff line
		@@ -564,25 +564,6 @@ config TSIF_DEBUG
		---help---
		This turns on debugging information for the tsif driver

		config TSPP
		depends on ARCH_MSM
		tristate "TSPP (Transport Stream Packet Processor) Support"
		---help---
		Transport Stream Packet Processor is used to offload the
		processing of MPEG transport streams from the main processor.
		This can also be compiled as a loadable module.

		config CI_BRIDGE_SPI
		depends on SPI_QUP
		tristate "CI Bridge SPI Driver Support"
		---help---
		This driver provides a simple SPI read/write interface to
		an external CI bridge. It implements a character device
		driver interface which allows making SPI transactions
		using the Linux SPI framework.

		To compile this driver as module, choose M here.

		config HAPTIC_ISA1200
		tristate "ISA1200 haptic support"
		depends on I2C