Merge "ARM: dts: msm: add gpio_key VOL_UP button on SDM660" (54c97fda) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+13 −13

Original line number	Diff line number	Diff line
		/* Copyright (c) 2016-2017, 2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2016-2017, 2019-2020 The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -50,18 +50,18 @@
		pm660l_gpios: pinctrl@c000 {
		compatible = "qcom,spmi-gpio";
		reg = <0xc000 0xc00>;
		interrupts = <0x0 0xc0 0 IRQ_TYPE_NONE>,
		<0x0 0xc1 0 IRQ_TYPE_NONE>,
		<0x0 0xc2 0 IRQ_TYPE_NONE>,
		<0x0 0xc3 0 IRQ_TYPE_NONE>,
		<0x0 0xc4 0 IRQ_TYPE_NONE>,
		<0x0 0xc5 0 IRQ_TYPE_NONE>,
		<0x0 0xc6 0 IRQ_TYPE_NONE>,
		<0x0 0xc7 0 IRQ_TYPE_NONE>,
		<0x0 0xc8 0 IRQ_TYPE_NONE>,
		<0x0 0xc9 0 IRQ_TYPE_NONE>,
		<0x0 0xca 0 IRQ_TYPE_NONE>,
		<0x0 0xcb 0 IRQ_TYPE_NONE>;
		interrupts = <0x2 0xc0 0 IRQ_TYPE_NONE>,
		<0x2 0xc1 0 IRQ_TYPE_NONE>,
		<0x2 0xc2 0 IRQ_TYPE_NONE>,
		<0x2 0xc3 0 IRQ_TYPE_NONE>,
		<0x2 0xc4 0 IRQ_TYPE_NONE>,
		<0x2 0xc5 0 IRQ_TYPE_NONE>,
		<0x2 0xc6 0 IRQ_TYPE_NONE>,
		<0x2 0xc7 0 IRQ_TYPE_NONE>,
		<0x2 0xc8 0 IRQ_TYPE_NONE>,
		<0x2 0xc9 0 IRQ_TYPE_NONE>,
		<0x2 0xca 0 IRQ_TYPE_NONE>,
		<0x2 0xcb 0 IRQ_TYPE_NONE>;
		interrupt-names = "pm660l_gpio1", "pm660l_gpio2",
		"pm660l_gpio3", "pm660l_gpio4",
		"pm660l_gpio5", "pm660l_gpio6",

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

+96 −9

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@
		#include <dt-bindings/msm/msm-bus-ids.h>
		#include <dt-bindings/clock/qcom,cpu-osm.h>
		#include <dt-bindings/thermal/thermal.h>
		#include <dt-bindings/gpio/gpio.h>
		#include <dt-bindings/input/input.h>

		#define MHZ_TO_MBPS(mhz, w) ((mhz * 1000000 * w) / (1024 * 1024))
		#define BW_OPP_ENTRY(mhz, w) opp-mhz {opp-hz = /bits/ 64 <MHZ_TO_MBPS(mhz, w)>;}
		@@ -58,6 +60,8 @@
		compatible = "arm,armv8";
		reg = <0x0 0x0>;
		enable-method = "psci";
		capacity-dmips-mhz = <1024>;
		sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;
		qcom,lmh-dcvs = <&lmh_dcvs0>;
		efficiency = <1024>;
		next-level-cache = <&L2_0>;
		@@ -86,6 +90,8 @@
		compatible = "arm,armv8";
		reg = <0x0 0x1>;
		enable-method = "psci";
		capacity-dmips-mhz = <1024>;
		sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;
		qcom,lmh-dcvs = <&lmh_dcvs0>;
		#cooling-cells = <2>;
		efficiency = <1024>;
		@@ -108,6 +114,8 @@
		compatible = "arm,armv8";
		reg = <0x0 0x2>;
		enable-method = "psci";
		capacity-dmips-mhz = <1024>;
		sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;
		qcom,lmh-dcvs = <&lmh_dcvs0>;
		efficiency = <1024>;
		next-level-cache = <&L2_0>;
		@@ -130,6 +138,8 @@
		compatible = "arm,armv8";
		reg = <0x0 0x3>;
		enable-method = "psci";
		capacity-dmips-mhz = <1024>;
		sched-energy-costs = <&CPU_COST_0 &CLUSTER_COST_0>;
		qcom,lmh-dcvs = <&lmh_dcvs0>;
		efficiency = <1024>;
		next-level-cache = <&L2_0>;
		@@ -152,6 +162,8 @@
		compatible = "arm,armv8";
		reg = <0x0 0x100>;
		enable-method = "psci";
		capacity-dmips-mhz = <1638>;
		sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_1>;
		qcom,lmh-dcvs = <&lmh_dcvs1>;
		efficiency = <1638>;
		next-level-cache = <&L2_1>;
		@@ -178,6 +190,8 @@
		compatible = "arm,armv8";
		reg = <0x0 0x101>;
		enable-method = "psci";
		capacity-dmips-mhz = <1638>;
		sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_1>;
		qcom,lmh-dcvs = <&lmh_dcvs1>;
		#cooling-cells = <2>;
		efficiency = <1638>;
		@@ -200,6 +214,8 @@
		compatible = "arm,armv8";
		reg = <0x0 0x102>;
		enable-method = "psci";
		capacity-dmips-mhz = <1638>;
		sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_1>;
		qcom,lmh-dcvs = <&lmh_dcvs1>;
		#cooling-cells = <2>;
		efficiency = <1638>;
		@@ -222,6 +238,8 @@
		compatible = "arm,armv8";
		reg = <0x0 0x103>;
		enable-method = "psci";
		capacity-dmips-mhz = <1638>;
		sched-energy-costs = <&CPU_COST_1 &CLUSTER_COST_1>;
		qcom,lmh-dcvs = <&lmh_dcvs1>;
		#cooling-cells = <2>;
		efficiency = <1638>;
		@@ -278,6 +296,72 @@
		};
		};

		energy_costs: energy-costs {
		compatible = "sched-energy";

		CPU_COST_0: core-cost0 {
		busy-cost-data = <
		633600 41
		902400 70
		1113600 83
		1401600 146
		1536000 158
		1747200 228
		1843200 285
		>;
		idle-cost-data = <
		20 16 10 8
		>;
		};

		CPU_COST_1: core-cost1 {
		busy-cost-data = <
		1113600 307
		1401600 485
		1747200 857
		1804800 883
		1958400 1222
		2150400 1592
		2208000 1632
		2457600 2080
		>;
		idle-cost-data = <
		100 80 60 40
		>;
		};

		CLUSTER_COST_0: cluster-cost0 {
		busy-cost-data = <
		633600 4
		902400 5
		1113600 7
		1401600 9
		1536000 9
		1747200 11
		1843200 13
		>;
		idle-cost-data = <
		4 3 2 1
		>;
		};

		CLUSTER_COST_1: cluster-cost1 {
		busy-cost-data = <
		1113600 14
		1401600 17
		1747200 25
		1804800 31
		1958400 31
		2150400 37
		2208000 44
		2457600 45
		>;
		idle-cost-data = <
		4 3 2 1
		>;
		};
		};

		clocks {
		xo_board {
		compatible = "fixed-clock";
		@@ -2594,13 +2678,14 @@

		&pm660l_gpios {
		/* GPIO 7 for VOL_UP */
		gpio@c600 {
		status = "okay";
		qcom,mode = <0>;
		qcom,pull = <0>;
		qcom,vin-sel = <0>;
		qcom,src-sel = <0>;
		qcom,out-strength = <1>;
		key_vol_up {
		key_vol_up_default: key_vol_up_default {
		pins = "gpio7";
		function = "normal";
		input-enable;
		bias-pull-up;
		power-source = <0>;
		};
		};
		};

		@@ -2614,8 +2699,9 @@
		status = "okay";
		compatible = "gpio-keys";
		input-name = "gpio-keys";
		pinctrl-names = "tlmm_gpio_key_active","tlmm_gpio_key_suspend";
		pinctrl-0 = <&gpio_key_active>;
		pinctrl-names = "tlmm_gpio_key_active","tlmm_gpio_key_suspend",
		"default";
		pinctrl-0 = <&gpio_key_active &key_vol_up_default>;
		pinctrl-1 = <&gpio_key_suspend>;

		camera_focus {
		@@ -2639,6 +2725,7 @@
		gpios = <&pm660l_gpios 7 0x1>;
		linux,input-type = <1>;
		linux,code = <115>;
		linux,can-disable;
		gpio-key,wakeup;
		debounce-interval = <15>;
		};