Merge branch 'arm64-thermal-for-5.2' into arm64-for-5.2 (58ad5ab7) · Commits · 戴 / test

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

+25 −16

Original line number	Diff line number	Diff line
		@@ -180,19 +180,19 @@
		};

		thermal-zones {
		cpu-thermal0 {
		cpu0_1-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens 4>;

		trips {
		cpu_alert0: trip0 {
		cpu0_1_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};
		cpu_crit0: trip1 {
		cpu0_1_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -201,7 +201,7 @@

		cooling-maps {
		map0 {
		trip = <&cpu_alert0>;
		trip = <&cpu0_1_alert0>;
		cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
		<&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
		<&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
		@@ -210,19 +210,19 @@
		};
		};

		cpu-thermal1 {
		cpu2_3-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens 3>;

		trips {
		cpu_alert1: trip0 {
		cpu2_3_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};
		cpu_crit1: trip1 {
		cpu2_3_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -231,7 +231,7 @@

		cooling-maps {
		map0 {
		trip = <&cpu_alert1>;
		trip = <&cpu2_3_alert0>;
		cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
		<&CPU1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
		<&CPU2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
		@@ -247,12 +247,12 @@
		thermal-sensors = <&tsens 2>;

		trips {
		gpu_alert: trip0 {
		gpu_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};
		gpu_crit: trip1 {
		gpu_crit: gpu_crit {
		temperature = <95000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -267,18 +267,27 @@
		thermal-sensors = <&tsens 1>;

		trips {
		cam_alert: trip0 {
		cam_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		type = "hot";
		};
		cam_crit: trip1 {
		temperature = <95000>;
		hysteresis = <2000>;
		type = "critical";
		};
		};

		modem-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens 0>;

		trips {
		modem_alert0: trip-point@0 {
		temperature = <85000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		};

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

+162 −12

Original line number	Diff line number	Diff line
		@@ -154,20 +154,20 @@
		};

		thermal-zones {
		cpu-thermal0 {
		cpu0-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 3>;

		trips {
		cpu_alert0: trip0 {
		cpu0_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit0: trip1 {
		cpu0_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -175,20 +175,20 @@
		};
		};

		cpu-thermal1 {
		cpu1-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 5>;

		trips {
		cpu_alert1: trip0 {
		cpu1_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit1: trip1 {
		cpu1_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -196,20 +196,20 @@
		};
		};

		cpu-thermal2 {
		cpu2-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 8>;

		trips {
		cpu_alert2: trip0 {
		cpu2_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit2: trip1 {
		cpu2_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -217,26 +217,176 @@
		};
		};

		cpu-thermal3 {
		cpu3-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 10>;

		trips {
		cpu_alert3: trip0 {
		cpu3_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit3: trip1 {
		cpu3_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		};
		};
		};

		gpu-thermal-top {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 6>;

		trips {
		gpu1_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		gpu-thermal-bottom {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 7>;

		trips {
		gpu2_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		m4m-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 1>;

		trips {
		m4m_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		l3-or-venus-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 2>;

		trips {
		l3_or_venus_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		cluster0-l2-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 7>;

		trips {
		cluster0_l2_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		cluster1-l2-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 12>;

		trips {
		cluster1_l2_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		camera-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 1>;

		trips {
		camera_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		q6-dsp-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 2>;

		trips {
		q6_dsp_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		mem-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 3>;

		trips {
		mem_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		modemtx-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 4>;

		trips {
		modemtx_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};
		};

		timer {

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

+197 −45

Original line number	Diff line number	Diff line
		@@ -78,7 +78,6 @@
		compatible = "arm,armv8";
		reg = <0x0 0x0>;
		enable-method = "psci";
		efficiency = <1024>;
		next-level-cache = <&L2_0>;
		L2_0: l2-cache {
		compatible = "arm,arch-cache";
		@@ -97,7 +96,6 @@
		compatible = "arm,armv8";
		reg = <0x0 0x1>;
		enable-method = "psci";
		efficiency = <1024>;
		next-level-cache = <&L2_0>;
		L1_I_1: l1-icache {
		compatible = "arm,arch-cache";
		@@ -112,7 +110,6 @@
		compatible = "arm,armv8";
		reg = <0x0 0x2>;
		enable-method = "psci";
		efficiency = <1024>;
		next-level-cache = <&L2_0>;
		L1_I_2: l1-icache {
		compatible = "arm,arch-cache";
		@@ -127,7 +124,6 @@
		compatible = "arm,armv8";
		reg = <0x0 0x3>;
		enable-method = "psci";
		efficiency = <1024>;
		next-level-cache = <&L2_0>;
		L1_I_3: l1-icache {
		compatible = "arm,arch-cache";
		@@ -142,7 +138,6 @@
		compatible = "arm,armv8";
		reg = <0x0 0x100>;
		enable-method = "psci";
		efficiency = <1536>;
		next-level-cache = <&L2_1>;
		L2_1: l2-cache {
		compatible = "arm,arch-cache";
		@@ -161,7 +156,6 @@
		compatible = "arm,armv8";
		reg = <0x0 0x101>;
		enable-method = "psci";
		efficiency = <1536>;
		next-level-cache = <&L2_1>;
		L1_I_101: l1-icache {
		compatible = "arm,arch-cache";
		@@ -176,7 +170,6 @@
		compatible = "arm,armv8";
		reg = <0x0 0x102>;
		enable-method = "psci";
		efficiency = <1536>;
		next-level-cache = <&L2_1>;
		L1_I_102: l1-icache {
		compatible = "arm,arch-cache";
		@@ -191,7 +184,6 @@
		compatible = "arm,armv8";
		reg = <0x0 0x103>;
		enable-method = "psci";
		efficiency = <1536>;
		next-level-cache = <&L2_1>;
		L1_I_103: l1-icache {
		compatible = "arm,arch-cache";
		@@ -346,20 +338,20 @@
		};

		thermal-zones {
		cpu-thermal0 {
		cpu0-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 6>;
		thermal-sensors = <&tsens0 1>;

		trips {
		cpu_alert0: trip0 {
		cpu0_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit0: trip1 {
		cpu0_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -367,20 +359,20 @@
		};
		};

		cpu-thermal1 {
		cpu1-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 7>;
		thermal-sensors = <&tsens0 2>;

		trips {
		cpu_alert1: trip0 {
		cpu1_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit1: trip1 {
		cpu1_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -388,20 +380,20 @@
		};
		};

		cpu-thermal2 {
		cpu2-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 8>;
		thermal-sensors = <&tsens0 3>;

		trips {
		cpu_alert2: trip0 {
		cpu2_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit2: trip1 {
		cpu2_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -409,20 +401,20 @@
		};
		};

		cpu-thermal3 {
		cpu3-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 9>;
		thermal-sensors = <&tsens0 4>;

		trips {
		cpu_alert3: trip0 {
		cpu3_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit3: trip1 {
		cpu3_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -430,20 +422,20 @@
		};
		};

		cpu-thermal4 {
		cpu4-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 10>;
		thermal-sensors = <&tsens0 7>;

		trips {
		cpu_alert4: trip0 {
		cpu4_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit4: trip1 {
		cpu4_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -451,20 +443,20 @@
		};
		};

		cpu-thermal5 {
		cpu5-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 11>;
		thermal-sensors = <&tsens0 8>;

		trips {
		cpu_alert5: trip0 {
		cpu5_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit5: trip1 {
		cpu5_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -472,20 +464,20 @@
		};
		};

		cpu-thermal6 {
		cpu6-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 0>;
		thermal-sensors = <&tsens0 9>;

		trips {
		cpu_alert6: trip0 {
		cpu6_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit6: trip1 {
		cpu6_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -493,20 +485,20 @@
		};
		};

		cpu-thermal7 {
		cpu7-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 1>;
		thermal-sensors = <&tsens0 10>;

		trips {
		cpu_alert7: trip0 {
		cpu7_alert0: trip-point@0 {
		temperature = <75000>;
		hysteresis = <2000>;
		type = "passive";
		};

		cpu_crit7: trip1 {
		cpu7_crit: cpu_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		@@ -514,11 +506,169 @@
		};
		};

		gpu-thermal {
		gpu-thermal-bottom {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 12>;

		trips {
		gpu1_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		gpu-thermal-top {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 13>;

		trips {
		gpu2_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		cluster0-mhm-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 5>;

		trips {
		cluster0_mhm_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		cluster1-mhm-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 6>;

		trips {
		cluster1_mhm_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		cluster1-l2-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 11>;

		trips {
		cluster1_l2_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		modem-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 1>;

		trips {
		modem_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		mem-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 2>;

		trips {
		mem_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		wlan-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 3>;

		trips {
		wlan_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		q6-dsp-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 4>;

		trips {
		q6_dsp_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		camera-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 5>;

		trips {
		camera_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		multimedia-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 6>;

		trips {
		multimedia_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};
		};

		@@ -590,17 +740,19 @@
		cell-index = <0>;
		};

		tsens0: thermal@10aa000 {
		tsens0: thermal@10ab000 {
		compatible = "qcom,msm8998-tsens", "qcom,tsens-v2";
		reg = <0x10aa000 0x2000>;
		reg = <0x10ab000 0x1000>, /* TM */
		<0x10aa000 0x1000>; /* SROT */

		#qcom,sensors = <12>;
		#thermal-sensor-cells = <1>;
		};

		tsens1: thermal@10ad000 {
		tsens1: thermal@10ae000 {
		compatible = "qcom,msm8998-tsens", "qcom,tsens-v2";
		reg = <0x10ad000 0x2000>;
		reg = <0x10ae000 0x1000>, /* TM */
		<0x10ad000 0x1000>; /* SROT */

		#qcom,sensors = <8>;
		#thermal-sensor-cells = <1>;

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

+205 −0

Original line number	Diff line number	Diff line
		@@ -2613,5 +2613,210 @@
		};
		};
		};

		aoss0-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 0>;

		trips {
		aoss0_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		cluster0-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 5>;

		trips {
		cluster0_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		cluster0_crit: cluster0_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		};
		};
		};

		cluster1-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 6>;

		trips {
		cluster1_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		cluster1_crit: cluster1_crit {
		temperature = <110000>;
		hysteresis = <2000>;
		type = "critical";
		};
		};
		};

		gpu-thermal-top {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 11>;

		trips {
		gpu1_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		gpu-thermal-bottom {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens0 12>;

		trips {
		gpu2_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		aoss1-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 0>;

		trips {
		aoss1_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		q6-modem-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 1>;

		trips {
		q6_modem_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		mem-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 2>;

		trips {
		mem_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		wlan-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 3>;

		trips {
		wlan_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		q6-hvx-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 4>;

		trips {
		q6_hvx_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		camera-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 5>;

		trips {
		camera_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		video-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 6>;

		trips {
		video_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};

		modem-thermal {
		polling-delay-passive = <250>;
		polling-delay = <1000>;

		thermal-sensors = <&tsens1 7>;

		trips {
		modem_alert0: trip-point@0 {
		temperature = <90000>;
		hysteresis = <2000>;
		type = "hot";
		};
		};
		};
		};
		};

Admin message