From patchwork Mon Mar 13 09:10:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9620291 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D5AFB60492 for ; Mon, 13 Mar 2017 09:13:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2C6D2845E for ; Mon, 13 Mar 2017 09:13:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7C7428460; Mon, 13 Mar 2017 09:13:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 68D0B2845E for ; Mon, 13 Mar 2017 09:13:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=1rUbDl1B4Sg6YkjcDPNZ5xJgUfArjoI2Kmt9WxhcCw4=; b=mSLGZnJm8IaH5vXGN/rtCHSCvO 3KhpzYcNxYEWacVimbjFrOQlPuNEtYD0TFiuppftdgOjNEmJ5iqNhCX7WccUAvKpjZb+Cv+yQXWmx F4cAbH4UrVr9/8jjDyXqd9zbH6cTwfvh7giHug/bOfkg+27/ZstHDO3HfGr+ZGQV8N1pMrHDFQGEP /ftPmd7N7Pf5wLSBxV/6ldx7LYFpckM/IC+sxto4yD08jvrh50r23e4UfA8SKK9EJ+4uJDZl6IxlE glqzn354eFQYSjRaoIs1xruGGrC8Dt2963+5h6EF9XbbnUbYxQZ5E7diAxbATQj0kKTodsWFg8IFb lHPU9pcg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cnM2l-0002O5-Kr; Mon, 13 Mar 2017 09:13:31 +0000 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cnM10-0001EL-67 for linux-arm-kernel@lists.infradead.org; Mon, 13 Mar 2017 09:11:46 +0000 Received: by mail-wm0-x232.google.com with SMTP id n11so35097085wma.1 for ; Mon, 13 Mar 2017 02:11:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yi/iD/paZuWFXproSkPuhoL0VLJSmtkLtd45zeqs7do=; b=sZarYsc9ADb4Ksa71Uc+/rL8rIQiT8edZ7rRr8JI6q+Oq650Iok2jEoDyXp2U+eJcZ alGL3VGNlp1rfTT6cQvEEVrrNQa92JpdNS1+diADpr0pw9tJCx27XvuWy/ZHILKcLbyX 7dgxqRb0gJ3l18beIOr4OUmzfRmJxMlfOdozbSKMePUy9C2pmaByLQ64IGqDpzswr23X izE39kNYLDvAtXyWl0oeekpAryltk2k6k7Gm671vkchMYnVzladYipB/rdZ6yhHDYj3+ r8gaofbxusxHHOzD3dHNZ5n6PYeY5KMQ85H0ZWOkhvuv5DF5s1uuQ5984+Vjd3bIrIrH ylQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yi/iD/paZuWFXproSkPuhoL0VLJSmtkLtd45zeqs7do=; b=NjJw2tsW1KU9tmQ235BLO2DbUH9gPQRmAoFt2sEde51jOVwgBvWIUiGfzQpEGXDpyZ /gDDYJvJIdmknnOVMKKFzI1nhwU6QlESWyJHOkXXoQ5hdy9S1+jJ3r4jBBDx3F/oFgG7 u6+je5v7m0960gjHWnDWf9yxDM0IgrTugLaqT23uJ8sBpWYUqsiruBTmYDwAb6VmYFPV noEZaYTf5pfE5/iCpAffAfKOjtBGze0YD2cS7YAjG1jb+e12adlTrrbWZidaopO1OO3g CgP0cHPIN5OSe4xLywlR9HI9kPElnwkqdFO3d15QRw3jyK7foi6aefki3+qHZwzIQ24x WlFQ== X-Gm-Message-State: AFeK/H0+ccynUaqeHLW2BSWk45xqXEw8yNH48Ep7RLD02pFSSCUi873GZCoFbpfNBXQMVfpR X-Received: by 10.28.128.147 with SMTP id b141mr9157490wmd.45.1489396280379; Mon, 13 Mar 2017 02:11:20 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 36sm24219121wrz.8.2017.03.13.02.11.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Mar 2017 02:11:19 -0700 (PDT) From: Neil Armstrong To: carlo@caione.org, khilman@baylibre.com Subject: [RESEND PATCH 3/3] ARM64: dts: meson-gx: Prepend GX generic compatible like other nodes Date: Mon, 13 Mar 2017 10:10:52 +0100 Message-Id: <1489396252-28696-4-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1489396252-28696-1-git-send-email-narmstrong@baylibre.com> References: <1489396252-28696-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170313_021142_477409_EEE5B25C X-CRM114-Status: UNSURE ( 9.07 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Prepend the compatible strings with a GX generic name in nodes compatible with the GXBB HW and keep the same scheme as other nodes. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 06d70bf..a010ab9 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -233,7 +233,7 @@ }; i2c_A: i2c@8500 { - compatible = "amlogic,meson-gxbb-i2c"; + compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; reg = <0x0 0x08500 0x0 0x20>; interrupts = ; #address-cells = <1>; @@ -279,7 +279,7 @@ }; i2c_B: i2c@87c0 { - compatible = "amlogic,meson-gxbb-i2c"; + compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; reg = <0x0 0x087c0 0x0 0x20>; interrupts = ; #address-cells = <1>; @@ -288,7 +288,7 @@ }; i2c_C: i2c@87e0 { - compatible = "amlogic,meson-gxbb-i2c"; + compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c"; reg = <0x0 0x087e0 0x0 0x20>; interrupts = ; #address-cells = <1>; @@ -297,7 +297,7 @@ }; spifc: spi@8c80 { - compatible = "amlogic,meson-gxbb-spifc"; + compatible = "amlogic,meson-gx-spifc", "amlogic,meson-gxbb-spifc"; reg = <0x0 0x08c80 0x0 0x80>; #address-cells = <1>; #size-cells = <0>; @@ -325,7 +325,7 @@ }; sram: sram@c8000000 { - compatible = "amlogic,meson-gxbb-sram", "mmio-sram"; + compatible = "amlogic,meson-gx-sram", "amlogic,meson-gxbb-sram", "mmio-sram"; reg = <0x0 0xc8000000 0x0 0x14000>; #address-cells = <1>; @@ -333,12 +333,12 @@ ranges = <0 0x0 0xc8000000 0x14000>; cpu_scp_lpri: scp-shmem@0 { - compatible = "amlogic,meson-gxbb-scp-shmem"; + compatible = "amlogic,meson-gx-scp-shmem", "amlogic,meson-gxbb-scp-shmem"; reg = <0x13000 0x400>; }; cpu_scp_hpri: scp-shmem@200 { - compatible = "amlogic,meson-gxbb-scp-shmem"; + compatible = "amlogic,meson-gx-scp-shmem", "amlogic,meson-gxbb-scp-shmem"; reg = <0x13400 0x400>; }; }; @@ -390,7 +390,7 @@ }; ir: ir@580 { - compatible = "amlogic,meson-gxbb-ir"; + compatible = "amlogic,meson-gx-ir", "amlogic,meson-gxbb-ir"; reg = <0x0 0x00580 0x0 0x40>; interrupts = ; status = "disabled";