mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-26 20:15:30 +07:00
rockpro64 regulator fixes that cause stability issues
-----BEGIN PGP SIGNATURE----- iQFEBAABCAAuFiEE7v+35S2Q1vLNA3Lx86Z5yZzRHYEFAlwQxV0QHGhlaWtvQHNu dGVjaC5kZQAKCRDzpnnJnNEdgQfMCACQoDDe2VXgehKylXYMEYk1JtypTCdkbGDO C4QUhupe7QC3kdFP1dEgy9sluMeZbUjnzXZPOaEUUxF3j2OEqp+ucSrm0mv3e3/d /Z2OO9aVf1+CevIY5cP3ZUZMDA6zRo8VjAhKKyrxSV8Ji5lroApox6obrOseWI9u Avw9dfFF1SXpBEvy7HkhfjGnZz2nXWN48trAksEmXv5Z3r558kSV8LJAmmENtZV2 uIULebOZvQ3Xod65A5zFCMdvjdEjlHrci/9Ci0H6TU6bGHztbNw5XO8nfkXV0yJX rI9Uec640SoZyAnjKHqUHe+abn5ZdGGbLv1Zj6q+DT70/SzIYDAm =Cgwo -----END PGP SIGNATURE----- Merge tag 'v4.20-rockchip-dts64fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes rockpro64 regulator fixes that cause stability issues * tag 'v4.20-rockchip-dts64fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: fix rk3399-rockpro64 regulator gpios Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
8e22bce990
@ -97,7 +97,7 @@ vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
|
||||
vcc3v3_pcie: vcc3v3-pcie-regulator {
|
||||
compatible = "regulator-fixed";
|
||||
enable-active-high;
|
||||
gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>;
|
||||
gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pcie_pwr_en>;
|
||||
regulator-name = "vcc3v3_pcie";
|
||||
@ -293,12 +293,12 @@ regulator-state-mem {
|
||||
};
|
||||
};
|
||||
|
||||
vcc2v8_dvp: LDO_REG2 {
|
||||
regulator-name = "vcc2v8_dvp";
|
||||
vcc3v0_touch: LDO_REG2 {
|
||||
regulator-name = "vcc3v0_touch";
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <2800000>;
|
||||
regulator-min-microvolt = <3000000>;
|
||||
regulator-max-microvolt = <3000000>;
|
||||
regulator-state-mem {
|
||||
regulator-off-in-suspend;
|
||||
};
|
||||
@ -397,7 +397,9 @@ regulator-state-mem {
|
||||
vdd_cpu_b: regulator@40 {
|
||||
compatible = "silergy,syr827";
|
||||
reg = <0x40>;
|
||||
fcs,suspend-voltage-selector = <0>;
|
||||
fcs,suspend-voltage-selector = <1>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&vsel1_gpio>;
|
||||
regulator-name = "vdd_cpu_b";
|
||||
regulator-min-microvolt = <712500>;
|
||||
regulator-max-microvolt = <1500000>;
|
||||
@ -415,6 +417,8 @@ vdd_gpu: regulator@41 {
|
||||
compatible = "silergy,syr828";
|
||||
reg = <0x41>;
|
||||
fcs,suspend-voltage-selector = <1>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&vsel2_gpio>;
|
||||
regulator-name = "vdd_gpu";
|
||||
regulator-min-microvolt = <712500>;
|
||||
regulator-max-microvolt = <1500000>;
|
||||
@ -519,7 +523,7 @@ lcd_panel_reset: lcd-panel-reset {
|
||||
|
||||
pcie {
|
||||
pcie_pwr_en: pcie-pwr-en {
|
||||
rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
@ -529,7 +533,7 @@ pmic_int_l: pmic-int-l {
|
||||
};
|
||||
|
||||
vsel1_gpio: vsel1-gpio {
|
||||
rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||
rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||
};
|
||||
|
||||
vsel2_gpio: vsel2-gpio {
|
||||
|
Loading…
Reference in New Issue
Block a user