openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm64: dts: rockchip: move rk3399-sapphire pwr_btn to daughterboard 

The power button is located on the daughterboard.

Signed-off-by: Vicente Bergas <vicencb@gmail.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
This commit is contained in:
Vicente Bergas 2018-02-20 00:11:02 +01:00 committed by Heiko Stuebner
parent 43798872d8
commit 3811c91524
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
View File

@ -41,7 +41,6 @@
*/ */
/dts-v1/; /dts-v1/;
#include <dt-bindings/input/input.h>
#include "rk3399-sapphire.dtsi" #include "rk3399-sapphire.dtsi"
/ { / {
@ -95,22 +94,6 @@ panel_in_edp: endpoint {
}; };
}; };
keys: gpio-keys {
compatible = "gpio-keys";
autorepeat;
power {
debounce-interval = <100>;
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
label = "GPIO Power";
linux,code = <KEY_POWER>;
linux,input-type = <1>;
pinctrl-names = "default";
pinctrl-0 = <&pwr_btn>;
wakeup-source;
};
};
rt5651-sound { rt5651-sound {
compatible = "simple-audio-card"; compatible = "simple-audio-card";
simple-audio-card,name = "realtek,rt5651-codec"; simple-audio-card,name = "realtek,rt5651-codec";
@ -208,12 +191,6 @@ &i2s0 {
}; };
&pinctrl { &pinctrl {
buttons {
pwr_btn: pwr-btn {
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
sdio-pwrseq { sdio-pwrseq {
wifi_enable_h: wifi-enable-h { wifi_enable_h: wifi-enable-h {
rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;

23
arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
View File

@ -41,6 +41,7 @@
*/ */
#include "dt-bindings/pwm/pwm.h" #include "dt-bindings/pwm/pwm.h"
#include "dt-bindings/input/input.h"
#include "rk3399.dtsi" #include "rk3399.dtsi"
#include "rk3399-opp.dtsi" #include "rk3399-opp.dtsi"
@ -102,6 +103,22 @@ dc_12v: dc-12v {
regulator-max-microvolt = <12000000>; regulator-max-microvolt = <12000000>;
}; };
keys: gpio-keys {
compatible = "gpio-keys";
autorepeat;
power {
debounce-interval = <100>;
gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
label = "GPIO Power";
linux,code = <KEY_POWER>;
linux,input-type = <1>;
pinctrl-names = "default";
pinctrl-0 = <&pwr_btn>;
wakeup-source;
};
};
/* switched by pmic_sleep */ /* switched by pmic_sleep */
vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 { vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
@ -475,6 +492,12 @@ &pmu_io_domains {
}; };
&pinctrl { &pinctrl {
buttons {
pwr_btn: pwr-btn {
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
pmic { pmic {
pmic_int_l: pmic-int-l { pmic_int_l: pmic-int-l {
rockchip,pins = rockchip,pins =