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

k210: dts: align fpioa node with Linux 

Linux kernel fpioa pinctrl driver expects the sysctl phandle and the
power bit offset of the fpioa device to be specified as a single
property "canaan,k210-sysctl-power".
Replace the "canaan,k210-sysctl" and "canaan,k210-power-offset"
properties with "canaan,k210-sysctl-power" to satisfy the Linux kernel
requirements. This new property is parsed using the existing function
dev_read_phandle_with_args().

Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Reviewed-by: Sean Anderson <seanga2@gmail.com>
This commit is contained in:
Damien Le Moal 2022-03-01 10:35:41 +00:00 committed by Leo Yu-Chi Liang
parent dd241d04a6
commit a6c86ec2d6
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/riscv/dts/k210.dtsi
View File

@ -378,8 +378,7 @@
<&sysclk K210_CLK_APB0>; <&sysclk K210_CLK_APB0>;
clock-names = "ref", "pclk"; clock-names = "ref", "pclk";
resets = <&sysrst K210_RST_FPIOA>; resets = <&sysrst K210_RST_FPIOA>;
canaan,k210-sysctl = <&sysctl>; canaan,k210-sysctl-power = <&sysctl K210_SYSCTL_POWER_SEL>;
canaan,k210-power-offset = <K210_SYSCTL_POWER_SEL>;
pinctrl-0 = <&fpioa_jtag>; pinctrl-0 = <&fpioa_jtag>;
pinctrl-names = "default"; pinctrl-names = "default";
status = "disabled"; status = "disabled";

19
drivers/pinctrl/pinctrl-k210.c
View File

@ -679,6 +679,7 @@ static int k210_pc_probe(struct udevice *dev)
{ {
int ret, i, j; int ret, i, j;
struct k210_pc_priv *priv = dev_get_priv(dev); struct k210_pc_priv *priv = dev_get_priv(dev);
struct ofnode_phandle_args args;
priv->fpioa = dev_read_addr_ptr(dev); priv->fpioa = dev_read_addr_ptr(dev);
if (!priv->fpioa) if (!priv->fpioa)
@ -692,15 +693,23 @@ static int k210_pc_probe(struct udevice *dev)
if (ret && ret != -ENOSYS && ret != -ENOTSUPP) if (ret && ret != -ENOSYS && ret != -ENOTSUPP)
goto err; goto err;
priv->sysctl = syscon_regmap_lookup_by_phandle(dev, "canaan,k210-sysctl"); ret = dev_read_phandle_with_args(dev, "canaan,k210-sysctl-power",
NULL, 1, 0, &args);
if (ret)
goto err;
if (args.args_count != 1) {
ret = -EINVAL;
goto err;
}
priv->sysctl = syscon_node_to_regmap(args.node);
if (IS_ERR(priv->sysctl)) { if (IS_ERR(priv->sysctl)) {
ret = -ENODEV; ret = PTR_ERR(priv->sysctl);
goto err; goto err;
} }
ret = dev_read_u32(dev, "canaan,k210-power-offset", &priv->power_offset); priv->power_offset = args.args[0];
if (ret)
goto err;
debug("%s: fpioa = %p sysctl = %p power offset = %x\n", __func__, debug("%s: fpioa = %p sysctl = %p power offset = %x\n", __func__,
priv->fpioa, (void *)priv->sysctl->ranges[0].start, priv->fpioa, (void *)priv->sysctl->ranges[0].start,