|
@@ -301,48 +301,27 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
|
|
|
{} /* Terminator */
|
|
|
};
|
|
|
|
|
|
-static struct regulator_consumer_supply rx51_vmmc1_supply = {
|
|
|
- .supply = "vmmc",
|
|
|
- .dev_name = "mmci-omap-hs.0",
|
|
|
-};
|
|
|
+static struct regulator_consumer_supply rx51_vmmc1_supply =
|
|
|
+ REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.0");
|
|
|
|
|
|
-static struct regulator_consumer_supply rx51_vaux3_supply = {
|
|
|
- .supply = "vmmc",
|
|
|
- .dev_name = "mmci-omap-hs.1",
|
|
|
-};
|
|
|
+static struct regulator_consumer_supply rx51_vaux3_supply =
|
|
|
+ REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1");
|
|
|
|
|
|
-static struct regulator_consumer_supply rx51_vsim_supply = {
|
|
|
- .supply = "vmmc_aux",
|
|
|
- .dev_name = "mmci-omap-hs.1",
|
|
|
-};
|
|
|
+static struct regulator_consumer_supply rx51_vsim_supply =
|
|
|
+ REGULATOR_SUPPLY("vmmc_aux", "mmci-omap-hs.1");
|
|
|
|
|
|
static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
|
|
|
/* tlv320aic3x analog supplies */
|
|
|
- {
|
|
|
- .supply = "AVDD",
|
|
|
- .dev_name = "2-0018",
|
|
|
- },
|
|
|
- {
|
|
|
- .supply = "DRVDD",
|
|
|
- .dev_name = "2-0018",
|
|
|
- },
|
|
|
+ REGULATOR_SUPPLY("AVDD", "2-0018"),
|
|
|
+ REGULATOR_SUPPLY("DRVDD", "2-0018"),
|
|
|
/* Keep vmmc as last item. It is not iterated for newer boards */
|
|
|
- {
|
|
|
- .supply = "vmmc",
|
|
|
- .dev_name = "mmci-omap-hs.1",
|
|
|
- },
|
|
|
+ REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1"),
|
|
|
};
|
|
|
|
|
|
static struct regulator_consumer_supply rx51_vio_supplies[] = {
|
|
|
/* tlv320aic3x digital supplies */
|
|
|
- {
|
|
|
- .supply = "IOVDD",
|
|
|
- .dev_name = "2-0018"
|
|
|
- },
|
|
|
- {
|
|
|
- .supply = "DVDD",
|
|
|
- .dev_name = "2-0018"
|
|
|
- },
|
|
|
+ REGULATOR_SUPPLY("IOVDD", "2-0018"),
|
|
|
+ REGULATOR_SUPPLY("DVDD", "2-0018"),
|
|
|
};
|
|
|
|
|
|
#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
|