1
0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-04 10:12:14 +02:00

led: bcm6358: convert to use live dt

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas
2018-03-22 19:39:33 +01:00
committed by Daniel Schwierzeck
parent e7e64fa0e6
commit a15c16f923

View File

@@ -31,8 +31,6 @@
#define LED_CTRL_BUSY_SHIFT 3 #define LED_CTRL_BUSY_SHIFT 3
#define LED_CTRL_BUSY_MASK (1 << LED_CTRL_BUSY_SHIFT) #define LED_CTRL_BUSY_MASK (1 << LED_CTRL_BUSY_SHIFT)
DECLARE_GLOBAL_DATA_PTR;
struct bcm6358_led_priv { struct bcm6358_led_priv {
void __iomem *regs; void __iomem *regs;
uint8_t pin; uint8_t pin;
@@ -114,8 +112,6 @@ static const struct led_ops bcm6358_led_ops = {
static int bcm6358_led_probe(struct udevice *dev) 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_platdata(dev);
fdt_addr_t addr;
fdt_size_t size;
/* Top-level LED node */ /* Top-level LED node */
if (!uc_plat->label) { if (!uc_plat->label) {
@@ -123,17 +119,14 @@ static int bcm6358_led_probe(struct udevice *dev)
unsigned int clk_div; unsigned int clk_div;
u32 set_bits = 0; u32 set_bits = 0;
addr = devfdt_get_addr_size_index(dev, 0, &size); regs = dev_remap_addr(dev);
if (addr == FDT_ADDR_T_NONE) if (!regs)
return -EINVAL; return -EINVAL;
regs = ioremap(addr, size); if (dev_read_bool(dev, "brcm,clk-dat-low"))
if (fdtdec_get_bool(gd->fdt_blob, dev_of_offset(dev),
"brcm,clk-dat-low"))
set_bits |= LED_CTRL_POL_MASK; set_bits |= LED_CTRL_POL_MASK;
clk_div = fdtdec_get_uint(gd->fdt_blob, dev_of_offset(dev), clk_div = dev_read_u32_default(dev, "brcm,clk-div",
"brcm,clk-div", LED_CTRL_CLK_1); LED_CTRL_CLK_1);
switch (clk_div) { switch (clk_div) {
case 8: case 8:
set_bits |= LED_CTRL_CLK_8; set_bits |= LED_CTRL_CLK_8;
@@ -157,21 +150,17 @@ static int bcm6358_led_probe(struct udevice *dev)
struct bcm6358_led_priv *priv = dev_get_priv(dev); struct bcm6358_led_priv *priv = dev_get_priv(dev);
unsigned int pin; unsigned int pin;
addr = devfdt_get_addr_size_index(dev_get_parent(dev), 0, priv->regs = dev_remap_addr(dev);
&size); if (!priv->regs)
if (addr == FDT_ADDR_T_NONE)
return -EINVAL; return -EINVAL;
pin = fdtdec_get_uint(gd->fdt_blob, dev_of_offset(dev), "reg", pin = dev_read_u32_default(dev, "reg", LEDS_MAX);
LEDS_MAX);
if (pin >= LEDS_MAX) if (pin >= LEDS_MAX)
return -EINVAL; return -EINVAL;
priv->regs = ioremap(addr, size);
priv->pin = pin; priv->pin = pin;
if (fdtdec_get_bool(gd->fdt_blob, dev_of_offset(dev), if (dev_read_bool(dev, "active-low"))
"active-low"))
priv->active_low = true; priv->active_low = true;
} }
@@ -180,27 +169,24 @@ static int bcm6358_led_probe(struct udevice *dev)
static int bcm6358_led_bind(struct udevice *parent) static int bcm6358_led_bind(struct udevice *parent)
{ {
const void *blob = gd->fdt_blob; ofnode node;
int node;
for (node = fdt_first_subnode(blob, dev_of_offset(parent)); dev_for_each_subnode(node, parent) {
node > 0;
node = fdt_next_subnode(blob, node)) {
struct led_uc_plat *uc_plat; struct led_uc_plat *uc_plat;
struct udevice *dev; struct udevice *dev;
const char *label; const char *label;
int ret; int ret;
label = fdt_getprop(blob, node, "label", NULL); label = ofnode_read_string(node, "label");
if (!label) { if (!label) {
debug("%s: node %s has no label\n", __func__, debug("%s: node %s has no label\n", __func__,
fdt_get_name(blob, node, NULL)); ofnode_get_name(node));
return -EINVAL; return -EINVAL;
} }
ret = device_bind_driver_to_node(parent, "bcm6358-led", ret = device_bind_driver_to_node(parent, "bcm6358-led",
fdt_get_name(blob, node, NULL), ofnode_get_name(node),
offset_to_ofnode(node), &dev); node, &dev);
if (ret) if (ret)
return ret; return ret;