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

Merge tag 'fixes-for-v3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

Pull late pinctrl fixes from Linus Walleij:
- Two fixes to the i.MX driver

* tag 'fixes-for-v3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: pinctrl-imx6q: add missed mux function for USBOTG_ID
pinctrl: pinctrl-imx: only print debug message when DEBUG is defined

Linus Torvalds 1694a0a0 84a1caf1

+6
+2
Documentation/devicetree/bindings/pinctrl/fsl,imx6q-pinctrl.txt
··· 1626 1626 MX6Q_PAD_SD2_DAT3__GPIO_1_12 1588 1627 1627 MX6Q_PAD_SD2_DAT3__SJC_DONE 1589 1628 1628 MX6Q_PAD_SD2_DAT3__ANATOP_TESTO_3 1590 1629 + MX6Q_PAD_ENET_RX_ER__ANATOP_USBOTG_ID 1591 1630 + MX6Q_PAD_GPIO_1__ANATOP_USBOTG_ID 1592
+2
drivers/pinctrl/pinctrl-imx.c
··· 474 474 grp->configs[j] = config & ~IMX_PAD_SION; 475 475 } 476 476 477 + #ifdef DEBUG 477 478 IMX_PMX_DUMP(info, grp->pins, grp->mux_mode, grp->configs, grp->npins); 479 + #endif 478 480 479 481 return 0; 480 482 }
+2
drivers/pinctrl/pinctrl-imx6q.c
··· 1950 1950 IMX_PIN_REG(MX6Q_PAD_SD2_DAT3, 0x0744, 0x035C, 5, 0x0000, 0), /* MX6Q_PAD_SD2_DAT3__GPIO_1_12 */ 1951 1951 IMX_PIN_REG(MX6Q_PAD_SD2_DAT3, 0x0744, 0x035C, 6, 0x0000, 0), /* MX6Q_PAD_SD2_DAT3__SJC_DONE */ 1952 1952 IMX_PIN_REG(MX6Q_PAD_SD2_DAT3, 0x0744, 0x035C, 7, 0x0000, 0), /* MX6Q_PAD_SD2_DAT3__ANATOP_TESTO_3 */ 1953 + IMX_PIN_REG(MX6Q_PAD_ENET_RX_ER, 0x04EC, 0x01D8, 0, 0x0000, 0), /* MX6Q_PAD_ENET_RX_ER__ANATOP_USBOTG_ID */ 1954 + IMX_PIN_REG(MX6Q_PAD_GPIO_1, 0x05F4, 0x0224, 3, 0x0000, 0), /* MX6Q_PAD_GPIO_1__ANATOP_USBOTG_ID */ 1953 1955 }; 1954 1956 1955 1957 /* Pad names for the pinmux subsystem */