From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754870AbdEQS1L (ORCPT ); Wed, 17 May 2017 14:27:11 -0400 Received: from gloria.sntech.de ([95.129.55.99]:51330 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752318AbdEQS1K (ORCPT ); Wed, 17 May 2017 14:27:10 -0400 From: Heiko Stuebner To: Frank Wang Cc: robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, wim@iguana.be, linux@roeck-us.net, ellisys@163.com, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, charles.chen@rock-chips.com, cody.xie@rock-chips.com, kevan.lan@rock-chips.com, huangtao@rock-chips.com, sugar.zhang@rock-chips.com, wmc@rock-chips.com Subject: Re: [PATCH v2 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets Date: Wed, 17 May 2017 20:26:30 +0200 Message-ID: <1850566.MEFZHgNvCM@phil> User-Agent: KMail/5.2.3 (Linux/4.9.0-2-amd64; KDE/5.28.0; x86_64; ; ) In-Reply-To: <1495014746-27621-3-git-send-email-frank.wang@rock-chips.com> References: <1495014746-27621-1-git-send-email-frank.wang@rock-chips.com> <1495014746-27621-3-git-send-email-frank.wang@rock-chips.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am Mittwoch, 17. Mai 2017, 17:52:25 CEST schrieb Frank Wang: > Correct UART2 PINCTRL flag and add another PINCTRL sets for UART2 > in case of confict with SDMMC. > > Signed-off-by: Frank Wang I've split that into 2 patches: - pull-up fix - addition of alternative pinctrl (also moved the uart21-xfer into the uart2 group directly below the uart2-xfer pinctrl) I've fixed up the subject in both (ARM: dts: rockchip:) and applied everything for 4.13 Heiko