From patchwork Sun Sep 15 20:55:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 11146147 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F2C3A76 for ; Sun, 15 Sep 2019 20:55:12 +0000 (UTC) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8257B20873 for ; Sun, 15 Sep 2019 20:55:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linux.kernel.org header.i=@linux.kernel.org header.b="OvWJB+8K" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8257B20873 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+26986+564+1554929+3438807@linux.kernel.org X-Received: by 127.0.0.2 with SMTP id fY5dYY1556264xczxVSbrcow; Sun, 15 Sep 2019 13:55:12 -0700 X-Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by groups.io with SMTP; Sun, 15 Sep 2019 13:55:11 -0700 X-Received: by mail.kernel.org (Postfix) id CC1BA214D8; Sun, 15 Sep 2019 20:55:10 +0000 (UTC) X-Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7C15B20873; Sun, 15 Sep 2019 20:55:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7C15B20873 X-Received: from ypsilon.sirena.org.uk ([2001:470:1f1d:6b5::7]) by heliosphere.sirena.org.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1i9bY0-0001LU-2g; Sun, 15 Sep 2019 20:55:04 +0000 X-Received: by ypsilon.sirena.org.uk (Postfix, from userid 1000) id D3EEF27415FF; Sun, 15 Sep 2019 21:55:02 +0100 (BST) Date: Sun, 15 Sep 2019 21:55:02 +0100 From: Mark Brown To: Linuxkernel+Patchwork-Soc via Email Integration Cc: "linux-arm-kernel@lists.infradead.org Linux Next Mailing List" , Linux Kernel Mailing List Subject: linux-next: manual merge of the crypto tree with the arm-soc tree Message-ID: <20190915205502.GF4352@sirena.co.uk> MIME-Version: 1.0 X-Cookie: Man and wife make one fool. User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: Bulk List-Unsubscribe: Sender: patchwork-soc@linux.kernel.org List-Id: Mailing-List: list patchwork-soc@linux.kernel.org; contact patchwork-soc+owner@linux.kernel.org Delivered-To: mailing list patchwork-soc@linux.kernel.org Reply-To: patchwork-soc+owner@linux.kernel.org X-Gm-Message-State: HUPpcKKs0sSDbOSM86OBD9Ykx1554929AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux.kernel.org; q=dns/txt; s=20140610; t=1568580912; bh=8E817FPTzUo4/Hvy+ZioRyfJclVeXr6GuYnydfDYP5E=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=OvWJB+8Kb5TKeefkemMvkyh1o27iDi8fkjmgR5nEzi9e0ycJ7QoYIYsjL3oP/gRkQYr zyfXRyADECWUAlPgPAgfu5JDNv8GP5iLcytjxRQ7Wt0BAxiRe4iJhN6Zxbph8yHkj9f5R Fjh8P4ldggKeMEAHtkpewMBIdAtogNo9GrU= Hi all, Today's linux-next merge of the crypto tree got a conflict in: arch/arm64/boot/dts/freescale/imx8mq.dtsi between commit: a99b26b14bea506 ("arm64: dts: imx8mq: Add MIPI D-PHY") from the arm-soc tree and commit: 007b3cf0af8cb7d ("arm64: dts: imx8mq: Add CAAM node") from the crypto tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts (generally DTS updates go through arm-soc). +++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi @@@ -743,19 -728,36 +743,49 @@@ status = "disabled"; }; + dphy: dphy@30a00300 { + compatible = "fsl,imx8mq-mipi-dphy"; + reg = <0x30a00300 0x100>; + clocks = <&clk IMX8MQ_CLK_DSI_PHY_REF>; + clock-names = "phy_ref"; + assigned-clocks = <&clk IMX8MQ_CLK_DSI_PHY_REF>; + assigned-clock-parents = <&clk IMX8MQ_VIDEO_PLL1_OUT>; + assigned-clock-rates = <24000000>; + #phy-cells = <0>; + power-domains = <&pgc_mipi>; + status = "disabled"; + }; + + crypto: crypto@30900000 { + compatible = "fsl,sec-v4.0"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x30900000 0x40000>; + ranges = <0 0x30900000 0x40000>; + interrupts = ; + clocks = <&clk IMX8MQ_CLK_AHB>, + <&clk IMX8MQ_CLK_IPG_ROOT>; + clock-names = "aclk", "ipg"; + + sec_jr0: jr@1000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x1000 0x1000>; + interrupts = ; + }; + + sec_jr1: jr@2000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x2000 0x1000>; + interrupts = ; + }; + + sec_jr2: jr@3000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x3000 0x1000>; + interrupts = ; + }; + }; + i2c1: i2c@30a20000 { compatible = "fsl,imx8mq-i2c", "fsl,imx21-i2c"; reg = <0x30a20000 0x10000>; -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#564): https://linux.kernel.org/g/patchwork-soc/message/564 Mute This Topic: https://linux.kernel.org/mt/34157429/1554929 Group Owner: patchwork-soc+owner@linux.kernel.org Unsubscribe: https://linux.kernel.org/g/patchwork-soc/unsub [patchwork-linux-kernel-org@patchwork.kernel.org] -=-=-=-=-=-=-=-=-=-=-=- diff --cc arch/arm64/boot/dts/freescale/imx8mq.dtsi index 046a0c8c8dd56,752d5a61878cb..0000000000000 --- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi