* [patch v3 net-next 2/2] net: hns: fixes no syscon error when init mdio
2016-01-13 3:01 [PATCH v2 next-next] net: hns: enet specifies a reference to dsaf Kejian Yan
@ 2016-01-13 3:01 ` Kejian Yan
0 siblings, 0 replies; 6+ messages in thread
From: Kejian Yan @ 2016-01-13 3:01 UTC (permalink / raw
To: davem, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
catalin.marinas, will.deacon, huangdaode, liguozhu, arnd,
fengguang.wu, salil.mehta, andriy.shevchenko, lisheng011
Cc: haifeng.wei, netdev, devicetree, linux-kernel, linux-arm-kernel,
linuxarm
As dtsi files use the normal naming conventions using '-' instead of '_'
inside of property names, the driver needs to update the phandle name
strings of the of_parse_phandle func.
Signed-off-by: Kejian Yan <yankejian@huawei.com>
---
change log:
v3:
same as v2
v2:
adds the initial version, because using '-' instead of '_'
v1:
does not exist.
v2 patch link: https://lkml.org/lkml/2015/12/7/77
---
drivers/net/ethernet/hisilicon/hns_mdio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/hisilicon/hns_mdio.c b/drivers/net/ethernet/hisilicon/hns_mdio.c
index 37491c8..1e07e91 100644
--- a/drivers/net/ethernet/hisilicon/hns_mdio.c
+++ b/drivers/net/ethernet/hisilicon/hns_mdio.c
@@ -458,7 +458,7 @@ static int hns_mdio_probe(struct platform_device *pdev)
}
mdio_dev->subctrl_vbase =
- syscon_node_to_regmap(of_parse_phandle(np, "subctrl_vbase", 0));
+ syscon_node_to_regmap(of_parse_phandle(np, "subctrl-vbase", 0));
if (IS_ERR(mdio_dev->subctrl_vbase)) {
dev_warn(&pdev->dev, "no syscon hisilicon,peri-c-subctrl\n");
mdio_dev->subctrl_vbase = NULL;
--
2.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [patch v3 net-next 0/2] dts: hisi: fixes no syscon fault when init mdio
@ 2016-01-13 7:09 Kejian Yan
2016-01-13 7:09 ` [patch v3 net-next 1/2] " Kejian Yan
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Kejian Yan @ 2016-01-13 7:09 UTC (permalink / raw
To: davem, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
xuwei5, catalin.marinas, will.deacon, f.fainelli, andrew,
liguozhu, Yisen.Zhuang, sboyd, haojian.zhuang, wangzhou1,
bintian.wang, long.wanglong, leo.yan
Cc: haifeng.wei, devicetree, linux-arm-kernel, linux-kernel, netdev,
linuxarm
This patchset fixes the bug that eth can't initial successful on hip05-D02
because the dts files doesn't match the source code.
Kejian Yan (2):
dts: hisi: fixes no syscon fault when init mdio
net: hns: fixes no syscon error when init mdio
---
change log:
v3:
1) uses capital letter at the beginning of sentences
2) updates the right device node name
v2:
1) update the related documented in the binding as well
2) use the normal naming conventions using '-' instead of '_', and
update the related *.c files.
v1:
first submit
.../devicetree/bindings/arm/hisilicon/hisilicon.txt | 16 ++++++++++++++++
arch/arm64/boot/dts/hisilicon/hip05.dtsi | 5 +++++
arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi | 4 ++--
drivers/net/ethernet/hisilicon/hns_mdio.c | 2 +-
4 files changed, 24 insertions(+), 3 deletions(-)
--
2.4.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [patch v3 net-next 1/2] dts: hisi: fixes no syscon fault when init mdio
2016-01-13 7:09 [patch v3 net-next 0/2] dts: hisi: fixes no syscon fault when init mdio Kejian Yan
@ 2016-01-13 7:09 ` Kejian Yan
[not found] ` <1452668999-443-2-git-send-email-yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
[not found] ` <1452668999-443-1-git-send-email-yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2016-01-15 19:40 ` [patch v3 net-next 0/2] dts: hisi: fixes no syscon fault " David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Kejian Yan @ 2016-01-13 7:09 UTC (permalink / raw
To: davem, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak,
xuwei5, catalin.marinas, will.deacon, f.fainelli, andrew,
liguozhu, Yisen.Zhuang, sboyd, haojian.zhuang, wangzhou1,
bintian.wang, long.wanglong, leo.yan
Cc: haifeng.wei, devicetree, linux-arm-kernel, linux-kernel, netdev,
linuxarm
When linux start up, we get the log below:
"Hi-HNS_MDIO 803c0000.mdio: no syscon hisilicon,peri-c-subctrl
mdio_bus mdio@803c0000: mdio sys ctl reg has not maped"
The source code about the subctrl is dealt syscon, but dts doesn't.
It cause such fault, so this patch adds the syscon info on dts files to
fixes it.
Signed-off-by: Kejian Yan <yankejian@huawei.com>
---
change log:
v3:
1) uses capital letter at the beginning of sentences
2) updates the right device node name
v2:
1) updates the related documented in the binding as well
2) uses the normal naming conventions using '-' instead of '_'
v1:
first submit
v2 patch link: https://lkml.org/lkml/2015/12/7/80
v1 patch link: https://lkml.org/lkml/2015/11/28/3
---
.../devicetree/bindings/arm/hisilicon/hisilicon.txt | 16 ++++++++++++++++
arch/arm64/boot/dts/hisilicon/hip05.dtsi | 5 +++++
arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi | 4 ++--
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
index 6ac7c00..e3ccab1 100644
--- a/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
+++ b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
@@ -187,6 +187,22 @@ Example:
reg = <0xb0000000 0x10000>;
};
+Hisilicon HiP05 PERISUB system controller
+
+Required properties:
+- compatible : "hisilicon,hip05-perisubc", "syscon";
+- reg : Register address and size
+
+The HiP05 PERISUB system controller is shared by peripheral controllers in
+HiP05 Soc to implement some basic configurations. The peripheral
+controllers include mdio, ddr, iic, uart, timer and so on.
+
+Example:
+ /* for HiP05 perisub-ctrl-c system */
+ peri_c_subctrl: syscon@80000000 {
+ compatible = "hisilicon,hip05-perisubc", "syscon";
+ reg = <0x0 0x80000000 0x0 0x10000>;
+ };
-----------------------------------------------------------------------
Hisilicon CPU controller
diff --git a/arch/arm64/boot/dts/hisilicon/hip05.dtsi b/arch/arm64/boot/dts/hisilicon/hip05.dtsi
index 4ff16d0..c1ea999 100644
--- a/arch/arm64/boot/dts/hisilicon/hip05.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hip05.dtsi
@@ -246,6 +246,11 @@
clock-frequency = <200000000>;
};
+ peri_c_subctrl: syscon@80000000 {
+ compatible = "hisilicon,hip05-perisubc", "syscon";
+ reg = < 0x0 0x80000000 0x0 0x10000>;
+ };
+
uart0: uart@80300000 {
compatible = "snps,dw-apb-uart";
reg = <0x0 0x80300000 0x0 0x10000>;
diff --git a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi
index 606dd5a..da7b6e6 100644
--- a/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi
@@ -10,8 +10,8 @@ soc0: soc@000000000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "hisilicon,hns-mdio";
- reg = <0x0 0x803c0000 0x0 0x10000
- 0x0 0x80000000 0x0 0x10000>;
+ reg = <0x0 0x803c0000 0x0 0x10000>;
+ subctrl-vbase = <&peri_c_subctrl>;
soc0_phy0: ethernet-phy@0 {
reg = <0x0>;
--
2.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [patch v3 net-next 2/2] net: hns: fixes no syscon error when init mdio
[not found] ` <1452668999-443-1-git-send-email-yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
@ 2016-01-13 7:09 ` Kejian Yan
0 siblings, 0 replies; 6+ messages in thread
From: Kejian Yan @ 2016-01-13 7:09 UTC (permalink / raw
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q, robh+dt-DgEjT+Ai2ygdnm+yROfE0A,
pawel.moll-5wv7dgnIgG8, mark.rutland-5wv7dgnIgG8,
ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg,
galak-sgV2jX0FEOL9JmXXK+q4OQ, xuwei5-C8/M+/jPZTeaMJb+Lgu22Q,
catalin.marinas-5wv7dgnIgG8, will.deacon-5wv7dgnIgG8,
f.fainelli-Re5JQEeQqe8AvxtiuMwx3w, andrew-g2DYL2Zd6BY,
liguozhu-hv44wF8Li93QT0dZR+AlfA,
Yisen.Zhuang-hv44wF8Li93QT0dZR+AlfA, sboyd-sgV2jX0FEOL9JmXXK+q4OQ,
haojian.zhuang-QSEj5FYQhm4dnm+yROfE0A,
wangzhou1-C8/M+/jPZTeaMJb+Lgu22Q,
bintian.wang-hv44wF8Li93QT0dZR+AlfA,
long.wanglong-hv44wF8Li93QT0dZR+AlfA,
leo.yan-QSEj5FYQhm4dnm+yROfE0A
Cc: haifeng.wei-hv44wF8Li93QT0dZR+AlfA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA, linuxarm-hv44wF8Li93QT0dZR+AlfA
As dtsi files use the normal naming conventions using '-' instead of '_'
inside of property names, the driver needs to update the phandle name
strings of the of_parse_phandle func.
Signed-off-by: Kejian Yan <yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
---
change log:
v3:
same as v2
v2:
adds the initial version, because using '-' instead of '_'
v1:
does not exist.
v2 patch link: https://lkml.org/lkml/2015/12/7/77
---
drivers/net/ethernet/hisilicon/hns_mdio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/hisilicon/hns_mdio.c b/drivers/net/ethernet/hisilicon/hns_mdio.c
index 37491c8..1e07e91 100644
--- a/drivers/net/ethernet/hisilicon/hns_mdio.c
+++ b/drivers/net/ethernet/hisilicon/hns_mdio.c
@@ -458,7 +458,7 @@ static int hns_mdio_probe(struct platform_device *pdev)
}
mdio_dev->subctrl_vbase =
- syscon_node_to_regmap(of_parse_phandle(np, "subctrl_vbase", 0));
+ syscon_node_to_regmap(of_parse_phandle(np, "subctrl-vbase", 0));
if (IS_ERR(mdio_dev->subctrl_vbase)) {
dev_warn(&pdev->dev, "no syscon hisilicon,peri-c-subctrl\n");
mdio_dev->subctrl_vbase = NULL;
--
2.4.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [patch v3 net-next 1/2] dts: hisi: fixes no syscon fault when init mdio
[not found] ` <1452668999-443-2-git-send-email-yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
@ 2016-01-15 2:17 ` Rob Herring
0 siblings, 0 replies; 6+ messages in thread
From: Rob Herring @ 2016-01-15 2:17 UTC (permalink / raw
To: Kejian Yan
Cc: davem-fT/PcQaiUtIeIZ0/mPfg9Q, pawel.moll-5wv7dgnIgG8,
mark.rutland-5wv7dgnIgG8, ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg,
galak-sgV2jX0FEOL9JmXXK+q4OQ, xuwei5-C8/M+/jPZTeaMJb+Lgu22Q,
catalin.marinas-5wv7dgnIgG8, will.deacon-5wv7dgnIgG8,
f.fainelli-Re5JQEeQqe8AvxtiuMwx3w, andrew-g2DYL2Zd6BY,
liguozhu-hv44wF8Li93QT0dZR+AlfA,
Yisen.Zhuang-hv44wF8Li93QT0dZR+AlfA, sboyd-sgV2jX0FEOL9JmXXK+q4OQ,
haojian.zhuang-QSEj5FYQhm4dnm+yROfE0A,
wangzhou1-C8/M+/jPZTeaMJb+Lgu22Q,
bintian.wang-hv44wF8Li93QT0dZR+AlfA,
long.wanglong-hv44wF8Li93QT0dZR+AlfA,
leo.yan-QSEj5FYQhm4dnm+yROfE0A,
haifeng.wei-hv44wF8Li93QT0dZR+AlfA,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA, linuxarm-hv44wF8Li93QT0dZR+AlfA
On Wed, Jan 13, 2016 at 03:09:58PM +0800, Kejian Yan wrote:
> When linux start up, we get the log below:
> "Hi-HNS_MDIO 803c0000.mdio: no syscon hisilicon,peri-c-subctrl
> mdio_bus mdio@803c0000: mdio sys ctl reg has not maped"
>
> The source code about the subctrl is dealt syscon, but dts doesn't.
> It cause such fault, so this patch adds the syscon info on dts files to
> fixes it.
>
> Signed-off-by: Kejian Yan <yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
> ---
> change log:
> v3:
> 1) uses capital letter at the beginning of sentences
> 2) updates the right device node name
>
> v2:
> 1) updates the related documented in the binding as well
> 2) uses the normal naming conventions using '-' instead of '_'
>
> v1:
> first submit
>
> v2 patch link: https://lkml.org/lkml/2015/12/7/80
> v1 patch link: https://lkml.org/lkml/2015/11/28/3
> ---
> .../devicetree/bindings/arm/hisilicon/hisilicon.txt | 16 ++++++++++++++++
> arch/arm64/boot/dts/hisilicon/hip05.dtsi | 5 +++++
> arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi | 4 ++--
> 3 files changed, 23 insertions(+), 2 deletions(-)
Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch v3 net-next 0/2] dts: hisi: fixes no syscon fault when init mdio
2016-01-13 7:09 [patch v3 net-next 0/2] dts: hisi: fixes no syscon fault when init mdio Kejian Yan
2016-01-13 7:09 ` [patch v3 net-next 1/2] " Kejian Yan
[not found] ` <1452668999-443-1-git-send-email-yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
@ 2016-01-15 19:40 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2016-01-15 19:40 UTC (permalink / raw
To: yankejian
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, xuwei5,
catalin.marinas, will.deacon, f.fainelli, andrew, liguozhu,
Yisen.Zhuang, sboyd, haojian.zhuang, wangzhou1, bintian.wang,
long.wanglong, leo.yan, haifeng.wei, devicetree, linux-arm-kernel,
linux-kernel, netdev, linuxarm
From: Kejian Yan <yankejian@huawei.com>
Date: Wed, 13 Jan 2016 15:09:57 +0800
> This patchset fixes the bug that eth can't initial successful on hip05-D02
> because the dts files doesn't match the source code.
Series applied, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-01-15 19:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-13 7:09 [patch v3 net-next 0/2] dts: hisi: fixes no syscon fault when init mdio Kejian Yan
2016-01-13 7:09 ` [patch v3 net-next 1/2] " Kejian Yan
[not found] ` <1452668999-443-2-git-send-email-yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2016-01-15 2:17 ` Rob Herring
[not found] ` <1452668999-443-1-git-send-email-yankejian-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2016-01-13 7:09 ` [patch v3 net-next 2/2] net: hns: fixes no syscon error " Kejian Yan
2016-01-15 19:40 ` [patch v3 net-next 0/2] dts: hisi: fixes no syscon fault " David Miller
-- strict thread matches above, loose matches on Subject: below --
2016-01-13 3:01 [PATCH v2 next-next] net: hns: enet specifies a reference to dsaf Kejian Yan
2016-01-13 3:01 ` [patch v3 net-next 2/2] net: hns: fixes no syscon error when init mdio Kejian Yan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).