* Florian Vaussard <[email protected]> [140824 01:29]:
> --- a/arch/arm/boot/dts/omap3-overo-base.dtsi
> +++ b/arch/arm/boot/dts/omap3-overo-base.dtsi
> @@ -119,7 +119,7 @@
> OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP | MUX_MODE0)
> /* sdmmc2_clk.sdmmc2_clk */
> OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP | MUX_MODE0)
> /* sdmmc2_cmd.sdmmc2_cmd */
> OMAP3_CORE1_IOPAD(0x215c, PIN_INPUT_PULLUP | MUX_MODE0)
> /* sdmmc2_dat0.sdmmc2_dat0 */
> - OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP | MUX_MODE0)
> /* sdmmc2_dat1.sdmmc2_dat1 */
> + OMAP3_CORE1_IOPAD(0x215e, PIN_INPUT_PULLUP |
> PIN_OFF_WAKEUPENABLE | MUX_MODE0) /* sdmmc2_dat1.sdmmc2_dat1 */
> OMAP3_CORE1_IOPAD(0x2160, PIN_INPUT_PULLUP | MUX_MODE0)
> /* sdmmc2_dat2.sdmmc2_dat2 */
> OMAP3_CORE1_IOPAD(0x2162, PIN_INPUT_PULLUP | MUX_MODE0)
> /* sdmmc2_dat3.sdmmc2_dat3 */
> >;
No need to have PIN_OFF_WAKEUPENABLE any longer here, it gets
enabled automatically after you do request_irq on it.
> @@ -195,6 +195,9 @@
> vmmc_aux-supply = <&w3cbw003c_wifi_nreset>;
> bus-width = <4>;
> cap-sdio-irq;
> +
> + interrupts-extended = <&intc 86>,
> + <&gpio5 5 GPIO_ACTIVE_HIGH>; /* gpio_133
> (mmc2.dat1) */
> non-removable;
> };
The second interrupt here just needs to be &omap3_pmx_core
(or &omap3_pmx_core2 depending where it's located) with the
offset to the dat1 pin from it's padconf area. For example,
on mmc3 it should be:
interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>;
So you need to look it up from the TRM to figure out the right
offset for mmc2.
> diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
> index b2891a9..1347bc9 100644
> --- a/arch/arm/boot/dts/omap3.dtsi
> +++ b/arch/arm/boot/dts/omap3.dtsi
> @@ -417,7 +417,6 @@
> mmc2: mmc@480b4000 {
> compatible = "ti,omap3-hsmmc";
> reg = <0x480b4000 0x200>;
> - interrupts = <86>;
> ti,hwmods = "mmc2";
> dmas = <&sdma 47>, <&sdma 48>;
> dma-names = "tx", "rx";
I think there's a patch now in mainline tree that by default tries
to use interrupts-extended first, so this may not need to be
changed.
Regards,
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
