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

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

Merge changes I46aba320,Idf10fc8c into msm-4.14 

* changes:
  defconfig: sdmshrike: Enable configs required for Android
  ARM: dts: msm: Enable PSCI enable method for SDMSHRIKE
parents 6ecb7c9c b84aa7d8

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

+13 −16
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ 
			device_type = "cpu";

			compatible = "arm,armv8";

			reg = <0x0 0x0>;

			enable-method = "spin-table";

			cpu-release-addr = <0x0 0x90000000>;

			enable-method = "psci";

			cache-size = <0x8000>;

			next-level-cache = <&L2_0>;

			L2_0: l2-cache {
@@ -66,8 +65,7 @@ 
			device_type = "cpu";

			compatible = "arm,armv8";

			reg = <0x0 0x100>;

			enable-method = "spin-table";

			cpu-release-addr = <0x0 0x90000000>;

			enable-method = "psci";

			cache-size = <0x8000>;

			next-level-cache = <&L2_1>;

			L2_1: l2-cache {
@@ -82,8 +80,7 @@ 
			device_type = "cpu";

			compatible = "arm,armv8";

			reg = <0x0 0x200>;

			enable-method = "spin-table";

			cpu-release-addr = <0x0 0x90000000>;

			enable-method = "psci";

			cache-size = <0x8000>;

			next-level-cache = <&L2_2>;

			L2_2: l2-cache {
@@ -98,8 +95,7 @@ 
			device_type = "cpu";

			compatible = "arm,armv8";

			reg = <0x0 0x300>;

			enable-method = "spin-table";

			cpu-release-addr = <0x0 0x90000000>;

			enable-method = "psci";

			cache-size = <0x8000>;

			next-level-cache = <&L2_3>;

			L2_3: l2-cache {
@@ -114,8 +110,7 @@ 
			device_type = "cpu";

			compatible = "arm,armv8";

			reg = <0x0 0x400>;

			enable-method = "spin-table";

			cpu-release-addr = <0x0 0x90000000>;

			enable-method = "psci";

			cache-size = <0x20000>;

			next-level-cache = <&L2_4>;

			L2_4: l2-cache {
@@ -130,8 +125,7 @@ 
			device_type = "cpu";

			compatible = "arm,armv8";

			reg = <0x0 0x500>;

			enable-method = "spin-table";

			cpu-release-addr = <0x0 0x90000000>;

			enable-method = "psci";

			cache-size = <0x20000>;

			next-level-cache = <&L2_5>;

			L2_5: l2-cache {
@@ -146,8 +140,7 @@ 
			device_type = "cpu";

			compatible = "arm,armv8";

			reg = <0x0 0x600>;

			enable-method = "spin-table";

			cpu-release-addr = <0x0 0x90000000>;

			enable-method = "psci";

			cache-size = <0x20000>;

			next-level-cache = <&L2_6>;

			L2_6: l2-cache {
@@ -162,8 +155,7 @@ 
			device_type = "cpu";

			compatible = "arm,armv8";

			reg = <0x0 0x700>;

			enable-method = "spin-table";

			cpu-release-addr = <0x0 0x90000000>;

			enable-method = "psci";

			cache-size = <0x20000>;

			next-level-cache = <&L2_7>;

			L2_7: l2-cache {
@@ -211,6 +203,11 @@ 
				};

			};

		};



		psci {

			compatible = "arm,psci-1.0";

			method = "smc";

		};

	};



	reserved-memory {

arch/arm64/configs/sdmshrike-perf_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ CONFIG_RCU_FAST_NO_HZ=y 
CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_CPU_MAX_BUF_SHIFT=17

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_CPUACCT=y
@@ -132,13 +134,16 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y 
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y

CONFIG_NETFILTER_XT_MATCH_POLICY=y

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y

CONFIG_NETFILTER_XT_MATCH_QTAGUID=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_SOCKET=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NETFILTER_XT_MATCH_STATISTIC=y

CONFIG_NETFILTER_XT_MATCH_STRING=y

CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_NF_SOCKET_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y

CONFIG_IP_NF_MATCH_ECN=y
@@ -156,6 +161,7 @@ CONFIG_IP_NF_ARPTABLES=y 
CONFIG_IP_NF_ARPFILTER=y

CONFIG_IP_NF_ARP_MANGLE=y

CONFIG_NF_CONNTRACK_IPV6=y

CONFIG_NF_SOCKET_IPV6=y

CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_FILTER=y

CONFIG_IP6_NF_TARGET_REJECT=y
@@ -388,6 +394,7 @@ CONFIG_TMPFS=y 
CONFIG_TMPFS_POSIX_ACL=y

CONFIG_ECRYPT_FS=y

CONFIG_ECRYPT_FS_MESSAGING=y

CONFIG_SDCARD_FS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

arch/arm64/configs/sdmshrike_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ CONFIG_IKCONFIG=y 
CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_CPU_MAX_BUF_SHIFT=17

CONFIG_CGROUPS=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y
@@ -137,13 +139,16 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y 
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y

CONFIG_NETFILTER_XT_MATCH_POLICY=y

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y

CONFIG_NETFILTER_XT_MATCH_QTAGUID=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_SOCKET=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NETFILTER_XT_MATCH_STATISTIC=y

CONFIG_NETFILTER_XT_MATCH_STRING=y

CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_NF_SOCKET_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y

CONFIG_IP_NF_MATCH_ECN=y
@@ -161,6 +166,7 @@ CONFIG_IP_NF_ARPTABLES=y 
CONFIG_IP_NF_ARPFILTER=y

CONFIG_IP_NF_ARP_MANGLE=y

CONFIG_NF_CONNTRACK_IPV6=y

CONFIG_NF_SOCKET_IPV6=y

CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_FILTER=y

CONFIG_IP6_NF_TARGET_REJECT=y
@@ -404,6 +410,7 @@ CONFIG_TMPFS_POSIX_ACL=y 
CONFIG_EFIVAR_FS=y

CONFIG_ECRYPT_FS=y

CONFIG_ECRYPT_FS_MESSAGING=y

CONFIG_SDCARD_FS=y

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y