Merge tag 'mmc-updates-for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / arch / arm / boot / dts / omap3.dtsi

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 3d05eff67e25ea501410a3505788f513d20991f6..5e5790f631eba4b5b1085ac64a1c4d5a0f6062c9 100644 (file)
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -181,6 +181,22 @@
                        pinctrl-single,function-mask = <0xff1f>;
                };
 
+               omap3_scm_general: tisyscon@48002270 {
+                       compatible = "syscon";
+                       reg = <0x48002270 0x2f0>;
+               };
+
+               pbias_regulator: pbias_regulator {
+                       compatible = "ti,pbias-omap";
+                       reg = <0x2b0 0x4>;
+                       syscon = <&omap3_scm_general>;
+                       pbias_mmc_reg: pbias_mmc_omap2430 {
+                               regulator-name = "pbias_mmc_omap2430";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3000000>;
+                       };
+               };
+
                gpio1: gpio@48310000 {
                        compatible = "ti,omap3-gpio";
                        reg = <0x48310000 0x200>;
@@ -395,6 +411,7 @@
                        ti,dual-volt;
                        dmas = <&sdma 61>, <&sdma 62>;
                        dma-names = "tx", "rx";
+                       pbias-supply = <&pbias_mmc_reg>;
                };
 
                mmc2: mmc@480b4000 {