Message ID | 1492374441-23336-23-git-send-email-daniel.lezcano@linaro.org |
---|---|
State | Accepted |
Commit | b72af3462dd8344285f6cc1ba726202b0d4eae20 |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1086978qgf; Sun, 16 Apr 2017 13:29:04 -0700 (PDT) X-Received: by 10.98.74.135 with SMTP id c7mr8178286pfj.140.1492374543947; Sun, 16 Apr 2017 13:29:03 -0700 (PDT) Return-Path: <linux-kernel-owner@vger.kernel.org> Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r75si8917811pfa.171.2017.04.16.13.29.03; Sun, 16 Apr 2017 13:29:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757092AbdDPU27 (ORCPT <rfc822;jens.wiklander@linaro.org> + 15 others); Sun, 16 Apr 2017 16:28:59 -0400 Received: from mail-wr0-f172.google.com ([209.85.128.172]:36082 "EHLO mail-wr0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756986AbdDPU2t (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 16 Apr 2017 16:28:49 -0400 Received: by mail-wr0-f172.google.com with SMTP id c55so74461060wrc.3 for <linux-kernel@vger.kernel.org>; Sun, 16 Apr 2017 13:28:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ybANClp+NHKaBjyxk26R82v4gM8vzXJfkSRRFXmvblg=; b=RazFFKgLGZ34zlDr+41skPzoDthrFsRv/k+As2c2hQeMAmPoL9nxB6584eswBd/qAX 9HAGvUihY9oNwBZuAvCFzCAYRveZt50b+Xz3bE8yqF4eGhjXDp9xfHCunmc7HYCqMbdO 4wIn0VU0TtYv7egGCvJxqiMuwCUGTr6EHwMUI= 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:mime-version:content-transfer-encoding; bh=ybANClp+NHKaBjyxk26R82v4gM8vzXJfkSRRFXmvblg=; b=DRI182FoF5tX94gOefpg26yJIcKh60Aca6Fw6KvSXIT+VIh/39+XuoOxSGqVPxI9EV sKpGFLKjqJzmmSnrc/QdHghRQnd75C7TXRrSfnA97ZLFfYv4iHhZ53Apt7KKMHQDmNQW dV+zhXuScwe7XbhlyRGLGb81GElJBNe+a3P2ewVAk998nWpvbMurf/88vM2H+y/x5Gt5 /3VHceLO1W0QvauUx93uWz/LWrF4fC9N8OQIk59KtTTwhIjnArAMooH5sf1W8G7z+V5B 7juF0RfrkLF2H8dhKLLvdTpY5TAu6yXtbwAOmTGGKb27l2FMNMsMmdrNplPOAdub0A1g Af3g== X-Gm-Message-State: AN3rC/7CijUXJGxMehF2GAcg6EPLX36LwuRV9ij27eg0wvCw3GpNPrLk KW6+IoEovDQ19qrn X-Received: by 10.223.179.65 with SMTP id k1mr14376349wrd.99.1492374522897; Sun, 16 Apr 2017 13:28:42 -0700 (PDT) Received: from mai.lan ([2001:41d0:fe90:b800:20c0:6248:a385:db35]) by smtp.gmail.com with ESMTPSA id 81sm7732196wmj.9.2017.04.16.13.28.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 16 Apr 2017 13:28:42 -0700 (PDT) From: Daniel Lezcano <daniel.lezcano@linaro.org> To: tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Alexander Kochetkov <al.kochet@gmail.com>, Heiko Stuebner <heiko@sntech.de>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Russell King <linux@armlinux.org.uk>, linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC support), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS) Subject: [PATCH 23/29] ARM: dts: rockchip: Update compatible property for rk322x timer Date: Sun, 16 Apr 2017 22:27:13 +0200 Message-Id: <1492374441-23336-23-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492374441-23336-1-git-send-email-daniel.lezcano@linaro.org> References: <20170416202542.GV2078@mai> <1492374441-23336-1-git-send-email-daniel.lezcano@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org |
Series |
[01/29] arm64: Allow checking of a CPU-local erratum
|
expand
|
diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi index 9dff822..641607d 100644 --- a/arch/arm/boot/dts/rk322x.dtsi +++ b/arch/arm/boot/dts/rk322x.dtsi @@ -325,7 +325,7 @@ }; timer: timer@110c0000 { - compatible = "rockchip,rk3288-timer"; + compatible = "rockchip,rk3228-timer", "rockchip,rk3288-timer"; reg = <0x110c0000 0x20>; interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; clocks = <&xin24m>, <&cru PCLK_TIMER>;