projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM64: dts: rk3399: add clock-latency-ns for each opp
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm64
/
boot
/
dts
/
rockchip
/
rk3399-vr-android.dts
diff --git
a/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
b/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
index 88931fec436a2170ba2e587d7935b30d57e9a0b9..25e1b06924741ff6353ad12a6ab4a7e800dc5eca 100644
(file)
--- a/
arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
+++ b/
arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
@@
-289,6
+289,14
@@
rockchip,adc_value = <780>;
};
};
rockchip,adc_value = <780>;
};
};
+
+ rk_headset {
+ compatible = "rockchip_headset";
+ headset_gpio = <&gpio4 28 GPIO_ACTIVE_LOW>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hp_det>;
+ io-channels = <&saradc 2>;
+ };
};
&cluster0_opp {
};
&cluster0_opp {
@@
-300,26
+308,32
@@
opp@600000000 {
opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <800000>;
opp@600000000 {
opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <800000>;
+ clock-latency-ns = <40000>;
};
opp@816000000 {
opp-hz = /bits/ 64 <816000000>;
opp-microvolt = <800000>;
};
opp@816000000 {
opp-hz = /bits/ 64 <816000000>;
opp-microvolt = <800000>;
+ clock-latency-ns = <40000>;
};
opp@1008000000 {
opp-hz = /bits/ 64 <1008000000>;
opp-microvolt = <850000>;
};
opp@1008000000 {
opp-hz = /bits/ 64 <1008000000>;
opp-microvolt = <850000>;
+ clock-latency-ns = <40000>;
};
opp@1200000000 {
opp-hz = /bits/ 64 <1200000000>;
opp-microvolt = <925000>;
};
opp@1200000000 {
opp-hz = /bits/ 64 <1200000000>;
opp-microvolt = <925000>;
+ clock-latency-ns = <40000>;
};
opp@1416000000 {
opp-hz = /bits/ 64 <1416000000>;
opp-microvolt = <1075000>;
};
opp@1416000000 {
opp-hz = /bits/ 64 <1416000000>;
opp-microvolt = <1075000>;
+ clock-latency-ns = <40000>;
};
opp@1512000000 {
opp-hz = /bits/ 64 <1512000000>;
opp-microvolt = <1100000>;
};
opp@1512000000 {
opp-hz = /bits/ 64 <1512000000>;
opp-microvolt = <1100000>;
+ clock-latency-ns = <40000>;
status="disabled";
};
};
status="disabled";
};
};
@@
-333,34
+347,42
@@
opp@600000000 {
opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <800000>;
opp@600000000 {
opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <800000>;
+ clock-latency-ns = <40000>;
};
opp@816000000 {
opp-hz = /bits/ 64 <816000000>;
opp-microvolt = <825000>;
};
opp@816000000 {
opp-hz = /bits/ 64 <816000000>;
opp-microvolt = <825000>;
+ clock-latency-ns = <40000>;
};
opp@1008000000 {
opp-hz = /bits/ 64 <1008000000>;
opp-microvolt = <850000>;
};
opp@1008000000 {
opp-hz = /bits/ 64 <1008000000>;
opp-microvolt = <850000>;
+ clock-latency-ns = <40000>;
};
opp@1200000000 {
opp-hz = /bits/ 64 <1200000000>;
opp-microvolt = <900000>;
};
opp@1200000000 {
opp-hz = /bits/ 64 <1200000000>;
opp-microvolt = <900000>;
+ clock-latency-ns = <40000>;
};
opp@1416000000 {
opp-hz = /bits/ 64 <1416000000>;
opp-microvolt = <1000000>;
};
opp@1416000000 {
opp-hz = /bits/ 64 <1416000000>;
opp-microvolt = <1000000>;
+ clock-latency-ns = <40000>;
};
opp@1608000000 {
opp-hz = /bits/ 64 <1608000000>;
opp-microvolt = <1050000>;
};
opp@1608000000 {
opp-hz = /bits/ 64 <1608000000>;
opp-microvolt = <1050000>;
+ clock-latency-ns = <40000>;
};
opp@1800000000 {
opp-hz = /bits/ 64 <1800000000>;
opp-microvolt = <1150000>;
};
opp@1800000000 {
opp-hz = /bits/ 64 <1800000000>;
opp-microvolt = <1150000>;
+ clock-latency-ns = <40000>;
};
opp@1992000000 {
opp-hz = /bits/ 64 <1992000000>;
opp-microvolt = <1225000>;
};
opp@1992000000 {
opp-hz = /bits/ 64 <1992000000>;
opp-microvolt = <1225000>;
+ clock-latency-ns = <40000>;
};
};
};
};
@@
-799,7
+821,6
@@
clocks = <&cru SCLK_I2S_8CH_OUT>;
clock-names = "mclk";
spk-con-gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
clocks = <&cru SCLK_I2S_8CH_OUT>;
clock-names = "mclk";
spk-con-gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
- hp-det-gpio = <&gpio4 28 GPIO_ACTIVE_LOW>;
};
};
};
};
@@
-1124,4
+1145,18
@@
rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>;
};
};
+
+ headphone {
+ hp_det: hp-det {
+ rockchip,pins = <4 28 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+ };
+};
+
+&pvtm {
+ status = "okay";
+};
+
+&pmu_pvtm {
+ status = "okay";
};
};