Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: tegra: tamonten: add the base board regulators

Currently the Tamonten DTS define a fixed regulator for the 5V supply.
However this regulator is in fact on the base board. Fix this by
properly defining the regulators found on the base boards.

Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de>
Signed-off-by: Stephen Warren <swarren@nvidia.com>

authored by

Alban Bedel and committed by
Thierry Reding
23e63345 6d0a067f

+124 -9
+41
arch/arm/boot/dts/tegra20-medcom-wide.dts
··· 64 64 <&tegra_car TEGRA20_CLK_CDEV1>; 65 65 clock-names = "pll_a", "pll_a_out0", "mclk"; 66 66 }; 67 + 68 + regulators { 69 + vcc_24v_reg: regulator@100 { 70 + compatible = "regulator-fixed"; 71 + reg = <100>; 72 + regulator-name = "vcc_24v"; 73 + regulator-min-microvolt = <24000000>; 74 + regulator-max-microvolt = <24000000>; 75 + regulator-always-on; 76 + }; 77 + 78 + vdd_5v0_reg: regulator@101 { 79 + compatible = "regulator-fixed"; 80 + reg = <101>; 81 + regulator-name = "vdd_5v0"; 82 + vin-supply = <&vcc_24v_reg>; 83 + regulator-min-microvolt = <5000000>; 84 + regulator-max-microvolt = <5000000>; 85 + regulator-always-on; 86 + }; 87 + 88 + vdd_3v3_reg: regulator@102 { 89 + compatible = "regulator-fixed"; 90 + reg = <102>; 91 + regulator-name = "vdd_3v3"; 92 + vin-supply = <&vcc_24v_reg>; 93 + regulator-min-microvolt = <3300000>; 94 + regulator-max-microvolt = <3300000>; 95 + regulator-always-on; 96 + }; 97 + 98 + vdd_1v8_reg: regulator@103 { 99 + compatible = "regulator-fixed"; 100 + reg = <103>; 101 + regulator-name = "vdd_1v8"; 102 + vin-supply = <&vdd_3v3_reg>; 103 + regulator-min-microvolt = <1800000>; 104 + regulator-max-microvolt = <1800000>; 105 + regulator-always-on; 106 + }; 107 + }; 67 108 };
+41
arch/arm/boot/dts/tegra20-plutux.dts
··· 58 58 <&tegra_car TEGRA20_CLK_CDEV1>; 59 59 clock-names = "pll_a", "pll_a_out0", "mclk"; 60 60 }; 61 + 62 + regulators { 63 + vcc_24v_reg: regulator@100 { 64 + compatible = "regulator-fixed"; 65 + reg = <100>; 66 + regulator-name = "vcc_24v"; 67 + regulator-min-microvolt = <24000000>; 68 + regulator-max-microvolt = <24000000>; 69 + regulator-always-on; 70 + }; 71 + 72 + vdd_5v0_reg: regulator@101 { 73 + compatible = "regulator-fixed"; 74 + reg = <101>; 75 + regulator-name = "vdd_5v0"; 76 + vin-supply = <&vcc_24v_reg>; 77 + regulator-min-microvolt = <5000000>; 78 + regulator-max-microvolt = <5000000>; 79 + regulator-always-on; 80 + }; 81 + 82 + vdd_3v3_reg: regulator@102 { 83 + compatible = "regulator-fixed"; 84 + reg = <102>; 85 + regulator-name = "vdd_3v3"; 86 + vin-supply = <&vcc_24v_reg>; 87 + regulator-min-microvolt = <3300000>; 88 + regulator-max-microvolt = <3300000>; 89 + regulator-always-on; 90 + }; 91 + 92 + vdd_1v8_reg: regulator@103 { 93 + compatible = "regulator-fixed"; 94 + reg = <103>; 95 + regulator-name = "vdd_1v8"; 96 + vin-supply = <&vdd_3v3_reg>; 97 + regulator-min-microvolt = <1800000>; 98 + regulator-max-microvolt = <1800000>; 99 + regulator-always-on; 100 + }; 101 + }; 61 102 };
+1 -9
arch/arm/boot/dts/tegra20-tamonten.dtsi
··· 334 334 #gpio-cells = <2>; 335 335 gpio-controller; 336 336 337 + /* vdd_5v0_reg must be provided by the base board */ 337 338 sys-supply = <&vdd_5v0_reg>; 338 339 vin-sm0-supply = <&sys_reg>; 339 340 vin-sm1-supply = <&sys_reg>; ··· 511 510 512 511 #address-cells = <1>; 513 512 #size-cells = <0>; 514 - 515 - vdd_5v0_reg: regulator@0 { 516 - compatible = "regulator-fixed"; 517 - reg = <0>; 518 - regulator-name = "vdd_5v0"; 519 - regulator-min-microvolt = <5000000>; 520 - regulator-max-microvolt = <5000000>; 521 - regulator-always-on; 522 - }; 523 513 524 514 pci_vdd_reg: regulator@1 { 525 515 compatible = "regulator-fixed";
+41
arch/arm/boot/dts/tegra20-tec.dts
··· 67 67 <&tegra_car TEGRA20_CLK_CDEV1>; 68 68 clock-names = "pll_a", "pll_a_out0", "mclk"; 69 69 }; 70 + 71 + regulators { 72 + vcc_24v_reg: regulator@100 { 73 + compatible = "regulator-fixed"; 74 + reg = <100>; 75 + regulator-name = "vcc_24v"; 76 + regulator-min-microvolt = <24000000>; 77 + regulator-max-microvolt = <24000000>; 78 + regulator-always-on; 79 + }; 80 + 81 + vdd_5v0_reg: regulator@101 { 82 + compatible = "regulator-fixed"; 83 + reg = <101>; 84 + regulator-name = "vdd_5v0"; 85 + vin-supply = <&vcc_24v_reg>; 86 + regulator-min-microvolt = <5000000>; 87 + regulator-max-microvolt = <5000000>; 88 + regulator-always-on; 89 + }; 90 + 91 + vdd_3v3_reg: regulator@102 { 92 + compatible = "regulator-fixed"; 93 + reg = <102>; 94 + regulator-name = "vdd_3v3"; 95 + vin-supply = <&vcc_24v_reg>; 96 + regulator-min-microvolt = <3300000>; 97 + regulator-max-microvolt = <3300000>; 98 + regulator-always-on; 99 + }; 100 + 101 + vdd_1v8_reg: regulator@103 { 102 + compatible = "regulator-fixed"; 103 + reg = <103>; 104 + regulator-name = "vdd_1v8"; 105 + vin-supply = <&vdd_3v3_reg>; 106 + regulator-min-microvolt = <1800000>; 107 + regulator-max-microvolt = <1800000>; 108 + regulator-always-on; 109 + }; 110 + }; 70 111 };