Merge tag 'v4.13-rc1' into omap-for-v4.14/mmc-regulator
authorTony Lindgren <tony@atomide.com>
Thu, 10 Aug 2017 16:05:53 +0000 (09:05 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 10 Aug 2017 16:05:53 +0000 (09:05 -0700)
Linux v4.13-rc1

arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts
arch/arm/boot/dts/dra7-evm.dts
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/dra71-evm.dts
arch/arm/boot/dts/dra72-evm-common.dtsi
arch/arm/boot/dts/dra72-evm-revc.dts
arch/arm/boot/dts/dra72-evm.dts

index 39a92aff0a0dc5338d29c13949001e2558f17474..578398c781b10f6bdb04d5eebfa9409e5726da90 100644 (file)
@@ -20,7 +20,7 @@
 
 &mmc1 {
        vmmc-supply = <&vdd_3v3>;
-       vmmc-aux-supply = <&ldo1_reg>;
+       vqmmc-supply = <&ldo1_reg>;
 };
 
 /* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */
index f47fc4daf0628a43278a5dcb4cdcf81c34fc56c9..9491b29cf7e5b19b24054c130d2ce46c17088f6d 100644 (file)
                stdout-path = &uart1;
        };
 
+       evm_1v8_sw: fixedregulator-evm_1v8 {
+               compatible = "regulator-fixed";
+               regulator-name = "evm_1v8";
+               vin-supply = <&smps9_reg>;
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+       };
+
        evm_3v3_sd: fixedregulator-sd {
                compatible = "regulator-fixed";
                regulator-name = "evm_3v3_sd";
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&mmc2_pins_default>;
-       vmmc-supply = <&evm_3v3_sw>;
+       vmmc-supply = <&evm_1v8_sw>;
        bus-width = <8>;
 };
 
index 0f0f6f58bd187db819701d3bafcd68ae7bb7c46e..571cacdf0010545750a228fe2194924d84c4849d 100644 (file)
                        dma-names = "tx", "rx";
                        status = "disabled";
                        pbias-supply = <&pbias_mmc_reg>;
+                       max-frequency = <192000000>;
                };
 
                mmc2: mmc@480b4000 {
                        dmas = <&sdma_xbar 47>, <&sdma_xbar 48>;
                        dma-names = "tx", "rx";
                        status = "disabled";
+                       max-frequency = <192000000>;
                };
 
                mmc3: mmc@480ad000 {
                        dmas = <&sdma_xbar 77>, <&sdma_xbar 78>;
                        dma-names = "tx", "rx";
                        status = "disabled";
+                       /* Errata i887 limits max-frequency of MMC3 to 64 MHz */
+                       max-frequency = <64000000>;
                };
 
                mmc4: mmc@480d1000 {
                        dmas = <&sdma_xbar 57>, <&sdma_xbar 58>;
                        dma-names = "tx", "rx";
                        status = "disabled";
+                       max-frequency = <192000000>;
                };
 
                mmu0_dsp1: mmu@40d01000 {
index 4d57a55473afd1f563667d948b49269e11028697..c7a56b6263a679d9d1015712555ad43d20854ef6 100644 (file)
                          3000000 0x1>;
        };
 
+       evm_1v8_sw: fixedregulator-evm_1v8 {
+               compatible = "regulator-fixed";
+               regulator-name = "evm_1v8";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               vin-supply = <&lp8732_buck0_reg>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
+
        poweroff: gpio-poweroff {
                compatible = "gpio-poweroff";
                gpios = <&gpio7 30 GPIO_ACTIVE_HIGH>;
        vmmc_aux-supply = <&vpo_sd_1v8_3v3>;
 };
 
+&mmc2 {
+       vmmc-supply = <&evm_1v8_sw>;
+};
+
 &mac {
        mode-gpios = <&pcf_gpio_21 4 GPIO_ACTIVE_LOW>,
                     <&pcf_hdmi 9 GPIO_ACTIVE_LOW>,     /* P11 */
index 85780549bc26359269b5f5bd05023364b0143905..4ef2d67b3914fff02c074454680ecbea99c595a5 100644 (file)
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&mmc2_pins_default>;
-
-       vmmc-supply = <&evm_3v3_sw>;
        bus-width = <8>;
        ti,non-removable;
        max-frequency = <192000000>;
index 3ecac56bf504de779a954208a4b7318a8ae4437c..5532309971ae599872051cb033a87242ec1b82df 100644 (file)
                device_type = "memory";
                reg = <0x0 0x80000000 0x0 0x80000000>; /* 2GB */
        };
+
+       evm_1v8_sw: fixedregulator-evm_1v8 {
+               compatible = "regulator-fixed";
+               regulator-name = "evm_1v8";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               vin-supply = <&smps4_reg>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
 };
 
 &i2c1 {
                interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
        };
 };
+
+&mmc1 {
+       vqmmc-supply = <&ldo1_reg>;
+};
+
+&mmc2 {
+       vmmc-supply = <&evm_1v8_sw>;
+};
index cd9c4ff12654ce00ae443c654a888dc14b4a66c6..99fdb3d8445bb2fa0f3bda00ccaececfe328edab 100644 (file)
                device_type = "memory";
                reg = <0x0 0x80000000 0x0 0x40000000>; /* 1024 MB */
        };
+
+       evm_1v8_sw: fixedregulator-evm_1v8 {
+               compatible = "regulator-fixed";
+               regulator-name = "evm_1v8";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               vin-supply = <&smps4_reg>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
 };
 
 &i2c1 {
        phy_id = <&davinci_mdio>, <3>;
        phy-mode = "rgmii";
 };
+
+&mmc1 {
+       vqmmc-supply = <&ldo1_reg>;
+};
+
+&mmc2 {
+       vmmc-supply = <&evm_1v8_sw>;
+};