aboutsummaryrefslogtreecommitdiff
path: root/drivers/led
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/led')
-rw-r--r--drivers/led/led-uclass.c4
-rw-r--r--drivers/led/led_bcm6328.c6
-rw-r--r--drivers/led/led_bcm6358.c6
-rw-r--r--drivers/led/led_bcm6858.c6
-rw-r--r--drivers/led/led_cortina.c28
-rw-r--r--drivers/led/led_gpio.c6
6 files changed, 28 insertions, 28 deletions
diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c
index 2859475a6b..e15a2967ff 100644
--- a/drivers/led/led-uclass.c
+++ b/drivers/led/led-uclass.c
@@ -22,7 +22,7 @@ int led_get_by_label(const char *label, struct udevice **devp)
if (ret)
return ret;
uclass_foreach_dev(dev, uc) {
- struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev);
+ struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);
/* Ignore the top-level LED node */
if (uc_plat->label && !strcmp(label, uc_plat->label))
@@ -96,5 +96,5 @@ int led_default_state(void)
UCLASS_DRIVER(led) = {
.id = UCLASS_LED,
.name = "led",
- .per_device_platdata_auto_alloc_size = sizeof(struct led_uc_plat),
+ .per_device_plat_auto = sizeof(struct led_uc_plat),
};
diff --git a/drivers/led/led_bcm6328.c b/drivers/led/led_bcm6328.c
index 52946835de..bf8207d638 100644
--- a/drivers/led/led_bcm6328.c
+++ b/drivers/led/led_bcm6328.c
@@ -147,7 +147,7 @@ static const struct led_ops bcm6328_led_ops = {
static int bcm6328_led_probe(struct udevice *dev)
{
- struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev);
+ struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);
/* Top-level LED node */
if (!uc_plat->label) {
@@ -222,7 +222,7 @@ static int bcm6328_led_bind(struct udevice *parent)
if (ret)
return ret;
- uc_plat = dev_get_uclass_platdata(dev);
+ uc_plat = dev_get_uclass_plat(dev);
uc_plat->label = label;
}
@@ -241,5 +241,5 @@ U_BOOT_DRIVER(bcm6328_led) = {
.ops = &bcm6328_led_ops,
.bind = bcm6328_led_bind,
.probe = bcm6328_led_probe,
- .priv_auto_alloc_size = sizeof(struct bcm6328_led_priv),
+ .priv_auto = sizeof(struct bcm6328_led_priv),
};
diff --git a/drivers/led/led_bcm6358.c b/drivers/led/led_bcm6358.c
index 307d418a17..3e57cdfd17 100644
--- a/drivers/led/led_bcm6358.c
+++ b/drivers/led/led_bcm6358.c
@@ -113,7 +113,7 @@ static const struct led_ops bcm6358_led_ops = {
static int bcm6358_led_probe(struct udevice *dev)
{
- struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev);
+ struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);
/* Top-level LED node */
if (!uc_plat->label) {
@@ -192,7 +192,7 @@ static int bcm6358_led_bind(struct udevice *parent)
if (ret)
return ret;
- uc_plat = dev_get_uclass_platdata(dev);
+ uc_plat = dev_get_uclass_plat(dev);
uc_plat->label = label;
}
@@ -210,6 +210,6 @@ U_BOOT_DRIVER(bcm6358_led) = {
.of_match = bcm6358_led_ids,
.bind = bcm6358_led_bind,
.probe = bcm6358_led_probe,
- .priv_auto_alloc_size = sizeof(struct bcm6358_led_priv),
+ .priv_auto = sizeof(struct bcm6358_led_priv),
.ops = &bcm6358_led_ops,
};
diff --git a/drivers/led/led_bcm6858.c b/drivers/led/led_bcm6858.c
index 511185ffad..fbf46a114c 100644
--- a/drivers/led/led_bcm6858.c
+++ b/drivers/led/led_bcm6858.c
@@ -154,7 +154,7 @@ static const struct led_ops bcm6858_led_ops = {
static int bcm6858_led_probe(struct udevice *dev)
{
- struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev);
+ struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);
/* Top-level LED node */
if (!uc_plat->label) {
@@ -229,7 +229,7 @@ static int bcm6858_led_bind(struct udevice *parent)
if (ret)
return ret;
- uc_plat = dev_get_uclass_platdata(dev);
+ uc_plat = dev_get_uclass_plat(dev);
uc_plat->label = label;
}
@@ -247,6 +247,6 @@ U_BOOT_DRIVER(bcm6858_led) = {
.of_match = bcm6858_led_ids,
.bind = bcm6858_led_bind,
.probe = bcm6858_led_probe,
- .priv_auto_alloc_size = sizeof(struct bcm6858_led_priv),
+ .priv_auto = sizeof(struct bcm6858_led_priv),
.ops = &bcm6858_led_ops,
};
diff --git a/drivers/led/led_cortina.c b/drivers/led/led_cortina.c
index 8fd6fd1539..598c0a03db 100644
--- a/drivers/led/led_cortina.c
+++ b/drivers/led/led_cortina.c
@@ -57,7 +57,7 @@ struct cortina_led_cfg {
};
/* LED_control structures */
-struct cortina_led_platdata {
+struct cortina_led_plat {
void __iomem *ctrl_regs;
u16 rate1; /* blink rate setting 0 */
u16 rate2; /* blink rate setting 1 */
@@ -130,13 +130,13 @@ static const struct led_ops cortina_led_ops = {
.set_state = cortina_led_set_state,
};
-static int ca_led_ofdata_to_platdata(struct udevice *dev)
+static int ca_led_of_to_plat(struct udevice *dev)
{
- struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev);
+ struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);
/* Top-level LED node */
if (!uc_plat->label) {
- struct cortina_led_platdata *plt = dev_get_platdata(dev);
+ struct cortina_led_plat *plt = dev_get_plat(dev);
plt->rate1 =
dev_read_u32_default(dev, "Cortina,blink-rate1", 256);
@@ -165,22 +165,22 @@ static int ca_led_ofdata_to_platdata(struct udevice *dev)
static int cortina_led_probe(struct udevice *dev)
{
- struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev);
+ struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);
/* Top-level LED node */
if (!uc_plat->label) {
- struct cortina_led_platdata *platdata = dev_get_platdata(dev);
+ struct cortina_led_plat *plat = dev_get_plat(dev);
u32 reg_value, val;
u16 rate1, rate2;
- if (!platdata->ctrl_regs)
+ if (!plat->ctrl_regs)
return -EINVAL;
reg_value = 0;
reg_value |= LED_CLK_POLARITY;
- rate1 = platdata->rate1;
- rate2 = platdata->rate2;
+ rate1 = plat->rate1;
+ rate2 = plat->rate2;
val = rate1 / 16 - 1;
rate1 = val > LED_MAX_HW_BLINK ?
@@ -194,7 +194,7 @@ static int cortina_led_probe(struct udevice *dev)
reg_value |= (rate2 & LED_BLINK_RATE2_MASK) <<
LED_BLINK_RATE2_SHIFT;
- cortina_led_write(platdata->ctrl_regs, reg_value);
+ cortina_led_write(plat->ctrl_regs, reg_value);
} else {
struct cortina_led_cfg *priv = dev_get_priv(dev);
@@ -273,7 +273,7 @@ static int cortina_led_bind(struct udevice *parent)
node, &dev);
if (ret)
return ret;
- uc_plat = dev_get_uclass_platdata(dev);
+ uc_plat = dev_get_uclass_plat(dev);
uc_plat->label = label;
}
@@ -289,10 +289,10 @@ U_BOOT_DRIVER(cortina_led) = {
.name = "ca-leds",
.id = UCLASS_LED,
.of_match = ca_led_ids,
- .ofdata_to_platdata = ca_led_ofdata_to_platdata,
+ .of_to_plat = ca_led_of_to_plat,
.bind = cortina_led_bind,
.probe = cortina_led_probe,
- .platdata_auto_alloc_size = sizeof(struct cortina_led_platdata),
- .priv_auto_alloc_size = sizeof(struct cortina_led_cfg),
+ .plat_auto = sizeof(struct cortina_led_plat),
+ .priv_auto = sizeof(struct cortina_led_cfg),
.ops = &cortina_led_ops,
};
diff --git a/drivers/led/led_gpio.c b/drivers/led/led_gpio.c
index 2cdb0269f4..67ece3cbcd 100644
--- a/drivers/led/led_gpio.c
+++ b/drivers/led/led_gpio.c
@@ -57,7 +57,7 @@ static enum led_state_t gpio_led_get_state(struct udevice *dev)
static int led_gpio_probe(struct udevice *dev)
{
- struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev);
+ struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev);
struct led_gpio_priv *priv = dev_get_priv(dev);
int ret;
@@ -106,7 +106,7 @@ static int led_gpio_bind(struct udevice *parent)
node, &dev);
if (ret)
return ret;
- uc_plat = dev_get_uclass_platdata(dev);
+ uc_plat = dev_get_uclass_plat(dev);
uc_plat->label = label;
}
@@ -128,7 +128,7 @@ U_BOOT_DRIVER(led_gpio) = {
.id = UCLASS_LED,
.of_match = led_gpio_ids,
.ops = &gpio_led_ops,
- .priv_auto_alloc_size = sizeof(struct led_gpio_priv),
+ .priv_auto = sizeof(struct led_gpio_priv),
.bind = led_gpio_bind,
.probe = led_gpio_probe,
.remove = led_gpio_remove,