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 X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5116C3F2D7 for ; Wed, 4 Mar 2020 11:00:12 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B911922522 for ; Wed, 4 Mar 2020 11:00:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Fwg2Ee0y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B911922522 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sntech.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=smpz3X/FnZ5HUW1eutUSSspHH2lSoZNF7uIS5USglN0=; b=Fwg2Ee0yoJnz9W uoKRsn3UMYTke+CopylhhDJ/V/2yuUZLI2/Fe/cmfW6OaWzRPX21lq17HywGp6HeHUA2STjG2MeTJ bGf9JdLRYVWXcrhnOlF3/azKqooHTKOkaPbRxS74SMPx9e3jqdG2hlw6zJI7zFLV6ChuCPhIQ4pFM 1tM+BXRPDJALaUIPlK60ioGsqCwNiDy8AWV4cj5t9thBy3w5FFiMpe4b9YPin+kcWv0QcLiO7PUru 96Fa5ITqcQFRKfeu8Cu9lB3PkdJVBVRZBWUAR7+dAJAh/HvHOumKdDABaLeYqoc/pMJ3mS4+645zI T8IcEGHuWEy28ZPcaG4w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j9Rl5-0006kV-MT; Wed, 04 Mar 2020 11:00:11 +0000 Received: from gloria.sntech.de ([185.11.138.130]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j9Rl2-0005Xa-Cd; Wed, 04 Mar 2020 11:00:10 +0000 Received: from ip5f5a5d2f.dynamic.kabel-deutschland.de ([95.90.93.47] helo=diego.localnet) by gloria.sntech.de with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1j9Rko-0006RL-Ow; Wed, 04 Mar 2020 11:59:54 +0100 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: =?ISO-8859-1?Q?Myl=E8ne?= Josserand Subject: Re: [PATCH 1/2] ARM: Rockchip: Handle rk3288/rk3288w revision Date: Wed, 04 Mar 2020 11:59:54 +0100 Message-ID: <2221545.2vEflg7qi2@diego> In-Reply-To: <20200302155703.278421-2-mylene.josserand@collabora.com> References: <20200302155703.278421-1-mylene.josserand@collabora.com> <20200302155703.278421-2-mylene.josserand@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200304_030008_585370_1216BCF6 X-CRM114-Status: GOOD ( 20.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sboyd@kernel.org, mturquette@baylibre.com, linux@armlinux.org.uk, linux-rockchip@lists.infradead.org, kernel@collabora.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, Am Montag, 2. M=E4rz 2020, 16:57:02 CET schrieb Myl=E8ne Josserand: > Determine which revision of rk3288 by checking the HDMI version. > According to the Rockchip BSP kernel, on rk3288w, the HDMI > revision equals 0x1A which is not the case for the rk3288 [1]. > = > As these SOC have some differences, the new function > 'soc_is_rk3288w' will help us to know on which revision > we are. what happened to just having a different compatible in the dts? Aka doing a = rk3288w.dtsi with #include "rk3288.dtsi" &cru { compatible =3D "rockchip,rk3288w-cru"; } I somehow don't expect boards to just switch between soc variants on the fly. Also, doing things in mach-rockchip is not very future-proof: (1) having random soc-specific APIs spanning the kernel feels wrong, especially as at some point it might not be contained to our own special drivers like the cru. I cannot really see people being enthusiastic if something like this would be needed in say the core Analogix-DP bridge = ;-) (2) I guess the rk3288w will not be the last soc doing this and on arm64 you can't do it that way, as there is no mach-rockchip there So my personal preference would really would be just a specific compatible for affected ip blocks. Heiko > [1]:https://github.com/rockchip-linux/u-boot/blob/f992fe3334aa5090acb4482= 61982628b5a3d37a5/arch/arm/include/asm/arch-rockchip/cpu.h#L30..L34 > = > Signed-off-by: Myl=E8ne Josserand > --- > arch/arm/mach-rockchip/rockchip.c | 45 +++++++++++++++++++++++++++++++ > include/soc/rockchip/revision.h | 22 +++++++++++++++ > 2 files changed, 67 insertions(+) > create mode 100644 include/soc/rockchip/revision.h > = > diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/r= ockchip.c > index f9797a2b5d0d..b907ba390093 100644 > --- a/arch/arm/mach-rockchip/rockchip.c > +++ b/arch/arm/mach-rockchip/rockchip.c > @@ -9,12 +9,14 @@ > #include > #include > #include > +#include > #include > #include > #include > #include > #include > #include > +#include > #include > #include > #include > @@ -22,6 +24,49 @@ > #include "pm.h" > = > #define RK3288_TIMER6_7_PHYS 0xff810000 > +#define RK3288_HDMI_REV_REG 0x04 > +#define RK3288W_HDMI_REV 0x1A > + > +static const struct of_device_id rk3288_dt_hdmi_match[] __initconst =3D { > + { .compatible =3D "rockchip,rk3288-dw-hdmi" }, > + { } > +}; > + > +int rk3288_get_revision(void) > +{ > + static int revision =3D RK3288_SOC_REV_UNKNOWN; > + struct device_node *dn; > + void __iomem *hdmi_base; > + > + if (revision !=3D RK3288_SOC_REV_UNKNOWN) > + return revision; > + > + dn =3D of_find_matching_node(NULL, rk3288_dt_hdmi_match); > + if (!dn) { > + pr_err("%s: Couldn't find HDMI node\n", __func__); > + return -EINVAL; > + } > + > + hdmi_base =3D of_iomap(dn, 0); > + of_node_put(dn); > + > + if (!hdmi_base) { > + pr_err("%s: Couldn't map %pOF regs\n", __func__, > + hdmi_base); > + return -ENXIO; > + } > + > + if (readl_relaxed(hdmi_base + RK3288_HDMI_REV_REG) =3D=3D > + RK3288W_HDMI_REV) > + revision =3D RK3288_SOC_REV_RK3288W; > + else > + revision =3D RK3288_SOC_REV_RK3288; > + > + iounmap(hdmi_base); > + > + return revision; > +} > +EXPORT_SYMBOL(rk3288_get_revision); > = > static void __init rockchip_timer_init(void) > { > diff --git a/include/soc/rockchip/revision.h b/include/soc/rockchip/revis= ion.h > new file mode 100644 > index 000000000000..226419c60af0 > --- /dev/null > +++ b/include/soc/rockchip/revision.h > @@ -0,0 +1,22 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Copyright 2020 Collabora > + */ > + > +#ifndef __SOC_ROCKCHIP_REVISION_H__ > +#define __SOC_ROCKCHIP_REVISION_H__ > + > +enum rk3288_soc_revision { > + RK3288_SOC_REV_UNKNOWN, > + RK3288_SOC_REV_RK3288, > + RK3288_SOC_REV_RK3288W, > +}; > + > +int rk3288_get_revision(void); > + > +static inline bool soc_is_rk3288w(void) > +{ > + return rk3288_get_revision() =3D=3D RK3288_SOC_REV_RK3288W; > +} > + > +#endif /* __SOC_ROCKCHIP_REVISION_H__ */ > = _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel