From patchwork Wed Feb 12 17:09:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Majewski X-Patchwork-Id: 13972189 Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB1A62586E2; Wed, 12 Feb 2025 17:09:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739380166; cv=none; b=aBg0w8e8NqenZOH2z2h+oAy8tF8La6NU5dEbriwCQCI8HBbcFxKzz+cCUVc8+/8SXBINKu4Qpxtkj8PLTsm54inw0Oh2c9JksFvwEagRCSI/qEaYEh0Zeve9YpWo8OhOqHftzqYV9WIncdCjOKs2qvKg9kttpMYk0D7Ybulu7do= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739380166; c=relaxed/simple; bh=LpvD4GRKt56iJUYjxt5c/loK033MF5rI2aRsrq6XDOQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=naycj09739m4vv5OhR6nNdIpWzhybzW2RAM7qWF8vGwpVVH9k4Ce1IxREshEsqlM9Bo834scT+vGGu+9IwtK76IiEd8PxoTXWhiL/OhIUZi8vPy2vUrtPSKLPGKIO9N9Nb6slDiDsM+BH9GniI5nKIVkLOMYqPs/AIkTnTdfeIM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Fh7c2o0a; arc=none smtp.client-ip=209.85.160.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Fh7c2o0a" Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-4719edfcd13so3261181cf.1; Wed, 12 Feb 2025 09:09:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739380163; x=1739984963; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BpLNszSPIwwrh77tKsORDywoOtjOjCMx1grEp42UkB4=; b=Fh7c2o0ak7V/2SOW0tusVfMMXO99zlE4FOggKn0rLYnl5Zpu5olQFJ+zfitc8zIvRb d2bP89mV+k7+dR67IfP3NzhkxkUhF19yexGnb8lhdbu/6rpqVE43zM4+bVZlmauOEK1T JqN/uuuyqejfp/UMGgmIadXvuMJnELea8ktaXByZFh4Nh2uZTmyvutcdJPWpIa5F74Uo Q6H6hW+xYjnMvojhRk+pvKAYAl+kTmtMA8VeXP+MLcFByenmI0Rbfv/lcQtprY1oMkDJ o0yKrb+2TSmGFfJzPEykw6IPHXuGq3R4gQHVCvlnede55Dw08vWSSdKQMaEI1oI6GhFN j4Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739380163; x=1739984963; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BpLNszSPIwwrh77tKsORDywoOtjOjCMx1grEp42UkB4=; b=T0DGHYxzSMROpqIoc6H/NGTNN1GxxmyI58/eqMe/9NiGmdo+tSGC3H3Cg7Nolzfjif VuPa+BPloScF9EMXpjZmspLXULr4TicFSnx9djsCFBT9KZ0LGp1x491NXxsfoL/DAO5A XuLhCTa3PFVseftbvAIK9AHHOoTKyAE3zh5u2SUrB/t//SuC5NWgV9EqDLuR8MQGZNId IU7VRQ8zvT0eFnT6KTeXWDsnIx4Vtc2FbMaEx8eQqiVe+9zs7E9QEXxJ+GWpWMrAOwBd KjtCG7BxHXFY2ebWX8na+fSwY8o7k4UZrkY7nQqgCZ4UeLedzVSQqUOLvJeMG1t/Vgdp UufQ== X-Forwarded-Encrypted: i=1; AJvYcCU6slBQHhkEGrVhajOVimlaNG9eAqwPYUdy4AQ0NaiV3DVSmeIT5Jcl2sT2QGQjy/bxv3lQdMx+uCb8RL8=@vger.kernel.org, AJvYcCUgvWYX9v3Mc2DLFTAcqNk3iBnVHdIoYirTo8KZ+/4JUACww2qzT97YAi/bVByh1o5v+rCQg+VnRymlwxQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyMM17JFDtCgTqibeSTn7pxfYVKXP0IXD1htSV1Ru0x9JPKPqrp iJOrHcD3AYxvE1vlq55cdv9C8arjchmOqcy3hytsEN80La65QSNx X-Gm-Gg: ASbGncu+l8ZSmYEr8vDoI7ftWdKSVl5iAV1pHqcRxIDcvKk8RMUKCHBtXgVk5YFSLDf zDSftuMs2tFTcqA+9vdtHkE+64axNwo2jg3BwuPCxbiUeX3pkpGceH4xqrMf7A8ERTARGIbW+D9 gnbFPPI7z0nuFaSaeBxTGO7uAYurqeS0KPa1nu38cFnFH8DRlwgNlC3YrkVF2kk1ThlwsRJaW0h f6nKmMYfNunXvV+WqTVnUys7EHLA/c5SO0BPI6v9JlBEYo/PERWKtFjy3N6/o9RnXM1zlGhzVrf /JLZ3B3yfEsd455disMEW6P4/AF/uQBcbUdAY1Ut47DggQt3R+vcY+kR X-Google-Smtp-Source: AGHT+IHKWzLwDfNePO702O88CwKx9UYCSyolieihropdI5zFR3komWMYTqdpjqYxT0udFvZHn0eykA== X-Received: by 2002:a05:6214:20e9:b0:6e4:449c:ab1d with SMTP id 6a1803df08f44-6e46ed77434mr26170986d6.2.1739380163677; Wed, 12 Feb 2025 09:09:23 -0800 (PST) Received: from matt-Z87X-UD4H.mynetworksettings.com ([2600:1002:a012:94a2:c438:570:6155:5ffc]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e52798f66asm12079546d6.37.2025.02.12.09.09.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 09:09:23 -0800 (PST) From: Matthew Majewski To: Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Hans Verkuil , "Dr. David Alan Gilbert" , Neil Armstrong , "Uwe Kleine-Konig" , Andrzej Pietrasiewicz Cc: devicetree@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Matthew Majewski Subject: [PATCH 1/2] media: dt-bindings: Add dt bindings for m2m-deinterlace device Date: Wed, 12 Feb 2025 12:09:00 -0500 Message-Id: <20250212170901.3881838-2-mattwmajewski@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250212170901.3881838-1-mattwmajewski@gmail.com> References: <20250212170901.3881838-1-mattwmajewski@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Create a new yaml schema file to describe the device tree bindings for the generic m2m-deinterlace driver. Signed-off-by: Matthew Majewski --- .../bindings/media/m2m-deinterlace.yaml | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/m2m-deinterlace.yaml diff --git a/Documentation/devicetree/bindings/media/m2m-deinterlace.yaml b/Documentation/devicetree/bindings/media/m2m-deinterlace.yaml new file mode 100644 index 000000000000..3ac9c1e7be88 --- /dev/null +++ b/Documentation/devicetree/bindings/media/m2m-deinterlace.yaml @@ -0,0 +1,41 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/media/m2m-deinterlace.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: M2M Deinterlacer + +maintainers: + - Mauro Carvalho Chehab + +description: | + A generic memory2memory device for deinterlacing video + using dmaengine. + +properties: + compatible: + const: m2m-deinterlace + + dma-names: + items: + - const: rxtx + + dmas: + items: + - description: mem-to-mem capable DMA channel + +required: + - compatible + - dma-names + - dmas + +additionalProperties: false + +examples: + - | + m2m-deinterlace { + compatible = "m2m-deinterlace"; + dma-names = "rxtx"; + dmas = <&edma 20 0>; + }; From patchwork Wed Feb 12 17:09:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Majewski X-Patchwork-Id: 13972190 Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7843E25D538; Wed, 12 Feb 2025 17:09:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739380169; cv=none; b=RIiokPin3n7SKA8mg1LWm3w4lEnlfQfgekPHZOrrwnEAHfTqwbNRNRDOSuz7Moh/lj74pO60l5CI4wrVKwmcFse60XdEU31jLemsi145wYgqMYDX1pRfx3XPs0pITWwIsCj9BIvYv3uLZWM0lNJZRzz8n57tYYV6uZwOP12dt4U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739380169; c=relaxed/simple; bh=TE3oEgraRsG6/yVyd1qKvYuB31ewWb6CIHQdaS7to1g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oMj3dLQKaC0M/TJJjQcPSqdXHtdbs9upy5/VWzlVewTlf4lfFrOuWHYevrhbvbkjR/F7sKhA/MO5K1ShQXI9G0fVYEgAiurN62d2SsU0tq7O29fEPyDDGajvQBD9hj4GSgGTzQ2uF9Z4T9HzsIMtd9DGjIeWlYnZPYPetXOASl4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gD6eFA+T; arc=none smtp.client-ip=209.85.160.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gD6eFA+T" Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-471a4f8bf65so701151cf.3; Wed, 12 Feb 2025 09:09:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739380166; x=1739984966; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NgSQtsSRJfTvvGbkYKS1L//GTl5a7DNUmVZ6Swpvw8k=; b=gD6eFA+TbhXEtEgtM3kdypeoNUxmXMTpCkn0dceenYSWVB/21luvh8UHdD3HdsaawY GQWq5y3291lktGQnODPigQ75J6qQFgzEdwMRr6PxJx9nz1WTj4JzCDOWeVq3Sl9A7jHv pFOmKwS1Ak4nZjG5afcjS2eRcDy4eor1H90myEW9GCWfinvG0RSXFtSKnHyvpRaTc14P kH77oqboFRCalxbN4it+FBd5M4xu4SRiwtamQzlGr+RmoWy+tS+PWhwrxJDicnCHlPFt ZM1brWOirVPJr4mlzOHLfFymSg8CXWlp1Wa2ssHiNtisVnoeU4LRVNS3+g8iYRyTOvxg hWiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739380166; x=1739984966; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NgSQtsSRJfTvvGbkYKS1L//GTl5a7DNUmVZ6Swpvw8k=; b=qOEsXmOMVBIvqoxVh7DHbptJb1Avf2sWwZsy74RH/PfZJc1MdW/FgPd8xGJxD5RUig 7DZ77vj67tzuhJfVlFHdkrNgGW74632jqERYe9nPoIw9xAHfzMbbUYGPQrpkyOhRwElq QbYlVKYGiF3teuDYXidBqp+elxfQ7dyb1zfOkNP+BR6D2iBSgwH+4L5T0Il17Xah48vb hf1sstIbPClG0jyx9HUFpT0FAyCKyXkQKZlzH2D/aTSmdXBZiBIT8YcVZd/qF7fNEWNV PEY5F5uRGNxY7UJe9zFPbi/SuXM1Cr0P64uE7FLq1+QikOBYunoo157SpPTcyWXQ98bD kGhA== X-Forwarded-Encrypted: i=1; AJvYcCUfeY/qJMSzw1tHNc2HZ4oaC+z1NQUf9k+rQnlxTgK/U54xwiqneXzj/K2FY/dnKFi1HA5Qjf3YP6Xh6KQ=@vger.kernel.org, AJvYcCWgc/T75e5kJWwD3VBiKSfvwzaV3oIhpqMLDSFXtTdLTM9xbe5bTZ+WzPr0E0DzuW0RIGK29rJzqhbNbNQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yzl9DPrISta/pIIz6MCOy4amPGtdQjjiwozfVDJGHELHzubPEJc 0upWB7WhZ7PTiKjLpIP8ue/OaCYfpWAEq/SnuLjd1UHYya3+WU2v X-Gm-Gg: ASbGnct9Ogv49R9EDIRMmopxdsuK6ICw8ciJifaHDSvSOLNjO9lYrL3Z2WggqZeLXuT xJYs110dMbxZBZTTwst0VESJZEUFmJSQ4FuBZGdhRyFJQL0DOIfpfik2+Vmwoc/NrXIBoPXXruS foe+TpyrL9LShNlmrKt12aaSK8YQJYtNhRFf3AEM7X012vTNRPly+mZqE73NOdgtbHzKqj+5DYn hClPZggEe40I3HmFLq8Rz5uyI3Pq45+4g9sZnEXy7gmTpGASZi/vHczB6bb5YqyjikMEpOJ/XSZ oFXzQHiAhnw17y5/O8LNCHZDbG5N+cgmZwDv2JJfLGM6sW5/piZzkxiG X-Google-Smtp-Source: AGHT+IG1LJxLezvshuhqs82k/JmK46r6Q76xu80RrPWUoRkjSzgD8z3+b6AmcCgLy4vaoGBtCmHUmA== X-Received: by 2002:a05:6214:2b0:b0:6e6:5a25:e10f with SMTP id 6a1803df08f44-6e65a25e2b3mr9254166d6.1.1739380166379; Wed, 12 Feb 2025 09:09:26 -0800 (PST) Received: from matt-Z87X-UD4H.mynetworksettings.com ([2600:1002:a012:94a2:c438:570:6155:5ffc]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e52798f66asm12079546d6.37.2025.02.12.09.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 09:09:25 -0800 (PST) From: Matthew Majewski To: Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Hans Verkuil , "Dr. David Alan Gilbert" , Neil Armstrong , "Uwe Kleine-Konig" , Andrzej Pietrasiewicz Cc: devicetree@vger.kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Matthew Majewski Subject: [PATCH 2/2] media: m2m-deinterlace: add device-tree support Date: Wed, 12 Feb 2025 12:09:01 -0500 Message-Id: <20250212170901.3881838-3-mattwmajewski@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250212170901.3881838-1-mattwmajewski@gmail.com> References: <20250212170901.3881838-1-mattwmajewski@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add support for loading the m2m-deinterlace driver through the device-tree. Prefer to query the dma device through dma_request_chan(), which will get the dma device information from the device-tree node if present. Otherwise, fall back to the original dma_request_channel() to preserve backwards compatibility. Signed-off-by: Matthew Majewski --- drivers/media/platform/m2m-deinterlace.c | 25 ++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c index 5188f3189096..ba4e4ee6ad34 100644 --- a/drivers/media/platform/m2m-deinterlace.c +++ b/drivers/media/platform/m2m-deinterlace.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -914,7 +915,6 @@ static int deinterlace_probe(struct platform_device *pdev) { struct deinterlace_dev *pcdev; struct video_device *vfd; - dma_cap_mask_t mask; int ret = 0; pcdev = devm_kzalloc(&pdev->dev, sizeof(*pcdev), GFP_KERNEL); @@ -923,9 +923,16 @@ static int deinterlace_probe(struct platform_device *pdev) spin_lock_init(&pcdev->irqlock); - dma_cap_zero(mask); - dma_cap_set(DMA_INTERLEAVE, mask); - pcdev->dma_chan = dma_request_channel(mask, NULL, pcdev); + if (pdev->dev.of_node) { + pcdev->dma_chan = dma_request_chan(&pdev->dev, "rxtx"); + } else { + dma_cap_mask_t mask; + + dma_cap_zero(mask); + dma_cap_set(DMA_INTERLEAVE, mask); + pcdev->dma_chan = dma_request_channel(mask, NULL, pcdev); + } + if (!pcdev->dma_chan) return -ENODEV; @@ -989,12 +996,18 @@ static void deinterlace_remove(struct platform_device *pdev) dma_release_channel(pcdev->dma_chan); } +static const struct of_device_id deinterlace_dt_match[] = { + { .compatible = "m2m-deinterlace" }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, deinterlace_dt_match); + static struct platform_driver deinterlace_pdrv = { .probe = deinterlace_probe, .remove = deinterlace_remove, .driver = { - .name = MEM2MEM_NAME, + .name = MEM2MEM_NAME, + .of_match_table = deinterlace_dt_match, }, }; module_platform_driver(deinterlace_pdrv); -