brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

Merge https://gitlab.denx.de/u-boot/custodians/u-boot-sh

Browse Source 
- R-Car pinctrl updates
This commit is contained in:
Tom Rini 2021-01-18 12:37:55 -05:00
commit ae3d8b6c40
9 changed files with 80 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/dts/r7s72100-gr-peach-u-boot.dts
View File

@ -46,7 +46,7 @@
};
rpc: rpc@0xee200000 {
rpc: rpc@ee200000 {
compatible = "renesas,rpc-r7s72100", "renesas,rpc";
reg = <0x3fefa000 0x100>, <0x18000000 0x08000000>;
bank-width = <2>;

2
arch/arm/dts/r8a77950-u-boot.dtsi
View File

@ -13,7 +13,7 @@
/ {
soc {
rpc: rpc@0xee200000 {
rpc: rpc@ee200000 {
compatible = "renesas,rpc-r8a7795", "renesas,rpc";
reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
clocks = <&cpg CPG_MOD 917>;

2
arch/arm/dts/r8a77960-u-boot.dtsi
View File

@ -13,7 +13,7 @@
/ {
soc {
rpc: rpc@0xee200000 {
rpc: rpc@ee200000 {
compatible = "renesas,rpc-r8a7796", "renesas,rpc";
reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
clocks = <&cpg CPG_MOD 917>;

2
arch/arm/dts/r8a77965-u-boot.dtsi
View File

@ -13,7 +13,7 @@
/ {
soc {
rpc: rpc@0xee200000 {
rpc: rpc@ee200000 {
compatible = "renesas,rpc-r8a77965", "renesas,rpc";
reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
clocks = <&cpg CPG_MOD 917>;

2
arch/arm/dts/r8a77970-u-boot.dtsi
View File

@ -13,7 +13,7 @@
/ {
soc {
rpc: rpc@0xee200000 {
rpc: rpc@ee200000 {
compatible = "renesas,rpc-r8a77970", "renesas,rpc";
reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
clocks = <&cpg CPG_MOD 917>;

2
arch/arm/dts/r8a77980-u-boot.dtsi
View File

@ -13,7 +13,7 @@
/ {
soc {
rpc: rpc@0xee200000 {
rpc: rpc@ee200000 {
compatible = "renesas,rpc-r8a77980", "renesas,rpc";
reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
clocks = <&cpg CPG_MOD 917>;

2
arch/arm/dts/r8a77990-u-boot.dtsi
View File

@ -9,7 +9,7 @@
/ {
soc {
rpc: rpc@0xee200000 {
rpc: rpc@ee200000 {
compatible = "renesas,rpc-r8a77990", "renesas,rpc";
reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
clocks = <&cpg CPG_MOD 917>;

2
arch/arm/dts/r8a77995-u-boot.dtsi
View File

@ -9,7 +9,7 @@
/ {
soc {
rpc: rpc@0xee200000 {
rpc: rpc@ee200000 {
compatible = "renesas,rpc-r8a77995", "renesas,rpc";
reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0>;
clocks = <&cpg CPG_MOD 917>;

77
drivers/pinctrl/renesas/pfc.c
View File

@ -44,6 +44,7 @@ enum sh_pfc_model {
struct sh_pfc_pin_config {
u32 type;
const char *name;
};
struct sh_pfc_pinctrl {
@ -448,6 +449,30 @@ static const char *sh_pfc_pinctrl_get_group_name(struct udevice *dev,
return priv->pfc.info->groups[selector].name;
}
static int sh_pfc_pinctrl_get_pin_muxing(struct udevice *dev,
unsigned int selector,
char *buf, int size)
{
struct sh_pfc_pinctrl_priv *priv = dev_get_priv(dev);
struct sh_pfc_pinctrl *pmx = &priv->pmx;
struct sh_pfc *pfc = &priv->pfc;
struct sh_pfc_pin_config *cfg;
const struct sh_pfc_pin *pin;
int idx;
pin = &priv->pfc.info->pins[selector];
if (!pin) {
snprintf(buf, size, "Unknown");
return -EINVAL;
}
idx = sh_pfc_get_pin_index(pfc, pin->pin);
cfg = &pmx->configs[idx];
snprintf(buf, size, "%s", cfg->name);
return 0;
}
static int sh_pfc_pinctrl_get_functions_count(struct udevice *dev)
{
struct sh_pfc_pinctrl_priv *priv = dev_get_priv(dev);
@ -487,14 +512,21 @@ static int sh_pfc_gpio_request_enable(struct udevice *dev,
idx = sh_pfc_get_pin_index(pfc, pin->pin);
cfg = &pmx->configs[idx];
if (cfg->type != PINMUX_TYPE_NONE)
if (cfg->type != PINMUX_TYPE_NONE) {
if (!strcmp(cfg->name, pin->name))
return 0;
dev_err(pfc->dev, "Pin already used as %s\n",
cfg->name);
return -EBUSY;
}
ret = sh_pfc_config_mux(pfc, pin->enum_id, PINMUX_TYPE_GPIO);
if (ret)
return ret;
cfg->type = PINMUX_TYPE_GPIO;
cfg->name = "gpio";
return 0;
}
@ -524,6 +556,7 @@ static int sh_pfc_gpio_disable_free(struct udevice *dev,
cfg = &pmx->configs[idx];
cfg->type = PINMUX_TYPE_NONE;
cfg->name = "none";
return 0;
}
@ -537,11 +570,25 @@ static int sh_pfc_pinctrl_pin_set(struct udevice *dev, unsigned pin_selector,
const struct sh_pfc_pin *pin = &priv->pfc.info->pins[pin_selector];
int idx = sh_pfc_get_pin_index(pfc, pin->pin);
struct sh_pfc_pin_config *cfg = &pmx->configs[idx];
int ret;
if (cfg->type != PINMUX_TYPE_NONE)
if (cfg->type != PINMUX_TYPE_NONE) {
if (!strcmp(cfg->name, pin->name))
return 0;
dev_err(pfc->dev, "Pin already used as %s\n",
cfg->name);
return -EBUSY;
}
return sh_pfc_config_mux(pfc, pin->enum_id, PINMUX_TYPE_FUNCTION);
ret = sh_pfc_config_mux(pfc, pin->enum_id, PINMUX_TYPE_FUNCTION);
if (ret)
return ret;
cfg->type = PINMUX_TYPE_FUNCTION;
cfg->name = "function";
return 0;
}
static int sh_pfc_pinctrl_group_set(struct udevice *dev, unsigned group_selector,
@ -551,23 +598,41 @@ static int sh_pfc_pinctrl_group_set(struct udevice *dev, unsigned group_selector
struct sh_pfc_pinctrl *pmx = &priv->pmx;
struct sh_pfc *pfc = &priv->pfc;
const struct sh_pfc_pin_group *grp = &priv->pfc.info->groups[group_selector];
bool grp_pins_configured = true;
struct sh_pfc_pin_config *cfg;
unsigned int i;
int ret = 0;
int idx;
for (i = 0; i < grp->nr_pins; ++i) {
int idx = sh_pfc_get_pin_index(pfc, grp->pins[i]);
struct sh_pfc_pin_config *cfg = &pmx->configs[idx];
idx = sh_pfc_get_pin_index(pfc, grp->pins[i]);
cfg = &pmx->configs[idx];
if (cfg->type != PINMUX_TYPE_NONE) {
if (!strcmp(cfg->name, grp->name))
continue;
dev_err(pfc->dev, "Pin already used as %s\n",
cfg->name);
ret = -EBUSY;
goto done;
} else {
grp_pins_configured = false;
}
}
if (grp_pins_configured)
return 0;
for (i = 0; i < grp->nr_pins; ++i) {
ret = sh_pfc_config_mux(pfc, grp->mux[i], PINMUX_TYPE_FUNCTION);
if (ret < 0)
break;
idx = sh_pfc_get_pin_index(pfc, grp->pins[i]);
cfg = &pmx->configs[idx];
cfg->type = PINMUX_TYPE_FUNCTION;
cfg->name = priv->pfc.info->groups[group_selector].name;
}
done:
@ -774,6 +839,7 @@ static struct pinctrl_ops sh_pfc_pinctrl_ops = {
.get_pin_name = sh_pfc_pinctrl_get_pin_name,
.get_groups_count = sh_pfc_pinctrl_get_groups_count,
.get_group_name = sh_pfc_pinctrl_get_group_name,
.get_pin_muxing = sh_pfc_pinctrl_get_pin_muxing,
.get_functions_count = sh_pfc_pinctrl_get_functions_count,
.get_function_name = sh_pfc_pinctrl_get_function_name,
@ -804,6 +870,7 @@ static int sh_pfc_map_pins(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx)
for (i = 0; i < pfc->info->nr_pins; ++i) {
struct sh_pfc_pin_config *cfg = &pmx->configs[i];
cfg->type = PINMUX_TYPE_NONE;
cfg->name = "none";
}
return 0;