From 6eaf8b3d89571992a0aa7142cfab3f1dcef3c802 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 13 Nov 2017 22:39:01 +0100 Subject: lantiq: kernel 4.14: update dts files Updated the devicetree source files to make use of the following upstreamed drivers: - xrx200 ethernet phy - reset controller unit - dwc2 - fpi Use our custom xrx200 ethernet phy compatible to support boards, which have switched the vr9 revision during lifetime, with a single devicetree source file. By switching to the dwc2 driver + usb phy framework, we don't need to used our custom gpio power patch and can use a fixed regulator instead. Signed-off-by: Hauke Mehrtens Signed-off-by: Mathias Kresin --- .../lantiq/files-4.14/arch/mips/boot/dts/vr9.dtsi | 95 ++++++++++++++++++---- 1 file changed, 80 insertions(+), 15 deletions(-) (limited to 'target/linux/lantiq/files-4.14/arch/mips/boot/dts/vr9.dtsi') diff --git a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/vr9.dtsi index 14427900a6..adad9506d9 100644 --- a/target/linux/lantiq/files-4.14/arch/mips/boot/dts/vr9.dtsi +++ b/target/linux/lantiq/files-4.14/arch/mips/boot/dts/vr9.dtsi @@ -46,8 +46,10 @@ }; watchdog@803f0 { - compatible = "lantiq,wdt"; + compatible = "lantiq,xrx100-wdt", "lantiq,xrx100-wdt"; reg = <0x803f0 0x10>; + + regmap = <&rcu0>; }; }; @@ -91,25 +93,81 @@ }; rcu0: rcu@203000 { - compatible = "lantiq,rcu-xrx200"; - reg = <0x203000 0x1000>; - /* irq for thermal sensor */ - interrupt-parent = <&icu0>; - interrupts = <115>; - }; - - xbar0: xbar@400000 { - compatible = "lantiq,xbar-xway"; - reg = <0x400000 0x1000>; + compatible = "lantiq,xrx200-rcu", "simple-mfd", "syscon"; + reg = <0x203000 0x100>; + ranges = <0x0 0x203000 0x100>; + big-endian; + + gphy0: gphy@20 { + compatible = "lantiq,xrx200-gphy"; + reg = <0x20 0x4>; + + resets = <&reset0 31 30>, <&reset1 7 7>; + reset-names = "gphy", "gphy2"; + }; + + gphy1: gphy@68 { + compatible = "lantiq,xrx200-gphy"; + reg = <0x68 0x4>; + + resets = <&reset0 29 28>, <&reset1 6 6>; + reset-names = "gphy", "gphy2"; + }; + + reset0: reset-controller@10 { + compatible = "lantiq,xrx200-reset"; + reg = <0x10 4>, <0x14 4>; + + #reset-cells = <2>; + }; + + reset1: reset-controller@48 { + compatible = "lantiq,xrx200-reset"; + reg = <0x48 4>, <0x24 4>; + + #reset-cells = <2>; + }; + + usb_phy0: usb2-phy@18 { + compatible = "lantiq,xrx200-usb2-phy"; + reg = <0x18 4>, <0x38 4>; + status = "disabled"; + + resets = <&reset1 4 4>, <&reset0 4 4>; + reset-names = "phy", "ctrl"; + #phy-cells = <0>; + }; + + usb_phy1: usb2-phy@34 { + compatible = "lantiq,xrx200-usb2-phy"; + reg = <0x34 4>, <0x3c 4>; + status = "disabled"; + + resets = <&reset1 5 4>, <&reset0 4 4>; + reset-names = "phy", "ctrl"; + #phy-cells = <0>; + }; + + reboot@10 { + compatible = "syscon-reboot"; + reg = <0x10 4>; + + regmap = <&rcu0>; + offset = <0x10>; + mask = <0x40000000>; + }; }; }; fpi@10000000 { + compatible = "lantiq,xrx200-fpi", "simple-bus"; + ranges = <0x0 0x10000000 0xf000000>; + reg = <0x1f400000 0x1000>, + <0x10000000 0xf000000>; + regmap = <&rcu0>; + offset-endianness = <0x4c>; #address-cells = <1>; #size-cells = <1>; - compatible = "lantiq,fpi", "simple-bus"; - ranges = <0x0 0x10000000 0xeefffff>; - reg = <0x10000000 0xef00000>; localbus: localbus@0 { #address-cells = <2>; @@ -191,12 +249,14 @@ usb0: usb@e101000 { status = "disabled"; - compatible = "lantiq,xrx200-usb", "lantiq,ifxhcd-xrx200"; + compatible = "lantiq,xrx200-usb"; reg = <0xe101000 0x1000 0xe120000 0x3f000>; interrupt-parent = <&icu0>; interrupts = <62 91>; dr_mode = "host"; + phys = <&usb_phy0>; + phy-names = "usb2-phy"; }; usb1: usb@e106000 { @@ -206,6 +266,8 @@ interrupt-parent = <&icu0>; interrupts = <91>; dr_mode = "host"; + phys = <&usb_phy1>; + phy-names = "usb2-phy"; }; eth0: eth@e108000 { @@ -219,6 +281,9 @@ >; interrupt-parent = <&icu0>; interrupts = <75 73 72>; + resets = <&reset0 21 16>, <&reset0 8 8>; + reset-names = "switch", "ppe"; + lantiq,phys = <&gphy0>, <&gphy1>; }; mei@e116000 { -- cgit v1.2.3