Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b9c1334 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes-4.4-3' of... 

Merge tag 'imx-fixes-4.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

The i.MX fixes for 4.4, 3rd round:
- Fix Ethernet PHY mode on i.MX6 Ventana boards, which can result in
  a non-functional Ethernet when Marvell phy driver rather than generic
  phy driver is selected.
- Fix an assigned-clock configuration bug on imx6qdl-sabreauto board
  which was introduced by commit ed339363 ("ARM: dts:
  imx6qdl-sabreauto: Allow HDMI and LVDS to work simultaneously").

* tag 'imx-fixes-4.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6: Fix Ethernet PHY mode on Ventana boards
  ARM: dts: imx: Fix the assigned-clock mismatch issue on imx6q/dl
parents bccd240f 3a35e470

arch/arm/boot/dts/imx6q-gw5400-a.dts

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 
&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;

	status = "okay";

};

arch/arm/boot/dts/imx6qdl-gw51xx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 
&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;

	status = "okay";

};

arch/arm/boot/dts/imx6qdl-gw52xx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 
&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;

	status = "okay";

};

arch/arm/boot/dts/imx6qdl-gw53xx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ 
&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;

	status = "okay";

};

arch/arm/boot/dts/imx6qdl-gw54xx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ 
&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;

	status = "okay";

};