Skip to content

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

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

parents b7ced444 45ea75eb
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 19 deletions
arch/arm/boot/dts/am572x-idk.dts
View file @ 4a568f7f
...@@ -79,7 +79,7 @@ &extcon_usb2 { ...@@ -79,7 +79,7 @@ &extcon_usb2 {
&mmc1 { &mmc1 {
status = "okay"; status = "okay";
vmmc-supply = <&v3_3d>; vmmc-supply = <&v3_3d>;
vmmc_aux-supply = <&ldo1_reg>; vqmmc-supply = <&ldo1_reg>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */ cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */
}; };
......
arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts
View file @ 4a568f7f
...@@ -20,7 +20,7 @@ &tpd12s015 { ...@@ -20,7 +20,7 @@ &tpd12s015 {
&mmc1 { &mmc1 {
vmmc-supply = <&vdd_3v3>; vmmc-supply = <&vdd_3v3>;
vmmc-aux-supply = <&ldo1_reg>; vqmmc-supply = <&ldo1_reg>;
}; };
/* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */ /* errata i880 "Ethernet RGMII2 Limited to 10/100 Mbps" */
......
arch/arm/boot/dts/dra7-evm.dts
View file @ 4a568f7f
...@@ -25,6 +25,14 @@ chosen { ...@@ -25,6 +25,14 @@ chosen {
stdout-path = &uart1; 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 { evm_3v3_sd: fixedregulator-sd {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "evm_3v3_sd"; regulator-name = "evm_3v3_sd";
...@@ -438,7 +446,7 @@ &mmc1 { ...@@ -438,7 +446,7 @@ &mmc1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_default>; pinctrl-0 = <&mmc1_pins_default>;
vmmc-supply = <&evm_3v3_sd>; vmmc-supply = <&evm_3v3_sd>;
vmmc_aux-supply = <&ldo1_reg>; vqmmc-supply = <&ldo1_reg>;
bus-width = <4>; bus-width = <4>;
/* /*
* SDCD signal is not being used here - using the fact that GPIO mode * SDCD signal is not being used here - using the fact that GPIO mode
...@@ -451,7 +459,7 @@ &mmc2 { ...@@ -451,7 +459,7 @@ &mmc2 {
status = "okay"; status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_default>; pinctrl-0 = <&mmc2_pins_default>;
vmmc-supply = <&evm_3v3_sw>; vmmc-supply = <&evm_1v8_sw>;
bus-width = <8>; bus-width = <8>;
}; };
......
arch/arm/boot/dts/dra7.dtsi
View file @ 4a568f7f
...@@ -1037,6 +1037,7 @@ mmc1: mmc@4809c000 { ...@@ -1037,6 +1037,7 @@ mmc1: mmc@4809c000 {
dma-names = "tx", "rx"; dma-names = "tx", "rx";
status = "disabled"; status = "disabled";
pbias-supply = <&pbias_mmc_reg>; pbias-supply = <&pbias_mmc_reg>;
max-frequency = <192000000>;
}; };
mmc2: mmc@480b4000 { mmc2: mmc@480b4000 {
...@@ -1048,6 +1049,7 @@ mmc2: mmc@480b4000 { ...@@ -1048,6 +1049,7 @@ mmc2: mmc@480b4000 {
dmas = <&sdma_xbar 47>, <&sdma_xbar 48>; dmas = <&sdma_xbar 47>, <&sdma_xbar 48>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
status = "disabled"; status = "disabled";
max-frequency = <192000000>;
}; };
mmc3: mmc@480ad000 { mmc3: mmc@480ad000 {
...@@ -1059,6 +1061,8 @@ mmc3: mmc@480ad000 { ...@@ -1059,6 +1061,8 @@ mmc3: mmc@480ad000 {
dmas = <&sdma_xbar 77>, <&sdma_xbar 78>; dmas = <&sdma_xbar 77>, <&sdma_xbar 78>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
status = "disabled"; status = "disabled";
/* Errata i887 limits max-frequency of MMC3 to 64 MHz */
max-frequency = <64000000>;
}; };
mmc4: mmc@480d1000 { mmc4: mmc@480d1000 {
...@@ -1070,6 +1074,7 @@ mmc4: mmc@480d1000 { ...@@ -1070,6 +1074,7 @@ mmc4: mmc@480d1000 {
dmas = <&sdma_xbar 57>, <&sdma_xbar 58>; dmas = <&sdma_xbar 57>, <&sdma_xbar 58>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
status = "disabled"; status = "disabled";
max-frequency = <192000000>;
}; };
mmu0_dsp1: mmu@40d01000 { mmu0_dsp1: mmu@40d01000 {
......
arch/arm/boot/dts/dra71-evm.dts
View file @ 4a568f7f
...@@ -32,6 +32,16 @@ vpo_sd_1v8_3v3: gpio-regulator-TPS74801 { ...@@ -32,6 +32,16 @@ vpo_sd_1v8_3v3: gpio-regulator-TPS74801 {
3000000 0x1>; 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 { poweroff: gpio-poweroff {
compatible = "gpio-poweroff"; compatible = "gpio-poweroff";
gpios = <&gpio7 30 GPIO_ACTIVE_HIGH>; gpios = <&gpio7 30 GPIO_ACTIVE_HIGH>;
...@@ -162,7 +172,11 @@ p0 { ...@@ -162,7 +172,11 @@ p0 {
}; };
&mmc1 { &mmc1 {
vmmc_aux-supply = <&vpo_sd_1v8_3v3>; vqmmc-supply = <&vpo_sd_1v8_3v3>;
};
&mmc2 {
vmmc-supply = <&evm_1v8_sw>;
}; };
&mac { &mac {
......
arch/arm/boot/dts/dra72-evm-common.dtsi
View file @ 4a568f7f
...@@ -419,8 +419,6 @@ &mmc2 { ...@@ -419,8 +419,6 @@ &mmc2 {
status = "okay"; status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_default>; pinctrl-0 = <&mmc2_pins_default>;
vmmc-supply = <&evm_3v3_sw>;
bus-width = <8>; bus-width = <8>;
ti,non-removable; ti,non-removable;
max-frequency = <192000000>; max-frequency = <192000000>;
......
arch/arm/boot/dts/dra72-evm-revc.dts
View file @ 4a568f7f
...@@ -15,6 +15,16 @@ memory@0 { ...@@ -15,6 +15,16 @@ memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x0 0x80000000 0x0 0x80000000>; /* 2GB */ 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 { &i2c1 {
...@@ -82,3 +92,11 @@ dp83867_1: ethernet-phy@3 { ...@@ -82,3 +92,11 @@ dp83867_1: ethernet-phy@3 {
interrupts = <16 IRQ_TYPE_EDGE_FALLING>; interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
}; };
}; };
&mmc1 {
vqmmc-supply = <&ldo1_reg>;
};
&mmc2 {
vmmc-supply = <&evm_1v8_sw>;
};
arch/arm/boot/dts/dra72-evm-tps65917.dtsi
View file @ 4a568f7f
...@@ -146,5 +146,5 @@ &dss { ...@@ -146,5 +146,5 @@ &dss {
}; };
&mmc1 { &mmc1 {
vmmc_aux-supply = <&ldo1_reg>; vqmmc-supply = <&ldo1_reg>;
}; };
arch/arm/boot/dts/dra72-evm.dts
View file @ 4a568f7f
...@@ -13,6 +13,16 @@ memory@0 { ...@@ -13,6 +13,16 @@ memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x0 0x80000000 0x0 0x40000000>; /* 1024 MB */ 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 { &i2c1 {
...@@ -43,3 +53,11 @@ &cpsw_emac0 { ...@@ -43,3 +53,11 @@ &cpsw_emac0 {
phy_id = <&davinci_mdio>, <3>; phy_id = <&davinci_mdio>, <3>;
phy-mode = "rgmii"; phy-mode = "rgmii";
}; };
&mmc1 {
vqmmc-supply = <&ldo1_reg>;
};
&mmc2 {
vmmc-supply = <&evm_1v8_sw>;
};
arch/arm/boot/dts/omap3-beagle-xm.dts
View file @ 4a568f7f
...@@ -299,7 +299,7 @@ &i2c3 { ...@@ -299,7 +299,7 @@ &i2c3 {
&mmc1 { &mmc1 {
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
bus-width = <8>; bus-width = <8>;
}; };
......
arch/arm/boot/dts/omap3-beagle.dts
View file @ 4a568f7f
...@@ -283,7 +283,7 @@ &i2c3 { ...@@ -283,7 +283,7 @@ &i2c3 {
&mmc1 { &mmc1 {
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
bus-width = <8>; bus-width = <8>;
}; };
......
arch/arm/boot/dts/omap3-cm-t3517.dts
View file @ 4a568f7f
...@@ -129,7 +129,7 @@ &mmc2 { ...@@ -129,7 +129,7 @@ &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>; pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&wl12xx_vmmc2>; vmmc-supply = <&wl12xx_vmmc2>;
vmmc_aux-supply = <&wl12xx_vaux2>; vqmmc-supply = <&wl12xx_vaux2>;
non-removable; non-removable;
bus-width = <4>; bus-width = <4>;
cap-power-off-card; cap-power-off-card;
......
arch/arm/boot/dts/omap3-cm-t3730.dts
View file @ 4a568f7f
...@@ -69,7 +69,7 @@ &mmc2 { ...@@ -69,7 +69,7 @@ &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>; pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&wl12xx_vmmc2>; vmmc-supply = <&wl12xx_vmmc2>;
vmmc_aux-supply = <&wl12xx_vaux2>; vqmmc-supply = <&wl12xx_vaux2>;
non-removable; non-removable;
bus-width = <4>; bus-width = <4>;
cap-power-off-card; cap-power-off-card;
......
arch/arm/boot/dts/omap3-devkit8000-common.dtsi
View file @ 4a568f7f
...@@ -149,7 +149,7 @@ &i2c3 { ...@@ -149,7 +149,7 @@ &i2c3 {
&mmc1 { &mmc1 {
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
bus-width = <8>; bus-width = <8>;
}; };
......
arch/arm/boot/dts/omap3-evm-common.dtsi
View file @ 4a568f7f
...@@ -115,7 +115,7 @@ tsc2046@0 { ...@@ -115,7 +115,7 @@ tsc2046@0 {
&mmc1 { &mmc1 {
interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>; interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
bus-width = <8>; bus-width = <8>;
}; };
......
arch/arm/boot/dts/omap3-n900.dts
View file @ 4a568f7f
...@@ -741,7 +741,7 @@ &mmc2 { ...@@ -741,7 +741,7 @@ &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>; pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&vaux3>; vmmc-supply = <&vaux3>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
no-sdio; no-sdio;
......
arch/arm/boot/dts/omap3-overo-base.dtsi
View file @ 4a568f7f
...@@ -181,7 +181,7 @@ &mmc2 { ...@@ -181,7 +181,7 @@ &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>; pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&w3cbw003c_npoweron>; vmmc-supply = <&w3cbw003c_npoweron>;
vmmc_aux-supply = <&w3cbw003c_wifi_nreset>; vqmmc-supply = <&w3cbw003c_wifi_nreset>;
bus-width = <4>; bus-width = <4>;
cap-sdio-irq; cap-sdio-irq;
non-removable; non-removable;
......
arch/arm/boot/dts/omap3-tao3530.dtsi
View file @ 4a568f7f
...@@ -223,7 +223,7 @@ &mmc1 { ...@@ -223,7 +223,7 @@ &mmc1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>; pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>; cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>;
bus-width = <8>; bus-width = <8>;
}; };
......
arch/arm/boot/dts/omap3-zoom3.dts
View file @ 4a568f7f
...@@ -174,7 +174,7 @@ &twl_gpio { ...@@ -174,7 +174,7 @@ &twl_gpio {
&mmc1 { &mmc1 {
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
bus-width = <4>; bus-width = <4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>; pinctrl-0 = <&mmc1_pins>;
......
arch/arm/boot/dts/omap3430-sdp.dts
View file @ 4a568f7f
...@@ -33,7 +33,7 @@ twl: twl@48 { ...@@ -33,7 +33,7 @@ twl: twl@48 {
&mmc1 { &mmc1 {
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
/* /*
* S6-3 must be in ON position for 8 bit mode to function * S6-3 must be in ON position for 8 bit mode to function
* Else, use 4 bit mode * Else, use 4 bit mode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7