aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryankejian <yankejian@huawei.com>2016-01-13 02:09:58 -0500
committerDavid S. Miller <davem@davemloft.net>2016-01-15 14:40:03 -0500
commitb70ce2ab41cb67ab3d661eda078f7c4029bbca95 (patch)
treeea468282ce796291065bd35245c07a5c100104ea
parent9207f9d45b0ad071baa128e846d7e7ed85016df3 (diff)
dts: hisi: fixes no syscon fault when init mdio
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> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt16
-rw-r--r--arch/arm64/boot/dts/hisilicon/hip05.dtsi5
-rw-r--r--arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi4
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 6ac7c000af22..e3ccab114006 100644
--- a/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
+++ b/Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
@@ -187,6 +187,22 @@ Example:
187 reg = <0xb0000000 0x10000>; 187 reg = <0xb0000000 0x10000>;
188 }; 188 };
189 189
190Hisilicon HiP05 PERISUB system controller
191
192Required properties:
193- compatible : "hisilicon,hip05-perisubc", "syscon";
194- reg : Register address and size
195
196The HiP05 PERISUB system controller is shared by peripheral controllers in
197HiP05 Soc to implement some basic configurations. The peripheral
198controllers include mdio, ddr, iic, uart, timer and so on.
199
200Example:
201 /* for HiP05 perisub-ctrl-c system */
202 peri_c_subctrl: syscon@80000000 {
203 compatible = "hisilicon,hip05-perisubc", "syscon";
204 reg = <0x0 0x80000000 0x0 0x10000>;
205 };
190----------------------------------------------------------------------- 206-----------------------------------------------------------------------
191Hisilicon CPU controller 207Hisilicon CPU controller
192 208
diff --git a/arch/arm64/boot/dts/hisilicon/hip05.dtsi b/arch/arm64/boot/dts/hisilicon/hip05.dtsi
index 4ff16d016e34..c1ea999c7be1 100644
--- a/arch/arm64/boot/dts/hisilicon/hip05.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hip05.dtsi
@@ -246,6 +246,11 @@
246 clock-frequency = <200000000>; 246 clock-frequency = <200000000>;
247 }; 247 };
248 248
249 peri_c_subctrl: syscon@80000000 {
250 compatible = "hisilicon,hip05-perisubc", "syscon";
251 reg = < 0x0 0x80000000 0x0 0x10000>;
252 };
253
249 uart0: uart@80300000 { 254 uart0: uart@80300000 {
250 compatible = "snps,dw-apb-uart"; 255 compatible = "snps,dw-apb-uart";
251 reg = <0x0 0x80300000 0x0 0x10000>; 256 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 606dd5a05c2d..da7b6e613257 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 {
10 #address-cells = <1>; 10 #address-cells = <1>;
11 #size-cells = <0>; 11 #size-cells = <0>;
12 compatible = "hisilicon,hns-mdio"; 12 compatible = "hisilicon,hns-mdio";
13 reg = <0x0 0x803c0000 0x0 0x10000 13 reg = <0x0 0x803c0000 0x0 0x10000>;
14 0x0 0x80000000 0x0 0x10000>; 14 subctrl-vbase = <&peri_c_subctrl>;
15 15
16 soc0_phy0: ethernet-phy@0 { 16 soc0_phy0: ethernet-phy@0 {
17 reg = <0x0>; 17 reg = <0x0>;