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

Commit 8b57dbb9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "misc: Rename apq8084_dock to liquid_dock"

parents b1a0ae40 83c40d8a

Documentation/devicetree/bindings/misc/apq8084_dock.txt→Documentation/devicetree/bindings/misc/qcom-liquid-dock.txt

+8 −6
Original line number Diff line number Diff line 
QTI APQ8084 Docking Station

QTI LiQUID Docking Station



This device describes the interface used when connecting to the

Docking Station's USB hub and Ethernet ports. The interface

consists of GPIOs used for controlling the main power supply

and reset lines.

This device describes the interface used when connecting a Qualcomm

Technology LiQUID Mobile Development Platform to its docking station.

This particular device describe's the dock's USB hub and Ethernet ports.

The interface consists of GPIOs used for controlling the main power

supply and reset lines.



Required properties:

 - compatible: Should be "qcom,apq8084-dock"

 - compatible: Should be "qcom,liquid-dock". "qcom,apq8084-dock" is

	       also supported but deprecated.

 - qcom,dock-detect-gpio: phandle to a GPIO node corresponding to the input

                         signal indicating when the dock is connected

 - qcom,dock-enable-gpio: phandle to a GPIO node corresponding to the output

arch/arm/configs/apq8084-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ CONFIG_HAPTIC_ISA1200=y 
CONFIG_QSEECOM=y

CONFIG_QPNP_MISC=y

CONFIG_TI_DRV2667=y

CONFIG_APQ8084_DOCKING_STATION=y

CONFIG_QCOM_LIQUID_DOCK=y

CONFIG_SCSI_TGT=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

arch/arm/configs/apq8084_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ CONFIG_HAPTIC_ISA1200=y 
CONFIG_QSEECOM=y

CONFIG_QPNP_MISC=y

CONFIG_TI_DRV2667=y

CONFIG_APQ8084_DOCKING_STATION=y

CONFIG_QCOM_LIQUID_DOCK=y

CONFIG_SCSI_TGT=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

drivers/misc/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -612,12 +612,13 @@ config TI_DRV2667 
	  To compile this driver as a module, choose M here: the

	  module will be called ti_drv2667.



config APQ8084_DOCKING_STATION

	tristate "QTI APQ8084 Docking Station USB/Ethernet support"

config QCOM_LIQUID_DOCK

	tristate "QTI LiQUID Docking Station USB/Ethernet support"

	depends on OF_GPIO

	help

	  This option enables support for the USB and Ethernet ports found on

	  the QTI APQ8084 Docking Station.

	  the docking station of various models of Qualcomm Technology's

	  LiQUID Mobile Development Platforms.



source "drivers/misc/c2port/Kconfig"

source "drivers/misc/eeprom/Kconfig"

drivers/misc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -65,5 +65,5 @@ endif 
obj-$(CONFIG_QFP_FUSE) += qfp_fuse.o

obj-$(CONFIG_TI_DRV2667) += ti_drv2667.o

obj-$(CONFIG_QPNP_MISC) += qpnp-misc.o

obj-$(CONFIG_APQ8084_DOCKING_STATION)	+= apq8084_dock.o

obj-$(CONFIG_QCOM_LIQUID_DOCK)	+= qcom_liquid_dock.o

obj-y				+= qcom/