Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: imx6ull-colibri: add/update some comments

Add/update some comments.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Marcel Ziswiler and committed by
Shawn Guo
17c101d8 54845368

+30 -10
+3 -1
arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi
··· 8 8 / { 9 9 aliases { 10 10 mmc0 = &usdhc2; /* eMMC */ 11 - mmc1 = &usdhc1; /* MMC 4bit slot */ 11 + mmc1 = &usdhc1; /* MMC 4-bit slot */ 12 12 }; 13 13 14 14 memory@80000000 { ··· 154 154 "SODIMM_127"; 155 155 }; 156 156 157 + /* NAND */ 157 158 &gpmi { 158 159 status = "disabled"; 159 160 }; ··· 171 170 pinctrl-0 = <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio3>; 172 171 }; 173 172 173 + /* eMMC */ 174 174 &usdhc2 { 175 175 pinctrl-names = "default"; 176 176 pinctrl-0 = <&pinctrl_usdhc2emmc>;
+27 -9
arch/arm/boot/dts/imx6ull-colibri.dtsi
··· 6 6 #include "imx6ull.dtsi" 7 7 8 8 / { 9 + /* Ethernet aliases to ensure correct MAC addresses */ 9 10 aliases { 10 11 ethernet0 = &fec2; 11 12 ethernet1 = &fec1; ··· 105 104 pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>; 106 105 }; 107 106 107 + /* Ethernet */ 108 108 &fec2 { 109 109 pinctrl-names = "default", "sleep"; 110 110 pinctrl-0 = <&pinctrl_enet2>; ··· 127 125 }; 128 126 }; 129 127 128 + /* NAND */ 130 129 &gpmi { 131 130 pinctrl-names = "default"; 132 131 pinctrl-0 = <&pinctrl_gpmi_nand>; ··· 139 136 status = "okay"; 140 137 }; 141 138 139 + /* I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier board) */ 142 140 &i2c1 { 143 141 pinctrl-names = "default", "gpio"; 144 142 pinctrl-0 = <&pinctrl_i2c1>; ··· 161 157 }; 162 158 }; 163 159 160 + /* 161 + * PWR_I2C: power I2C to audio codec, PMIC, temperature sensor and 162 + * touch screen controller 163 + */ 164 164 &i2c2 { 165 165 /* Use low frequency to compensate for the high pull-up values. */ 166 166 clock-frequency = <40000>; ··· 204 196 }; 205 197 }; 206 198 199 + /* PWM <A> */ 207 200 &pwm4 { 208 201 pinctrl-names = "default"; 209 202 pinctrl-0 = <&pinctrl_pwm4>; 210 203 }; 211 204 205 + /* PWM <B> */ 212 206 &pwm5 { 213 207 pinctrl-names = "default"; 214 208 pinctrl-0 = <&pinctrl_pwm5>; 215 209 }; 216 210 211 + /* PWM <C> */ 217 212 &pwm6 { 218 213 pinctrl-names = "default"; 219 214 pinctrl-0 = <&pinctrl_pwm6>; 220 215 }; 221 216 217 + /* PWM <D> */ 222 218 &pwm7 { 223 219 pinctrl-names = "default"; 224 220 pinctrl-0 = <&pinctrl_pwm7>; ··· 236 224 status = "disabled"; 237 225 }; 238 226 227 + /* Colibri UART_A */ 239 228 &uart1 { 240 229 pinctrl-names = "default"; 241 230 pinctrl-0 = <&pinctrl_uart1 &pinctrl_uart1_ctrl1>; ··· 244 231 fsl,dte-mode; 245 232 }; 246 233 234 + /* Colibri UART_B */ 247 235 &uart2 { 248 236 pinctrl-names = "default"; 249 237 pinctrl-0 = <&pinctrl_uart2>; ··· 252 238 fsl,dte-mode; 253 239 }; 254 240 241 + /* Colibri UART_C */ 255 242 &uart5 { 256 243 pinctrl-names = "default"; 257 244 pinctrl-0 = <&pinctrl_uart5>; 258 245 fsl,dte-mode; 259 246 }; 260 247 248 + /* Colibri USBC */ 261 249 &usbotg1 { 262 250 dr_mode = "otg"; 263 251 srp-disable; ··· 267 251 adp-disable; 268 252 }; 269 253 254 + /* Colibri USBH */ 270 255 &usbotg2 { 271 256 dr_mode = "host"; 272 257 }; 273 258 259 + /* Colibri MMC/SD */ 274 260 &usdhc1 { 275 261 pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; 276 262 pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_snvs_usdhc1_cd>; ··· 283 265 assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>; 284 266 assigned-clock-rates = <0>, <198000000>; 285 267 bus-width = <4>; 286 - cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; 268 + cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; /* MMC_CD */ 287 269 disable-wp; 288 270 keep-power-in-suspend; 289 271 no-1-8-v; ··· 449 431 450 432 /* 451 433 * With an eMMC instead of a raw NAND device the following pins 452 - * are available at SODIMM pins 434 + * are available at SODIMM pins. 453 435 */ 454 436 pinctrl_gpmi_gpio: gpmi-gpio-grp { 455 437 fsl,pins = < ··· 574 556 575 557 pinctrl_uart1_ctrl1: uart1-ctrl1-grp { /* Additional DTR, DCD */ 576 558 fsl,pins = < 577 - MX6UL_PAD_JTAG_TDI__GPIO1_IO13 0x70a0 /* SODIMM 31 */ 578 - MX6UL_PAD_LCD_DATA18__GPIO3_IO23 0x10b0 /* SODIMM 29 */ 579 - MX6UL_PAD_JTAG_TDO__GPIO1_IO12 0x90b1 /* SODIMM 23 */ 580 - MX6UL_PAD_LCD_DATA19__GPIO3_IO24 0x10b0 /* SODIMM 37 */ 559 + MX6UL_PAD_JTAG_TDI__GPIO1_IO13 0x70a0 /* SODIMM 31 / DCD */ 560 + MX6UL_PAD_LCD_DATA18__GPIO3_IO23 0x10b0 /* SODIMM 29 / DSR */ 561 + MX6UL_PAD_JTAG_TDO__GPIO1_IO12 0x90b1 /* SODIMM 23 / DTR */ 562 + MX6UL_PAD_LCD_DATA19__GPIO3_IO24 0x10b0 /* SODIMM 37 / RI */ 581 563 >; 582 564 }; 583 565 ··· 598 580 599 581 pinctrl_usbh_reg: gpio-usbh-reg { 600 582 fsl,pins = < 601 - MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0x10b0 /* SODIMM 129 */ 583 + MX6UL_PAD_GPIO1_IO02__GPIO1_IO02 0x10b0 /* SODIMM 129 / USBH_PEN */ 602 584 >; 603 585 }; 604 586 ··· 676 658 MX6ULL_PAD_SNVS_TAMPER6__GPIO5_IO06 0x110a0 /* SODIMM 93 */ 677 659 MX6ULL_PAD_SNVS_TAMPER3__GPIO5_IO03 0x110a0 /* SODIMM 95 */ 678 660 MX6ULL_PAD_BOOT_MODE0__GPIO5_IO10 0x1b0a0 /* SODIMM 105 */ 679 - MX6ULL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x0b0a0 /* SODIMM 131 */ 661 + MX6ULL_PAD_SNVS_TAMPER5__GPIO5_IO05 0x0b0a0 /* SODIMM 131 / USBH_OC */ 680 662 MX6ULL_PAD_SNVS_TAMPER8__GPIO5_IO08 0x110a0 /* SODIMM 138 */ 681 663 >; 682 664 }; ··· 713 695 714 696 pinctrl_snvs_usdhc1_cd: snvs-usdhc1-cd-grp { 715 697 fsl,pins = < 716 - MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x1b0a0 /* SODIMM 43 */ 698 + MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x1b0a0 /* SODIMM 43 / MMC_CD */ 717 699 >; 718 700 }; 719 701