Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a568f7f authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v4.14/mmc-regulator' into omap-for-v4.14/dt

parents b7ced444 45ea75eb

arch/arm/boot/dts/am572x-idk.dts

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
&mmc1 {

	status = "okay";

	vmmc-supply = <&v3_3d>;

	vmmc_aux-supply = <&ldo1_reg>;

	vqmmc-supply = <&ldo1_reg>;

	bus-width = <4>;

	cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */

};

arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts

+1 −1
Original line number Diff line number Diff line
@@ -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" */

arch/arm/boot/dts/dra7-evm.dts

+10 −2
Original line number Diff line number Diff line
@@ -25,6 +25,14 @@ 
		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";
@@ -438,7 +446,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins_default>;

	vmmc-supply = <&evm_3v3_sd>;

	vmmc_aux-supply = <&ldo1_reg>;

	vqmmc-supply = <&ldo1_reg>;

	bus-width = <4>;

	/*

	 * SDCD signal is not being used here - using the fact that GPIO mode
@@ -451,7 +459,7 @@ 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins_default>;

	vmmc-supply = <&evm_3v3_sw>;

	vmmc-supply = <&evm_1v8_sw>;

	bus-width = <8>;

};

arch/arm/boot/dts/dra7.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -1037,6 +1037,7 @@ 
			dma-names = "tx", "rx";

			status = "disabled";

			pbias-supply = <&pbias_mmc_reg>;

			max-frequency = <192000000>;

		};



		mmc2: mmc@480b4000 {
@@ -1048,6 +1049,7 @@ 
			dmas = <&sdma_xbar 47>, <&sdma_xbar 48>;

			dma-names = "tx", "rx";

			status = "disabled";

			max-frequency = <192000000>;

		};



		mmc3: mmc@480ad000 {
@@ -1059,6 +1061,8 @@ 
			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 {
@@ -1070,6 +1074,7 @@ 
			dmas = <&sdma_xbar 57>, <&sdma_xbar 58>;

			dma-names = "tx", "rx";

			status = "disabled";

			max-frequency = <192000000>;

		};



		mmu0_dsp1: mmu@40d01000 {

arch/arm/boot/dts/dra71-evm.dts

+15 −1
Original line number Diff line number Diff line
@@ -32,6 +32,16 @@ 
			  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>;
@@ -162,7 +172,11 @@ 
};



&mmc1 {

	vmmc_aux-supply = <&vpo_sd_1v8_3v3>;

	vqmmc-supply = <&vpo_sd_1v8_3v3>;

};



&mmc2 {

	vmmc-supply = <&evm_1v8_sw>;

};



&mac {