diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-03-29 15:56:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-03-29 15:56:48 +0200 |
| commit | feecb81732d8f271440d907beb082425e109f877 (patch) | |
| tree | af55ca33d43cf3b3c2b82e9860df7d01be061a0f /arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | |
| parent | MAINTAINERS: Add myself as futex reviewer (diff) | |
| parent | Linux 5.12-rc5 (diff) | |
| download | linux-feecb81732d8f271440d907beb082425e109f877.tar.xz linux-feecb81732d8f271440d907beb082425e109f877.zip | |
Merge tag 'v5.12-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6ul-14x14-evk.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi index c593597b2119..5a1e10def6ef 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi @@ -210,9 +210,6 @@ micrel,led-mode = <1>; clocks = <&clks IMX6UL_CLK_ENET_REF>; clock-names = "rmii-ref"; - reset-gpios = <&gpio_spi 1 GPIO_ACTIVE_LOW>; - reset-assert-us = <10000>; - reset-deassert-us = <100>; }; @@ -222,9 +219,6 @@ micrel,led-mode = <1>; clocks = <&clks IMX6UL_CLK_ENET2_REF>; clock-names = "rmii-ref"; - reset-gpios = <&gpio_spi 2 GPIO_ACTIVE_LOW>; - reset-assert-us = <10000>; - reset-deassert-us = <100>; }; }; }; @@ -243,6 +237,22 @@ status = "okay"; }; +&gpio_spi { + eth0-phy-hog { + gpio-hog; + gpios = <1 GPIO_ACTIVE_HIGH>; + output-high; + line-name = "eth0-phy"; + }; + + eth1-phy-hog { + gpio-hog; + gpios = <2 GPIO_ACTIVE_HIGH>; + output-high; + line-name = "eth1-phy"; + }; +}; + &i2c1 { clock-frequency = <100000>; pinctrl-names = "default"; |