kernel: bump 4.14 to 4.14.144
[oweals/openwrt.git] / target / linux / gemini / patches-4.14 / 0031-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini.patch
1 From dd62aee5d2d24199e71e745544e49a1a8b3c6f7a Mon Sep 17 00:00:00 2001
2 From: Linus Walleij <linus.walleij@linaro.org>
3 Date: Fri, 21 Apr 2017 20:50:22 +0200
4 Subject: [PATCH 31/31] ARM: dts: Add the FOTG210 USB host to Gemini
5
6 This adds the FOTG210 USB host controller to the Gemini
7 device trees. In the main SoC DTSI it is flagged as disabled
8 and then it is selectively enabled on the devices that utilize
9 it (these per-platform enablements are done on the out-of-tree
10 OpenWrt patch set). It is not enabled on the Itian SquareOne
11 NAS/router since this instead has a VIA host controller
12 soldered on the PCI port, and can gate off these USB host
13 controllers.
14
15 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
16 ---
17 USB maintainers: I will merge this through the ARM SoC tree,
18 the patch is only included in the series for context.
19 ---
20  arch/arm/boot/dts/gemini-dlink-dir-685.dts |  8 ++++++++
21  arch/arm/boot/dts/gemini-nas4220b.dts      |  8 ++++++++
22  arch/arm/boot/dts/gemini-rut1xx.dts        | 20 ++++++++++++++++++++
23  arch/arm/boot/dts/gemini-wbd111.dts        | 20 ++++++++++++++++++++
24  arch/arm/boot/dts/gemini-wbd222.dts        | 21 +++++++++++++++++++++
25  arch/arm/boot/dts/gemini.dtsi              | 26 ++++++++++++++++++++++++++
26  6 files changed, 103 insertions(+)
27
28 --- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
29 +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
30 @@ -299,5 +299,13 @@
31                                 };
32                         };
33                 };
34 +
35 +               usb@68000000 {
36 +                       status = "okay";
37 +               };
38 +
39 +               usb@69000000 {
40 +                       status = "okay";
41 +               };
42         };
43  };
44 --- a/arch/arm/boot/dts/gemini-nas4220b.dts
45 +++ b/arch/arm/boot/dts/gemini-nas4220b.dts
46 @@ -146,5 +146,13 @@
47                 ata@63000000 {
48                         status = "okay";
49                 };
50 +
51 +               usb@68000000 {
52 +                       status = "okay";
53 +               };
54 +
55 +               usb@69000000 {
56 +                       status = "okay";
57 +               };
58         };
59  };
60 --- a/arch/arm/boot/dts/gemini-rut1xx.dts
61 +++ b/arch/arm/boot/dts/gemini-rut1xx.dts
62 @@ -114,5 +114,25 @@
63                         pinctrl-names = "default";
64                         pinctrl-0 = <&gpio1_default_pins>;
65                 };
66 +
67 +               ethernet@60000000 {
68 +                       status = "okay";
69 +
70 +                       ethernet-port@0 {
71 +                               phy-mode = "rgmii";
72 +                               phy-handle = <&phy0>;
73 +                       };
74 +                       ethernet-port@1 {
75 +                               /* Not used in this platform */
76 +                       };
77 +               };
78 +
79 +               usb@68000000 {
80 +                       status = "okay";
81 +               };
82 +
83 +               usb@69000000 {
84 +                       status = "okay";
85 +               };
86         };
87  };
88 --- a/arch/arm/boot/dts/gemini-wbd111.dts
89 +++ b/arch/arm/boot/dts/gemini-wbd111.dts
90 @@ -160,5 +160,25 @@
91                                 <0x6000 0 0 3 &pci_intc 1>,
92                                 <0x6000 0 0 4 &pci_intc 2>;
93                 };
94 +
95 +               ethernet@60000000 {
96 +                       status = "okay";
97 +
98 +                       ethernet-port@0 {
99 +                               phy-mode = "rgmii";
100 +                               phy-handle = <&phy0>;
101 +                       };
102 +                       ethernet-port@1 {
103 +                               /* Not used in this platform */
104 +                       };
105 +               };
106 +
107 +               usb@68000000 {
108 +                       status = "okay";
109 +               };
110 +
111 +               usb@69000000 {
112 +                       status = "okay";
113 +               };
114         };
115  };
116 --- a/arch/arm/boot/dts/gemini-wbd222.dts
117 +++ b/arch/arm/boot/dts/gemini-wbd222.dts
118 @@ -165,5 +165,26 @@
119                                 <0x6000 0 0 3 &pci_intc 1>,
120                                 <0x6000 0 0 4 &pci_intc 2>;
121                 };
122 +
123 +               ethernet@60000000 {
124 +                       status = "okay";
125 +
126 +                       ethernet-port@0 {
127 +                               phy-mode = "rgmii";
128 +                               phy-handle = <&phy0>;
129 +                       };
130 +                       ethernet-port@1 {
131 +                               phy-mode = "rgmii";
132 +                               phy-handle = <&phy1>;
133 +                       };
134 +               };
135 +
136 +               usb@68000000 {
137 +                       status = "okay";
138 +               };
139 +
140 +               usb@69000000 {
141 +                       status = "okay";
142 +               };
143         };
144  };
145 --- a/arch/arm/boot/dts/gemini.dtsi
146 +++ b/arch/arm/boot/dts/gemini.dtsi
147 @@ -411,5 +411,31 @@
148                         #size-cells = <0>;
149                         status = "disabled";
150                 };
151 +
152 +               usb@68000000 {
153 +                       compatible = "cortina,gemini-usb", "faraday,fotg210";
154 +                       reg = <0x68000000 0x1000>;
155 +                       interrupts = <10 IRQ_TYPE_LEVEL_HIGH>;
156 +                       resets = <&syscon GEMINI_RESET_USB0>;
157 +                       clocks = <&syscon GEMINI_CLK_GATE_USB0>;
158 +                       clock-names = "PCLK";
159 +                       pinctrl-names = "default";
160 +                       pinctrl-0 = <&usb_default_pins>;
161 +                       syscon = <&syscon>;
162 +                       status = "disabled";
163 +               };
164 +
165 +               usb@69000000 {
166 +                       compatible = "cortina,gemini-usb", "faraday,fotg210";
167 +                       reg = <0x69000000 0x1000>;
168 +                       interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
169 +                       resets = <&syscon GEMINI_RESET_USB1>;
170 +                       clocks = <&syscon GEMINI_CLK_GATE_USB1>;
171 +                       clock-names = "PCLK";
172 +                       pinctrl-names = "default";
173 +                       pinctrl-0 = <&usb_default_pins>;
174 +                       syscon = <&syscon>;
175 +                       status = "disabled";
176 +               };
177         };
178  };