From patchwork Fri Oct 11 19:33:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 20985 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C97652611D for ; Fri, 11 Oct 2013 19:34:01 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id e14sf8592883iej.0 for ; Fri, 11 Oct 2013 12:34:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:date:from:user-agent :mime-version:to:cc:subject:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=x9JOKfaSazK7dlMswspQQ5ZOQxqK/AxGma2LmdhUV9c=; b=luyusQh6DsWuYFTVzz9NgprkNKcVoSZtQWrou1iwkZ9We2Fgw00DUo4zVXTk6eQpaG 5tz9WlPL+ounSEeOI2YMI26huQ34M6c2wI9PVdw1ppgxqzot9TEReVPEpsvn/sRQON9M VenLe8oykYtz62eiEBJgG+tr95MY2WxgrFLtVF80hsRNsAc4yDuZPM86jJxBYDaydXBt Cy5bQs8GbGZaFelv5xSZvFCC219zoDPEovLcwwi4oO/ltWpddQt5VX/p40mZVIfWCAAo 28cjp7B3T9GoZJj/ELiBdqp8gcuVaU9bRUXQl717nkYZwcQlgL2i196U4LXcPM0tppNk 8tmQ== X-Received: by 10.42.112.138 with SMTP id y10mr9292580icp.28.1381520040788; Fri, 11 Oct 2013 12:34:00 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.12.20 with SMTP id u20ls1587646qeb.92.gmail; Fri, 11 Oct 2013 12:34:00 -0700 (PDT) X-Received: by 10.52.228.137 with SMTP id si9mr18497039vdc.29.1381520040623; Fri, 11 Oct 2013 12:34:00 -0700 (PDT) Received: from mail-vb0-f42.google.com (mail-vb0-f42.google.com [209.85.212.42]) by mx.google.com with ESMTPS id tj1si17214240vdc.144.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Oct 2013 12:34:00 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.42 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.42; Received: by mail-vb0-f42.google.com with SMTP id e12so3123974vbg.15 for ; Fri, 11 Oct 2013 12:34:00 -0700 (PDT) X-Gm-Message-State: ALoCoQlCL9dTCrVA7M6/76BIjR9PqyccMnnJa64/2XNKzqk6BfdB3Ss7gz3j3d001CfMH22t87rj X-Received: by 10.220.182.69 with SMTP id cb5mr403243vcb.41.1381520040540; Fri, 11 Oct 2013 12:34:00 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp64627vcz; Fri, 11 Oct 2013 12:33:59 -0700 (PDT) X-Received: by 10.112.53.130 with SMTP id b2mr17965498lbp.6.1381520039275; Fri, 11 Oct 2013 12:33:59 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com [209.85.217.172]) by mx.google.com with ESMTPS id e8si22811771lah.64.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Oct 2013 12:33:59 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.217.172 is neither permitted nor denied by best guess record for domain of andrey.konovalov@linaro.org) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id x18so3837146lbi.31 for ; Fri, 11 Oct 2013 12:33:58 -0700 (PDT) X-Received: by 10.112.126.37 with SMTP id mv5mr17932598lbb.20.1381520038474; Fri, 11 Oct 2013 12:33:58 -0700 (PDT) Received: from [192.168.11.163] (mail.dev.rtsoft.ru. [213.79.90.226]) by mx.google.com with ESMTPSA id mz3sm28983569lbb.14.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Oct 2013 12:33:58 -0700 (PDT) Message-ID: <525852A4.6090500@linaro.org> Date: Fri, 11 Oct 2013 23:33:56 +0400 From: Andrey Konovalov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: tony@atomide.com, devicetree@vger.kernel.org CC: rnayak@ti.com, bcousson@baylibre.com, luca@coelho.fi, p.pisati@gmail.com Subject: [PATCH] ARM: dts: move wl12xx pins to the proper pinmux for pandaboard X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: andrey.konovalov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.42 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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. Signed-off-by: Andrey Konovalov --- arch/arm/boot/dts/omap4-panda-common.dtsi | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) -- 1.7.9.5 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>;