tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: dts: imx6qdl: move phy properties into phy device node

This patch fixes issues found by dtbs_check:
make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/net/fsl,fec.yaml

According to the Micrel PHY dt-binding:
Documentation/devicetree/bindings/net/micrel-ksz90x1.txt,
Add clock delay in an Ethernet OF device node is deprecated, so move
these properties to PHY OF device node.

Suggested-by: Rob Herring <robh@kernel.org>
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Joakim Zhang and committed by
David S. Miller dabb5db1 649502a3

+124 -64
+22 -12
arch/arm/boot/dts/imx6q-novena.dts
··· 222 222 pinctrl-names = "default"; 223 223 pinctrl-0 = <&pinctrl_enet_novena>; 224 224 phy-mode = "rgmii"; 225 + phy-handle = <&ethphy>; 225 226 phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>; 226 - rxc-skew-ps = <3000>; 227 - rxdv-skew-ps = <0>; 228 - txc-skew-ps = <3000>; 229 - txen-skew-ps = <0>; 230 - rxd0-skew-ps = <0>; 231 - rxd1-skew-ps = <0>; 232 - rxd2-skew-ps = <0>; 233 - rxd3-skew-ps = <0>; 234 - txd0-skew-ps = <3000>; 235 - txd1-skew-ps = <3000>; 236 - txd2-skew-ps = <3000>; 237 - txd3-skew-ps = <3000>; 238 227 status = "okay"; 228 + 229 + mdio { 230 + #address-cells = <1>; 231 + #size-cells = <0>; 232 + 233 + ethphy: ethernet-phy { 234 + compatible = "ethernet-phy-ieee802.3-c22"; 235 + rxc-skew-ps = <3000>; 236 + rxdv-skew-ps = <0>; 237 + txc-skew-ps = <3000>; 238 + txen-skew-ps = <0>; 239 + rxd0-skew-ps = <0>; 240 + rxd1-skew-ps = <0>; 241 + rxd2-skew-ps = <0>; 242 + rxd3-skew-ps = <0>; 243 + txd0-skew-ps = <3000>; 244 + txd1-skew-ps = <3000>; 245 + txd2-skew-ps = <3000>; 246 + txd3-skew-ps = <3000>; 247 + }; 248 + }; 239 249 }; 240 250 241 251 &hdmi {
+14 -4
arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
··· 316 316 pinctrl-names = "default"; 317 317 pinctrl-0 = <&pinctrl_enet>; 318 318 phy-mode = "rgmii"; 319 + phy-handle = <&ethphy>; 319 320 phy-reset-gpios = <&gpio7 18 GPIO_ACTIVE_LOW>; 320 - txd0-skew-ps = <0>; 321 - txd1-skew-ps = <0>; 322 - txd2-skew-ps = <0>; 323 - txd3-skew-ps = <0>; 324 321 status = "okay"; 322 + 323 + mdio { 324 + #address-cells = <1>; 325 + #size-cells = <0>; 326 + 327 + ethphy: ethernet-phy { 328 + compatible = "ethernet-phy-ieee802.3-c22"; 329 + txd0-skew-ps = <0>; 330 + txd1-skew-ps = <0>; 331 + txd2-skew-ps = <0>; 332 + txd3-skew-ps = <0>; 333 + }; 334 + }; 325 335 }; 326 336 327 337 &gpmi {
+22 -12
arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
··· 190 190 pinctrl-names = "default"; 191 191 pinctrl-0 = <&pinctrl_enet>; 192 192 phy-mode = "rgmii"; 193 + phy-handle = <&ethphy>; 193 194 phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; 194 - txen-skew-ps = <0>; 195 - txc-skew-ps = <3000>; 196 - rxdv-skew-ps = <0>; 197 - rxc-skew-ps = <3000>; 198 - rxd0-skew-ps = <0>; 199 - rxd1-skew-ps = <0>; 200 - rxd2-skew-ps = <0>; 201 - rxd3-skew-ps = <0>; 202 - txd0-skew-ps = <0>; 203 - txd1-skew-ps = <0>; 204 - txd2-skew-ps = <0>; 205 - txd3-skew-ps = <0>; 206 195 interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, 207 196 <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; 208 197 fsl,err006687-workaround-present; 209 198 status = "okay"; 199 + 200 + mdio { 201 + #address-cells = <1>; 202 + #size-cells = <0>; 203 + 204 + ethphy: ethernet-phy { 205 + compatible = "ethernet-phy-ieee802.3-c22"; 206 + txen-skew-ps = <0>; 207 + txc-skew-ps = <3000>; 208 + rxdv-skew-ps = <0>; 209 + rxc-skew-ps = <3000>; 210 + rxd0-skew-ps = <0>; 211 + rxd1-skew-ps = <0>; 212 + rxd2-skew-ps = <0>; 213 + rxd3-skew-ps = <0>; 214 + txd0-skew-ps = <0>; 215 + txd1-skew-ps = <0>; 216 + txd2-skew-ps = <0>; 217 + txd3-skew-ps = <0>; 218 + }; 219 + }; 210 220 }; 211 221 212 222 &hdmi {
+22 -12
arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
··· 332 332 pinctrl-names = "default"; 333 333 pinctrl-0 = <&pinctrl_enet>; 334 334 phy-mode = "rgmii"; 335 + phy-handle = <&ethphy>; 335 336 phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; 336 - txen-skew-ps = <0>; 337 - txc-skew-ps = <3000>; 338 - rxdv-skew-ps = <0>; 339 - rxc-skew-ps = <3000>; 340 - rxd0-skew-ps = <0>; 341 - rxd1-skew-ps = <0>; 342 - rxd2-skew-ps = <0>; 343 - rxd3-skew-ps = <0>; 344 - txd0-skew-ps = <0>; 345 - txd1-skew-ps = <0>; 346 - txd2-skew-ps = <0>; 347 - txd3-skew-ps = <0>; 348 337 interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, 349 338 <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; 350 339 fsl,err006687-workaround-present; 351 340 status = "okay"; 341 + 342 + mdio { 343 + #address-cells = <1>; 344 + #size-cells = <0>; 345 + 346 + ethphy: ethernet-phy { 347 + compatible = "ethernet-phy-ieee802.3-c22"; 348 + txen-skew-ps = <0>; 349 + txc-skew-ps = <3000>; 350 + rxdv-skew-ps = <0>; 351 + rxc-skew-ps = <3000>; 352 + rxd0-skew-ps = <0>; 353 + rxd1-skew-ps = <0>; 354 + rxd2-skew-ps = <0>; 355 + rxd3-skew-ps = <0>; 356 + txd0-skew-ps = <0>; 357 + txd1-skew-ps = <0>; 358 + txd2-skew-ps = <0>; 359 + txd3-skew-ps = <0>; 360 + }; 361 + }; 352 362 }; 353 363 354 364 &hdmi {
+22 -12
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
··· 265 265 pinctrl-names = "default"; 266 266 pinctrl-0 = <&pinctrl_enet>; 267 267 phy-mode = "rgmii"; 268 + phy-handle = <&ethphy>; 268 269 phy-reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; 269 - txen-skew-ps = <0>; 270 - txc-skew-ps = <3000>; 271 - rxdv-skew-ps = <0>; 272 - rxc-skew-ps = <3000>; 273 - rxd0-skew-ps = <0>; 274 - rxd1-skew-ps = <0>; 275 - rxd2-skew-ps = <0>; 276 - rxd3-skew-ps = <0>; 277 - txd0-skew-ps = <0>; 278 - txd1-skew-ps = <0>; 279 - txd2-skew-ps = <0>; 280 - txd3-skew-ps = <0>; 281 270 interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>, 282 271 <&intc 0 119 IRQ_TYPE_LEVEL_HIGH>; 283 272 fsl,err006687-workaround-present; 284 273 status = "okay"; 274 + 275 + mdio { 276 + #address-cells = <1>; 277 + #size-cells = <0>; 278 + 279 + ethphy: ethernet-phy { 280 + compatible = "ethernet-phy-ieee802.3-c22"; 281 + txen-skew-ps = <0>; 282 + txc-skew-ps = <3000>; 283 + rxdv-skew-ps = <0>; 284 + rxc-skew-ps = <3000>; 285 + rxd0-skew-ps = <0>; 286 + rxd1-skew-ps = <0>; 287 + rxd2-skew-ps = <0>; 288 + rxd3-skew-ps = <0>; 289 + txd0-skew-ps = <0>; 290 + txd1-skew-ps = <0>; 291 + txd2-skew-ps = <0>; 292 + txd3-skew-ps = <0>; 293 + }; 294 + }; 285 295 }; 286 296 287 297 &hdmi {
+22 -12
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
··· 324 324 pinctrl-names = "default"; 325 325 pinctrl-0 = <&pinctrl_enet>; 326 326 phy-mode = "rgmii"; 327 + phy-handle = <&ethphy>; 327 328 phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>; 328 - txen-skew-ps = <0>; 329 - txc-skew-ps = <3000>; 330 - rxdv-skew-ps = <0>; 331 - rxc-skew-ps = <3000>; 332 - rxd0-skew-ps = <0>; 333 - rxd1-skew-ps = <0>; 334 - rxd2-skew-ps = <0>; 335 - rxd3-skew-ps = <0>; 336 - txd0-skew-ps = <0>; 337 - txd1-skew-ps = <0>; 338 - txd2-skew-ps = <0>; 339 - txd3-skew-ps = <0>; 340 329 status = "okay"; 330 + 331 + mdio { 332 + #address-cells = <1>; 333 + #size-cells = <0>; 334 + 335 + ethphy: ethernet-phy { 336 + compatible = "ethernet-phy-ieee802.3-c22"; 337 + txen-skew-ps = <0>; 338 + txc-skew-ps = <3000>; 339 + rxdv-skew-ps = <0>; 340 + rxc-skew-ps = <3000>; 341 + rxd0-skew-ps = <0>; 342 + rxd1-skew-ps = <0>; 343 + rxd2-skew-ps = <0>; 344 + rxd3-skew-ps = <0>; 345 + txd0-skew-ps = <0>; 346 + txd1-skew-ps = <0>; 347 + txd2-skew-ps = <0>; 348 + txd3-skew-ps = <0>; 349 + }; 350 + }; 341 351 }; 342 352 343 353 &hdmi {