Commit 3f288e1b66cd9004b07a6695cdbb892a3bd0bb2a
1 parent
d1cb1b7889
Exists in
smarc-rel_imx_4.1.15_1.2.0_ga
Fix pinmux for SMARC-FiMX7 rev. 00B0
Showing 2 changed files with 17 additions and 14 deletions Side-by-side Diff
arch/arm/boot/dts/imx7d-smarcfimx7.dts
| ... | ... | @@ -23,8 +23,8 @@ |
| 23 | 23 | |
| 24 | 24 | backlight { |
| 25 | 25 | compatible = "pwm-backlight"; |
| 26 | - enable-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; /* Backlight Enable Pin*/ | |
| 27 | - pwms = <&pwm1 0 5000000>; | |
| 26 | + enable-gpios = <&gpio6 17 GPIO_ACTIVE_HIGH>; /* Backlight Enable Pin*/ | |
| 27 | + pwms = <&pwm2 0 5000000>; | |
| 28 | 28 | brightness-levels = <0 4 8 16 32 64 128 255>; |
| 29 | 29 | default-brightness-level = <7>; |
| 30 | 30 | status = "okay"; |
| 31 | 31 | |
| 32 | 32 | |
| ... | ... | @@ -436,14 +436,16 @@ |
| 436 | 436 | MX7D_PAD_UART3_RTS_B__GPIO4_IO6 0x80000000 /* GPIO10 */ |
| 437 | 437 | MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x80000000 /* GPIO11 */ |
| 438 | 438 | MX7D_PAD_SD2_DATA0__GPIO5_IO14 0x80000000 /* SLEEP# */ |
| 439 | - MX7D_PAD_ENET1_RX_CLK__GPIO7_IO13 0x80000000 /* CHARGER_PRSNT# */ | |
| 439 | + MX7D_PAD_GPIO1_IO09__GPIO1_IO9 0x80000000 /* CHARGER_PRSNT# */ | |
| 440 | 440 | MX7D_PAD_GPIO1_IO08__GPIO1_IO8 0x80000000 /* CHARGING# */ |
| 441 | 441 | MX7D_PAD_SAI1_RX_SYNC__GPIO6_IO16 0x80000000 /* CARRIER_STBY# */ |
| 442 | - MX7D_PAD_SAI1_RX_BCLK__GPIO6_IO17 0x80000000 /* CARRIER_PWR_ON# */ | |
| 443 | 442 | MX7D_PAD_SD2_RESET_B__GPIO5_IO11 0x80000000 /* BATLOW# */ |
| 444 | 443 | MX7D_PAD_SD1_RESET_B__GPIO5_IO2 0x80000000 /* SDIO_PWR_EN */ |
| 445 | 444 | MX7D_PAD_LCD_RESET__GPIO3_IO4 0x80000000 /* LCD POWER */ |
| 446 | 445 | MX7D_PAD_EPDC_BDR1__GPIO2_IO29 0x80000000 /* RESET_OUT# */ |
| 446 | + MX7D_PAD_ENET1_COL__GPIO7_IO15 0x80000000 /* ENET1_INT# */ | |
| 447 | + MX7D_PAD_ENET1_RX_CLK__GPIO7_IO13 0x80000000 /* ENET2_INT# */ | |
| 448 | + MX7D_PAD_ENET1_CRS__GPIO7_IO14 0x80000000 /* WDT_TIME_OUT# */ | |
| 447 | 449 | >; |
| 448 | 450 | }; |
| 449 | 451 | |
| 450 | 452 | |
| ... | ... | @@ -912,14 +914,14 @@ |
| 912 | 914 | status = "okay"; |
| 913 | 915 | }; |
| 914 | 916 | |
| 917 | +/* GPIO5 configure as pwm1, to use GPIO5 as GPIO disabled this pin */ | |
| 918 | + | |
| 915 | 919 | &pwm1 { |
| 916 | 920 | pinctrl-names = "default"; |
| 917 | 921 | pinctrl-0 = <&pinctrl_pwm1>; |
| 918 | 922 | status = "okay"; |
| 919 | 923 | }; |
| 920 | 924 | |
| 921 | -/* GPIO5 configure as pwm2, to use GPIO5 as GPIO disabled this pin */ | |
| 922 | - | |
| 923 | 925 | &pwm2 { |
| 924 | 926 | pinctrl-names = "default"; |
| 925 | 927 | pinctrl-0 = <&pinctrl_pwm2>; |
| ... | ... | @@ -945,7 +947,7 @@ |
| 945 | 947 | |
| 946 | 948 | pinctrl_pwm2: pwm2grp { |
| 947 | 949 | fsl,pins = < |
| 948 | - MX7D_PAD_GPIO1_IO09__PWM2_OUT 0x30 | |
| 950 | + MX7D_PAD_GPIO1_IO02__PWM2_OUT 0x30 | |
| 949 | 951 | >; |
| 950 | 952 | }; |
| 951 | 953 |
arch/arm/boot/dts/imx7s-smarcfimx7.dts
| ... | ... | @@ -19,8 +19,8 @@ |
| 19 | 19 | |
| 20 | 20 | backlight { |
| 21 | 21 | compatible = "pwm-backlight"; |
| 22 | - enable-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; /* Backlight Enable Pin*/ | |
| 23 | - pwms = <&pwm1 0 5000000>; | |
| 22 | + enable-gpios = <&gpio6 17 GPIO_ACTIVE_HIGH>; /* Backlight Enable Pin*/ | |
| 23 | + pwms = <&pwm2 0 5000000>; | |
| 24 | 24 | brightness-levels = <0 4 8 16 32 64 128 255>; |
| 25 | 25 | default-brightness-level = <7>; |
| 26 | 26 | status = "okay"; |
| 27 | 27 | |
| 28 | 28 | |
| ... | ... | @@ -414,14 +414,15 @@ |
| 414 | 414 | MX7D_PAD_UART3_RTS_B__GPIO4_IO6 0x80000000 /* GPIO10 */ |
| 415 | 415 | MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x80000000 /* GPIO11 */ |
| 416 | 416 | MX7D_PAD_SD2_DATA0__GPIO5_IO14 0x80000000 /* SLEEP# */ |
| 417 | - MX7D_PAD_ENET1_RX_CLK__GPIO7_IO13 0x80000000 /* CHARGER_PRSNT# */ | |
| 417 | + MX7D_PAD_GPIO1_IO09__GPIO1_IO9 0x80000000 /* CHARGER_PRSNT# */ | |
| 418 | 418 | MX7D_PAD_GPIO1_IO08__GPIO1_IO8 0x80000000 /* CHARGING# */ |
| 419 | 419 | MX7D_PAD_SAI1_RX_SYNC__GPIO6_IO16 0x80000000 /* CARRIER_STBY# */ |
| 420 | - MX7D_PAD_SAI1_RX_BCLK__GPIO6_IO17 0x80000000 /* CARRIER_PWR_ON# */ | |
| 421 | 420 | MX7D_PAD_SD2_RESET_B__GPIO5_IO11 0x80000000 /* BATLOW# */ |
| 422 | 421 | MX7D_PAD_SD1_RESET_B__GPIO5_IO2 0x80000000 /* SDIO_PWR_EN */ |
| 423 | 422 | MX7D_PAD_LCD_RESET__GPIO3_IO4 0x80000000 /* LCD POWER */ |
| 424 | 423 | MX7D_PAD_EPDC_BDR1__GPIO2_IO29 0x80000000 /* RESET_OUT# */ |
| 424 | + MX7D_PAD_ENET1_COL__GPIO7_IO15 0x80000000 /* ENET1_INT# */ | |
| 425 | + MX7D_PAD_ENET1_CRS__GPIO7_IO14 0x80000000 /* WDT_TIME_OUT# */ | |
| 425 | 426 | >; |
| 426 | 427 | }; |
| 427 | 428 | |
| 428 | 429 | |
| ... | ... | @@ -884,14 +885,14 @@ |
| 884 | 885 | status = "okay"; |
| 885 | 886 | }; |
| 886 | 887 | |
| 888 | +/* GPIO5 configure as pwm1, to use GPIO5 as GPIO disabled this pin */ | |
| 889 | + | |
| 887 | 890 | &pwm1 { |
| 888 | 891 | pinctrl-names = "default"; |
| 889 | 892 | pinctrl-0 = <&pinctrl_pwm1>; |
| 890 | 893 | status = "okay"; |
| 891 | 894 | }; |
| 892 | 895 | |
| 893 | -/* GPIO5 configure as pwm1, to use GPIO5 as GPIO disabled this pin */ | |
| 894 | - | |
| 895 | 896 | &pwm2 { |
| 896 | 897 | pinctrl-names = "default"; |
| 897 | 898 | pinctrl-0 = <&pinctrl_pwm2>; |
| ... | ... | @@ -917,7 +918,7 @@ |
| 917 | 918 | |
| 918 | 919 | pinctrl_pwm2: pwm2grp { |
| 919 | 920 | fsl,pins = < |
| 920 | - MX7D_PAD_GPIO1_IO09__PWM2_OUT 0x30 | |
| 921 | + MX7D_PAD_GPIO1_IO02__PWM2_OUT 0x30 | |
| 921 | 922 | >; |
| 922 | 923 | }; |
| 923 | 924 |