[PATCH 2/2] ARM: dts: imx6q: add quirky select input for USB_OTG_ID

[Linus Walleij]

On Thu, Aug 8, 2013 at 3:27 AM, Shawn Guo <shawn.guo at linaro.org> wrote:
> On Wed, Aug 07, 2013 at 08:34:05PM +0200, Linus Walleij wrote:
>> On Thu, Aug 1, 2013 at 6:22 AM, Shawn Guo <shawn.guo at linaro.org> wrote:
>>
>> > For some reason, the select input of pin function USB_OTG_ID is not
>> > implemented via a regular select input register but using the bit
>> > USB_OTG_ID_ SEL (shift 13) of IOMUXC_GPR1 register (offset 0x4).
>> >
>> > As per the workaround for such quirk implemented in pinctrl driver,
>> > we need to compose the input_val cell as below.
>> >
>> >         31     23      15      7        0
>> >         | 0xff | shift | width | select |
>> >
>> > Thus, we have 0xff0d0100 for MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID and
>> > 0xff0d0101 for MX6QDL_PAD_GPIO_1__USB_OTG_ID in input_val cell.
>> >
>> > Signed-off-by: Shawn Guo <shawn.guo at linaro.org>
>>
>> This does not apply on top of my "devel" branch in the pinctrl tree.
>>
>> Could you respin this on top of devel and resend?
>>
>> Or do I need some other patch(es) for this to apply?
>
> Sorry for not making this clear.  Due to the changes happened on IMX
> tree, we will have to queue this one for 3.13 merge window through IMX
> tree, after driver change hits mainline.  In short, I will take care of
> the merge of this patch.

OK Acked-by: Linus Walleij <linus.walleij at linaro.org>

Yours,
Linus Walleij