update linux patch, fix eth1 not work bug

guowenxue

2021-11-17 a43f71cec50f5d82e7e0fe8cd44bd8cdbeddb62f

 bsp/kernel/patch/linux-imx-imx6ull.patch

@@ -1,6 +1,6 @@
diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi linux-imx-imx6ull/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
--- linux-imx/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi   2021-09-08 18:41:11.000000000 +0800
+++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi   2021-11-17 21:58:06.816818504 +0800
+++ linux-imx-imx6ull/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi   2021-11-17 23:49:58.757150998 +0800
@@ -31,7 +31,41 @@
       brightness-levels = <0 4 8 16 32 64 128 255>;
       default-brightness-level = <6>;
@@ -44,6 +44,15 @@
 
    pxp_v4l2 {
       compatible = "fsl,imx6ul-pxp-v4l2", "fsl,imx6sx-pxp-v4l2", "fsl,imx6sl-pxp-v4l2";
@@ -142,7 +176,7 @@
       compatible = "spi-gpio";
       pinctrl-names = "default";
       pinctrl-0 = <&pinctrl_spi4>;
-      status = "okay";
+      status = "disabled"; /* MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07 conflict with fec1 reset pin */
       pinctrl-assert-gpios = <&gpio5 8 GPIO_ACTIVE_LOW>;
       gpio-sck = <&gpio5 11 0>;
       gpio-mosi = <&gpio5 10 0>;
@@ -184,6 +218,12 @@
    pinctrl-0 = <&pinctrl_i2c2>;
    status = "okay";
@@ -67,7 +76,39 @@
    };
 
    ov5640: ov5640@3c {
@@ -301,21 +342,21 @@
@@ -221,7 +262,9 @@
    pinctrl-0 = <&pinctrl_enet1>;
    phy-mode = "rmii";
    phy-handle = <&ethphy0>;
-   phy-supply = <&reg_peri_3v3>;
+    phy-reset-gpios = <&gpio5 7 GPIO_ACTIVE_LOW>; /* MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07 conflict with spi4 */
+    phy-reset-duration = <50>;
+    phy-reset-post-delay = <15>;
    status = "okay";
 };
 
@@ -230,15 +273,17 @@
    pinctrl-0 = <&pinctrl_enet2>;
    phy-mode = "rmii";
    phy-handle = <&ethphy1>;
-   phy-supply = <&reg_peri_3v3>;
+    phy-reset-gpios = <&gpio5 4 GPIO_ACTIVE_LOW>; /* MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04 conflict with sai2 */
+    phy-reset-duration = <50>;
+    phy-reset-post-delay = <15>;
    status = "okay";
 
    mdio {
       #address-cells = <1>;
       #size-cells = <0>;
 
-      ethphy0: ethernet-phy@2 {
-         reg = <2>;
+      ethphy0: ethernet-phy@0 {
+         reg = <0>;
          micrel,led-mode = <1>;
          clocks = <&clks IMX6UL_CLK_ENET_REF>;
          clock-names = "rmii-ref";
@@ -301,21 +346,21 @@
 
    display0: display@0 {
       bits-per-pixel = <16>;
@@ -99,7 +140,7 @@
             hsync-active = <0>;
             vsync-active = <0>;
             de-active = <1>;
@@ -332,6 +373,13 @@
@@ -332,6 +377,13 @@
    status = "okay";
 };
 
@@ -113,7 +154,7 @@
 &pxp {
    status = "okay";
 };
@@ -339,7 +387,7 @@
@@ -339,7 +391,7 @@
 &qspi {
    pinctrl-names = "default";
    pinctrl-0 = <&pinctrl_qspi>;
@@ -122,7 +163,16 @@
 
    flash0: n25q256a@0 {
       #address-cells = <1>;
@@ -451,7 +499,7 @@
@@ -360,7 +412,7 @@
    assigned-clock-parents = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
    assigned-clock-rates = <0>, <12288000>;
    fsl,sai-mclk-direction-output;
-   status = "okay";
+   status = "disabled"; /* MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04 conflict with fec2 reset pin */
 };
 
 &snvs_poweroff {
@@ -451,7 +503,7 @@
    non-removable;
    keep-power-in-suspend;
    wakeup-source;
@@ -131,7 +181,7 @@
 };
 
 &wdog1 {
@@ -463,6 +511,18 @@
@@ -463,6 +515,18 @@
 &iomuxc {
    pinctrl-names = "default";
 
@@ -150,7 +200,31 @@
    pinctrl_csi1: csi1grp {
       fsl,pins = <
          MX6UL_PAD_CSI_MCLK__CSI_MCLK      0x1b088
@@ -610,6 +670,12 @@
@@ -490,6 +554,7 @@
          MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00   0x1b0b0
          MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01   0x1b0b0
          MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1   0x4001b031
+         MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07   0x10B0 /* ENET1 RESET conflict with pinctrl_spi4 */
       >;
    };
 
@@ -505,6 +570,7 @@
          MX6UL_PAD_ENET2_TX_DATA0__ENET2_TDATA00   0x1b0b0
          MX6UL_PAD_ENET2_TX_DATA1__ENET2_TDATA01   0x1b0b0
          MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2   0x4001b031
+         MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04   0x10B0 /* ENET2 RESET conflict with pinctrl_sai2 */
       >;
    };
 
@@ -594,7 +660,6 @@
          MX6UL_PAD_JTAG_TRST_B__SAI2_TX_DATA   0x11088
          MX6UL_PAD_JTAG_TCK__SAI2_RX_DATA   0x11088
          MX6UL_PAD_JTAG_TMS__SAI2_MCLK      0x17088
-         MX6UL_PAD_SNVS_TAMPER4__GPIO5_IO04   0x17059
       >;
    };
 
@@ -610,6 +675,12 @@
       >;
    };
 
@@ -163,7 +237,15 @@
    pinctrl_sim2: sim2grp {
       fsl,pins = <
          MX6UL_PAD_CSI_DATA03__SIM2_PORT1_PD      0xb808
@@ -679,8 +745,6 @@
@@ -625,7 +696,6 @@
       fsl,pins = <
          MX6UL_PAD_BOOT_MODE0__GPIO5_IO10   0x70a1
          MX6UL_PAD_BOOT_MODE1__GPIO5_IO11   0x70a1
-         MX6UL_PAD_SNVS_TAMPER7__GPIO5_IO07   0x70a1
          MX6UL_PAD_SNVS_TAMPER8__GPIO5_IO08   0x80000000
       >;
    };
@@ -679,8 +749,6 @@
          MX6UL_PAD_SD1_DATA2__USDHC1_DATA2    0x17059
          MX6UL_PAD_SD1_DATA3__USDHC1_DATA3    0x17059
          MX6UL_PAD_UART1_RTS_B__GPIO1_IO19       0x17059 /* SD1 CD */
@@ -185,7 +267,7 @@
             snvs_poweroff: snvs-poweroff {
diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/.cfg-imx6ull linux-imx-imx6ull/.cfg-imx6ull
--- linux-imx/.cfg-imx6ull   1970-01-01 08:00:00.000000000 +0800
+++ linux-imx-imx6ull/.cfg-imx6ull   2021-11-17 21:54:22.114060031 +0800
+++ linux-imx-imx6ull/.cfg-imx6ull   2021-11-17 23:54:02.719749912 +0800
@@ -0,0 +1,6910 @@
+#
+# Automatically generated file; DO NOT EDIT.
@@ -7099,7 +7181,7 @@
+# end of Kernel hacking
diff -Nuar -x include-prefixes -x logo_linux_clut224.ppm linux-imx/Makefile linux-imx-imx6ull/Makefile
--- linux-imx/Makefile   2021-09-08 18:41:11.000000000 +0800
+++ linux-imx-imx6ull/Makefile   2021-11-17 21:49:34.243652949 +0800
+++ linux-imx-imx6ull/Makefile   2021-11-17 23:50:00.489132691 +0800
@@ -367,7 +367,8 @@
 # Alternatively CROSS_COMPILE can be set in the environment.
 # Default value for CROSS_COMPILE is not to prefix executables