leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pinctrl: uniphier: allow to have pinctrl node under syscon node

Browse Source 
Currently, the UniPhier pinctrl driver itself is a syscon, but it
turned out much more reasonable to make it a child node of a syscon
because our syscon node consists of a bunch of system configuration
registers, not only pinctrl, but also phy, and misc registers.
It is difficult to split the node.  This commit allows to migrate to
the new DT structure.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-06-29 19:38:57 +09:00
parent c4adc50ea6
commit 186c133444
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pinctrl/uniphier/pinctrl-uniphier-core.c
View File

@ -173,7 +173,7 @@ int uniphier_pinctrl_probe(struct udevice *dev,
struct uniphier_pinctrl_priv *priv = dev_get_priv(dev);
fdt_addr_t addr;
addr = dev_get_addr(dev);
addr = dev_get_addr(dev->parent);
if (addr == FDT_ADDR_T_NONE)
return -EINVAL;

4
drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c
View File

@ -95,8 +95,8 @@ static int uniphier_ld20_pinctrl_probe(struct udevice *dev)
}
static const struct udevice_id uniphier_ld20_pinctrl_match[] = {
{ .compatible = "socionext,ph1-ld11-pinctrl" },
{ .compatible = "socionext,ph1-ld20-pinctrl" },
{ .compatible = "socionext,uniphier-ld11-pinctrl" },
{ .compatible = "socionext,uniphier-ld20-pinctrl" },
{ /* sentinel */ }
};

2
drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
View File

@ -115,7 +115,7 @@ static int uniphier_ld4_pinctrl_probe(struct udevice *dev)
}
static const struct udevice_id uniphier_ld4_pinctrl_match[] = {
{ .compatible = "socionext,ph1-ld4-pinctrl" },
{ .compatible = "socionext,uniphier-ld4-pinctrl" },
{ /* sentinel */ }
};

2
drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
View File

@ -115,7 +115,7 @@ static int uniphier_ld6b_pinctrl_probe(struct udevice *dev)
}
static const struct udevice_id uniphier_ld6b_pinctrl_match[] = {
{ .compatible = "socionext,ph1-ld6b-pinctrl" },
{ .compatible = "socionext,uniphier-ld6b-pinctrl" },
{ /* sentinel */ }
};

2
drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
View File

@ -112,7 +112,7 @@ static int uniphier_pro4_pinctrl_probe(struct udevice *dev)
}
static const struct udevice_id uniphier_pro4_pinctrl_match[] = {
{ .compatible = "socionext,ph1-pro4-pinctrl" },
{ .compatible = "socionext,uniphier-pro4-pinctrl" },
{ /* sentinel */ }
};

2
drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
View File

@ -126,7 +126,7 @@ static int uniphier_pro5_pinctrl_probe(struct udevice *dev)
}
static const struct udevice_id uniphier_pro5_pinctrl_match[] = {
{ .compatible = "socionext,ph1-pro5-pinctrl" },
{ .compatible = "socionext,uniphier-pro5-pinctrl" },
{ /* sentinel */ }
};

2
drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
View File

@ -120,7 +120,7 @@ static int uniphier_pxs2_pinctrl_probe(struct udevice *dev)
}
static const struct udevice_id uniphier_pxs2_pinctrl_match[] = {
{ .compatible = "socionext,proxstream2-pinctrl" },
{ .compatible = "socionext,uniphier-pxs2-pinctrl" },
{ /* sentinel */ }
};

2
drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
View File

@ -123,7 +123,7 @@ static int uniphier_sld8_pinctrl_probe(struct udevice *dev)
}
static const struct udevice_id uniphier_sld8_pinctrl_match[] = {
{ .compatible = "socionext,ph1-sld8-pinctrl" },
{ .compatible = "socionext,uniphier-sld8-pinctrl" },
{ /* sentinel */ }
};

6
drivers/pinctrl/uniphier/pinctrl-uniphier.h
View File

@ -12,9 +12,9 @@
#include <linux/kernel.h>
#include <linux/types.h>
#define UNIPHIER_PINCTRL_PINMUX_BASE 0x0
#define UNIPHIER_PINCTRL_LOAD_PINMUX 0x700
#define UNIPHIER_PINCTRL_IECTRL 0xd00
#define UNIPHIER_PINCTRL_PINMUX_BASE 0x1000
#define UNIPHIER_PINCTRL_LOAD_PINMUX 0x1700
#define UNIPHIER_PINCTRL_IECTRL 0x1d00
#define UNIPHIER_PIN_ATTR_PACKED(iectrl) (iectrl)