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

Commit edf48613 authored by shaohanlin(127659)'s avatar shaohanlin(127659) Committed by Gerrit Code Review
Browse files

Merge "branch vanilla into gms" into 8901-fairphone-p-vanilla-gms

parents b50bc8d6 e4f7c8fa

Documentation/devicetree/bindings/regulator/qpnp-lcdb-regulator.txt

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,14 @@ First Level Node - LCDB module 
	Value type: <phandle>

	Definition:  Phandle to the PMIC's revid node



- qcom,voltage-step-ramp

	Usage:      optional

	Value type: <bool>

	Definition:  Required only if the voltage needs to be set in the

		     steps of 500 mV starting from the 4500 mV. This needs

		     to be enabled only on platforms where voltage needs to

		     be ramped up with multiple steps.



Touch-to-wake (TTW) properties:



TTW supports 2 modes of operation - HW and SW. In the HW mode the enable/disable

arch/arm/configs/msm8937-perf_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -106,10 +106,12 @@ CONFIG_IP_MULTIPLE_TABLES=y 
CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_SYN_COOKIES=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

CONFIG_INET_UDP_DIAG=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y
@@ -126,7 +128,6 @@ CONFIG_NF_CONNTRACK=y 
CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y

CONFIG_NF_CT_PROTO_UDPLITE=y

CONFIG_NF_CONNTRACK_AMANDA=y

CONFIG_NF_CONNTRACK_FTP=y
@@ -173,6 +174,7 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y 
CONFIG_NETFILTER_XT_MATCH_QTAGUID=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

# CONFIG_NETFILTER_XT_MATCH_SCTP is not set

CONFIG_NETFILTER_XT_MATCH_SOCKET=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
@@ -206,6 +208,7 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_IP_SCTP=y

CONFIG_L2TP=y

CONFIG_L2TP_DEBUGFS=y

CONFIG_L2TP_V3=y

arch/arm/configs/msm8937_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -109,10 +109,12 @@ CONFIG_IP_MULTIPLE_TABLES=y 
CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_SYN_COOKIES=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

CONFIG_INET_UDP_DIAG=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y
@@ -129,7 +131,6 @@ CONFIG_NF_CONNTRACK=y 
CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y

CONFIG_NF_CT_PROTO_UDPLITE=y

CONFIG_NF_CONNTRACK_AMANDA=y

CONFIG_NF_CONNTRACK_FTP=y
@@ -176,6 +177,7 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y 
CONFIG_NETFILTER_XT_MATCH_QTAGUID=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

# CONFIG_NETFILTER_XT_MATCH_SCTP is not set

CONFIG_NETFILTER_XT_MATCH_SOCKET=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
@@ -209,6 +211,7 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_IP_SCTP=y

CONFIG_L2TP=y

CONFIG_L2TP_DEBUGFS=y

CONFIG_L2TP_V3=y

arch/arm/configs/msm8953-perf_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -102,10 +102,12 @@ CONFIG_IP_MULTIPLE_TABLES=y 
CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_SYN_COOKIES=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

CONFIG_INET_UDP_DIAG=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y
@@ -122,7 +124,6 @@ CONFIG_NF_CONNTRACK=y 
CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y

CONFIG_NF_CT_PROTO_UDPLITE=y

CONFIG_NF_CONNTRACK_AMANDA=y

CONFIG_NF_CONNTRACK_FTP=y
@@ -169,6 +170,7 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y 
CONFIG_NETFILTER_XT_MATCH_QTAGUID=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

# CONFIG_NETFILTER_XT_MATCH_SCTP is not set

CONFIG_NETFILTER_XT_MATCH_SOCKET=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
@@ -202,6 +204,7 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_IP_SCTP=y

CONFIG_L2TP=y

CONFIG_L2TP_DEBUGFS=y

CONFIG_L2TP_V3=y

arch/arm/configs/msm8953_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -106,10 +106,12 @@ CONFIG_IP_MULTIPLE_TABLES=y 
CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_SYN_COOKIES=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y

CONFIG_INET_UDP_DIAG=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y
@@ -126,7 +128,6 @@ CONFIG_NF_CONNTRACK=y 
CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y

CONFIG_NF_CT_PROTO_UDPLITE=y

CONFIG_NF_CONNTRACK_AMANDA=y

CONFIG_NF_CONNTRACK_FTP=y
@@ -173,6 +174,7 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y 
CONFIG_NETFILTER_XT_MATCH_QTAGUID=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

# CONFIG_NETFILTER_XT_MATCH_SCTP is not set

CONFIG_NETFILTER_XT_MATCH_SOCKET=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
@@ -206,6 +208,7 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_IP_SCTP=y

CONFIG_L2TP=y

CONFIG_L2TP_DEBUGFS=y

CONFIG_L2TP_V3=y