From patchwork Mon Aug 7 13:12:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 132077 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1490749vqr; Mon, 7 Aug 2023 07:29:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG71GmJKtDop8Mo7+npnTkPEOmlVEaR46fU3Hrx0lgiNNh+vWQcySebOfEXcHSpgPeoigVh X-Received: by 2002:a54:448c:0:b0:3a7:6a37:87bc with SMTP id v12-20020a54448c000000b003a76a3787bcmr9092138oiv.6.1691418560848; Mon, 07 Aug 2023 07:29:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691418560; cv=none; d=google.com; s=arc-20160816; b=g6a6qOvHcpZGUej2GLu2IXHzByqQr5WtVKpaMA4Qxa/OxH5lGAQpD8roFfh+5tEq9E BenZ/WTO5F4fdWyV3bxOshNC9em78gHp3TaqJ3sctqiHc4Nnyt9ovwMCE0/6oTwuIwGS hnO/Yp0wwNr5mlP4kCLLHr60ZMzRS23WRo4J5n8JihREPT+8hZY1gZoCiGMc0dM5viCu +2MuyAC4FsuMy+SCKHj9R9mweC7m9P+vE0EVzRp7Ijewd/AcnLqxnPa3DM0pskvXQbGt py/puEgZhwxI3PYdSNBlzQLbj1hMtwIp7GqYSYIok86UTRXv7hT93r7X6UFbe36feMVK ms9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ZW8bAZOpofrAZ+E1cERRtB886PDebwGsovf/Pz2sHNY=; fh=3xsL5LMWKBIdcCPb0jIgDoHpBI6+diRt0m8D/sjLVB8=; b=x9GzrirCOpJk4Fepr4rCLbosLdS8EXR4PhV56yp1+Y4GTbMvhfMblQTK6aV/BSo/j7 Y9pi7S/IAobemTtxsrPVVGUSB5XOkjmwmBDMduPTzvOSbVFzhj1Yl9W4QbjK+FRfjWK7 smpy8LqiuPTZgn0135nn21/DAyT8tEx0GAVgVHtpMcfkZZduBkp+ZieEN4JC30LGpOYK SAP9OBihuHz3gtCttu3KM8PkCkSD0ZCdCPOEg++TzCSLbbxdcVK6/D5V8+o/l5sCzQAu DKTIngiraFK5dxw29Ljs26Fp44qZzO4CSU5hAPXIYCn2CcuVoMo3oNO+VbDelFfKVbMr 6gyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NBFvLuOf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 7-20020a630c47000000b00542abcf2ce4si5587619pgm.623.2023.08.07.07.29.07; Mon, 07 Aug 2023 07:29:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NBFvLuOf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S232442AbjHGNNJ (ORCPT + 99 others); Mon, 7 Aug 2023 09:13:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231483AbjHGNNH (ORCPT ); Mon, 7 Aug 2023 09:13:07 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC9FAE43 for ; Mon, 7 Aug 2023 06:13:01 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3fe4b45a336so22308495e9.1 for ; Mon, 07 Aug 2023 06:13:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691413980; x=1692018780; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ZW8bAZOpofrAZ+E1cERRtB886PDebwGsovf/Pz2sHNY=; b=NBFvLuOfuqii+YsiP6fAqg2jYNwaUOzi+zy+p6hiHsBwUqsGaqC+jifC8WkeFzHJ3p 9bGi50BRrixhKZ/AGczbT2D3DNDVj03v9oFDRRHS2WkCOxSgt0ReT/fFhGpFPPQaiYse HjxvkP/NPV8DohAp7J6hq4SeaAVItFAQMsVt+SfbSHFhqvYCiX33LEnBwSQkefvkpPrQ yAG2arWbsqrzYzjfXZ0MuU6zVyGjf0a83K1Qw76IAac7k0Q0bdpmgA3og9NEk19823Rs PFfEj+kknB+PamtZqAc8GhCIC/I8vL8fk56b6X5XQc+PMdXeDdJWaaRsa4824aUoVD8b 8PLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691413980; x=1692018780; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ZW8bAZOpofrAZ+E1cERRtB886PDebwGsovf/Pz2sHNY=; b=OncN8n4vDSZcTKwoSnX33VPLeATe64FAC9ZTWd/uLOmwQvRzxtHtlCbHmtfQgoHpd5 LdOd7+m+dpfeZDYtym7H93srZEwNYa3tZOJPv1sX/AgbHK8kGK8ZFGEyUgOFAel0cFFb hLEE05tfg+MNcbGeImo6G1lGt7UCxkirm9j+ejTwRrAhQiKE9TDR9nDwPe8r/igTNhDW JOMHCX1dtvGx+gizn6BtEMXUIY/cX/T1zlEa4Ux9RHDvNxz4rLN8BNLt66N6xyQX77w4 xCsyzGw8IIWxaQcyRyVs+PFlO5fcIML4uDexF29fio9eH7JQ1nB3BWLX11rNVNkj1H1d ZlQQ== X-Gm-Message-State: AOJu0Yw1rvgSRTUSlv6rhVUt/cbC0t9maBVjce3UFJr3FDBhPc/iA9FN 8OxvCczEYnQM+f9LGve5U2/w1g== X-Received: by 2002:a1c:f60b:0:b0:3fa:991c:2af9 with SMTP id w11-20020a1cf60b000000b003fa991c2af9mr5860825wmc.16.1691413980429; Mon, 07 Aug 2023 06:13:00 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.113]) by smtp.gmail.com with ESMTPSA id j9-20020a5d4489000000b0031411b7087dsm10618428wrq.20.2023.08.07.06.12.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 06:13:00 -0700 (PDT) From: Krzysztof Kozlowski To: Sylwester Nawrocki , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Rob Herring Subject: [PATCH v2 1/3] media: dt-bindings: samsung,exynos4212-fimc-is: replace duplicate pmu node with phandle Date: Mon, 7 Aug 2023 15:12:54 +0200 Message-Id: <20230807131256.254243-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773580908723558528 X-GMAIL-MSGID: 1773580908723558528 The FIMC IS camera must access the PMU (Power Management Unit) IO memory to control camera power. This was achieved by duplicating the PMU node as its child like: soc@0 { system-controller@10020000 { ... }; // Real PMU camera@11800000 { fimc-is@12000000 { // FIMC IS camera node pmu@10020000 { reg = <0x10020000 0x3000>; // Fake PMU node }; }; }; }; This is not a correct representation of the hardware. Mapping the PMU (Power Management Unit) IO memory should be via syscon-like phandle (samsung,pmu-syscon, already used for other drivers), not by duplicating "pmu" Devicetree node inside the FIMC IS. Reviewed-by: Rob Herring Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. Add Rb tag. --- .../media/samsung,exynos4212-fimc-is.yaml | 15 ++++++++++----- .../devicetree/bindings/media/samsung,fimc.yaml | 5 +---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml b/Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml index 3691cd4962b2..3a5ff3f47060 100644 --- a/Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml +++ b/Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml @@ -75,13 +75,20 @@ properties: power-domains: maxItems: 1 + samsung,pmu-syscon: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Power Management Unit (PMU) system controller interface, used to + power/start the ISP. + patternProperties: "^pmu@[0-9a-f]+$": type: object additionalProperties: false + deprecated: true description: Node representing the SoC's Power Management Unit (duplicated with the - correct PMU node in the SoC). + correct PMU node in the SoC). Deprecated, use samsung,pmu-syscon. properties: reg: @@ -131,6 +138,7 @@ required: - clock-names - interrupts - ranges + - samsung,pmu-syscon - '#size-cells' additionalProperties: false @@ -179,15 +187,12 @@ examples: <&sysmmu_fimc_fd>, <&sysmmu_fimc_mcuctl>; iommu-names = "isp", "drc", "fd", "mcuctl"; power-domains = <&pd_isp>; + samsung,pmu-syscon = <&pmu_system_controller>; #address-cells = <1>; #size-cells = <1>; ranges; - pmu@10020000 { - reg = <0x10020000 0x3000>; - }; - i2c-isp@12140000 { compatible = "samsung,exynos4212-i2c-isp"; reg = <0x12140000 0x100>; diff --git a/Documentation/devicetree/bindings/media/samsung,fimc.yaml b/Documentation/devicetree/bindings/media/samsung,fimc.yaml index 79ff6d83a9fd..530a08f5d3fe 100644 --- a/Documentation/devicetree/bindings/media/samsung,fimc.yaml +++ b/Documentation/devicetree/bindings/media/samsung,fimc.yaml @@ -236,15 +236,12 @@ examples: <&sysmmu_fimc_fd>, <&sysmmu_fimc_mcuctl>; iommu-names = "isp", "drc", "fd", "mcuctl"; power-domains = <&pd_isp>; + samsung,pmu-syscon = <&pmu_system_controller>; #address-cells = <1>; #size-cells = <1>; ranges; - pmu@10020000 { - reg = <0x10020000 0x3000>; - }; - i2c-isp@12140000 { compatible = "samsung,exynos4212-i2c-isp"; reg = <0x12140000 0x100>; From patchwork Mon Aug 7 13:12:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 132148 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1519831vqr; Mon, 7 Aug 2023 08:15:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEHGXaH7RhslWNM9Aw40dKb+Dz8+uEmqU2oEKnOWc3qi3OeHvY3u0rLKsbY6RO/B1AfVVhA X-Received: by 2002:a17:903:41c6:b0:1bb:ab0d:4f76 with SMTP id u6-20020a17090341c600b001bbab0d4f76mr12799585ple.58.1691421303286; Mon, 07 Aug 2023 08:15:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691421303; cv=none; d=google.com; s=arc-20160816; b=lxRdiONZa0lDN4Z7UgDdOZmWLD/MThyns0+rAdhSh7755t+IWBzAH4gXi+3NBx4gvY b36Q6l6dVV27w27uF0s+XczFMkV44wWdrxW6sr1iRf/rdG6TqcE0a5ZjY3QvzLHtfspZ F4j/LcYaoa4QzFDZbdh5Fy5jygEKwxItTof6y9I9RAwWrRjBySUhZtz+Ofk3V8TLSsTn 6TIE30Kxnv3V7F1qQ7T6PQNVRcbybYJ0TOsCQ44MN7cj9pBZ34p+fvfti9eYyYEYfhqW 1at1WSHF4MNp4UcJQKRf0xoGDnki768dREfCG0SCx1dylhPKbBMQAH+yNLLCJivGn348 LGaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ucHNhqP919T+93NL2V3Ir/+jeAbz5Mj5YOR6x5XuKY0=; fh=CK2L8BEAbT1N/agGonMwwFM52n2CIp8R97Gpnda0vBY=; b=FweY7EBIoAgD66dUywq7bOYjgTDPBeL9r4+4bFd7el2c0Z+RbmKX9YnKmK989ROVtO T2EOy3QhG5l6jWXpdoiNB/saERFs9ZFQ/JMHAhuUibdoxjO6JaEpriS2yqn80kyimofP 5XXGq6KwmobWcFKftutUF5UqQ9etqR2ep8wwsMixUyx7o5Y9qvhV98fGI0woos/jr4wW p7CQqlh3MiCazsHRrB6+CnNcuSi6NcvGGr/cgD5ihA3hltg3j3JFY16oEq5URrX657OZ ulTXdmLyEtjH3iGVJ6oP5dNL2u3NjssRrfYPiXNYCMOuF2zThkZkflEoQO+Wagfhx5Uw 58pA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U8Av5idF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id le6-20020a170902fb0600b001b9d4de4929si5835307plb.575.2023.08.07.08.14.48; Mon, 07 Aug 2023 08:15:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U8Av5idF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S233879AbjHGNNQ (ORCPT + 99 others); Mon, 7 Aug 2023 09:13:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232540AbjHGNNJ (ORCPT ); Mon, 7 Aug 2023 09:13:09 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F20AECA for ; Mon, 7 Aug 2023 06:13:03 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-31781e15a0cso3553748f8f.3 for ; Mon, 07 Aug 2023 06:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691413982; x=1692018782; 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=ucHNhqP919T+93NL2V3Ir/+jeAbz5Mj5YOR6x5XuKY0=; b=U8Av5idF1F3qpkb7EOcg5U2a5TWux3EAl06PbO7wRvesI16uQC61IbqFolk6CuYFEs 2ZdI6e0u4dyGJNIHMoFIWLp3+im66Rajokm69rj68xZIqx1XXybcRH9F2a/Q0mOEHb6M 1QWiEAFoxhCQzA7XravONhNtcMR0MslGesEcPsGxFzMDAI+jOJWWUQx8E3kqHMcWynh0 BpOn9f/lao7Dw7kAmulGupF088me1UBK3qIHZDDwwoWpMzdI9L26xSWij0vL/q7FMAtp NT6bsRpS/g9Wz2Lz5F957u26fkdAQVqU+gLv9vKzSidVBzNsnLcARGM7GozzG1t3mUiE hY8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691413982; x=1692018782; 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=ucHNhqP919T+93NL2V3Ir/+jeAbz5Mj5YOR6x5XuKY0=; b=hTB72wsyixSsmbYfUSbN2ofJvm+tCgfo6N777KgzSKxZdLRqK7zNg/PnWYC0Piqn+N 7chUyTskw6BhTAk+hzzrmL8EyfiNJ1Tph+15FEekyVlEHx15l7Fxd4NT+VfrSgU3q5nJ IbG61IQh+Y+6TIvVfkfqEbIV3NQuLOHUx/x4TG8kXWwdwF31DmtXFjQrhxemXfN/Pevc ZfBSW7/+g0aovl3F0gp0mokKYv/1/3Pr4dPIMk9tonLoxC0Y4d9Jx6PTTYLH/r0jexsY FW5BrJWAIGlDW3iQvC6qWtgQANYQBBvclOdWN1bFxwRXBRXy6kteXme/xPW4IfvvRw8c 5bkA== X-Gm-Message-State: AOJu0YwXRf+HqVGbKF84fuEq/bsQkLsLmjZNTLyBnbfvXJsCaMgrNZ7Z 9q+1qhrz9suB59osw09AEA0ejw== X-Received: by 2002:a5d:680e:0:b0:317:4ef8:1659 with SMTP id w14-20020a5d680e000000b003174ef81659mr5210186wru.28.1691413982495; Mon, 07 Aug 2023 06:13:02 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.113]) by smtp.gmail.com with ESMTPSA id j9-20020a5d4489000000b0031411b7087dsm10618428wrq.20.2023.08.07.06.13.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 06:13:01 -0700 (PDT) From: Krzysztof Kozlowski To: Sylwester Nawrocki , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Conor Dooley Subject: [PATCH v2 2/3] media: dt-bindings: samsung,fimc: correct unit addresses in DTS example Date: Mon, 7 Aug 2023 15:12:55 +0200 Message-Id: <20230807131256.254243-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230807131256.254243-1-krzysztof.kozlowski@linaro.org> References: <20230807131256.254243-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773583784230952921 X-GMAIL-MSGID: 1773583784230952921 The camera node's ranges property and unit addresses of its children were not correct. If camera is @11800000, then its fimc child is @0. Acked-by: Conor Dooley Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. Add Ab tag. --- .../bindings/media/samsung,fimc.yaml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Documentation/devicetree/bindings/media/samsung,fimc.yaml b/Documentation/devicetree/bindings/media/samsung,fimc.yaml index 530a08f5d3fe..88b176d594e2 100644 --- a/Documentation/devicetree/bindings/media/samsung,fimc.yaml +++ b/Documentation/devicetree/bindings/media/samsung,fimc.yaml @@ -117,7 +117,7 @@ examples: #clock-cells = <1>; #address-cells = <1>; #size-cells = <1>; - ranges = <0x0 0x0 0x18000000>; + ranges = <0x0 0x0 0xba1000>; clocks = <&clock CLK_SCLK_CAM0>, <&clock CLK_SCLK_CAM1>, <&clock CLK_PIXELASYNCM0>, <&clock CLK_PIXELASYNCM1>; @@ -132,9 +132,9 @@ examples: pinctrl-0 = <&cam_port_a_clk_active &cam_port_b_clk_active>; pinctrl-names = "default"; - fimc@11800000 { + fimc@0 { compatible = "samsung,exynos4212-fimc"; - reg = <0x11800000 0x1000>; + reg = <0x00000000 0x1000>; interrupts = ; clocks = <&clock CLK_FIMC0>, <&clock CLK_SCLK_FIMC0>; @@ -151,9 +151,9 @@ examples: /* ... FIMC 1-3 */ - csis@11880000 { + csis@80000 { compatible = "samsung,exynos4210-csis"; - reg = <0x11880000 0x4000>; + reg = <0x00080000 0x4000>; interrupts = ; clocks = <&clock CLK_CSIS0>, <&clock CLK_SCLK_CSIS0>; @@ -186,9 +186,9 @@ examples: /* ... CSIS 1 */ - fimc-lite@12390000 { + fimc-lite@b90000 { compatible = "samsung,exynos4212-fimc-lite"; - reg = <0x12390000 0x1000>; + reg = <0xb90000 0x1000>; interrupts = ; power-domains = <&pd_isp>; clocks = <&isp_clock CLK_ISP_FIMC_LITE0>; @@ -198,9 +198,9 @@ examples: /* ... FIMC-LITE 1 */ - fimc-is@12000000 { + fimc-is@800000 { compatible = "samsung,exynos4212-fimc-is"; - reg = <0x12000000 0x260000>; + reg = <0x00800000 0x260000>; interrupts = , ; clocks = <&isp_clock CLK_ISP_FIMC_LITE0>, @@ -242,9 +242,9 @@ examples: #size-cells = <1>; ranges; - i2c-isp@12140000 { + i2c-isp@940000 { compatible = "samsung,exynos4212-i2c-isp"; - reg = <0x12140000 0x100>; + reg = <0x00940000 0x100>; clocks = <&isp_clock CLK_ISP_I2C1_ISP>; clock-names = "i2c_isp"; pinctrl-0 = <&fimc_is_i2c1>; From patchwork Mon Aug 7 13:12:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 132071 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1487733vqr; Mon, 7 Aug 2023 07:24:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHjPcZOOYAZHk7bzDS4J5A/5bE9pJO0oPqfbKU23la7MPXU1hA8/1sHoWA63nNuWN2012Gz X-Received: by 2002:a17:906:56:b0:992:48b7:99e3 with SMTP id 22-20020a170906005600b0099248b799e3mr8563299ejg.63.1691418277439; Mon, 07 Aug 2023 07:24:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691418277; cv=none; d=google.com; s=arc-20160816; b=o4nRcXDM1hZgh8T2C2B7YMXMTj/ePMEF2WcwkLndyDHdn4PkcGPHS/GUjRxTpdqqPo gdFn0SOJ1qXZN2z6WUfjkZyC6hNG1oDbI3AYu5Tns6UlCJqmNep7ZhTXuUyg4i1TxfTW xDuajdtKIP67biyK9XM+4cXRNfrrJcEX0zBz3boat8pGvgUa5/3/VU3wAoXAV6yOvUAO yVcpzdtZcp0HcJNq3biYakByCvlEZwFQekAEvLcozbwIlHTmOCL3iJOUbqsqci0C0YFr SQhEmbJ7vD4prpPaPgeJhyHhfzAgND+u3zyA3dXzh5C3kE2v0NcH0RZKuNB3u6CLCmmY 7H6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DiXOG4vhE2jwuThX92Y67MrIjgQpotVRhoEdfPPU/2s=; fh=l5tDndJEyEuSXH8p3Wx1dfAyiqL2OB2SmLmAQu11EuQ=; b=BulmE74zwp/IapMyYTTJx+ZWGXlR7PjDNrn3zHXZUTBHqyEi1gRwIhTaJ8opKCLSTi qRZ3iobr+7roLBqThOCfKM7Ksl8KY2YQ10RndjBbKz7E5Jt3Xwe74oserYaXa6Skc7KG cA/hIANu3abSq0GDE6rOELS8Vahxoe5758JMO6cXmSjuUJ6yd70GIiS+BO6FXw5HR63o DTQBRjMw/sSwLjlzA7PZ4SPv4pXnqmiLrnmCEtlfwRz1epRDEFn4Lqr7p7HHH1TzmUtz O6qkPGGLvLgUcqqsd4caFWGeb4HbeKLe999Mdp6vwPQ9aRl8gSS0ergKh/0XAPt4P4JJ t6Cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UJfvJt5A; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h16-20020a170906261000b0098e444cba76si4256202ejc.91.2023.08.07.07.24.13; Mon, 07 Aug 2023 07:24:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UJfvJt5A; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S232738AbjHGNNL (ORCPT + 99 others); Mon, 7 Aug 2023 09:13:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231593AbjHGNNI (ORCPT ); Mon, 7 Aug 2023 09:13:08 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDC6C10FE for ; Mon, 7 Aug 2023 06:13:05 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-317f1c480eeso321347f8f.2 for ; Mon, 07 Aug 2023 06:13:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691413984; x=1692018784; 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=DiXOG4vhE2jwuThX92Y67MrIjgQpotVRhoEdfPPU/2s=; b=UJfvJt5AU+IWVBtlv78t+VTZeFaFm00LqJqWR6xVo2ENDxmCWPoNpDsLUjcv+1pevw w8N1ygAfMf1wUreBI0q5hYIpPFbnj0xcsFLV/hR/9CsUZiHntmTPIa0AsycPVzGqf6oM 72pp2uoiuXa7/jvaq3N9pgijqiVWgRBNDKUQyeiwk4aejKIR6N5Sq32SKfjwJyKrAhSJ +kSW12teQ1KrwbZZVGReE1tZ3pdcFx1MlbaMggxbFhSaOk/WIOXEO62sM1gmdGWEoXxx KFSzaBQe9gSvN+VFZioCg50Y1flr8gKMBc4GsR21Bj3kCjDA4OSrVmydpmxlMawYF7R9 acPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691413984; x=1692018784; 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=DiXOG4vhE2jwuThX92Y67MrIjgQpotVRhoEdfPPU/2s=; b=IYr26rJxeb/qP9WlzXRwStchFw50rvQgFtipUQTVraKxckBnpWDDfTtkMzTKEl2f2i KbsswidUIILzLYNcl1kKr1KC2JhXmzBd45BjKUvwDlTIi+EZElQ4xJh1lLJgoiXIAjj4 nPix6c2v1HcxZPCusi7vN1qcflTcrCuqKxQ5KssARwtWp93Ox4C53VAyE3qHbOYxTo4O QuSKxlk+KPrazlQ/UaJ4Vkyoph08On63l+pu4Dy3znA2kun1lB+u/5vhIsz+FtOf+Bfe mvJ/65AA0dO3//hNkyJE6OjsgBbSjuW8yUKb1AJevwo8jk7+z1AwiPj+s8a108sbqp7L E1SQ== X-Gm-Message-State: AOJu0Yyb1eaSh6G47WDYR6j9MbqqhK2s2eCzJgWbRJxAVugWwTtH6kGP 8KBz0xOF1JFFU4rboEmBVfQ/6w== X-Received: by 2002:a05:6000:10a:b0:317:5b99:d3d7 with SMTP id o10-20020a056000010a00b003175b99d3d7mr5036961wrx.34.1691413984192; Mon, 07 Aug 2023 06:13:04 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.113]) by smtp.gmail.com with ESMTPSA id j9-20020a5d4489000000b0031411b7087dsm10618428wrq.20.2023.08.07.06.13.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 06:13:03 -0700 (PDT) From: Krzysztof Kozlowski To: Sylwester Nawrocki , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 3/3] media: exynos4-is: fimc-is: replace duplicate pmu node with phandle Date: Mon, 7 Aug 2023 15:12:56 +0200 Message-Id: <20230807131256.254243-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230807131256.254243-1-krzysztof.kozlowski@linaro.org> References: <20230807131256.254243-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773580611858542614 X-GMAIL-MSGID: 1773580611858542614 Devicetree for the FIMC IS camera included duplicated PMU node as its child like: soc@0 { system-controller@10020000 { ... }; // Real PMU camera@11800000 { fimc-is@12000000 { // FIMC IS camera node pmu@10020000 { reg = <0x10020000 0x3000>; // Fake PMU node }; }; }; }; This is not a correct representation of the hardware. Mapping the PMU (Power Management Unit) IO memory should be via syscon-like phandle (samsung,pmu-syscon, already used for other drivers), not by duplicating "pmu" Devicetree node inside the FIMC IS. Backward compatibility is preserved. Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. Use IOMEM_ERR_PTR (Hans) --- .../platform/samsung/exynos4-is/fimc-is.c | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-is.c b/drivers/media/platform/samsung/exynos4-is/fimc-is.c index 530a148fe4d3..c995b1226ca3 100644 --- a/drivers/media/platform/samsung/exynos4-is/fimc-is.c +++ b/drivers/media/platform/samsung/exynos4-is/fimc-is.c @@ -767,12 +767,32 @@ static void fimc_is_debugfs_create(struct fimc_is *is) static int fimc_is_runtime_resume(struct device *dev); static int fimc_is_runtime_suspend(struct device *dev); +static void __iomem *fimc_is_get_pmu_regs(struct device *dev) +{ + struct device_node *node; + void __iomem *regs; + + node = of_parse_phandle(dev->of_node, "samsung,pmu-syscon", 0); + if (!node) { + dev_warn(dev, "Finding PMU node via deprecated method, update your DTB\n"); + node = of_get_child_by_name(dev->of_node, "pmu"); + if (!node) + return IOMEM_ERR_PTR(-ENODEV); + } + + regs = of_iomap(node, 0); + of_node_put(node); + if (!regs) + return IOMEM_ERR_PTR(-ENOMEM); + + return regs; +} + static int fimc_is_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct fimc_is *is; struct resource res; - struct device_node *node; int ret; is = devm_kzalloc(&pdev->dev, sizeof(*is), GFP_KERNEL); @@ -794,14 +814,9 @@ static int fimc_is_probe(struct platform_device *pdev) if (IS_ERR(is->regs)) return PTR_ERR(is->regs); - node = of_get_child_by_name(dev->of_node, "pmu"); - if (!node) - return -ENODEV; - - is->pmu_regs = of_iomap(node, 0); - of_node_put(node); - if (!is->pmu_regs) - return -ENOMEM; + is->pmu_regs = fimc_is_get_pmu_regs(dev); + if (IS_ERR(is->pmu_regs)) + return PTR_ERR(is->pmu_regs); is->irq = irq_of_parse_and_map(dev->of_node, 0); if (!is->irq) {