| Message ID | 20181210094358.3241-6-markz@nvidia.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | NVIDIA Shield TV device tree patch set | expand |
On Mon, Dec 10, 2018 at 05:43:58PM +0800, Mark Zhang wrote: > Add regulators to the Tegra210 Darcy DTS file including support for > the MAX77620 PMIC. > > Signed-off-by: Mark Zhang <markz@nvidia.com> > --- > .../arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 438 ++++++++++++++++++ > 1 file changed, 438 insertions(+) > > diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi > index c3b8e74de3f0..541f23199cca 100644 > --- a/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi > +++ b/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi > @@ -1,6 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 > > #include <dt-bindings/input/input.h> > +#include <dt-bindings/mfd/max77620.h> > #include <dt-bindings/pinctrl/pinctrl-tegra.h> > #include "tegra210.dtsi" > > @@ -1324,6 +1325,237 @@ > status = "okay"; > }; > > + i2c@7000d000 { > + status = "okay"; > + clock-frequency = <400000>; > + > + max77620: max77620@3c { > + compatible = "maxim,max77620"; > + reg = <0x3c>; > + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; > + > + #interrupt-cells = <2>; > + interrupt-controller; > + > + gpio-controller; > + #gpio-cells = <2>; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&max77620_default>; > + > + max77620_default: pinmux@0 { > + pin_gpio0 { > + pins = "gpio0"; > + function = "gpio"; > + }; > + > + pin_gpio1 { > + pins = "gpio1"; > + function = "fps-out"; > + drive-push-pull = <1>; > + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; > + maxim,active-fps-power-up-slot = <7>; > + maxim,active-fps-power-down-slot = <0>; > + }; > + > + pin_gpio2_3 { > + pins = "gpio2", "gpio3"; > + function = "fps-out"; > + drive-open-drain = <1>; > + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; > + }; > + > + pin_gpio4 { > + pins = "gpio4"; > + function = "32k-out1"; > + }; > + > + pin_gpio5_6_7 { > + pins = "gpio5", "gpio6", "gpio7"; > + function = "gpio"; > + drive-push-pull = <1>; > + }; > + > + pin_gpio2 { > + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; > + }; > + > + pin_gpio3 { > + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; > + }; > + }; > + > + spmic-default-output-high { > + gpio-hog; > + output-high; > + gpios = <2 0 7 0>; I think these 0's should be GPIO_ACTIVE_HIGH. > + line-name = "spmic-default-output-high"; This is unnecessary. According to the binding: - line-name: The GPIO label name. If not present the node name is used. > + }; > + > + fps { > + #address-cells = <1>; > + #size-cells = <0>; > + fps0 { For readability I recommend a blank line between the above two lines. > + reg = <0>; > + maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN0>; > + }; > + > + fps1 { > + reg = <1>; > + maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN1>; > + maxim,device-state-on-disabled-event = <MAX77620_FPS_INACTIVE_STATE_SLEEP>; > + }; > + > + fps2 { > + reg = <2>; > + maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN0>; > + }; > + }; > + > + regulators { > + in-ldo0-1-supply = <&max77620_sd2>; > + in-ldo7-8-supply = <&max77620_sd2>; > + > + max77620_sd0: sd0 { > + regulator-name = "vdd-core"; > + regulator-min-microvolt = <600000>; > + regulator-max-microvolt = <1400000>; > + regulator-boot-on; > + regulator-always-on; > + maxim,active-fps-power-up-slot = <0>; > + maxim,active-fps-source = <MAX77620_FPS_SRC_1>; > + regulator-enable-ramp-delay = <146>; > + regulator-ramp-delay = <27500>; I think there's a (perhaps unwritten) rule that standard properties go before vendor-specific properties, so you should sort all regulator-* properties together, followed by maxim,* properties. Perhaps throw in a blank line as separator between the two blocks for extra readability. Also, I usually see boolean properties sorted below those with an explicit value. So regulator-enable-ramp-delay and regulator-ramp-delay should go before regulator-boot-on and regulator-always-on. Same goes for all the nodes below. > + }; > + > + max77620_sd1: sd1 { > + regulator-name = "vddio-ddr"; > + regulator-always-on; > + regulator-boot-on; > + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; > + regulator-enable-ramp-delay = <130>; > + regulator-ramp-delay = <27500>; > + }; > + > + max77620_sd2: sd2 { > + regulator-name = "vdd-pre-reg"; > + regulator-always-on; > + regulator-boot-on; > + maxim,active-fps-source = <MAX77620_FPS_SRC_1>; > + maxim,suspend-fps-source = <MAX77620_FPS_SRC_NONE>; > + regulator-enable-ramp-delay = <176>; > + regulator-ramp-delay = <27500>; > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + }; > + > + max77620_sd3: sd3 { > + regulator-name = "vdd-1v8"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-always-on; > + regulator-boot-on; > + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; > + regulator-enable-ramp-delay = <242>; > + regulator-ramp-delay = <27500>; > + }; > + > + max77620_ldo0: ldo0 { > + regulator-name = "avdd-sys"; > + regulator-min-microvolt = <1200000>; > + regulator-max-microvolt = <1200000>; > + regulator-boot-on; > + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; > + regulator-enable-ramp-delay = <26>; > + regulator-ramp-delay = <100000>; > + }; > + > + max77620_ldo1: ldo1 { > + regulator-name = "vdd-pex"; > + regulator-min-microvolt = <1075000>; > + regulator-max-microvolt = <1075000>; > + regulator-always-on; > + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; > + regulator-enable-ramp-delay = <22>; > + regulator-ramp-delay = <100000>; > + }; > + > + max77620_ldo2: ldo2 { > + regulator-name = "vddio-sdmmc3"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3300000>; > + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; > + regulator-enable-ramp-delay = <62>; > + regulator-ramp-delay = <100000>; > + }; > + > + max77620_ldo3: ldo3 { > + regulator-name = "vdd-3v3-eth"; > + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + regulator-boot-on; > + regulator-enable-ramp-delay = <50>; > + regulator-ramp-delay = <100000>; > + }; > + > + max77620_ldo4: ldo4 { > + regulator-name = "vdd-rtc"; > + regulator-min-microvolt = <850000>; > + regulator-max-microvolt = <850000>; > + regulator-always-on; > + regulator-boot-on; > + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; > + regulator-enable-ramp-delay = <22>; > + regulator-ramp-delay = <100000>; > + }; > + > + max77620_ldo5: ldo5 { > + regulator-name = "avdd-ts-hv"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; > + regulator-enable-ramp-delay = <62>; > + regulator-ramp-delay = <100000>; > + }; > + > + max77620_ldo6: ldo6 { > + regulator-name = "vdd-ts"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-boot-on; > + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; > + regulator-enable-ramp-delay = <36>; > + regulator-ramp-delay = <100000>; > + }; > + > + max77620_ldo7: ldo7 { > + regulator-name = "vdd-gen-pll-edp"; > + regulator-min-microvolt = <1050000>; > + regulator-max-microvolt = <1050000>; > + regulator-always-on; > + regulator-boot-on; > + maxim,active-fps-source = <MAX77620_FPS_SRC_1>; > + maxim,suspend-fps-source = <MAX77620_FPS_SRC_NONE>; > + regulator-enable-ramp-delay = <24>; > + regulator-ramp-delay = <100000>; > + }; > + > + max77620_ldo8: ldo8 { > + regulator-name = "vdd-hdmi-dp"; > + regulator-min-microvolt = <1050000>; > + regulator-max-microvolt = <1050000>; > + regulator-boot-on; > + regulator-always-on; > + maxim,active-fps-source = <MAX77620_FPS_SRC_1>; > + regulator-enable-ramp-delay = <22>; > + regulator-ramp-delay = <100000>; > + }; > + }; > + }; > + }; > + > pmc@7000e400 { > nvidia,invert-interrupt; > nvidia,suspend-mode = <0>; > @@ -1391,4 +1623,210 @@ > compatible = "arm,psci-1.0"; > method = "smc"; > }; > + > + regulators { > + compatible = "simple-bus"; > + device_type = "fixed-regulators"; > + #address-cells = <1>; > + #size-cells = <0>; > + > + battery_reg: regulator@0 { > + compatible = "regulator-fixed"; > + reg = <0>; > + regulator-name = "vdd-ac-bat"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + regulator-always-on; > + }; > + > + vdd_3v3: regulator@1 { > + compatible = "regulator-fixed"; > + reg = <1>; > + regulator-name = "vdd-3v3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + gpio = <&max77620 3 0>; > + enable-active-high; > + regulator-enable-ramp-delay = <160>; Again, this belongs with the other regulator-* properties. And a blank line to separate regulator-* from GPIO related properties would be good too. Also, the "0" in the gpio property should be GPIO_ACTIVE_HIGH. Same comments for other nodes below. > + }; > + > + max77620_gpio7: regulator@2 { > + compatible = "regulator-fixed"; > + reg = <2>; > + regulator-name = "max77620-gpio7"; > + regulator-min-microvolt = <1200000>; > + regulator-max-microvolt = <1200000>; > + regulator-boot-on; > + gpio = <&max77620 7 0>; > + enable-active-high; > + vin-supply = <&max77620_ldo0>; > + regulator-always-on; > + regulator-enable-ramp-delay = <240>; > + }; > + > + lcd_bl_en: regulator@3 { > + compatible = "regulator-fixed"; > + reg = <3>; > + regulator-name = "lcd-bl-en"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-boot-on; > + gpio = <&gpio TEGRA_GPIO(V, 1) 0>; > + enable-active-high; > + }; > + > + en_vdd_sd: regulator@4 { > + compatible = "regulator-fixed"; > + reg = <4>; > + regulator-name = "en-vdd-sd"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + gpio = <&gpio TEGRA_GPIO(Z, 4) 0>; > + enable-active-high; > + vin-supply = <&vdd_3v3>; > + regulator-enable-ramp-delay = <472>; > + }; > + > + en_vdd_cam: regulator@5 { > + compatible = "regulator-fixed"; > + reg = <5>; > + regulator-name = "en-vdd-cam"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + gpio = <&gpio TEGRA_GPIO(S, 4) 0>; > + enable-active-high; > + }; > + > + vdd_sys_boost: regulator@6 { > + compatible = "regulator-fixed"; > + reg = <6>; > + regulator-name = "vdd-sys-boost"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + regulator-always-on; > + gpio = <&max77620 1 0>; > + enable-active-high; > + regulator-enable-ramp-delay = <3090>; > + }; > + > + vdd_hdmi: regulator@7 { > + compatible = "regulator-fixed"; > + reg = <7>; > + regulator-name = "vdd-hdmi"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + gpio = <&gpio TEGRA_GPIO(CC, 7) 0>; > + enable-active-high; > + regulator-boot-on; > + vin-supply = <&vdd_sys_boost>; > + regulator-enable-ramp-delay = <468>; > + }; > + > + en_vdd_cpu_fixed: regulator@8 { > + compatible = "regulator-fixed"; > + reg = <8>; > + regulator-name = "vdd-cpu-fixed"; > + regulator-min-microvolt = <1000000>; > + regulator-max-microvolt = <1000000>; > + }; > + > + vdd_aux_3v3: regulator@9 { > + compatible = "regulator-fixed"; > + reg = <9>; > + regulator-name = "aux-3v3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + }; > + > + vdd_snsr_pm: regulator@10 { > + compatible = "regulator-fixed"; > + reg = <10>; > + regulator-name = "snsr_pm"; > + enable-active-high; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + }; > + > + vdd_usb_5v0: regulator@11 { > + compatible = "regulator-fixed"; > + reg = <11>; > + status = "disabled"; > + regulator-name = "vdd-usb-5v0"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + vin-supply = <&vdd_3v3>; > + enable-active-high; > + }; > + > + vdd_cdc_1v2_aud: regulator@101 { > + compatible = "regulator-fixed"; > + reg = <101>; > + status = "disabled"; > + regulator-name = "vdd_cdc_1v2_aud"; > + regulator-min-microvolt = <1200000>; > + regulator-max-microvolt = <1200000>; > + enable-active-high; > + startup-delay-us = <250000>; > + }; > + > + vdd_disp_3v0: regulator@12 { > + compatible = "regulator-fixed"; > + reg = <12>; > + regulator-name = "vdd-disp-3v0"; > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + gpio = <&gpio TEGRA_GPIO(I, 3) 0>; > + regulator-always-on; > + enable-active-high; > + regulator-enable-ramp-delay = <232>; > + }; > + > + vdd_fan: regulator@13 { > + compatible = "regulator-fixed"; > + reg = <13>; > + regulator-name = "vdd-fan"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + gpio = <&gpio TEGRA_GPIO(E, 4) 0>; > + enable-active-high; > + regulator-enable-ramp-delay = <284>; > + }; > + > + usb_vbus1: regulator@14 { > + compatible = "regulator-fixed"; > + reg = <14>; > + regulator-name = "usb-vbus1"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + gpio = <&gpio TEGRA_GPIO(CC, 5) 0>; > + enable-active-high; > + gpio-open-drain; > + }; > + > + usb_vbus2: regulator@15 { > + compatible = "regulator-fixed"; > + reg = <15>; > + regulator-name = "usb-vbus2"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + gpio = <&gpio TEGRA_GPIO(CC, 4) 0>; > + enable-active-high; > + gpio-open-drain; > + }; > + > + vdd_3v3_eth: regulator@16 { > + compatible = "regulator-fixed"; > + reg = <16>; > + regulator-name = "vdd-3v3-eth-a02"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + gpio = <&gpio TEGRA_GPIO(D, 4) 0>; > + regulator-always-on; > + regulator-boot-on; > + enable-active-high; > + gpio-open-drain; > + regulator-disable-on-shutdown; I can't find this "regulator-disable-on-shutdown" anywhere in the kernel. Can it just be dropped? Thierry
All comments make sense and will be addressed in next version, thanks Thierry. BTW, I saw that "enable-active-high" and "gpio-open-drain" have been removed from fixed regulator driver. It seems that they will be handled in gpiolib so I guess it should not have impact on DTS? Anyway let me know if dts needs to be changed as well. Mark On 12/10/2018 6:41 PM, Thierry Reding wrote: > On Mon, Dec 10, 2018 at 05:43:58PM +0800, Mark Zhang wrote: >> Add regulators to the Tegra210 Darcy DTS file including support for >> the MAX77620 PMIC. >> >> Signed-off-by: Mark Zhang <markz@nvidia.com> >> --- >> .../arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 438 ++++++++++++++++++ >> 1 file changed, 438 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi >> index c3b8e74de3f0..541f23199cca 100644 >> --- a/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi >> +++ b/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi >> @@ -1,6 +1,7 @@ >> // SPDX-License-Identifier: GPL-2.0 >> >> #include <dt-bindings/input/input.h> >> +#include <dt-bindings/mfd/max77620.h> >> #include <dt-bindings/pinctrl/pinctrl-tegra.h> >> #include "tegra210.dtsi" >> >> @@ -1324,6 +1325,237 @@ >> status = "okay"; >> }; >> >> + i2c@7000d000 { >> + status = "okay"; >> + clock-frequency = <400000>; >> + >> + max77620: max77620@3c { >> + compatible = "maxim,max77620"; >> + reg = <0x3c>; >> + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; >> + >> + #interrupt-cells = <2>; >> + interrupt-controller; >> + >> + gpio-controller; >> + #gpio-cells = <2>; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&max77620_default>; >> + >> + max77620_default: pinmux@0 { >> + pin_gpio0 { >> + pins = "gpio0"; >> + function = "gpio"; >> + }; >> + >> + pin_gpio1 { >> + pins = "gpio1"; >> + function = "fps-out"; >> + drive-push-pull = <1>; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; >> + maxim,active-fps-power-up-slot = <7>; >> + maxim,active-fps-power-down-slot = <0>; >> + }; >> + >> + pin_gpio2_3 { >> + pins = "gpio2", "gpio3"; >> + function = "fps-out"; >> + drive-open-drain = <1>; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; >> + }; >> + >> + pin_gpio4 { >> + pins = "gpio4"; >> + function = "32k-out1"; >> + }; >> + >> + pin_gpio5_6_7 { >> + pins = "gpio5", "gpio6", "gpio7"; >> + function = "gpio"; >> + drive-push-pull = <1>; >> + }; >> + >> + pin_gpio2 { >> + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; >> + }; >> + >> + pin_gpio3 { >> + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; >> + }; >> + }; >> + >> + spmic-default-output-high { >> + gpio-hog; >> + output-high; >> + gpios = <2 0 7 0>; > > I think these 0's should be GPIO_ACTIVE_HIGH. > >> + line-name = "spmic-default-output-high"; > > This is unnecessary. According to the binding: > > - line-name: The GPIO label name. If not present the node name is used. > >> + }; >> + >> + fps { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + fps0 { > > For readability I recommend a blank line between the above two lines. > >> + reg = <0>; >> + maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN0>; >> + }; >> + >> + fps1 { >> + reg = <1>; >> + maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN1>; >> + maxim,device-state-on-disabled-event = <MAX77620_FPS_INACTIVE_STATE_SLEEP>; >> + }; >> + >> + fps2 { >> + reg = <2>; >> + maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN0>; >> + }; >> + }; >> + >> + regulators { >> + in-ldo0-1-supply = <&max77620_sd2>; >> + in-ldo7-8-supply = <&max77620_sd2>; >> + >> + max77620_sd0: sd0 { >> + regulator-name = "vdd-core"; >> + regulator-min-microvolt = <600000>; >> + regulator-max-microvolt = <1400000>; >> + regulator-boot-on; >> + regulator-always-on; >> + maxim,active-fps-power-up-slot = <0>; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_1>; >> + regulator-enable-ramp-delay = <146>; >> + regulator-ramp-delay = <27500>; > > I think there's a (perhaps unwritten) rule that standard properties go > before vendor-specific properties, so you should sort all regulator-* > properties together, followed by maxim,* properties. Perhaps throw in a > blank line as separator between the two blocks for extra readability. > > Also, I usually see boolean properties sorted below those with an > explicit value. So regulator-enable-ramp-delay and regulator-ramp-delay > should go before regulator-boot-on and regulator-always-on. > > Same goes for all the nodes below. > >> + }; >> + >> + max77620_sd1: sd1 { >> + regulator-name = "vddio-ddr"; >> + regulator-always-on; >> + regulator-boot-on; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; >> + regulator-enable-ramp-delay = <130>; >> + regulator-ramp-delay = <27500>; >> + }; >> + >> + max77620_sd2: sd2 { >> + regulator-name = "vdd-pre-reg"; >> + regulator-always-on; >> + regulator-boot-on; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_1>; >> + maxim,suspend-fps-source = <MAX77620_FPS_SRC_NONE>; >> + regulator-enable-ramp-delay = <176>; >> + regulator-ramp-delay = <27500>; >> + regulator-min-microvolt = <3000000>; >> + regulator-max-microvolt = <3000000>; >> + }; >> + >> + max77620_sd3: sd3 { >> + regulator-name = "vdd-1v8"; >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <1800000>; >> + regulator-always-on; >> + regulator-boot-on; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; >> + regulator-enable-ramp-delay = <242>; >> + regulator-ramp-delay = <27500>; >> + }; >> + >> + max77620_ldo0: ldo0 { >> + regulator-name = "avdd-sys"; >> + regulator-min-microvolt = <1200000>; >> + regulator-max-microvolt = <1200000>; >> + regulator-boot-on; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; >> + regulator-enable-ramp-delay = <26>; >> + regulator-ramp-delay = <100000>; >> + }; >> + >> + max77620_ldo1: ldo1 { >> + regulator-name = "vdd-pex"; >> + regulator-min-microvolt = <1075000>; >> + regulator-max-microvolt = <1075000>; >> + regulator-always-on; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; >> + regulator-enable-ramp-delay = <22>; >> + regulator-ramp-delay = <100000>; >> + }; >> + >> + max77620_ldo2: ldo2 { >> + regulator-name = "vddio-sdmmc3"; >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <3300000>; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; >> + regulator-enable-ramp-delay = <62>; >> + regulator-ramp-delay = <100000>; >> + }; >> + >> + max77620_ldo3: ldo3 { >> + regulator-name = "vdd-3v3-eth"; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-always-on; >> + regulator-boot-on; >> + regulator-enable-ramp-delay = <50>; >> + regulator-ramp-delay = <100000>; >> + }; >> + >> + max77620_ldo4: ldo4 { >> + regulator-name = "vdd-rtc"; >> + regulator-min-microvolt = <850000>; >> + regulator-max-microvolt = <850000>; >> + regulator-always-on; >> + regulator-boot-on; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; >> + regulator-enable-ramp-delay = <22>; >> + regulator-ramp-delay = <100000>; >> + }; >> + >> + max77620_ldo5: ldo5 { >> + regulator-name = "avdd-ts-hv"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; >> + regulator-enable-ramp-delay = <62>; >> + regulator-ramp-delay = <100000>; >> + }; >> + >> + max77620_ldo6: ldo6 { >> + regulator-name = "vdd-ts"; >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <1800000>; >> + regulator-boot-on; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; >> + regulator-enable-ramp-delay = <36>; >> + regulator-ramp-delay = <100000>; >> + }; >> + >> + max77620_ldo7: ldo7 { >> + regulator-name = "vdd-gen-pll-edp"; >> + regulator-min-microvolt = <1050000>; >> + regulator-max-microvolt = <1050000>; >> + regulator-always-on; >> + regulator-boot-on; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_1>; >> + maxim,suspend-fps-source = <MAX77620_FPS_SRC_NONE>; >> + regulator-enable-ramp-delay = <24>; >> + regulator-ramp-delay = <100000>; >> + }; >> + >> + max77620_ldo8: ldo8 { >> + regulator-name = "vdd-hdmi-dp"; >> + regulator-min-microvolt = <1050000>; >> + regulator-max-microvolt = <1050000>; >> + regulator-boot-on; >> + regulator-always-on; >> + maxim,active-fps-source = <MAX77620_FPS_SRC_1>; >> + regulator-enable-ramp-delay = <22>; >> + regulator-ramp-delay = <100000>; >> + }; >> + }; >> + }; >> + }; >> + >> pmc@7000e400 { >> nvidia,invert-interrupt; >> nvidia,suspend-mode = <0>; >> @@ -1391,4 +1623,210 @@ >> compatible = "arm,psci-1.0"; >> method = "smc"; >> }; >> + >> + regulators { >> + compatible = "simple-bus"; >> + device_type = "fixed-regulators"; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + battery_reg: regulator@0 { >> + compatible = "regulator-fixed"; >> + reg = <0>; >> + regulator-name = "vdd-ac-bat"; >> + regulator-min-microvolt = <5000000>; >> + regulator-max-microvolt = <5000000>; >> + regulator-always-on; >> + }; >> + >> + vdd_3v3: regulator@1 { >> + compatible = "regulator-fixed"; >> + reg = <1>; >> + regulator-name = "vdd-3v3"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-always-on; >> + gpio = <&max77620 3 0>; >> + enable-active-high; >> + regulator-enable-ramp-delay = <160>; > > Again, this belongs with the other regulator-* properties. And a blank > line to separate regulator-* from GPIO related properties would be good > too. > > Also, the "0" in the gpio property should be GPIO_ACTIVE_HIGH. > > Same comments for other nodes below. > >> + }; >> + >> + max77620_gpio7: regulator@2 { >> + compatible = "regulator-fixed"; >> + reg = <2>; >> + regulator-name = "max77620-gpio7"; >> + regulator-min-microvolt = <1200000>; >> + regulator-max-microvolt = <1200000>; >> + regulator-boot-on; >> + gpio = <&max77620 7 0>; >> + enable-active-high; >> + vin-supply = <&max77620_ldo0>; >> + regulator-always-on; >> + regulator-enable-ramp-delay = <240>; >> + }; >> + >> + lcd_bl_en: regulator@3 { >> + compatible = "regulator-fixed"; >> + reg = <3>; >> + regulator-name = "lcd-bl-en"; >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <1800000>; >> + regulator-boot-on; >> + gpio = <&gpio TEGRA_GPIO(V, 1) 0>; >> + enable-active-high; >> + }; >> + >> + en_vdd_sd: regulator@4 { >> + compatible = "regulator-fixed"; >> + reg = <4>; >> + regulator-name = "en-vdd-sd"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + gpio = <&gpio TEGRA_GPIO(Z, 4) 0>; >> + enable-active-high; >> + vin-supply = <&vdd_3v3>; >> + regulator-enable-ramp-delay = <472>; >> + }; >> + >> + en_vdd_cam: regulator@5 { >> + compatible = "regulator-fixed"; >> + reg = <5>; >> + regulator-name = "en-vdd-cam"; >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <1800000>; >> + gpio = <&gpio TEGRA_GPIO(S, 4) 0>; >> + enable-active-high; >> + }; >> + >> + vdd_sys_boost: regulator@6 { >> + compatible = "regulator-fixed"; >> + reg = <6>; >> + regulator-name = "vdd-sys-boost"; >> + regulator-min-microvolt = <5000000>; >> + regulator-max-microvolt = <5000000>; >> + regulator-always-on; >> + gpio = <&max77620 1 0>; >> + enable-active-high; >> + regulator-enable-ramp-delay = <3090>; >> + }; >> + >> + vdd_hdmi: regulator@7 { >> + compatible = "regulator-fixed"; >> + reg = <7>; >> + regulator-name = "vdd-hdmi"; >> + regulator-min-microvolt = <5000000>; >> + regulator-max-microvolt = <5000000>; >> + gpio = <&gpio TEGRA_GPIO(CC, 7) 0>; >> + enable-active-high; >> + regulator-boot-on; >> + vin-supply = <&vdd_sys_boost>; >> + regulator-enable-ramp-delay = <468>; >> + }; >> + >> + en_vdd_cpu_fixed: regulator@8 { >> + compatible = "regulator-fixed"; >> + reg = <8>; >> + regulator-name = "vdd-cpu-fixed"; >> + regulator-min-microvolt = <1000000>; >> + regulator-max-microvolt = <1000000>; >> + }; >> + >> + vdd_aux_3v3: regulator@9 { >> + compatible = "regulator-fixed"; >> + reg = <9>; >> + regulator-name = "aux-3v3"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + }; >> + >> + vdd_snsr_pm: regulator@10 { >> + compatible = "regulator-fixed"; >> + reg = <10>; >> + regulator-name = "snsr_pm"; >> + enable-active-high; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + }; >> + >> + vdd_usb_5v0: regulator@11 { >> + compatible = "regulator-fixed"; >> + reg = <11>; >> + status = "disabled"; >> + regulator-name = "vdd-usb-5v0"; >> + regulator-min-microvolt = <5000000>; >> + regulator-max-microvolt = <5000000>; >> + vin-supply = <&vdd_3v3>; >> + enable-active-high; >> + }; >> + >> + vdd_cdc_1v2_aud: regulator@101 { >> + compatible = "regulator-fixed"; >> + reg = <101>; >> + status = "disabled"; >> + regulator-name = "vdd_cdc_1v2_aud"; >> + regulator-min-microvolt = <1200000>; >> + regulator-max-microvolt = <1200000>; >> + enable-active-high; >> + startup-delay-us = <250000>; >> + }; >> + >> + vdd_disp_3v0: regulator@12 { >> + compatible = "regulator-fixed"; >> + reg = <12>; >> + regulator-name = "vdd-disp-3v0"; >> + regulator-min-microvolt = <3000000>; >> + regulator-max-microvolt = <3000000>; >> + gpio = <&gpio TEGRA_GPIO(I, 3) 0>; >> + regulator-always-on; >> + enable-active-high; >> + regulator-enable-ramp-delay = <232>; >> + }; >> + >> + vdd_fan: regulator@13 { >> + compatible = "regulator-fixed"; >> + reg = <13>; >> + regulator-name = "vdd-fan"; >> + regulator-min-microvolt = <5000000>; >> + regulator-max-microvolt = <5000000>; >> + gpio = <&gpio TEGRA_GPIO(E, 4) 0>; >> + enable-active-high; >> + regulator-enable-ramp-delay = <284>; >> + }; >> + >> + usb_vbus1: regulator@14 { >> + compatible = "regulator-fixed"; >> + reg = <14>; >> + regulator-name = "usb-vbus1"; >> + regulator-min-microvolt = <5000000>; >> + regulator-max-microvolt = <5000000>; >> + gpio = <&gpio TEGRA_GPIO(CC, 5) 0>; >> + enable-active-high; >> + gpio-open-drain; >> + }; >> + >> + usb_vbus2: regulator@15 { >> + compatible = "regulator-fixed"; >> + reg = <15>; >> + regulator-name = "usb-vbus2"; >> + regulator-min-microvolt = <5000000>; >> + regulator-max-microvolt = <5000000>; >> + gpio = <&gpio TEGRA_GPIO(CC, 4) 0>; >> + enable-active-high; >> + gpio-open-drain; >> + }; >> + >> + vdd_3v3_eth: regulator@16 { >> + compatible = "regulator-fixed"; >> + reg = <16>; >> + regulator-name = "vdd-3v3-eth-a02"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + gpio = <&gpio TEGRA_GPIO(D, 4) 0>; >> + regulator-always-on; >> + regulator-boot-on; >> + enable-active-high; >> + gpio-open-drain; >> + regulator-disable-on-shutdown; > > I can't find this "regulator-disable-on-shutdown" anywhere in the > kernel. Can it just be dropped? > > Thierry >
On Tue, Dec 11, 2018 at 11:01:07AM +0800, Mark Zhang wrote: > All comments make sense and will be addressed in next version, thanks > Thierry. > > BTW, I saw that "enable-active-high" and "gpio-open-drain" have been > removed from fixed regulator driver. It seems that they will be handled > in gpiolib so I guess it should not have impact on DTS? Anyway let me > know if dts needs to be changed as well. Looks to me like enable-active-high is handled in of_gpio_flags_quirks() and gpio-open-drain is completely ignored for "regulator-fixed". I think the enable-active-high should stay, but from the above it sounds like it should all still work if you just remove "gpio-open-drain". Thierry
On 12/11/2018 6:14 PM, Thierry Reding wrote: > On Tue, Dec 11, 2018 at 11:01:07AM +0800, Mark Zhang wrote: >> All comments make sense and will be addressed in next version, thanks >> Thierry. >> >> BTW, I saw that "enable-active-high" and "gpio-open-drain" have been >> removed from fixed regulator driver. It seems that they will be handled >> in gpiolib so I guess it should not have impact on DTS? Anyway let me >> know if dts needs to be changed as well. > > Looks to me like enable-active-high is handled in of_gpio_flags_quirks() > and gpio-open-drain is completely ignored for "regulator-fixed". I think > the enable-active-high should stay, but from the above it sounds like it > should all still work if you just remove "gpio-open-drain". > Yeah actually gpio-open-drain is also parsed in of_gpio_flags_quirks, but it's only done when the compatible string is: reg-fixed-voltage. Is this an old compatible name of "regulator-fixed"? Besides, the code shows that we need to update the DTS: pr_info("%s uses legacy open drain flag - update the DTS if you can\n", of_node_full_name(np)); Does "update DTS if you can" mean to remove the gpio-open-drain? Mark > Thierry >
diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi index c3b8e74de3f0..541f23199cca 100644 --- a/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include <dt-bindings/input/input.h> +#include <dt-bindings/mfd/max77620.h> #include <dt-bindings/pinctrl/pinctrl-tegra.h> #include "tegra210.dtsi" @@ -1324,6 +1325,237 @@ status = "okay"; }; + i2c@7000d000 { + status = "okay"; + clock-frequency = <400000>; + + max77620: max77620@3c { + compatible = "maxim,max77620"; + reg = <0x3c>; + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; + + #interrupt-cells = <2>; + interrupt-controller; + + gpio-controller; + #gpio-cells = <2>; + + pinctrl-names = "default"; + pinctrl-0 = <&max77620_default>; + + max77620_default: pinmux@0 { + pin_gpio0 { + pins = "gpio0"; + function = "gpio"; + }; + + pin_gpio1 { + pins = "gpio1"; + function = "fps-out"; + drive-push-pull = <1>; + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; + maxim,active-fps-power-up-slot = <7>; + maxim,active-fps-power-down-slot = <0>; + }; + + pin_gpio2_3 { + pins = "gpio2", "gpio3"; + function = "fps-out"; + drive-open-drain = <1>; + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; + }; + + pin_gpio4 { + pins = "gpio4"; + function = "32k-out1"; + }; + + pin_gpio5_6_7 { + pins = "gpio5", "gpio6", "gpio7"; + function = "gpio"; + drive-push-pull = <1>; + }; + + pin_gpio2 { + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; + }; + + pin_gpio3 { + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; + }; + }; + + spmic-default-output-high { + gpio-hog; + output-high; + gpios = <2 0 7 0>; + line-name = "spmic-default-output-high"; + }; + + fps { + #address-cells = <1>; + #size-cells = <0>; + fps0 { + reg = <0>; + maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN0>; + }; + + fps1 { + reg = <1>; + maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN1>; + maxim,device-state-on-disabled-event = <MAX77620_FPS_INACTIVE_STATE_SLEEP>; + }; + + fps2 { + reg = <2>; + maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN0>; + }; + }; + + regulators { + in-ldo0-1-supply = <&max77620_sd2>; + in-ldo7-8-supply = <&max77620_sd2>; + + max77620_sd0: sd0 { + regulator-name = "vdd-core"; + regulator-min-microvolt = <600000>; + regulator-max-microvolt = <1400000>; + regulator-boot-on; + regulator-always-on; + maxim,active-fps-power-up-slot = <0>; + maxim,active-fps-source = <MAX77620_FPS_SRC_1>; + regulator-enable-ramp-delay = <146>; + regulator-ramp-delay = <27500>; + }; + + max77620_sd1: sd1 { + regulator-name = "vddio-ddr"; + regulator-always-on; + regulator-boot-on; + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; + regulator-enable-ramp-delay = <130>; + regulator-ramp-delay = <27500>; + }; + + max77620_sd2: sd2 { + regulator-name = "vdd-pre-reg"; + regulator-always-on; + regulator-boot-on; + maxim,active-fps-source = <MAX77620_FPS_SRC_1>; + maxim,suspend-fps-source = <MAX77620_FPS_SRC_NONE>; + regulator-enable-ramp-delay = <176>; + regulator-ramp-delay = <27500>; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + }; + + max77620_sd3: sd3 { + regulator-name = "vdd-1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + regulator-boot-on; + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; + regulator-enable-ramp-delay = <242>; + regulator-ramp-delay = <27500>; + }; + + max77620_ldo0: ldo0 { + regulator-name = "avdd-sys"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-boot-on; + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; + regulator-enable-ramp-delay = <26>; + regulator-ramp-delay = <100000>; + }; + + max77620_ldo1: ldo1 { + regulator-name = "vdd-pex"; + regulator-min-microvolt = <1075000>; + regulator-max-microvolt = <1075000>; + regulator-always-on; + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; + regulator-enable-ramp-delay = <22>; + regulator-ramp-delay = <100000>; + }; + + max77620_ldo2: ldo2 { + regulator-name = "vddio-sdmmc3"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; + regulator-enable-ramp-delay = <62>; + regulator-ramp-delay = <100000>; + }; + + max77620_ldo3: ldo3 { + regulator-name = "vdd-3v3-eth"; + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-boot-on; + regulator-enable-ramp-delay = <50>; + regulator-ramp-delay = <100000>; + }; + + max77620_ldo4: ldo4 { + regulator-name = "vdd-rtc"; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <850000>; + regulator-always-on; + regulator-boot-on; + maxim,active-fps-source = <MAX77620_FPS_SRC_0>; + regulator-enable-ramp-delay = <22>; + regulator-ramp-delay = <100000>; + }; + + max77620_ldo5: ldo5 { + regulator-name = "avdd-ts-hv"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; + regulator-enable-ramp-delay = <62>; + regulator-ramp-delay = <100000>; + }; + + max77620_ldo6: ldo6 { + regulator-name = "vdd-ts"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + maxim,active-fps-source = <MAX77620_FPS_SRC_NONE>; + regulator-enable-ramp-delay = <36>; + regulator-ramp-delay = <100000>; + }; + + max77620_ldo7: ldo7 { + regulator-name = "vdd-gen-pll-edp"; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + regulator-always-on; + regulator-boot-on; + maxim,active-fps-source = <MAX77620_FPS_SRC_1>; + maxim,suspend-fps-source = <MAX77620_FPS_SRC_NONE>; + regulator-enable-ramp-delay = <24>; + regulator-ramp-delay = <100000>; + }; + + max77620_ldo8: ldo8 { + regulator-name = "vdd-hdmi-dp"; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + regulator-boot-on; + regulator-always-on; + maxim,active-fps-source = <MAX77620_FPS_SRC_1>; + regulator-enable-ramp-delay = <22>; + regulator-ramp-delay = <100000>; + }; + }; + }; + }; + pmc@7000e400 { nvidia,invert-interrupt; nvidia,suspend-mode = <0>; @@ -1391,4 +1623,210 @@ compatible = "arm,psci-1.0"; method = "smc"; }; + + regulators { + compatible = "simple-bus"; + device_type = "fixed-regulators"; + #address-cells = <1>; + #size-cells = <0>; + + battery_reg: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "vdd-ac-bat"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + vdd_3v3: regulator@1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "vdd-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + gpio = <&max77620 3 0>; + enable-active-high; + regulator-enable-ramp-delay = <160>; + }; + + max77620_gpio7: regulator@2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "max77620-gpio7"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-boot-on; + gpio = <&max77620 7 0>; + enable-active-high; + vin-supply = <&max77620_ldo0>; + regulator-always-on; + regulator-enable-ramp-delay = <240>; + }; + + lcd_bl_en: regulator@3 { + compatible = "regulator-fixed"; + reg = <3>; + regulator-name = "lcd-bl-en"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + gpio = <&gpio TEGRA_GPIO(V, 1) 0>; + enable-active-high; + }; + + en_vdd_sd: regulator@4 { + compatible = "regulator-fixed"; + reg = <4>; + regulator-name = "en-vdd-sd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio TEGRA_GPIO(Z, 4) 0>; + enable-active-high; + vin-supply = <&vdd_3v3>; + regulator-enable-ramp-delay = <472>; + }; + + en_vdd_cam: regulator@5 { + compatible = "regulator-fixed"; + reg = <5>; + regulator-name = "en-vdd-cam"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + gpio = <&gpio TEGRA_GPIO(S, 4) 0>; + enable-active-high; + }; + + vdd_sys_boost: regulator@6 { + compatible = "regulator-fixed"; + reg = <6>; + regulator-name = "vdd-sys-boost"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + gpio = <&max77620 1 0>; + enable-active-high; + regulator-enable-ramp-delay = <3090>; + }; + + vdd_hdmi: regulator@7 { + compatible = "regulator-fixed"; + reg = <7>; + regulator-name = "vdd-hdmi"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio TEGRA_GPIO(CC, 7) 0>; + enable-active-high; + regulator-boot-on; + vin-supply = <&vdd_sys_boost>; + regulator-enable-ramp-delay = <468>; + }; + + en_vdd_cpu_fixed: regulator@8 { + compatible = "regulator-fixed"; + reg = <8>; + regulator-name = "vdd-cpu-fixed"; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + }; + + vdd_aux_3v3: regulator@9 { + compatible = "regulator-fixed"; + reg = <9>; + regulator-name = "aux-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + vdd_snsr_pm: regulator@10 { + compatible = "regulator-fixed"; + reg = <10>; + regulator-name = "snsr_pm"; + enable-active-high; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + vdd_usb_5v0: regulator@11 { + compatible = "regulator-fixed"; + reg = <11>; + status = "disabled"; + regulator-name = "vdd-usb-5v0"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vdd_3v3>; + enable-active-high; + }; + + vdd_cdc_1v2_aud: regulator@101 { + compatible = "regulator-fixed"; + reg = <101>; + status = "disabled"; + regulator-name = "vdd_cdc_1v2_aud"; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + enable-active-high; + startup-delay-us = <250000>; + }; + + vdd_disp_3v0: regulator@12 { + compatible = "regulator-fixed"; + reg = <12>; + regulator-name = "vdd-disp-3v0"; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + gpio = <&gpio TEGRA_GPIO(I, 3) 0>; + regulator-always-on; + enable-active-high; + regulator-enable-ramp-delay = <232>; + }; + + vdd_fan: regulator@13 { + compatible = "regulator-fixed"; + reg = <13>; + regulator-name = "vdd-fan"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio TEGRA_GPIO(E, 4) 0>; + enable-active-high; + regulator-enable-ramp-delay = <284>; + }; + + usb_vbus1: regulator@14 { + compatible = "regulator-fixed"; + reg = <14>; + regulator-name = "usb-vbus1"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio TEGRA_GPIO(CC, 5) 0>; + enable-active-high; + gpio-open-drain; + }; + + usb_vbus2: regulator@15 { + compatible = "regulator-fixed"; + reg = <15>; + regulator-name = "usb-vbus2"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio TEGRA_GPIO(CC, 4) 0>; + enable-active-high; + gpio-open-drain; + }; + + vdd_3v3_eth: regulator@16 { + compatible = "regulator-fixed"; + reg = <16>; + regulator-name = "vdd-3v3-eth-a02"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio TEGRA_GPIO(D, 4) 0>; + regulator-always-on; + regulator-boot-on; + enable-active-high; + gpio-open-drain; + regulator-disable-on-shutdown; + }; + }; };
Add regulators to the Tegra210 Darcy DTS file including support for the MAX77620 PMIC. Signed-off-by: Mark Zhang <markz@nvidia.com> --- .../arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 438 ++++++++++++++++++ 1 file changed, 438 insertions(+)