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

Commit b8925b7c authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Heiko Stuebner
Browse files

ARM: dts: rockchip: Split GPIO keys for veyron into multiple devices 



With a single device DT overrides can become messy, especially when
keys are added or removed. Multiple devices also allow to
enable/disable wakeup per key/group.

Signed-off-by: default avatarMatthias Kaehlcke <mka@chromium.org>
[used actual switch+event constants in new lid-switch entry]
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent cd638608

arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi

+15 −12
Original line number Diff line number Diff line
@@ -70,6 +70,21 @@ 
		pinctrl-0 = <&ac_present_ap>;

	};



	lid_switch: lid-switch {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&ap_lid_int_l>;



		lid {

			label = "Lid";

			gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;

			wakeup-source;

			linux,code = <SW_LID>;

			linux,input-type = <EV_SW>;

			debounce-interval = <1>;

		};

	};



	panel: panel {

		compatible ="innolux,n116bge", "simple-panel";

		status = "okay";
@@ -149,18 +164,6 @@ 
	status = "okay";

};



&gpio_keys {

	pinctrl-0 = <&pwr_key_l &ap_lid_int_l>;

	lid {

		label = "Lid";

		gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;

		wakeup-source;

		linux,code = <0>; /* SW_LID */

		linux,input-type = <5>; /* EV_SW */

		debounce-interval = <1>;

	};

};



&pwm0 {

	status = "okay";

};

arch/arm/boot/dts/rk3288-veyron-minnie.dts

+20 −18
Original line number Diff line number Diff line
@@ -48,6 +48,26 @@ 
		regulator-boot-on;

		vin-supply = <&vcc18_wl>;

	};



	volume_buttons: volume-buttons {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&volum_down_l &volum_up_l>;



		volum_down {

			label = "Volum_down";

			gpios = <&gpio5 RK_PB3 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEDOWN>;

			debounce-interval = <100>;

		};



		volum_up {

			label = "Volum_up";

			gpios = <&gpio5 RK_PB2 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEUP>;

			debounce-interval = <100>;

		};

	};

};



&backlight {
@@ -90,24 +110,6 @@ 
	pwm-off-delay-ms = <200>;

};



&gpio_keys {

	pinctrl-0 = <&pwr_key_l &ap_lid_int_l &volum_down_l &volum_up_l>;



	volum_down {

		label = "Volum_down";

		gpios = <&gpio5 RK_PB3 GPIO_ACTIVE_LOW>;

		linux,code = <KEY_VOLUMEDOWN>;

		debounce-interval = <100>;

	};



	volum_up {

		label = "Volum_up";

		gpios = <&gpio5 RK_PB2 GPIO_ACTIVE_LOW>;

		linux,code = <KEY_VOLUMEUP>;

		debounce-interval = <100>;

	};

};



&i2c_tunnel {

	battery: bq27500@55 {

		compatible = "ti,bq27500";

arch/arm/boot/dts/rk3288-veyron-pinky.dts

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
	force-hpd;

};



&gpio_keys {

&lid_switch {

	pinctrl-0 = <&pwr_key_h &ap_lid_int_l>;



	power {

arch/arm/boot/dts/rk3288-veyron.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ 
		reg = <0x0 0x0 0x0 0x80000000>;

	};



	gpio_keys: gpio-keys {

	power_button: power-button {

		compatible = "gpio-keys";



		pinctrl-names = "default";

		pinctrl-0 = <&pwr_key_l>;



		power {

			label = "Power";

			gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;