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

A number of improvements for rv1108 boards, removal of an obsolete property 

from the Edison tablet and a chosen node for veyron devices.
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAlxp5qUQHGhlaWtvQHNu
 dGVjaC5kZQAKCRDzpnnJnNEdgXsjCACcvu8DsAywvD4A1Ifnj1LCwIfzzTk7Njle
 NMtg4xGJDgjuTWYZMWUeIf7/te/sRX5w1T9a+yURxU7q7+aFhquKSIfhncqpKzeI
 0glWTsOuIVaQSjn4+R5as6KPOxgWrBLZOolu39HmDnmaAjDn6hb5/NTm+lxSSrQO
 R/IJuMSbHL++vPNsP7415hYuZf+5uwFkbOeE7b3nU4zhPFa5IO7WNQlzytf3o4+M
 4YqZ+C3eA9/M0izFN2UOvkqKIgHp6ZGGzE1fpcbrM74OqyreZh9CuuBnGbOmSD4N
 medTwJEVnuKJRFSmAyXuEUP8+M+RAQOrPZOop/HtvHdRhhfHvrCE
 =HTA/
 -----END PGP SIGNATURE-----

Merge tag 'v5.1-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

A number of improvements for rv1108 boards, removal of an obsolete property
from the Edison tablet and a chosen node for veyron devices.

* tag 'v5.1-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add chosen node on veyron devices
  ARM: dts: rockchip: remove cap-mmc-highspeed from rk3188-bqedison2qc mmc1 node
  ARM: dts: rockchip: Use the correct regulator properties on rv1108-evb
  ARM: dts: rockchip: Use the correct regulator properties on rv1108-elgin
  ARM: dts: rockchip: Fix vcc5/6-supply representation on rv1108-elgin

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2019-02-18 11:18:02 +01:00
parent bf5db21cb9 5aed37a5cd
commit c22ae32d94
4 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/rk3188-bqedison2qc.dts
View File

@ -460,7 +460,6 @@ &mmc0 {
&mmc1 {
bus-width = <4>;
cap-sd-highspeed;
cap-mmc-highspeed;
keep-power-in-suspend;
mmc-pwrseq = <&sdio_pwrseq>;
non-removable;

4
arch/arm/boot/dts/rk3288-veyron.dtsi
View File

@ -10,6 +10,10 @@
#include "rk3288.dtsi"
/ {
chosen {
stdout-path = "serial2:115200n8";
};
/*
* The default coreboot on veyron devices ignores memory@0 nodes
* and would instead create another memory node.

34
arch/arm/boot/dts/rv1108-elgin-r1.dts
View File

@ -74,8 +74,8 @@ rk805: pmic@18 {
vcc2-supply = <&vcc_sys>;
vcc3-supply = <&vcc_sys>;
vcc4-supply = <&vcc_sys>;
vcc5-supply = <&vcc_sys>;
vcc6-supply = <&vcc_sys>;
vcc5-supply = <&vdd_buck2>;
vcc6-supply = <&vdd_buck2>;
regulators {
vdd_core: DCDC_REG1 {
@ -85,17 +85,19 @@ vdd_core: DCDC_REG1 {
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-state-enabled;
regulator-state-uv = <900000>;
regulator-on-in-suspend;
regulator-suspend-microvolt = <900000>;
};
};
vdd_cam: DCDC_REG2 {
regulator-name= "vdd_cam";
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <2000000>;
vdd_buck2: DCDC_REG2 {
regulator-name= "vdd_buck2";
regulator-min-microvolt = <2200000>;
regulator-max-microvolt = <2200000>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-state-disabled;
regulator-off-in-suspend;
};
};
@ -104,7 +106,7 @@ vcc_ddr: DCDC_REG3 {
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-state-enabled;
regulator-on-in-suspend;
};
};
@ -115,8 +117,8 @@ vcc_io: DCDC_REG4 {
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-state-enabled;
regulator-state-uv = <3300000>;
regulator-on-in-suspend;
regulator-suspend-microvolt = <3300000>;
};
};
@ -127,7 +129,7 @@ vdd_10: LDO_REG1 {
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-state-disabled;
regulator-off-in-suspend;
};
};
@ -138,7 +140,7 @@ vcc_18: LDO_REG2 {
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-state-disabled;
regulator-off-in-suspend;
};
};
@ -149,8 +151,8 @@ vdd10_pmu: LDO_REG3 {
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-state-enabled;
regulator-state-uv = <1000000>;
regulator-on-in-suspend;
regulator-suspend-microvolt = <1000000>;
};
};
};

20
arch/arm/boot/dts/rv1108-evb.dts
View File

@ -97,8 +97,8 @@ vdd_core: DCDC_REG1 {
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-state-enabled;
regulator-state-uv = <900000>;
regulator-on-in-suspend;
regulator-suspend-microvolt = <900000>;
};
};
@ -107,7 +107,7 @@ vdd_cam: DCDC_REG2 {
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <2000000>;
regulator-state-mem {
regulator-state-disabled;
regulator-off-in-suspend;
};
};
@ -116,7 +116,7 @@ vcc_ddr: DCDC_REG3 {
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-state-enabled;
regulator-on-in-suspend;
};
};
@ -127,8 +127,8 @@ vcc_io: DCDC_REG4 {
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-state-enabled;
regulator-state-uv = <3300000>;
regulator-on-in-suspend;
regulator-suspend-microvolt = <3300000>;
};
};
@ -139,7 +139,7 @@ vdd_10: LDO_REG1 {
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-state-disabled;
regulator-off-in-suspend;
};
};
@ -150,7 +150,7 @@ vcc_18: LDO_REG2 {
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-state-disabled;
regulator-off-in-suspend;
};
};
@ -161,8 +161,8 @@ vdd10_pmu: LDO_REG3 {
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
regulator-state-enabled;
regulator-state-uv = <1000000>;
regulator-on-in-suspend;
regulator-suspend-microvolt = <1000000>;
};
};
};