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=-8.8 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 6FA7CC04AB6 for ; Tue, 28 May 2019 16:15:19 +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 320B221721 for ; Tue, 28 May 2019 16:15:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="B8lB/u02"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YhSCXK01" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 320B221721 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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=vgTcYMg1+Ea0hnI05OBgQVU6aWVWA5E+1/v4Ue3gtjI=; b=B8lB/u02IChWRu eLagks/Oj2A/4Nfdxs654qWhf4ZPJDLhLw83O45R5+yy9EpA0zSMoYSLv5AhYJasaSPykHaAB3zvQ RpI/h07PIG8ly0kNinMYEvzW8dE4o11WB1JT5zh4ojqTi4QHtP9QMKTE4quELKymBJiG5HZLr6A75 gNwBdQDMlPZ8nJ6snCxTUuVlBGFz2MB3V/QyVwxuA43fxtJMfdgBsYwZs/HO8j1vjWDr34V6tA/Q4 YK3f1wrj1C4chd5g7CubWD8am025Q5y97JvDKaI3eeqGYafBThNLAnMr42E2s825mLzAYAvqRd/FH FQh5zqSx0yRqgOLZpZmQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hVekt-0001IC-GW; Tue, 28 May 2019 16:15:15 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hVekd-0008KD-I3 for linux-arm-kernel@lists.infradead.org; Tue, 28 May 2019 16:15:01 +0000 Received: by mail-wr1-x444.google.com with SMTP id d18so20904573wrs.5 for ; Tue, 28 May 2019 09:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O41YUIVc2MJNuuXTwafk8QcCnNJUPDaUXKLKqpHPW48=; b=YhSCXK01y9HbwTyBObMn3fJPittt7i4aSVRpTPPjmajO7xtSjaZK0cRaOXZ7r19ajz +gcBgQ3posddHCH2GiO5s3XPG64beLuuMwRvfakcEEBy/wGjlbmefL665TJWDH9b/cJJ VRhTq4fAgXEbZg7Cq/EKE4aoJuOHkaTTrWBlbdA7Rj0EkSwQklxIh5O899bqnMZc3dLv AGzhwDwcXYSegQBMRAicZB64GRgo5zkE0wJ6pvH3/lDvYmtILl/FsJIRjNYeNd68OBRr JZLCsg28+RL5ynz4N7OfvWclWUiP+jIxdBqWSiL1T8LxLo2tSYJDn0MpySItIjfT9hYq /klQ== 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=O41YUIVc2MJNuuXTwafk8QcCnNJUPDaUXKLKqpHPW48=; b=ee9E8kdeCIeKDfzqM5EC1XV4F70vU/Ge0sPrbD90uAtiMX1zkoRwq+GvwwF6a6H3TE 7wlWsn7igLtpi6+St4hMx2AsxmmtVBqSiUsJCaUnoMpjDCHKBZWIQWMlfIqmVbtjUYug Rl0nwhN3DZTyFMUp6LtqOVqsT9YYN6sC19XN4vy11RhSPmPNnX3XjWzu3Oto8eq3hWsr h+0Vp/wEIc6bycOzxwG7dPM6DZpJj5SF5vZIJi7vOCPjVXHplqb3XWtRDi7IrDY0jXZu cez0MNxOfMY2pQRqAq4OH5B2p/V4p5jaPzj0GrNPLX3P8O9KxtlgufY5gVlzmVAXy7WW JAWw== X-Gm-Message-State: APjAAAVkk1ulD4P9rASUmw7eC+RN0VUvRj7gFuvkJkpvcdSsDkZURPUO PGAgFn4ogf1fNL5V0nwM1eU= X-Google-Smtp-Source: APXvYqzh9lA7QzTMNcXB9f8W/fXyhl8ZsJbIZmnPh8abVqtzC8iHmrkSxwMiA782tasG2CDzuGF3rA== X-Received: by 2002:adf:9022:: with SMTP id h31mr22187951wrh.46.1559060097123; Tue, 28 May 2019 09:14:57 -0700 (PDT) Received: from localhost.localdomain (18.189-60-37.rdns.acropolistelecom.net. [37.60.189.18]) by smtp.gmail.com with ESMTPSA id l14sm13678787wrt.57.2019.05.28.09.14.56 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 28 May 2019 09:14:56 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Mauro Carvalho Chehab , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai Subject: [PATCH v3 02/12] media: rc: Introduce sunxi_ir_quirks Date: Tue, 28 May 2019 18:14:30 +0200 Message-Id: <20190528161440.27172-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190528161440.27172-1-peron.clem@gmail.com> References: <20190528161440.27172-1-peron.clem@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190528_091459_599415_26702DA8 X-CRM114-Status: GOOD ( 17.74 ) 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: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org VGhpcyBkcml2ZXIgaXMgdXNlZCBpbiB2YXJpb3VzIEFsbHdpbm5lciBTb0Mgd2l0aCBkaWZmZXJl bnQgY29uZmlndXJhdGlvbi4KCkludHJvZHVjZSBhIHF1aXJrcyBzdHJ1Y3QgdG8ga25vdyB0aGUg ZmlmbyBzaXplIGFuZCBpZiBhIHJlc2V0IGlzIHJlcXVpcmVkLgoKU2lnbmVkLW9mZi1ieTogQ2zD qW1lbnQgUMOpcm9uIDxwZXJvbi5jbGVtQGdtYWlsLmNvbT4KLS0tCiBkcml2ZXJzL21lZGlhL3Jj L3N1bnhpLWNpci5jIHwgNjEgKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9tZWRpYS9yYy9zdW54aS1jaXIuYyBiL2RyaXZlcnMvbWVkaWEvcmMvc3Vu eGktY2lyLmMKaW5kZXggMzA3ZTQ0NzE0ZWEwLi5kMDJkY2I2ZmQwYTUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvbWVkaWEvcmMvc3VueGktY2lyLmMKKysrIGIvZHJpdmVycy9tZWRpYS9yYy9zdW54aS1j aXIuYwpAQCAtODEsNiArODEsMTcgQEAKIC8qIFRpbWUgYWZ0ZXIgd2hpY2ggZGV2aWNlIHN0b3Bz IHNlbmRpbmcgZGF0YSBpbiBtcyAqLwogI2RlZmluZSBTVU5YSV9JUl9USU1FT1VUICAgICAgMTIw CiAKKy8qKgorICogc3RydWN0IHN1bnhpX2lyX3F1aXJrcyAtIERpZmZlcmVuY2VzIGJldHdlZW4g U29DIHZhcmlhbnRzLgorICoKKyAqIEBoYXNfcmVzZXQ6IFNvQyBuZWVkcyByZXNldCBkZWFzc2Vy dGVkLgorICogQGZpZm9fc2l6ZTogc2l6ZSBvZiB0aGUgZmlmby4KKyAqLworc3RydWN0IHN1bnhp X2lyX3F1aXJrcyB7CisJYm9vbAkJaGFzX3Jlc2V0OworCWludAkJZmlmb19zaXplOworfTsKKwog c3RydWN0IHN1bnhpX2lyIHsKIAlzcGlubG9ja190ICAgICAgaXJfbG9jazsKIAlzdHJ1Y3QgcmNf ZGV2ICAgKnJjOwpAQCAtMTQzLDYgKzE1NCw3IEBAIHN0YXRpYyBpbnQgc3VueGlfaXJfcHJvYmUo c3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAogCXN0cnVjdCBkZXZpY2UgKmRldiA9ICZw ZGV2LT5kZXY7CiAJc3RydWN0IGRldmljZV9ub2RlICpkbiA9IGRldi0+b2Zfbm9kZTsKKwljb25z dCBzdHJ1Y3Qgc3VueGlfaXJfcXVpcmtzICpxdWlya3M7CiAJc3RydWN0IHJlc291cmNlICpyZXM7 CiAJc3RydWN0IHN1bnhpX2lyICppcjsKIAl1MzIgYl9jbGtfZnJlcSA9IFNVTlhJX0lSX0JBU0Vf Q0xLOwpAQCAtMTUxLDEyICsxNjMsMTUgQEAgc3RhdGljIGludCBzdW54aV9pcl9wcm9iZShzdHJ1 Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCWlmICghaXIpCiAJCXJldHVybiAtRU5PTUVNOwog CisJcXVpcmtzID0gb2ZfZGV2aWNlX2dldF9tYXRjaF9kYXRhKCZwZGV2LT5kZXYpOworCWlmIChx dWlya3MgPT0gTlVMTCkgeworCQlkZXZfZXJyKCZwZGV2LT5kZXYsICJGYWlsZWQgdG8gZGV0ZXJt aW5lIHRoZSBxdWlya3MgdG8gdXNlXG4iKTsKKwkJcmV0dXJuIC1FTk9ERVY7CisJfQorCiAJc3Bp bl9sb2NrX2luaXQoJmlyLT5pcl9sb2NrKTsKIAotCWlmIChvZl9kZXZpY2VfaXNfY29tcGF0aWJs ZShkbiwgImFsbHdpbm5lcixzdW41aS1hMTMtaXIiKSkKLQkJaXItPmZpZm9fc2l6ZSA9IDY0Owot CWVsc2UKLQkJaXItPmZpZm9fc2l6ZSA9IDE2OworCWlyLT5maWZvX3NpemUgPSBxdWlya3MtPmZp Zm9fc2l6ZTsKIAogCS8qIENsb2NrICovCiAJaXItPmFwYl9jbGsgPSBkZXZtX2Nsa19nZXQoZGV2 LCAiYXBiIik7CkBAIC0xNzMsMTMgKzE4OCwxNSBAQCBzdGF0aWMgaW50IHN1bnhpX2lyX3Byb2Jl KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJLyogQmFzZSBjbG9jayBmcmVxdWVuY3kg KG9wdGlvbmFsKSAqLwogCW9mX3Byb3BlcnR5X3JlYWRfdTMyKGRuLCAiY2xvY2stZnJlcXVlbmN5 IiwgJmJfY2xrX2ZyZXEpOwogCi0JLyogUmVzZXQgKG9wdGlvbmFsKSAqLwotCWlyLT5yc3QgPSBk ZXZtX3Jlc2V0X2NvbnRyb2xfZ2V0X29wdGlvbmFsX2V4Y2x1c2l2ZShkZXYsIE5VTEwpOwotCWlm IChJU19FUlIoaXItPnJzdCkpCi0JCXJldHVybiBQVFJfRVJSKGlyLT5yc3QpOwotCXJldCA9IHJl c2V0X2NvbnRyb2xfZGVhc3NlcnQoaXItPnJzdCk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsK KwkvKiBSZXNldCAqLworCWlmIChxdWlya3MtPmhhc19yZXNldCkgeworCQlpci0+cnN0ID0gZGV2 bV9yZXNldF9jb250cm9sX2dldF9leGNsdXNpdmUoZGV2LCBOVUxMKTsKKwkJaWYgKElTX0VSUihp ci0+cnN0KSkKKwkJCXJldHVybiBQVFJfRVJSKGlyLT5yc3QpOworCQlyZXQgPSByZXNldF9jb250 cm9sX2RlYXNzZXJ0KGlyLT5yc3QpOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKwl9CiAK IAlyZXQgPSBjbGtfc2V0X3JhdGUoaXItPmNsaywgYl9jbGtfZnJlcSk7CiAJaWYgKHJldCkgewpA QCAtMzE2LDEwICszMzMsMjYgQEAgc3RhdGljIGludCBzdW54aV9pcl9yZW1vdmUoc3RydWN0IHBs YXRmb3JtX2RldmljZSAqcGRldikKIAlyZXR1cm4gMDsKIH0KIAorc3RhdGljIGNvbnN0IHN0cnVj dCBzdW54aV9pcl9xdWlya3Mgc3VuNGlfYTEwX2lyX3F1aXJrcyA9IHsKKwkuaGFzX3Jlc2V0ID0g ZmFsc2UsCisJLmZpZm9fc2l6ZSA9IDE2LAorfTsKKworc3RhdGljIGNvbnN0IHN0cnVjdCBzdW54 aV9pcl9xdWlya3Mgc3VuNWlfYTEzX2lyX3F1aXJrcyA9IHsKKwkuaGFzX3Jlc2V0ID0gZmFsc2Us CisJLmZpZm9fc2l6ZSA9IDY0LAorfTsKKwogc3RhdGljIGNvbnN0IHN0cnVjdCBvZl9kZXZpY2Vf aWQgc3VueGlfaXJfbWF0Y2hbXSA9IHsKLQl7IC5jb21wYXRpYmxlID0gImFsbHdpbm5lcixzdW40 aS1hMTAtaXIiLCB9LAotCXsgLmNvbXBhdGlibGUgPSAiYWxsd2lubmVyLHN1bjVpLWExMy1pciIs IH0sCi0Je30sCisJeworCQkuY29tcGF0aWJsZSA9ICJhbGx3aW5uZXIsc3VuNGktYTEwLWlyIiwK KwkJLmRhdGEgPSAmc3VuNGlfYTEwX2lyX3F1aXJrcywKKwl9LAorCXsKKwkJLmNvbXBhdGlibGUg PSAiYWxsd2lubmVyLHN1bjVpLWExMy1pciIsCisJCS5kYXRhID0gJnN1bjVpX2ExM19pcl9xdWly a3MsCisJfSwKKwl7fQogfTsKIE1PRFVMRV9ERVZJQ0VfVEFCTEUob2YsIHN1bnhpX2lyX21hdGNo KTsKIAotLSAKMi4yMC4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBs aXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlz dGluZm8vbGludXgtYXJtLWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Subject: [PATCH v3 02/12] media: rc: Introduce sunxi_ir_quirks Date: Tue, 28 May 2019 18:14:30 +0200 Message-ID: <20190528161440.27172-3-peron.clem@gmail.com> References: <20190528161440.27172-1-peron.clem@gmail.com> Reply-To: peron.clem-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Return-path: Sender: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org In-Reply-To: <20190528161440.27172-1-peron.clem-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , To: Mauro Carvalho Chehab , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai Cc: linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= List-Id: devicetree@vger.kernel.org This driver is used in various Allwinner SoC with different configuration. Introduce a quirks struct to know the fifo size and if a reset is required. Signed-off-by: Cl=C3=A9ment P=C3=A9ron --- drivers/media/rc/sunxi-cir.c | 61 +++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/drivers/media/rc/sunxi-cir.c b/drivers/media/rc/sunxi-cir.c index 307e44714ea0..d02dcb6fd0a5 100644 --- a/drivers/media/rc/sunxi-cir.c +++ b/drivers/media/rc/sunxi-cir.c @@ -81,6 +81,17 @@ /* Time after which device stops sending data in ms */ #define SUNXI_IR_TIMEOUT 120 =20 +/** + * struct sunxi_ir_quirks - Differences between SoC variants. + * + * @has_reset: SoC needs reset deasserted. + * @fifo_size: size of the fifo. + */ +struct sunxi_ir_quirks { + bool has_reset; + int fifo_size; +}; + struct sunxi_ir { spinlock_t ir_lock; struct rc_dev *rc; @@ -143,6 +154,7 @@ static int sunxi_ir_probe(struct platform_device *pdev) =20 struct device *dev =3D &pdev->dev; struct device_node *dn =3D dev->of_node; + const struct sunxi_ir_quirks *quirks; struct resource *res; struct sunxi_ir *ir; u32 b_clk_freq =3D SUNXI_IR_BASE_CLK; @@ -151,12 +163,15 @@ static int sunxi_ir_probe(struct platform_device *pde= v) if (!ir) return -ENOMEM; =20 + quirks =3D of_device_get_match_data(&pdev->dev); + if (quirks =3D=3D NULL) { + dev_err(&pdev->dev, "Failed to determine the quirks to use\n"); + return -ENODEV; + } + spin_lock_init(&ir->ir_lock); =20 - if (of_device_is_compatible(dn, "allwinner,sun5i-a13-ir")) - ir->fifo_size =3D 64; - else - ir->fifo_size =3D 16; + ir->fifo_size =3D quirks->fifo_size; =20 /* Clock */ ir->apb_clk =3D devm_clk_get(dev, "apb"); @@ -173,13 +188,15 @@ static int sunxi_ir_probe(struct platform_device *pde= v) /* Base clock frequency (optional) */ of_property_read_u32(dn, "clock-frequency", &b_clk_freq); =20 - /* Reset (optional) */ - ir->rst =3D devm_reset_control_get_optional_exclusive(dev, NULL); - if (IS_ERR(ir->rst)) - return PTR_ERR(ir->rst); - ret =3D reset_control_deassert(ir->rst); - if (ret) - return ret; + /* Reset */ + if (quirks->has_reset) { + ir->rst =3D devm_reset_control_get_exclusive(dev, NULL); + if (IS_ERR(ir->rst)) + return PTR_ERR(ir->rst); + ret =3D reset_control_deassert(ir->rst); + if (ret) + return ret; + } =20 ret =3D clk_set_rate(ir->clk, b_clk_freq); if (ret) { @@ -316,10 +333,26 @@ static int sunxi_ir_remove(struct platform_device *pd= ev) return 0; } =20 +static const struct sunxi_ir_quirks sun4i_a10_ir_quirks =3D { + .has_reset =3D false, + .fifo_size =3D 16, +}; + +static const struct sunxi_ir_quirks sun5i_a13_ir_quirks =3D { + .has_reset =3D false, + .fifo_size =3D 64, +}; + static const struct of_device_id sunxi_ir_match[] =3D { - { .compatible =3D "allwinner,sun4i-a10-ir", }, - { .compatible =3D "allwinner,sun5i-a13-ir", }, - {}, + { + .compatible =3D "allwinner,sun4i-a10-ir", + .data =3D &sun4i_a10_ir_quirks, + }, + { + .compatible =3D "allwinner,sun5i-a13-ir", + .data =3D &sun5i_a13_ir_quirks, + }, + {} }; MODULE_DEVICE_TABLE(of, sunxi_ir_match); =20 --=20 2.20.1 --=20 You received this message because you are subscribed to the Google Groups "= linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an e= mail to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org To view this discussion on the web, visit https://groups.google.com/d/msgid= /linux-sunxi/20190528161440.27172-3-peron.clem%40gmail.com. For more options, visit https://groups.google.com/d/optout. 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=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 9928AC04AB6 for ; Tue, 28 May 2019 16:16:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 65D9521721 for ; Tue, 28 May 2019 16:16:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YhSCXK01" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727615AbfE1QQC (ORCPT ); Tue, 28 May 2019 12:16:02 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:43805 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726371AbfE1QO7 (ORCPT ); Tue, 28 May 2019 12:14:59 -0400 Received: by mail-wr1-f68.google.com with SMTP id l17so12494184wrm.10; Tue, 28 May 2019 09:14:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O41YUIVc2MJNuuXTwafk8QcCnNJUPDaUXKLKqpHPW48=; b=YhSCXK01y9HbwTyBObMn3fJPittt7i4aSVRpTPPjmajO7xtSjaZK0cRaOXZ7r19ajz +gcBgQ3posddHCH2GiO5s3XPG64beLuuMwRvfakcEEBy/wGjlbmefL665TJWDH9b/cJJ VRhTq4fAgXEbZg7Cq/EKE4aoJuOHkaTTrWBlbdA7Rj0EkSwQklxIh5O899bqnMZc3dLv AGzhwDwcXYSegQBMRAicZB64GRgo5zkE0wJ6pvH3/lDvYmtILl/FsJIRjNYeNd68OBRr JZLCsg28+RL5ynz4N7OfvWclWUiP+jIxdBqWSiL1T8LxLo2tSYJDn0MpySItIjfT9hYq /klQ== 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=O41YUIVc2MJNuuXTwafk8QcCnNJUPDaUXKLKqpHPW48=; b=I8tChv1EJhDPLh9nLT3rP6JxyCQAwrEXWUgz1TC/+mIuA1GWP4EtX72nbps5jeoTgK h+JnTQAIPeTZoS/0XSMiNAsLOclp820DzYVJcjNhwExt63x8Vv5G6Epnq3AJROWuAXgH BQiBDz1wcEijwGmhb8FESm3u1PqefGf5BQ5Q7ZrRunJOdJOwZGaOnPD2+ZRkZba/oOc1 EbNOvl71AG/V8vnjSi0mvg6UXuaWQDBychlYlTz/jBgeX31Q9DjacEXJshPXrzgQZToL w2mQ7pqW+sWMmAx+UUTJyTIZDPO4bf2g/wvpv9q5HLXaklbU9Y+1IdUxyP0Fl6XfOyPd tlQQ== X-Gm-Message-State: APjAAAWh7s8v3MIl5K1WZRztQdBI/O8PBi7SIvjSC2zAEeHb+SlFFt3z PDxeL/qWmq/aHO+Eqdy28Usu/b+6S0lfeQ== X-Google-Smtp-Source: APXvYqzh9lA7QzTMNcXB9f8W/fXyhl8ZsJbIZmnPh8abVqtzC8iHmrkSxwMiA782tasG2CDzuGF3rA== X-Received: by 2002:adf:9022:: with SMTP id h31mr22187951wrh.46.1559060097123; Tue, 28 May 2019 09:14:57 -0700 (PDT) Received: from localhost.localdomain (18.189-60-37.rdns.acropolistelecom.net. [37.60.189.18]) by smtp.gmail.com with ESMTPSA id l14sm13678787wrt.57.2019.05.28.09.14.56 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 28 May 2019 09:14:56 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Mauro Carvalho Chehab , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Subject: [PATCH v3 02/12] media: rc: Introduce sunxi_ir_quirks Date: Tue, 28 May 2019 18:14:30 +0200 Message-Id: <20190528161440.27172-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190528161440.27172-1-peron.clem@gmail.com> References: <20190528161440.27172-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This driver is used in various Allwinner SoC with different configuration. Introduce a quirks struct to know the fifo size and if a reset is required. Signed-off-by: Clément Péron --- drivers/media/rc/sunxi-cir.c | 61 +++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/drivers/media/rc/sunxi-cir.c b/drivers/media/rc/sunxi-cir.c index 307e44714ea0..d02dcb6fd0a5 100644 --- a/drivers/media/rc/sunxi-cir.c +++ b/drivers/media/rc/sunxi-cir.c @@ -81,6 +81,17 @@ /* Time after which device stops sending data in ms */ #define SUNXI_IR_TIMEOUT 120 +/** + * struct sunxi_ir_quirks - Differences between SoC variants. + * + * @has_reset: SoC needs reset deasserted. + * @fifo_size: size of the fifo. + */ +struct sunxi_ir_quirks { + bool has_reset; + int fifo_size; +}; + struct sunxi_ir { spinlock_t ir_lock; struct rc_dev *rc; @@ -143,6 +154,7 @@ static int sunxi_ir_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct device_node *dn = dev->of_node; + const struct sunxi_ir_quirks *quirks; struct resource *res; struct sunxi_ir *ir; u32 b_clk_freq = SUNXI_IR_BASE_CLK; @@ -151,12 +163,15 @@ static int sunxi_ir_probe(struct platform_device *pdev) if (!ir) return -ENOMEM; + quirks = of_device_get_match_data(&pdev->dev); + if (quirks == NULL) { + dev_err(&pdev->dev, "Failed to determine the quirks to use\n"); + return -ENODEV; + } + spin_lock_init(&ir->ir_lock); - if (of_device_is_compatible(dn, "allwinner,sun5i-a13-ir")) - ir->fifo_size = 64; - else - ir->fifo_size = 16; + ir->fifo_size = quirks->fifo_size; /* Clock */ ir->apb_clk = devm_clk_get(dev, "apb"); @@ -173,13 +188,15 @@ static int sunxi_ir_probe(struct platform_device *pdev) /* Base clock frequency (optional) */ of_property_read_u32(dn, "clock-frequency", &b_clk_freq); - /* Reset (optional) */ - ir->rst = devm_reset_control_get_optional_exclusive(dev, NULL); - if (IS_ERR(ir->rst)) - return PTR_ERR(ir->rst); - ret = reset_control_deassert(ir->rst); - if (ret) - return ret; + /* Reset */ + if (quirks->has_reset) { + ir->rst = devm_reset_control_get_exclusive(dev, NULL); + if (IS_ERR(ir->rst)) + return PTR_ERR(ir->rst); + ret = reset_control_deassert(ir->rst); + if (ret) + return ret; + } ret = clk_set_rate(ir->clk, b_clk_freq); if (ret) { @@ -316,10 +333,26 @@ static int sunxi_ir_remove(struct platform_device *pdev) return 0; } +static const struct sunxi_ir_quirks sun4i_a10_ir_quirks = { + .has_reset = false, + .fifo_size = 16, +}; + +static const struct sunxi_ir_quirks sun5i_a13_ir_quirks = { + .has_reset = false, + .fifo_size = 64, +}; + static const struct of_device_id sunxi_ir_match[] = { - { .compatible = "allwinner,sun4i-a10-ir", }, - { .compatible = "allwinner,sun5i-a13-ir", }, - {}, + { + .compatible = "allwinner,sun4i-a10-ir", + .data = &sun4i_a10_ir_quirks, + }, + { + .compatible = "allwinner,sun5i-a13-ir", + .data = &sun5i_a13_ir_quirks, + }, + {} }; MODULE_DEVICE_TABLE(of, sunxi_ir_match); -- 2.20.1