Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 628a96e7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hisi-fixes' 



Kejian Yan says:

====================
dts: hisi: fixes no syscon fault when init mdio

This patchset fixes the bug that eth can't initial successful on hip05-D02
because the dts files doesn't match the source code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9207f9d4 28052e75

Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt

+16 −0
Original line number Diff line number Diff line
@@ -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

arch/arm64/boot/dts/hisilicon/hip05.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -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>;

arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -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>;

drivers/net/ethernet/hisilicon/hns_mdio.c

+1 −1
Original line number Diff line number Diff line
@@ -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;