Commit 227746e88bd6b7a5d9aeb37f5efc2bcdc6682083

Authored by Eric Lee
1 parent 81f7e38249

Make changes for rev. 00C0

Showing 2 changed files with 10 additions and 15 deletions Side-by-side Diff

arch/arm64/boot/dts/embedian/fsl-smarcimx8mq-common.dtsi
... ... @@ -187,14 +187,13 @@
187 187 MX8MQ_IOMUXC_GPIO1_IO03_GPIO1_IO3 0x19 /*RESET_OUT#*/
188 188 MX8MQ_IOMUXC_GPIO1_IO11_GPIO1_IO11 0x19 /*FEC_IRQ#*/
189 189 MX8MQ_IOMUXC_NAND_CLE_GPIO3_IO5 0x19 /*PCIE_WAKE#*/
190   - MX8MQ_IOMUXC_GPIO1_IO09_GPIO1_IO9 0x19 /*LID#*/
191   - MX8MQ_IOMUXC_GPIO1_IO10_GPIO1_IO10 0x19 /*SLEEP#*/
192   - MX8MQ_IOMUXC_GPIO1_IO01_GPIO1_IO1 0x19 /*CHARGING#*/
193   - MX8MQ_IOMUXC_GPIO1_IO12_GPIO1_IO12 0x19 /*CHARGER_PRSNT#*/
  190 + MX8MQ_IOMUXC_GPIO1_IO09_GPIO1_IO9 0x41 /*LID#*/
  191 + MX8MQ_IOMUXC_GPIO1_IO12_GPIO1_IO12 0x41 /*SLEEP#*/
  192 + MX8MQ_IOMUXC_GPIO1_IO01_GPIO1_IO1 0x41 /*CHARGING#*/
  193 + MX8MQ_IOMUXC_SAI2_RXC_GPIO4_IO22 0x41 /*CHARGER_PRSNT#*/
194 194 MX8MQ_IOMUXC_SAI3_MCLK_GPIO5_IO2 0x19 /*CARRIER_STBY#*/
195   - MX8MQ_IOMUXC_GPIO1_IO08_GPIO1_IO8 0x19 /*BATLOW#*/
  195 + MX8MQ_IOMUXC_SAI2_RXFS_GPIO4_IO21 0x41 /*BATLOW#*/
196 196 MX8MQ_IOMUXC_NAND_DATA04_GPIO3_IO10 0x41 /*USB0_EN_OC#*/
197   - MX8MQ_IOMUXC_NAND_DATA05_GPIO3_IO11 0x41 /*USB1_EN_OC#*/
198 197 MX8MQ_IOMUXC_NAND_DATA06_GPIO3_IO12 0x41 /*USB2_EN_OC#*/
199 198 MX8MQ_IOMUXC_NAND_DATA07_GPIO3_IO13 0x41 /*USB3_EN_OC#*/
200 199 >;
201 200  
... ... @@ -690,9 +689,9 @@
690 689 status = "disabled";
691 690 reg = <0x2c>;
692 691 compatible = "ti,sn65dsi84";
693   - enable-gpios = <&gpio4 2 GPIO_ACTIVE_HIGH>;
  692 + enable-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>;
694 693 interrupt-parent = <&gpio4>;
695   - interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
  694 + interrupts = <29 IRQ_TYPE_EDGE_FALLING>;
696 695  
697 696 /* AUO G070VW01 7-inch 800x480 LVDS Display */
698 697 sn65dsi84,addresses = < 0x09 0x0A 0x0B 0x0D 0x10 0x11 0x12 0x13
... ... @@ -898,7 +897,7 @@
898 897  
899 898 &usb_dwc3_0 {
900 899 status = "okay";
901   - dr_mode = "otg";
  900 + dr_mode = "peripheral";
902 901 };
903 902  
904 903 &usb3_phy1 {
... ... @@ -1185,8 +1184,6 @@
1185 1184 reg = <2>;
1186 1185 spi-max-frequency = <16000000>;
1187 1186 clocks = <&can_osc>;
1188   - interrupt-parent = <&gpio3>;
1189   - interrupts = <18 IRQ_TYPE_EDGE_FALLING>;
1190 1187 vdd-supply = <&reg_3p3v>;
1191 1188 xceiver-supply = <&reg_5p0v>;
1192 1189 };
... ... @@ -1196,8 +1193,6 @@
1196 1193 reg = <3>;
1197 1194 spi-max-frequency = <16000000>;
1198 1195 clocks = <&can_osc>;
1199   - interrupt-parent = <&gpio3>;
1200   - interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
1201 1196 vdd-supply = <&reg_3p3v>;
1202 1197 xceiver-supply = <&reg_5p0v>;
1203 1198 };
drivers/pci/dwc/pci-imx6.c
... ... @@ -958,10 +958,10 @@
958 958 if (gpio_is_valid(imx_pcie->reset_gpio)) {
959 959 gpio_set_value_cansleep(imx_pcie->reset_gpio,
960 960 imx_pcie->gpio_active_high);
961   - mdelay(20);
  961 + mdelay(100);
962 962 gpio_set_value_cansleep(imx_pcie->reset_gpio,
963 963 !imx_pcie->gpio_active_high);
964   - mdelay(20);
  964 + mdelay(100);
965 965 }
966 966  
967 967 if (ret == 0)