Skip to content
Snippets Groups Projects
Commit 6eaf8b3d authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by Mathias Kresin
Browse files

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: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarMathias Kresin <dev@kresin.me>
parent f519fea4
No related branches found
No related tags found
No related merge requests found
Showing
with 301 additions and 51 deletions
......@@ -13,6 +13,18 @@
memory@0 {
reg = <0x0 0x4000000>;
};
usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed";
regulator-name = "USB_VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio 3 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
&gpio {
......@@ -87,9 +99,13 @@
status = "okay";
};
&usb_phy {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb {
status = "okay";
gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
};
&vmmc {
......
......@@ -96,6 +96,18 @@
gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
};
};
usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed";
regulator-name = "USB_VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio 14 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
&gpio {
......@@ -178,9 +190,13 @@
req-mask = <0xf>;
};
&usb_phy {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb {
status = "okay";
gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
};
&vmmc {
......
......@@ -106,6 +106,18 @@
gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
};
};
usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed";
regulator-name = "USB_VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio 14 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
&gpio {
......@@ -175,9 +187,13 @@
req-mask = <0xf>;
};
&usb_phy {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb {
status = "okay";
gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
};
&vmmc {
......
......@@ -112,6 +112,18 @@
info is missing
*/
};
usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed";
regulator-name = "USB_VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio 28 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
&gpio {
......@@ -199,9 +211,13 @@
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
};
&usb_phy {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb {
status = "okay";
gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
};
&vmmc {
......
......@@ -124,6 +124,18 @@
gpios = <&gpiomm 9 GPIO_ACTIVE_LOW>;
};
};
usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed";
regulator-name = "USB_VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio 28 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
&gpio {
......@@ -217,9 +229,13 @@
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
};
&usb_phy {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb {
status = "okay";
gpios = <&gpio 28 GPIO_ACTIVE_HIGH>;
};
&vmmc {
......
......@@ -114,6 +114,18 @@
lantiq,output = <0>;
};
};
usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed";
regulator-name = "USB_VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio 8 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
&gsw {
......@@ -181,9 +193,13 @@
};
};
&usb_phy {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb {
status = "okay";
gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
};
&vmmc {
......
......@@ -145,6 +145,18 @@
lantiq,open-drain = <1>;
};
};
usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed";
regulator-name = "USB_VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio 14 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
&gpiomm {
......@@ -213,9 +225,13 @@
};
};
&usb_phy {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb {
status = "okay";
gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
};
&vmmc {
......
......@@ -214,6 +214,10 @@
};
};
&usb_phy {
status = "okay";
};
/* warning: passive port only works with active devices */
&usb {
status = "okay";
......
......@@ -3,6 +3,7 @@
#include "vr9.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/mips/lantiq_rcu_gphy.h>
/ {
compatible = "arcadyan,arv7519rw22", "lantiq,xway", "lantiq,vr9";
......@@ -24,13 +25,6 @@
reg = <0x0 0x8000000>;
};
gphy-xrx200 {
compatible = "lantiq,phy-xrx200";
firmware1 = "lantiq/xrx200_phy22f_a14.bin"; /*VR9 1.1*/
firmware2 = "lantiq/xrx200_phy22f_a22.bin"; /*VR9 1.2*/
phys = [ 00 01 ];
};
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
......@@ -87,6 +81,18 @@
gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
};
};
usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed";
regulator-name = "USB_VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio 32 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
&eth0 {
......@@ -159,6 +165,13 @@
};
};
&gphy0 {
lantiq,gphy-mode = <GPHY_MODE_FE>;
};
&gphy1 {
lantiq,gphy-mode = <GPHY_MODE_FE>;
};
&gpio {
pinctrl-names = "default";
......@@ -221,12 +234,20 @@
gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
};
&usb_phy0 {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb_phy1 {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb0 {
status = "okay";
gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
};
&usb1 {
status = "okay";
gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
};
......@@ -152,6 +152,18 @@
lantiq,open-drain = <1>;
};
};
usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed";
regulator-name = "USB_VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
&gpiomm {
......@@ -218,9 +230,13 @@
};
};
&usb_phy {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb {
status = "okay";
gpios = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
};
&vmmc {
......
......@@ -122,6 +122,18 @@
gpios = <&gpiomm 14 GPIO_ACTIVE_LOW>;
};
};
usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed";
regulator-name = "USB_VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
&gpio {
......@@ -240,9 +252,13 @@
};
};
&usb_phy {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb {
status = "okay";
gpios = <&gpiomm 0 GPIO_ACTIVE_HIGH>;
};
&vmmc {
......
......@@ -76,6 +76,18 @@
telefonie green is missing
*/
};
usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed";
regulator-name = "USB_VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio 14 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
&gpio {
......@@ -164,10 +176,13 @@
};
};
&usb_phy {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb {
status = "okay";
gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
lantiq,portmask = <0x3>;
};
&vmmc {
......
......@@ -3,6 +3,7 @@
#include "vr9.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/mips/lantiq_rcu_gphy.h>
/ {
compatible = "alphanetworks,asl56026", "lantiq,xway", "lantiq,vr9";
......@@ -24,13 +25,6 @@
reg = <0x0 0x2000000>;
};
gphy-xrx200 {
compatible = "lantiq,phy-xrx200";
firmware1 = "lantiq/xrx200_phy22f_a14.bin"; /*VR9 1.1*/
firmware2 = "lantiq/xrx200_phy22f_a22.bin"; /*VR9 1.2*/
phys = [ 00 01 ];
};
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
......@@ -120,6 +114,14 @@
};
};
&gphy0 {
lantiq,gphy-mode = <GPHY_MODE_FE>;
};
&gphy1 {
lantiq,gphy-mode = <GPHY_MODE_FE>;
};
&gpio {
pinctrl-names = "default";
pinctrl-0 = <&state_default>;
......
......@@ -248,6 +248,10 @@
};
};
&usb_phy {
status = "okay";
};
&usb {
status = "okay";
};
......
......@@ -90,6 +90,18 @@
gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
};
};
usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed";
regulator-name = "USB_VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio 33 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
&gpio {
......@@ -193,7 +205,11 @@
};
};
&usb_phy0 {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb0 {
status = "okay";
gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
};
......@@ -3,6 +3,7 @@
#include "vr9.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/mips/lantiq_rcu_gphy.h>
/ {
compatible = "bt,homehub-v5a", "lantiq,xway", "lantiq,vr9";
......@@ -25,13 +26,6 @@
reg = <0x0 0x8000000>;
};
gphy-xrx200 {
compatible = "lantiq,phy-xrx200";
firmware1 = "lantiq/xrx200_phy11g_a14.bin"; /*VR9 1.1*/
firmware2 = "lantiq/xrx200_phy11g_a22.bin"; /*VR9 1.2*/
phys = [ 00 01 ];
};
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
......@@ -108,6 +102,18 @@
gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
};
};
usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed";
regulator-name = "USB_VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio 33 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
&eth0 {
......@@ -179,6 +185,14 @@
};
};
&gphy0 {
lantiq,gphy-mode = <GPHY_MODE_GE>;
};
&gphy1 {
lantiq,gphy-mode = <GPHY_MODE_GE>;
};
&gpio {
pinctrl-names = "default";
pinctrl-0 = <&state_default>;
......@@ -275,7 +289,11 @@
};
};
&usb_phy0 {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb0 {
status = "okay";
gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
};
......@@ -164,6 +164,10 @@
};
};
&usb_phy {
status = "okay";
};
&usb {
status = "okay";
};
......@@ -204,6 +204,10 @@
};
};
&usb_phy0 {
status = "okay";
};
&usb0 {
status = "okay";
};
......@@ -3,6 +3,7 @@
#include "vr9.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/mips/lantiq_rcu_gphy.h>
/ {
compatible = "netgear,dm200", "lantiq,xway", "lantiq,vr9";
......@@ -24,12 +25,6 @@
reg = <0x0 0x4000000>;
};
gphy-xrx200 {
compatible = "lantiq,phy-xrx200";
firmware = "lantiq/xrx200_phy22f_a22.bin";
phys = [ 01 ];
};
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
......@@ -91,6 +86,8 @@
};
&eth0 {
lantiq,phys = <&gphy1>;
lan: interface@0 {
compatible = "lantiq,xrx200-pdi";
#address-cells = <1>;
......@@ -118,6 +115,10 @@
};
};
&gphy1 {
lantiq,gphy-mode = <GPHY_MODE_FE>;
};
&gpio {
pinctrl-names = "default";
pinctrl-0 = <&state_default>;
......
#include "vr9.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/mips/lantiq_rcu_gphy.h>
/ {
compatible = "lantiq,easy80920", "lantiq,xway", "lantiq,vr9";
......@@ -22,13 +23,6 @@
reg = <0x0 0x4000000>;
};
gphy-xrx200 {
compatible = "lantiq,phy-xrx200";
firmware1 = "lantiq/xrx200_phy11g_a14.bin";
firmware2 = "lantiq/xrx200_phy11g_a22.bin";
phys = [ 00 01 ];
};
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
......@@ -87,6 +81,18 @@
gpios = <&stp 12 GPIO_ACTIVE_HIGH>;
};
};
usb_vbus: regulator-usb-vbus {
compatible = "regulator-fixed";
regulator-name = "USB_VBUS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio 33 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
&eth0 {
......@@ -167,6 +173,14 @@
};
};
&gphy0 {
lantiq,gphy-mode = <GPHY_MODE_GE>;
};
&gphy1 {
lantiq,gphy-mode = <GPHY_MODE_GE>;
};
&gpio {
pinctrl-names = "default";
pinctrl-0 = <&state_default>;
......@@ -288,8 +302,11 @@
/* lantiq,rising; */
};
&usb_phy0 {
status = "okay";
phy-supply = <&usb_vbus>;
};
&usb0 {
status = "okay";
gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
lantiq,portmask = <0x3>;
};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment