From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko =?ISO-8859-1?Q?St=FCbner?= Subject: Re: [PATCH v9 00/11] Genericize DW MIPI DSI bridge and add i.MX 6 driver Date: Wed, 01 Jul 2020 14:50:58 +0200 Message-ID: <6400388.H4HLtoO0Qf@diego> References: <20200609174959.955926-1-adrian.ratiu@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: In-Reply-To: <20200609174959.955926-1-adrian.ratiu-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Adrian Ratiu Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Laurent Pinchart , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Philippe CORNU , Yannick FERTRE , Jernej Skrabec , Andrzej Hajda , Jonas Karlman , linux-imx-3arQi8VN3Tc@public.gmane.org, kernel-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org, linux-stm32-XDFAJ8BFU24N7RejjzZ/Li2xQDfSxrLKVpNB7YpNyf8@public.gmane.org List-Id: linux-rockchip.vger.kernel.org Hi Adrian, Am Dienstag, 9. Juni 2020, 19:49:48 CEST schrieb Adrian Ratiu: > [Re-submitting to cc dri-devel, sorry about the noise] > > Hello all, > > v9 cleanly applies on top of latest next-20200609 tree. at least it doesn't apply on top of current drm-misc-next for me which I really don't understand. Like patch 2/11 does @@ -31,6 +31,7 @@ #include . #define HWVER_131<----><------><------>0x31333100<---->/* IP version 1.31 */ +#define HWVER_130<----><------><------>0x31333000<---->/* IP version 1.30 */ . #define DSI_VERSION<--><------><------>0x00 #define VERSION<------><------><------><------>GENMASK(31, 8) where the file currently looks like #include #include #include #include #include #include #include #define HWVER_131 0x31333100 /* IP version 1.31 */ #define DSI_VERSION 0x00 #define VERSION GENMASK(31, 8) even in Linux-next So I guess ideally rebase on top of drm-misc-next Thanks Heiko