* [PATCH v2 next 0/2] dts: hisi: fixes no syscon error when init mdio
@ 2015-12-07 8:25 yankejian
2015-12-07 8:25 ` [PATCH v2 next 1/2] " yankejian
2015-12-07 8:25 ` [PATCH v2 next 2/2] net: hns: " yankejian
0 siblings, 2 replies; 5+ messages in thread
From: yankejian @ 2015-12-07 8:25 UTC (permalink / raw)
To: linux-arm-kernel
this patchset fixes the bug that eth can't initial successful on hip05-D02
because the dts files doesn't match the source code.
yankejian (2):
dts: hisi: fixes no syscon error when init mdio
net: hns: fixes no syscon error when init mdio
---
change log:
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:
initial version
.../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(-)
--
1.9.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2 next 1/2] dts: hisi: fixes no syscon error when init mdio 2015-12-07 8:25 [PATCH v2 next 0/2] dts: hisi: fixes no syscon error when init mdio yankejian @ 2015-12-07 8:25 ` yankejian 2015-12-08 15:25 ` Rob Herring 2015-12-07 8:25 ` [PATCH v2 next 2/2] net: hns: " yankejian 1 sibling, 1 reply; 5+ messages in thread From: yankejian @ 2015-12-07 8:25 UTC (permalink / raw) To: linux-arm-kernel Signed-nux start up, we get the log below: "Hi-HNS_MDIO 803c0000.mdio: no syscon hisilicon,peri-c-subctrl mdio_bus mdio at 803c0000: mdio sys ctl reg has not maped " the source code about the subctrl is dealled with syscon, but dts doesn't. it cause such fault. so this patch adds the syscon info on dts files to fixes it. and it adds documentation for the devicetree bindings used by DT files of Hisilicon Hip05-D02 development board. Signed-off-by: yankejian <yankejian@huawei.com> --- change log: v2: 1) updates the related documented in the binding as well 2) use the normal naming conventions using '-' instead of '_' v1: initial version --- .../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..9f05767 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,peri-c-subctrl", "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 PCIe-SAS system */ + peri-c-subctrl: sub-ctrl-c at 80000000 { + compatible = "hisilicon,peri-c-subctrl", "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..5fec740 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: sub-ctrl-c at 80000000 { + compatible = "hisilicon,peri-c-subctrl", "syscon"; + reg = < 0x0 0x80000000 0x0 0x10000>; + }; + uart0: uart at 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 at 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 at 0 { reg = <0x0>; -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 next 1/2] dts: hisi: fixes no syscon error when init mdio 2015-12-07 8:25 ` [PATCH v2 next 1/2] " yankejian @ 2015-12-08 15:25 ` Rob Herring 2015-12-09 10:52 ` Yankejian (Hackim Yim) 0 siblings, 1 reply; 5+ messages in thread From: Rob Herring @ 2015-12-08 15:25 UTC (permalink / raw) To: linux-arm-kernel On Mon, Dec 07, 2015 at 04:25:06PM +0800, yankejian wrote: > Signed-nux start up, we get the log below: > "Hi-HNS_MDIO 803c0000.mdio: no syscon hisilicon,peri-c-subctrl > mdio_bus mdio at 803c0000: mdio sys ctl reg has not maped " > > the source code about the subctrl is dealled with syscon, but dts doesn't. The source... s/dealled/dealt/ > it cause such fault. so this patch adds the syscon info on dts files to > fixes it. and it adds documentation for the devicetree bindings used by Capitalization please. > DT files of Hisilicon Hip05-D02 development board. > > Signed-off-by: yankejian <yankejian@huawei.com> > --- > change log: > v2: > 1) updates the related documented in the binding as well > 2) use the normal naming conventions using '-' instead of '_' > > v1: > initial version > --- > .../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..9f05767 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,peri-c-subctrl", "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 PCIe-SAS system */ > + peri-c-subctrl: sub-ctrl-c at 80000000 { s/sub-ctrl-c/syscon/ > + compatible = "hisilicon,peri-c-subctrl", "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..5fec740 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: sub-ctrl-c at 80000000 { > + compatible = "hisilicon,peri-c-subctrl", "syscon"; > + reg = < 0x0 0x80000000 0x0 0x10000>; > + }; > + > uart0: uart at 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 at 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 at 0 { > reg = <0x0>; > -- > 1.9.1 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 next 1/2] dts: hisi: fixes no syscon error when init mdio 2015-12-08 15:25 ` Rob Herring @ 2015-12-09 10:52 ` Yankejian (Hackim Yim) 0 siblings, 0 replies; 5+ messages in thread From: Yankejian (Hackim Yim) @ 2015-12-09 10:52 UTC (permalink / raw) To: linux-arm-kernel On 2015/12/8 23:25, Rob Herring wrote: > On Mon, Dec 07, 2015 at 04:25:06PM +0800, yankejian wrote: >> Signed-nux start up, we get the log below: >> "Hi-HNS_MDIO 803c0000.mdio: no syscon hisilicon,peri-c-subctrl >> mdio_bus mdio at 803c0000: mdio sys ctl reg has not maped " >> >> the source code about the subctrl is dealled with syscon, but dts doesn't. > The source... > > s/dealled/dealt/ Thanks for pointing it out. it will be changed in patch v3. Best Regards, yankejian >> it cause such fault. so this patch adds the syscon info on dts files to >> fixes it. and it adds documentation for the devicetree bindings used by > Capitalization please. Thanks a lot for pointing it out. i will pay attention to that next time. Best Regards, yankejian >> DT files of Hisilicon Hip05-D02 development board. >> >> Signed-off-by: yankejian <yankejian@huawei.com> >> --- >> change log: >> v2: >> 1) updates the related documented in the binding as well >> 2) use the normal naming conventions using '-' instead of '_' >> >> v1: >> initial version >> --- >> .../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..9f05767 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,peri-c-subctrl", "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 PCIe-SAS system */ >> + peri-c-subctrl: sub-ctrl-c at 80000000 { > s/sub-ctrl-c/syscon/ Thanks for pointing it out. it will be changed in patch v3. Best Regards, yankejian > >> + compatible = "hisilicon,peri-c-subctrl", "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..5fec740 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: sub-ctrl-c at 80000000 { >> + compatible = "hisilicon,peri-c-subctrl", "syscon"; >> + reg = < 0x0 0x80000000 0x0 0x10000>; >> + }; >> + >> uart0: uart at 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 at 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 at 0 { >> reg = <0x0>; >> -- >> 1.9.1 >> > . > ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 next 2/2] net: hns: fixes no syscon error when init mdio 2015-12-07 8:25 [PATCH v2 next 0/2] dts: hisi: fixes no syscon error when init mdio yankejian 2015-12-07 8:25 ` [PATCH v2 next 1/2] " yankejian @ 2015-12-07 8:25 ` yankejian 1 sibling, 0 replies; 5+ messages in thread From: yankejian @ 2015-12-07 8:25 UTC (permalink / raw) To: linux-arm-kernel 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: yankejian <yankejian@huawei.com> --- 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; -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-12-09 10:52 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-12-07 8:25 [PATCH v2 next 0/2] dts: hisi: fixes no syscon error when init mdio yankejian 2015-12-07 8:25 ` [PATCH v2 next 1/2] " yankejian 2015-12-08 15:25 ` Rob Herring 2015-12-09 10:52 ` Yankejian (Hackim Yim) 2015-12-07 8:25 ` [PATCH v2 next 2/2] net: hns: " yankejian
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 NNTP newsgroup(s).