From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 32EB4C433F5 for ; Mon, 28 Mar 2022 06:52:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kSzAGJzhAHsSZGLC9HXUhABSaInQbRsX1biMl1Upm7o=; b=RbOpVbplo8l92t TGG2m3bbFk10Kb8aCfEomz0TRcMZbccli8Ne0199uwCxTWSIOS+wKz62MqHGiIwYm7qUHyT9snrPg cVFznx/w55FJLgUdV0mKd/ofxGbdPRvwOGLA8R4rPtlZAMYcpGITlAgCCe/KbjjVRJe+K89RjTXpw Idwx8KqM0Ymf3gsh4f1S2XWhxgKC3wndleNPLjUfpD4L0BqmpHemJaEegnQJkSqksRbB9L51sY2yN JJi3uI7pkSjHUv49qtKpSGuRq0+YlBxPJ0GDLxEYKSquF2CsjUv9KXqVMCP+AJ1PtKRW91OgB/+7l jgBCK6ZqV/37gEEb6AhA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nYjDp-007Wfe-PG; Mon, 28 Mar 2022 06:51:25 +0000 Received: from mx1.tq-group.com ([93.104.207.81]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nYjDl-007Wf3-Li for linux-arm-kernel@lists.infradead.org; Mon, 28 Mar 2022 06:51:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1648450281; x=1679986281; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xwCNar8wDU+WM5mUFAsG79cakwF/ckD+0p872e/suE8=; b=GiD78uMelX/ljMIgXwehF9IrZIsNQ20lcPeRHQl1imF1d57SGHLrYSoH iw3P5fMHqPQv6luLFt4qBdZhib4+21LtOG4/rYBtKxgNYOdedHY6WqLRW 3UwzENX0ASjmcEtD7Kq6+aDGKnfoZg7JjvCU7yEfGgDKzCr2UMNoea6vO 6XGVw/Fq2cXpz1OLmao/gm3DKz5T6IEX9eLSsBxp21CHOa1873E67j1Fj IOIF7WWgPFbyNPcZeNfgxWXe00DHh9QAoPENzTk54HkZJ3K1MHxzlD8jJ sNbSSPxI5Q/8vJrhkyFRWvH3RxIEJlTpMmnOXUcEQj0ukF1XY2uFZs9XJ g==; X-IronPort-AV: E=Sophos;i="5.90,216,1643670000"; d="scan'208";a="22917408" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 28 Mar 2022 08:51:17 +0200 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Mon, 28 Mar 2022 08:51:17 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Mon, 28 Mar 2022 08:51:17 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1648450277; x=1679986277; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xwCNar8wDU+WM5mUFAsG79cakwF/ckD+0p872e/suE8=; b=ki4Xr/As+ybgQ7QbTZnjRZq63YnOBjFJDLvLGM0tcrS+xmzL/vCT36NM 7pjxwfye1/QyyfMw/X3eX0C2oKxy2bmOsLZneltQ5LyC9YJIvgm69SU2+ 5mfYk4i4mufNVXZ9upGg+cmMgaD2TPPkw8v6w2w6yOS9ehGwDKlobRsAf drUBQsJINFIwrC+RJWd3zMIu5fUY6IfIQAouJhp/9wQHjK+MkFpcSHVz2 97y44yezMQBzxL/htfCCrKe4uWjTrFRPMfct9zUah0pdEOE84+ehjRS4S wxnNxnDZb7lW9Q4LrMyEAA9H2BlMZwXymzx+R2kOqKqAw462tKX+cLSIo Q==; X-IronPort-AV: E=Sophos;i="5.90,216,1643670000"; d="scan'208";a="22917407" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 28 Mar 2022 08:51:17 +0200 Received: from steina-w.localnet (unknown [10.123.49.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 62773280065; Mon, 28 Mar 2022 08:51:17 +0200 (CEST) From: Alexander Stein To: Laurent Pinchart Cc: linux-arm-kernel@lists.infradead.org, Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , NXP Linux Team , Fabio Estevam , Paul Elder , Lucas Stach , Marek Vasut Subject: Re: (EXT) [PATCH v3 2/4] soc: imx: imx8m-blk-ctrl: Add i.MX8MP media blk-ctrl Date: Mon, 28 Mar 2022 08:51:14 +0200 Message-ID: <5555837.DvuYhMxLoT@steina-w> Organization: TQ-Systems GmbH In-Reply-To: <20220326183329.5072-3-laurent.pinchart@ideasonboard.com> References: <20220326183329.5072-1-laurent.pinchart@ideasonboard.com> <20220326183329.5072-3-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220327_235122_113655_743AE6F4 X-CRM114-Status: GOOD ( 11.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hello Laurent, Am Samstag, 26. M=E4rz 2022, 19:33:27 CEST schrieb Laurent Pinchart: > From: Paul Elder > = > Add the description for the i.MX8MP media blk-ctrl. > = > Signed-off-by: Paul Elder > Reviewed-by: Laurent Pinchart > Signed-off-by: Laurent Pinchart > Reviewed-by: Marek Vasut > Tested-by: Marek Vasut # MX8MP LCDIF #1 > --- > Changes since v1: > = > - Add ISP2 power domain and rename ISP to ISP1 > --- > drivers/soc/imx/imx8m-blk-ctrl.c | 131 ++++++++++++++++++++++++++++++- > 1 file changed, 129 insertions(+), 2 deletions(-) Which tree is this based on? I conflicts on linux-next with this patch [1], which has already been picked by Shawn for 5.18. The conflict is rather sim= ple = though. Best regards, Alexander [1] https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git/ commit/?h=3Dimx-drivers-5.18&id=3D608d7c325e855cb4a853afef3cd9f0df594bd12d _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel