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

1  2 
arch/arm/boot/dts/dra7-evm.dts
arch/arm/boot/dts/dra7.dtsi

index f9c28bf127a53690ab7d9c19284de6d8c4b74a94,f47fc4daf0628a43278a5dcb4cdcf81c34fc56c9..9491b29cf7e5b19b24054c130d2ce46c17088f6d
                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";
        tps659038: tps659038@58 {
                compatible = "ti,tps659038";
                reg = <0x58>;
+               ti,palmas-override-powerhold;
+               ti,system-power-controller;
  
                tps659038_pmic {
                        compatible = "ti,tps659038-pmic";
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&mmc2_pins_default>;
 -      vmmc-supply = <&evm_3v3_sw>;
 +      vmmc-supply = <&evm_1v8_sw>;
        bus-width = <8>;
  };
  
index abb1fa1acb427fbc305c02841287bfbd55bc116a,0f0f6f58bd187db819701d3bafcd68ae7bb7c46e..571cacdf0010545750a228fe2194924d84c4849d
                        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 {
        coefficients = <0 2000>;
  };
  
+ &cpu_crit {
+       temperature = <120000>; /* milli Celsius */
+ };
  /include/ "dra7xx-clocks.dtsi"