From patchwork Tue Mar 31 07:53:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: karthik poduval X-Patchwork-Id: 11466819 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DF8ED17EF for ; Tue, 31 Mar 2020 07:53:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE4AF2072A for ; Tue, 31 Mar 2020 07:53:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="pjDXE55Y" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730149AbgCaHxl (ORCPT ); Tue, 31 Mar 2020 03:53:41 -0400 Received: from mail-ua1-f68.google.com ([209.85.222.68]:33771 "EHLO mail-ua1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727614AbgCaHxk (ORCPT ); Tue, 31 Mar 2020 03:53:40 -0400 Received: by mail-ua1-f68.google.com with SMTP id v24so7361489uak.0 for ; Tue, 31 Mar 2020 00:53:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=RpJLTIbn/mYG38Y6oAIWwRqzx2pjox8Ab74rqdaS5Z8=; b=pjDXE55YaX1RyrPE1WylNgiDhf37tUUoyf4CPV0jEgf7ECkAlq8nIMCZtUkehxukpx MzdH68XHwukMUOnq0TMdtQuzKJuhCfqVqDPube4joUnR5zGvDluVkmdPQhQWeeK5DFTm UUmjxfYb2ImH/4V4gDTvuLcv05ohsvCrDv8QAvdrpCqQBO9aEtZFxMzov71PmIngc/vJ EuNy5U+urmByJSDwoip/5KX6Lw64+8aVt4XnEXEHRX9wA/ZstXwzy+zYhYtMV8lX8SoZ Zlds5Lqk7N8eZuUcE8wYBMLGnRo+W9/eCocxyQ0qijadjebhESCAkwrXtEU8WBXd9yVY 1bwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=RpJLTIbn/mYG38Y6oAIWwRqzx2pjox8Ab74rqdaS5Z8=; b=RfJVYpNXG0ceaieJp1ssUNmBZR2t4+OFTUgSJDJKD6o8knGX0Vi7KFrXmPTJj7HAvW kIFKSgyuzVhucWfIbh4ZKDebPH9RviDCDuFh9ab0F4UNFtuKhGHr9o4VcdgaRxgZE+Bf jMoZqXf/+22qEkKc8i9Io5/nPRuE/hY0MnTrsn88qJYUobedonRWgxiUbJbF2ciPAWil J4mSiB3E/9EWmxoaAFUZAcSiQq443wZK/1vtW4OwD9mNJvPzcZFnhSwr+0Q0vt2965eu hQlsuL3Ko8lP2SB5RUsNX+vkBZcz9Fg1vPjkwvBNA8S7R9YI3cslkIkBuBOcTn47u8MU ns1Q== X-Gm-Message-State: AGi0PuZYU1r4WA/CbomFYNvtCHo7G9YaS6yy4VQgv1TVSVXnvMmteMvg rzWS7VnN1VyYVH1xQiaH6BtOClzB5EM8sJQIfhj9tiXR X-Google-Smtp-Source: APiQypJEp3xQIgTnMRjCN0DiABPWo0DqQvmKxIBf5I06kToON0W6SOrszw3hsz19KvMBOe4PuadnkNrkfTQiKXFMEgU= X-Received: by 2002:ab0:477:: with SMTP id 110mr10908873uav.56.1585641219275; Tue, 31 Mar 2020 00:53:39 -0700 (PDT) MIME-Version: 1.0 From: karthik poduval Date: Tue, 31 Mar 2020 00:53:28 -0700 Message-ID: Subject: [PATCH 2/4] media: staging: rkisp1: add rk3288 support To: Linux Media Mailing List Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Add rk3288 support to the rkisp1 driver. ported over from (https://github.com/TinkerBoard/debian_kernel.git) Reported-by: Karthik Poduval Signed-off-by: Karthik Poduval --- .../bindings/media/rockchip-isp1.yaml | 1 + drivers/staging/media/rkisp1/rkisp1-dev.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) .data = &rk3399_isp_clk_data, diff --git a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml index af246b71eac6..4c31294cf14b 100644 --- a/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml +++ b/drivers/staging/media/rkisp1/Documentation/devicetree/bindings/media/rockchip-isp1.yaml @@ -16,6 +16,7 @@ description: | properties: compatible: const: rockchip,rk3399-cif-isp + const: rockchip,rk3288-rkisp1 reg: maxItems: 1 diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c index b1b3c058e957..1df4f5906fd0 100644 --- a/drivers/staging/media/rkisp1/rkisp1-dev.c +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c @@ -403,6 +403,20 @@ static irqreturn_t rkisp1_isr(int irq, void *ctx) return IRQ_HANDLED; } + +static const char * const rk3288_isp_clks[] = { + "clk_isp", + "aclk_isp", + "hclk_isp", + "pclk_isp_in", + "sclk_isp_jpe", +}; + +static const struct rkisp1_match_data rk3288_isp_clk_data = { + .clks = rk3288_isp_clks, + .size = ARRAY_SIZE(rk3288_isp_clks), +}; + static const char * const rk3399_isp_clks[] = { "clk_isp", "aclk_isp", @@ -417,6 +431,10 @@ static const struct rkisp1_match_data rk3399_isp_clk_data = { }; static const struct of_device_id rkisp1_of_match[] = { + { + .compatible = "rockchip,rk3288-rkisp1", + .data = &rk3288_isp_clk_data, + }, { .compatible = "rockchip,rk3399-cif-isp",