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

Commit c9757ae5 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge a024613f on remote branch 

Change-Id: I2550a2a59cd0e0355523e434bc0708c47239a6fb
parents 605d7a34 a024613f

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/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

arch/arm64/boot/dts/qcom/msm-arm-smmu-sdm845.dtsi

+5 −13
Original line number Diff line number Diff line
@@ -346,19 +346,11 @@ 
};



&apps_smmu {

	qcom,actlr =	<0x0880 0x8 0x103>,

			<0x0881 0x8 0x103>,

			<0x0c80 0x8 0x103>,

			<0x0c81 0x8 0x103>,

			<0x1090 0x0 0x103>,

			<0x1091 0x0 0x103>,

			<0x10a0 0x8 0x103>,

			<0x10b0 0x0 0x103>,

			<0x10a1 0x8 0x103>,

			<0x10a3 0x8 0x103>,

			<0x10a4 0x8 0x103>,

			<0x10b4 0x0 0x103>,

			<0x10a5 0x8 0x103>;

	qcom,actlr =

		/* HF and SF TBUs: +3 deep PF */

			<0x0800 0x7ff 0x103>,

			<0x1000 0x3ff 0x103>;



	qcom,mmu500-errata-1 =	<0x800 0x3ff>,

				<0xc00 0x3ff>;

};

arch/arm64/boot/dts/qcom/msm8909.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -1158,6 +1158,11 @@ 
			compatible = "qcom,msm-imem-restart_reason";

			reg = <0x65c 4>;

		};



		diag_dload@c8 {

			compatible = "qcom,msm-imem-diag-dload";

			reg = <0xc8 200>;

		};

	};



	qcom,mpm2-sleep-counter@4a3000 {