shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

ARM64: dts: rk3399: fix pwm id for vdd_center

Browse Source 
RK3399 EVB1 and EVB2 use pwm3 for vdd_center, but EVB3 use pwm2.
This patch moved the vdd_center node to each board dtsi file.

Change-Id: I2b46b06b622c30ab65f26663a3628e73733472ad
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
This commit is contained in:
Jianqun Xu
2016-08-10 11:11:29 +08:00
committed by Huang, Tao
parent c550cf0a6c
commit 9733fe3244
7 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts
View File

@@ -50,16 +50,6 @@
compatible = "rockchip,android", "rockchip,rk3399-evb-rev1", "rockchip,rk3399";
};
&vdd_log {
rockchip,pwm_id= <2>;
rockchip,pwm_voltage = <900000>;
};
&vdd_center {
rockchip,pwm_id= <3>;
rockchip,pwm_voltage = <900000>;
};
&rk_screen {
#include <dt-bindings/display/screen-timing/lcd-tv080wum-nl0-mipi.dtsi>
};

18
arch/arm64/boot/dts/rockchip/rk3399-evb-rev1.dtsi
View File

@@ -47,6 +47,8 @@
vdd_log: vdd-log {
compatible = "pwm-regulator";
rockchip,pwm_id = <2>;
rockchip,pwm_voltage = <900000>;
pwms = <&pwm2 0 25000 0>;
regulator-name = "vdd_log";
regulator-min-microvolt = <800000>;
@@ -54,6 +56,18 @@
regulator-always-on;
regulator-boot-on;
};
vdd_center: vdd-center {
compatible = "pwm-regulator";
rockchip,pwm_id = <3>;
rockchip,pwm_voltage = <900000>;
pwms = <&pwm3 0 25000 0>;
regulator-name = "vdd_center";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <1400000>;
regulator-always-on;
regulator-boot-on;
};
};
&cpu_l0 {
@@ -318,6 +332,10 @@
status = "okay";
};
&pwm3 {
status = "okay";
};
&u2phy0_otg {
rockchip,utmi-avalid;
};

5
arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts
View File

@@ -50,11 +50,6 @@
compatible = "rockchip,android", "rockchip,rk3399-evb-rev2", "rockchip,rk3399";
};
&vdd_center {
rockchip,pwm_id= <3>;
rockchip,pwm_voltage = <900000>;
};
&rk_screen {
#include <dt-bindings/display/screen-timing/lcd-tv080wum-nl0-mipi.dtsi>
};

16
arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi
View File

@@ -53,6 +53,18 @@
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
};
vdd_center: vdd-center {
compatible = "pwm-regulator";
rockchip,pwm_id = <3>;
rockchip,pwm_voltage = <900000>;
pwms = <&pwm3 0 25000 0>;
regulator-name = "vdd_center";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <1400000>;
regulator-always-on;
regulator-boot-on;
};
};
&cpu_l0 {
@@ -458,6 +470,10 @@
};
};
&pwm3 {
status = "okay";
};
&u2phy0_otg {
rockchip,utmi-avalid;
};

5
arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts
View File

@@ -50,11 +50,6 @@
compatible = "rockchip,android", "rockchip,rk3399-evb-rev3", "rockchip,rk3399";
};
&vdd_center {
rockchip,pwm_id= <3>;
rockchip,pwm_voltage = <900000>;
};
&rk_screen {
#include <dt-bindings/display/screen-timing/lcd-tv080wum-nl0-mipi.dtsi>
};

16
arch/arm64/boot/dts/rockchip/rk3399-evb-rev3.dtsi
View File

@@ -53,6 +53,18 @@
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
};
vdd_center: vdd-center {
compatible = "pwm-regulator";
rockchip,pwm_id = <2>;
rockchip,pwm_voltage = <900000>;
pwms = <&pwm2 0 25000 0>;
regulator-name = "vdd_center";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <1400000>;
regulator-always-on;
regulator-boot-on;
};
};
&cluster0_opp {
@@ -472,3 +484,7 @@
status = "okay";
};
};
&pwm2 {
status = "okay";
};

14
arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
View File

@@ -46,16 +46,6 @@
/ {
compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
vdd_center: vdd-center {
compatible = "pwm-regulator";
pwms = <&pwm3 0 25000 0>;
regulator-name = "vdd_center";
regulator-min-microvolt = <800000>;
regulator-max-microvolt = <1400000>;
regulator-always-on;
regulator-boot-on;
};
vcc3v3_sys: vcc3v3-sys {
compatible = "regulator-fixed";
regulator-name = "vcc3v3_sys";
@@ -467,10 +457,6 @@
status = "okay";
};
&pwm3 {
status = "okay";
};
&gmac {
phy-supply = <&vcc_phy>;
phy-mode = "rgmii";