diff options
author | Bill Chang <billdir@google.com> | 2023-07-13 08:56:48 +0000 |
---|---|---|
committer | Bill Chang <billdir@google.com> | 2023-07-25 02:42:25 +0000 |
commit | 0bc5f54a8751f78b30652bd528b95947b1faca9c (patch) | |
tree | d70d3b65bcbc102731f2fc8432604e627463405a | |
parent | b15ebb0c9e09c6081e2ce5ab2136114e7edf247a (diff) | |
download | shusky-0bc5f54a8751f78b30652bd528b95947b1faca9c.tar.gz |
arm64/dts: shusky: Add GNK VDDA & VDDD before VDDIO
Bug: 290926702
Test: GCA
Change-Id: I8433e2bc74715bbb30166bfd59da8b9bd0d409a4
Signed-off-by: Bill Chang <billdir@google.com>
-rw-r--r-- | dts/google/zuma-husky-camera.dtsi | 138 | ||||
-rw-r--r-- | dts/google/zuma-shiba-camera.dtsi | 110 |
2 files changed, 210 insertions, 38 deletions
diff --git a/dts/google/zuma-husky-camera.dtsi b/dts/google/zuma-husky-camera.dtsi index eb1ed7b..0970e54 100644 --- a/dts/google/zuma-husky-camera.dtsi +++ b/dts/google/zuma-husky-camera.dtsi @@ -259,9 +259,9 @@ "regulator", "regulator"; power-up-seq-delays-us = - <10 - 10 + <500 10 + 750 0 0 2000 @@ -277,10 +277,10 @@ "mclk_off", "reset", "ldo4", - "ldo1", "s2mpg15_ldo12", "s2mpg15_ldo26", "ldo8", + "ldo1", "enable"; power-down-seq-types = "regulator", @@ -300,8 +300,8 @@ 1000 0 0 - 0 - 0 + 500 + 500 0 0>; }; @@ -382,6 +382,8 @@ /* Power supplies */ s2mpg15_ldo26-supply = <&s_ldo26_reg>; s2mpg15_ldo12-supply = <&s_ldo12_reg>; + ldo1-supply = <&slg51002_ldo1>; + ldo8-supply = <&slg51002_ldo8>; gpio3-supply = <&slg51002_gpio3>; clocks = @@ -401,6 +403,8 @@ /* Power up sequence */ power-up-seqs = + "ldo1", + "ldo8", "s2mpg15_ldo26", "s2mpg15_ldo12", "gpio3", @@ -411,11 +415,15 @@ "regulator", "regulator", "regulator", + "regulator", + "regulator", "gpio", "pinctrl", "gpio"; power-up-seq-delays-us = - <0 + <500 + 750 + 0 0 500 500 @@ -429,13 +437,17 @@ "mclk_off", "gpio3", "s2mpg15_ldo12", - "s2mpg15_ldo26"; + "s2mpg15_ldo26", + "ldo8", + "ldo1"; power-down-seq-types = "gpio", "gpio", "pinctrl", "regulator", "regulator", + "regulator", + "regulator", "regulator"; power-down-seq-delays-us = <0 @@ -443,7 +455,9 @@ 1000 0 0 - 1000>; + 500 + 500 + 0>; /* Thread priority */ transaction-thread-priority = <99>; @@ -472,9 +486,11 @@ /* Power supplies */ s2mpg15_ldo12-supply = <&s_ldo12_reg>; + ldo1-supply = <&slg51002_ldo1>; ldo2-supply = <&slg51002_ldo2>; ldo4-supply = <&slg51002_ldo4>; ldo6-supply = <&slg51002_ldo6>; + ldo8-supply = <&slg51002_ldo8>; gpio2-supply = <&slg51002_gpio2>; clocks = @@ -494,6 +510,8 @@ /* Power up sequence */ power-up-seqs = + "ldo1", + "ldo8", "s2mpg15_ldo12", "ldo6", "ldo2", @@ -507,10 +525,14 @@ "regulator", "regulator", "regulator", + "regulator", + "regulator", "pinctrl", "gpio"; power-up-seq-delays-us = - <0 + <500 + 750 + 0 0 0 0 @@ -526,7 +548,9 @@ "ldo4", "ldo2", "ldo6", - "s2mpg15_ldo12"; + "s2mpg15_ldo12", + "ldo8", + "ldo1"; power-down-seq-types = "gpio", "pinctrl", @@ -534,6 +558,8 @@ "regulator", "regulator", "regulator", + "regulator", + "regulator", "regulator"; power-down-seq-delays-us = <1000 @@ -542,7 +568,9 @@ 0 0 0 - 1000>; + 500 + 500 + 0>; /* resume sequence */ resume-seqs = "reset"; @@ -581,9 +609,11 @@ /* Power supplies */ s2mpg15_ldo12-supply = <&s_ldo12_reg>; + ldo1-supply = <&slg51002_ldo1>; ldo3-supply = <&slg51002_ldo3>; ldo5-supply = <&slg51002_ldo5>; ldo7-supply = <&slg51002_ldo7>; + ldo8-supply = <&slg51002_ldo8>; gpio4-supply = <&slg51002_gpio4>; clocks = @@ -603,6 +633,8 @@ /* Power up sequence */ power-up-seqs = + "ldo1", + "ldo8", "s2mpg15_ldo12", "ldo7", "ldo3", @@ -616,10 +648,14 @@ "regulator", "regulator", "regulator", + "regulator", + "regulator", "pinctrl", "gpio"; power-up-seq-delays-us = - <300 + <500 + 750 + 300 0 0 500 @@ -635,6 +671,8 @@ "ldo5", "ldo7", "s2mpg15_ldo12", + "ldo8", + "ldo1", "ldo3"; power-down-seq-types = "gpio", @@ -643,6 +681,8 @@ "regulator", "regulator", "regulator", + "regulator", + "regulator", "regulator"; power-down-seq-delays-us = <0 @@ -650,6 +690,8 @@ 1000 0 0 + 500 + 500 0 0>; @@ -876,28 +918,42 @@ /* Power supplies */ s2mpg15_ldo12-supply = <&s_ldo12_reg>; + ldo1-supply = <&slg51002_ldo1>; ldo4-supply = <&slg51002_ldo4>; + ldo8-supply = <&slg51002_ldo8>; /* Power up sequence */ power-up-seqs = + "ldo1", + "ldo8", "s2mpg15_ldo12", "ldo4"; power-up-seq-types = "regulator", + "regulator", + "regulator", "regulator"; power-up-seq-delays-us = - <0 + <500 + 750 + 0 0>; /* Power down sequence */ power-down-seqs = "ldo4", - "s2mpg15_ldo12"; + "s2mpg15_ldo12", + "ldo8", + "ldo1"; power-down-seq-types = "regulator", + "regulator", + "regulator", "regulator"; power-down-seq-delays-us = <0 + 500 + 500 0>; /* Thread priority */ @@ -923,6 +979,8 @@ /* Power supplies */ s2mpg15_ldo12-supply = <&s_ldo12_reg>; + ldo1-supply = <&slg51002_ldo1>; + ldo8-supply = <&slg51002_ldo8>; shared-enable-gpios = <&s2mpg15_gpio 4 GPIO_ACTIVE_HIGH>; /* Make front AF can be powered up alone */ gpio3-supply = <&slg51002_gpio3>; @@ -930,15 +988,21 @@ /* Power up sequence */ power-up-seqs = + "ldo1", + "ldo8", "s2mpg15_ldo12", "gpio3", "shared-enable"; power-up-seq-types = "regulator", "regulator", + "regulator", + "regulator", "gpio"; power-up-seq-delays-us = - <1000 + <500 + 750 + 1000 500 0>; @@ -946,14 +1010,20 @@ power-down-seqs = "shared-enable", "gpio3", - "s2mpg15_ldo12"; + "s2mpg15_ldo12", + "ldo8", + "ldo1"; power-down-seq-types = "gpio", "regulator", + "regulator", + "regulator", "regulator"; power-down-seq-delays-us = <0 0 + 500 + 500 0>; /* Thread priority */ @@ -1021,11 +1091,15 @@ /* Power supplies */ s2mpg15_ldo12-supply = <&s_ldo12_reg>; + ldo1-supply = <&slg51002_ldo1>; + ldo8-supply = <&slg51002_ldo8>; ldo5-supply = <&slg51002_ldo5>; gpio1-supply = <&slg51002_gpio1>; /* Power up sequence */ power-up-seqs = + "ldo1", + "ldo8", "s2mpg15_ldo12", "ldo5", "gpio1", @@ -1034,9 +1108,13 @@ "regulator", "regulator", "regulator", + "regulator", + "regulator", "gpio"; power-up-seq-delays-us = - <1000 + <500 + 750 + 1000 1000 1000 0>; @@ -1046,16 +1124,22 @@ "reset", "gpio1", "ldo5", - "s2mpg15_ldo12"; + "s2mpg15_ldo12", + "ldo8", + "ldo1"; power-down-seq-types = "gpio", "regulator", "regulator", + "regulator", + "regulator", "regulator"; power-down-seq-delays-us = <1000 1000 1000 + 500 + 500 0>; /* Thread priority */ @@ -1107,6 +1191,8 @@ s2mpg15_ldo12-supply = <&s_ldo12_reg>; /* VADD 3.3V */ s2mpg15_ldo26-supply = <&s_ldo26_reg>; + ldo1-supply = <&slg51002_ldo1>; + ldo8-supply = <&slg51002_ldo8>; /* XAPC_MCLK8: GPP15[0] */ reset-gpios = <&gpp15 0 GPIO_ACTIVE_HIGH>; @@ -1126,17 +1212,23 @@ /* Power up sequence */ power-up-seqs = + "ldo1", + "ldo8", "mclk_off", "s2mpg15_ldo12", "s2mpg15_ldo26", "reset"; power-up-seq-types = + "regulator", + "regulator", "pinctrl", "regulator", "regulator", "gpio"; power-up-seq-delays-us = - <0 + <500 + 750 + 0 0 0 1000>; @@ -1145,14 +1237,20 @@ power-down-seqs = "reset", "s2mpg15_ldo26", - "s2mpg15_ldo12"; + "s2mpg15_ldo12", + "ldo8", + "ldo1"; power-down-seq-types = "gpio", "regulator", + "regulator", + "regulator", "regulator"; power-down-seq-delays-us = <1000 0 + 500 + 500 0>; i2c-lock-group-id = <0>; diff --git a/dts/google/zuma-shiba-camera.dtsi b/dts/google/zuma-shiba-camera.dtsi index f51a47f..ed9cf60 100644 --- a/dts/google/zuma-shiba-camera.dtsi +++ b/dts/google/zuma-shiba-camera.dtsi @@ -287,9 +287,9 @@ "gpio", "pinctrl"; power-up-seq-delays-us = - <10 - 10 + <500 10 + 750 0 2000 1000 @@ -316,9 +316,9 @@ <1000 1000 0 + 500 0 - 0 - 0 + 500 0>; /* Thread priority */ @@ -347,8 +347,10 @@ /* Power supplies */ s2mpg15_ldo12-supply = <&s_ldo12_reg>; + ldo1-supply = <&slg51002_ldo1>; ldo3-supply = <&slg51002_ldo3>; ldo7-supply = <&slg51002_ldo7>; + ldo8-supply = <&slg51002_ldo8>; clocks = <&clock CIS_CLK1>, @@ -367,6 +369,8 @@ /* Power up sequence */ power-up-seqs = + "ldo1", + "ldo8", "s2mpg15_ldo12", "ldo3", "ldo7", @@ -376,10 +380,14 @@ "regulator", "regulator", "regulator", + "regulator", + "regulator", "pinctrl", "gpio"; power-up-seq-delays-us = - <0 + <500 + 750 + 0 0 1000 1000 @@ -391,19 +399,25 @@ "mclk_off", "ldo7", "ldo3", - "s2mpg15_ldo12"; + "s2mpg15_ldo12", + "ldo8", + "ldo1"; power-down-seq-types = "gpio", "pinctrl", "regulator", "regulator", + "regulator", + "regulator", "regulator"; power-down-seq-delays-us = <0 1000 0 0 - 1000>; + 500 + 500 + 0>; /* Thread priority */ transaction-thread-priority = <99>; @@ -432,9 +446,11 @@ /* Power supplies */ s2mpg15_ldo12-supply = <&s_ldo12_reg>; + ldo1-supply = <&slg51002_ldo1>; ldo2-supply = <&slg51002_ldo2>; ldo4-supply = <&slg51002_ldo4>; ldo6-supply = <&slg51002_ldo6>; + ldo8-supply = <&slg51002_ldo8>; clocks = <&clock CIS_CLK0>, @@ -453,6 +469,8 @@ /* Power up sequence */ power-up-seqs = + "ldo1", + "ldo8", "s2mpg15_ldo12", "ldo6", "ldo4", @@ -464,10 +482,14 @@ "regulator", "regulator", "regulator", + "regulator", + "regulator", "pinctrl", "gpio"; power-up-seq-delays-us = - <0 + <500 + 750 + 0 0 0 100 @@ -481,7 +503,9 @@ "ldo2", "ldo4", "ldo6", - "s2mpg15_ldo12"; + "s2mpg15_ldo12", + "ldo8", + "ldo1"; power-down-seq-types = "gpio", "pinctrl", @@ -495,7 +519,9 @@ 0 0 0 - 1000>; + 500 + 500 + 0>; /* resume sequence */ resume-seqs = "reset"; @@ -526,27 +552,41 @@ reg-value-bitwidth = <32>; /* Power supplies */ s2mpg15_ldo12-supply = <&s_ldo12_reg>; + ldo1-supply = <&slg51002_ldo1>; ldo5-supply = <&slg51002_ldo5>; + ldo8-supply = <&slg51002_ldo8>; /* Power up sequence */ power-up-seqs = + "ldo1", + "ldo8", "s2mpg15_ldo12", "ldo5"; power-up-seq-types = "regulator", + "regulator", + "regulator", "regulator"; power-up-seq-delays-us = - <1000 + <500 + 750 + 1000 1000>; /* Power down sequence */ power-down-seqs = "ldo5", - "s2mpg15_ldo12"; + "s2mpg15_ldo12", + "ldo8", + "ldo1"; power-down-seq-types = "regulator", + "regulator", + "regulator", "regulator"; power-down-seq-delays-us = <1000 - 1000>; + 500 + 500 + 0>; i2c-lock-group-id = <0>; }; @@ -642,28 +682,42 @@ /* Power supplies */ s2mpg15_ldo12-supply = <&s_ldo12_reg>; + ldo1-supply = <&slg51002_ldo1>; ldo4-supply = <&slg51002_ldo4>; + ldo8-supply = <&slg51002_ldo8>; /* Power up sequence */ power-up-seqs = + "ldo1", + "ldo8", "s2mpg15_ldo12", "ldo4"; power-up-seq-types = "regulator", + "regulator", + "regulator", "regulator"; power-up-seq-delays-us = - <0 + <500 + 750 + 0 0>; /* Power down sequence */ power-down-seqs = "ldo4", - "s2mpg15_ldo12"; + "s2mpg15_ldo12", + "ldo8", + "ldo1"; power-down-seq-types = "regulator", + "regulator", + "regulator", "regulator"; power-down-seq-delays-us = <0 + 500 + 500 0>; /* Thread priority */ @@ -689,17 +743,25 @@ /* Power supplies */ s2mpg15_ldo12-supply = <&s_ldo12_reg>; + ldo1-supply = <&slg51002_ldo1>; ldo4-supply = <&slg51002_ldo4>; + ldo8-supply = <&slg51002_ldo8>; /* Power up sequence */ power-up-seqs = + "ldo1", + "ldo8", "s2mpg15_ldo12", "ldo4"; power-up-seq-types = "regulator", + "regulator", + "regulator", "regulator"; power-up-seq-delays-us = - <0 + <500 + 750 + 0 0>; /* Power down sequence */ @@ -736,20 +798,28 @@ /* Power supplies */ s2mpg15_ldo12-supply = <&s_ldo12_reg>; + ldo1-supply = <&slg51002_ldo1>; ldo5-supply = <&slg51002_ldo5>; + ldo8-supply = <&slg51002_ldo8>; gpio4-supply = <&slg51002_gpio4>; /* Power up sequence */ power-up-seqs = + "ldo1", + "ldo8", "s2mpg15_ldo12", "ldo5", "gpio4"; power-up-seq-types = "regulator", "regulator", + "regulator", + "regulator", "regulator"; power-up-seq-delays-us = - <1000 + <500 + 750 + 1000 1000 1000>; @@ -757,7 +827,9 @@ power-down-seqs = "gpio4", "ldo5", - "s2mpg15_ldo12"; + "s2mpg15_ldo12", + "ldo8", + "ldo1"; power-down-seq-types = "regulator", "regulator", @@ -765,6 +837,8 @@ power-down-seq-delays-us = <5000 4000 + 500 + 500 0>; /* Thread priority */ |