* Andrey Konovalov <andrey.konovalov@xxxxxxxxxx> [131011 12:42]:
> Commit 851320e (ARM: dts: Fix muxing and regulator for wl12xx on the
> SDIO bus for pandaboard) put the wl12xx pins into omap4_pmx_wkup. This
> is not correct, and results in the following messages at the boot time:
>
> pinctrl-single 4a31e040.pinmux: mux offset out of range: 0x38 (0x38)
> pinctrl-single 4a31e040.pinmux: could not add functions for pinmux_wl12xx_pins 56x
>
> Actually these pins belong to omap4_pmx_core.
Oops indeed. I wonder how that happened..
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
> Signed-off-by: Andrey Konovalov <andrey.konovalov@xxxxxxxxxx>
> ---
> arch/arm/boot/dts/omap4-panda-common.dtsi | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
> index 814ab67..712ddbf 100644
> --- a/arch/arm/boot/dts/omap4-panda-common.dtsi
> +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
> @@ -239,15 +239,6 @@
> 0xf0 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c4_sda */
> >;
> };
> -};
> -
> -&omap4_pmx_wkup {
> - led_wkgpio_pins: pinmux_leds_wkpins {
> - pinctrl-single,pins = <
> - 0x1a (PIN_OUTPUT | MUX_MODE3) /* gpio_wk7 */
> - 0x1c (PIN_OUTPUT | MUX_MODE3) /* gpio_wk8 */
> - >;
> - };
>
> /*
> * wl12xx GPIO outputs for WLAN_EN, BT_EN, FM_EN, BT_WAKEUP
> @@ -277,6 +268,16 @@
> };
> };
>
> +&omap4_pmx_wkup {
> + led_wkgpio_pins: pinmux_leds_wkpins {
> + pinctrl-single,pins = <
> + 0x1a (PIN_OUTPUT | MUX_MODE3) /* gpio_wk7 */
> + 0x1c (PIN_OUTPUT | MUX_MODE3) /* gpio_wk8 */
> + >;
> + };
> +
> +};
> +
> &i2c1 {
> pinctrl-names = "default";
> pinctrl-0 = <&i2c1_pins>;
> -- 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
