From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h5nx7-0001TJ-OJ for barebox@lists.infradead.org; Mon, 18 Mar 2019 08:49:02 +0000 Date: Mon, 18 Mar 2019 09:48:59 +0100 From: Sascha Hauer Message-ID: <20190318084859.u5bpnrupukjvu7sr@pengutronix.de> References: <20190315222717.11767-1-user@vserver64> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190315222717.11767-1-user@vserver64> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH] mci: imx-esdhc: resolve conflicting flags To: Alexander Kurz Cc: barebox@lists.infradead.org On Fri, Mar 15, 2019 at 10:27:17PM +0000, Alexander Kurz wrote: > From: Alexander Kurz > > With commit 3354adee3920 ("mci: imx-esdhc: Add bigendian register access > support") and commit 15b64fd520c2 ("mci: imx-esdhc: Add layerscape support") > two ESDHC_FLAGs got assigned to already existing values. This conflict made > the imx6sl usdhc appear to be big endian. > Resolve this conflict by assign the new flags to the next vacant values. > > Signed-off-by: Alexander Kurz > --- > drivers/mci/imx-esdhc.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) Applied to master, thanks Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox