diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2019-06-17 16:53:51 +0200 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2021-01-27 20:36:39 +0200 |
| commit | bf21bbbf66087db04c923270334fab8f06993736 (patch) | |
| tree | edfc5239baf559dae133c7c240d644670078db00 /arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | |
| parent | 3ed8534fb0f612e534ca770498635ffd4082f9a0 (diff) | |
ARM: dts (ds): imx6ull*colibri*: Merge changes from 4.9-2.3.x-imx-next
In 4.14 devicetress are based on the mainline DT's and only necessary
stuff for downstream is put into those devicetrees.
This commit holds the changes for imx6ull*colibri* from 4.9.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
(cherry picked from commit 2b1fa08bf92d264028e15a14a052a63f8380da65)
Conflicts:
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
arch/arm/boot/dts/imx6ull-colibri.dtsi
Squashed commit 'ARM: dts: imx6ull-colibri: add missing #endif' into
this one.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi index a0545431b3dc..a8abfe73a529 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi @@ -19,10 +19,6 @@ }; }; -&cpu0 { - clock-frequency = <792000000>; -}; - &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 |