From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225XBCwCXmhM3No6W4YqG9hBK6XLK1KPYhc+vs+P4nxGR4WwFGBHUv6fYyxYCQIFwfe8lAW1 ARC-Seal: i=1; a=rsa-sha256; t=1516610925; cv=none; d=google.com; s=arc-20160816; b=UoV498jlvFdlnAZl8YyUHdSDHUxQ3C3DExltOF2vChK8n4MeGhFXZ0cmKBx2VJgl19 BgnZSmPOT7u03EZCXUMIFn6vJz8UHJqP8VjsqI2is3C6P7V5QYWHil7ZGDHTPY93LnTb oQGRbXXaCRBHX8eA1Z7gEATuImggb7IiCqn5eR8Il98Ta69GD9ssHSFRZRXEGPpwyAL/ 4JuLyR1xZ9YrZIgdcOceQRJQCjBVyE7B2Rd1ZkIHY1gvG/LCHVnEWU/DZVfTjjOHiJzb p983uGSQpTjRSgBekIH7JmyhtJjhuk6LNaDRyuaXmWcqgIyobwe9NyVcatShnGQOM4y8 0Z0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=MjT/4fMJvmmj43vZB64hzeoWdVEMzfKNjstaGElJ33g=; b=k2A9HHyKdo/CtgX51AwOC2ZZ0MxTv7hYgWipR6rHSo0zTdQRxlFwvTJq1pjZMS/6TT cfwe1O9nSZEAtBlRFXB1lQpDUhk7QNfXabJIUWn9IGqMs8RRdjIoAlT+V8LKp05p/ZWe hfRVOaF2bbyq9dABqoS1DrLlY+g/VZiXJBOcnFb4z6Qb4su+J0At97I0OhWhShWhu6hN cbYLVq55AVgwrGRA4f3itYqKpEQdbbJ5tLk/9+Iigd8JqHvGbd/dafTCZw/lxr+ajYtv EeFeUbYYgYKTKVJfel+svSBdU9MbWZBboHeKx1fdEdUuEfpg20BvogrxY6ZmlcQR0XSN 6AUw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Petazzoni , Andrew Lunn , Gregory CLEMENT Subject: [PATCH 4.9 31/47] ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7 Date: Mon, 22 Jan 2018 09:45:42 +0100 Message-Id: <20180122083928.082422558@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083925.568134913@linuxfoundation.org> References: <20180122083925.568134913@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590281413170867681?= X-GMAIL-MSGID: =?utf-8?q?1590281817891591147?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Petazzoni commit 56aeb07c914a616ab84357d34f8414a69b140cdf upstream. MPP7 is currently muxed as "gpio", but this function doesn't exist for MPP7, only "gpo" is available. This causes the following error: kirkwood-pinctrl f1010000.pin-controller: unsupported function gpio on pin mpp7 pinctrl core: failed to register map default (6): invalid type given kirkwood-pinctrl f1010000.pin-controller: error claiming hogs: -22 kirkwood-pinctrl f1010000.pin-controller: could not claim hogs: -22 kirkwood-pinctrl f1010000.pin-controller: unable to register pinctrl driver kirkwood-pinctrl: probe of f1010000.pin-controller failed with error -22 So the pinctrl driver is not probed, all device drivers (including the UART driver) do a -EPROBE_DEFER, and therefore the system doesn't really boot (well, it boots, but with no UART, and no devices that require pin-muxing). Back when the Device Tree file for this board was introduced, the definition was already wrong. The pinctrl driver also always described as "gpo" this function for MPP7. However, between Linux 4.10 and 4.11, a hog pin failing to be muxed was turned from a simple warning to a hard error that caused the entire pinctrl driver probe to bail out. This is probably the result of commit 6118714275f0a ("pinctrl: core: Fix pinctrl_register_and_init() with pinctrl_enable()"). This commit fixes the Device Tree to use the proper "gpo" function for MPP7, which fixes the boot of OpenBlocks A7, which was broken since Linux 4.11. Fixes: f24b56cbcd9d ("ARM: kirkwood: add support for OpenBlocks A7 platform") Signed-off-by: Thomas Petazzoni Reviewed-by: Andrew Lunn Signed-off-by: Gregory CLEMENT Signed-off-by: Greg Kroah-Hartman --- arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts @@ -53,7 +53,8 @@ }; pinctrl: pin-controller@10000 { - pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>; + pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header + &pmx_gpio_header_gpo>; pinctrl-names = "default"; pmx_uart0: pmx-uart0 { @@ -85,11 +86,16 @@ * ground. */ pmx_gpio_header: pmx-gpio-header { - marvell,pins = "mpp17", "mpp7", "mpp29", "mpp28", + marvell,pins = "mpp17", "mpp29", "mpp28", "mpp35", "mpp34", "mpp40"; marvell,function = "gpio"; }; + pmx_gpio_header_gpo: pxm-gpio-header-gpo { + marvell,pins = "mpp7"; + marvell,function = "gpo"; + }; + pmx_gpio_init: pmx-init { marvell,pins = "mpp38"; marvell,function = "gpio";