From patchwork Sat Jul 22 11:54:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 124309 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp782272vqg; Sat, 22 Jul 2023 05:43:21 -0700 (PDT) X-Google-Smtp-Source: APBJJlG9vS43atkGZfDYZeeP5T4/VJHqp3MTE3qofBvSl4zSp1rvypFrFJ/l6P/gyKOgn6P5yutG X-Received: by 2002:a05:6a00:23d4:b0:686:2b60:3348 with SMTP id g20-20020a056a0023d400b006862b603348mr1923228pfc.21.1690029800757; Sat, 22 Jul 2023 05:43:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690029800; cv=none; d=google.com; s=arc-20160816; b=LYbw29er1cqlyBl1TjOzDHwpIzH4RhtZ3fT/lA/UYjRVQUA4050z1WbEgJcD7x9na1 kag9/HABn6uaAwpEx9QVLdx1qq8xCUbJ9v8UsWxvETu1NQgIeS8U3NCc4LmepxcLqi4V lhaZvwWPmNlN/Bayfwgm1PdiJoWiIZiA9lwMykzrAFIrSbNu9ovcSh8cmj2TdKK2XeNr pzhHZhIh8S5USJTW6UmY4m+zpTtcIku0L31zDn+R5ednIDJUzKo7AEWVYNFfKobwSY9J kvdynoZn4d/FTut8HjoYIbjKYmifHXl//9Y5Exmht2fNpsgtqvuVDf7QQ/xhUBzlgQ8Q d+/w== 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=02nknKMJYKlDUsZ+YqcOCSB4hUZzBMytrcBqER2E3Do=; fh=l5tDndJEyEuSXH8p3Wx1dfAyiqL2OB2SmLmAQu11EuQ=; b=q0eZ6M8vsggSvevHo0N1ocuf08HaYazW/dTb0A93yyblJX4ts9bSlL166HCuVCKd/b ulyeXQFKZMV6IbpwnSZIW30DQ7HPn/wpMwBBxVE9bxmngT4UZAowrcJwnLG22wl2/yuW 9Ji+4A32Tc98qggiQ2GgccZ7FUIU5xf6ptI4A4iz64Mxd9mZ8MU2thJx0f7MqiaqawJz 6dd74zurVaqv7B+4vDueuedIzyuA7SAvBLY1IZLNHWfP+V0tQAHMIaUzhXhU5/N/WYTt Yvz3m+wg+enTFLempeH2vEfzrM9Mmc/KZbVZicdfiHBMbnmPEV+zudhpe4ph7Tor5Yoc i5SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="umiYYc/a"; 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 a62-20020a639041000000b0055b28f930a3si5382958pge.546.2023.07.22.05.43.06; Sat, 22 Jul 2023 05:43: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="umiYYc/a"; 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 S229681AbjGVLzG (ORCPT + 99 others); Sat, 22 Jul 2023 07:55:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229545AbjGVLzE (ORCPT ); Sat, 22 Jul 2023 07:55:04 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 128382D47 for ; Sat, 22 Jul 2023 04:54:48 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3fbc656873eso25828455e9.1 for ; Sat, 22 Jul 2023 04:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690026886; x=1690631686; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=02nknKMJYKlDUsZ+YqcOCSB4hUZzBMytrcBqER2E3Do=; b=umiYYc/aB79bh3drCR+5MHqjugR24HGF2bX6eebpo10/T5g1KdLjrFKA9OZsFVoQvG 0W6mbXmvzfG5Z+NZyJ14nhs198h4uDwOXKBP7oWxSPVGBnxb06jURRyvhP+sVoVpk1X6 dafrfaNRCd7Em/sC5tVbcRLq0wHnQkdzB8yV7tSYeinLE2N1xMdDxhwP+VjKZJjoXhPw iO7yFefbiOju0bALua9+h18ZdzL/VXQb8I/nNUY3Qz1PqeiJECNPM1uI1emjgNCB2d8I 6ruDO1BRhg+bvQsJq2cQe4W8xKinaWsj+hA7vjZsvcjCXEPbBTpCPqqwxWTFdpxZG/lA pAbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690026886; x=1690631686; 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=02nknKMJYKlDUsZ+YqcOCSB4hUZzBMytrcBqER2E3Do=; b=UREV1R1zKY4sok5PbufFGfkKuFchtqq97Or4pGLUWAhdjVMl2FpKrsWf3/Uwyg23j8 BqrAqWBkrULwUBpfSIFYtKMvShC0ZfdmPpMfdYBaq/x5JCluoMlzbQkJjttilBUV2oEH MX5KJdhU6YMWqS4vlvtj/jcXqOj9G4DgvJA96TAyNdwajo0GLdCxVyxypZALusr1pYct Is49MPnSjaxbInh3C0nzEjoWfsN9o0k27LlkEkNDz2WKQ4DjVtpm0G5NcpFVySqlyh8g hyTVV0w7v5rVJtCHh3bHBMCKsMA+EomosHcdTs57lpHIcmgrCV9zFs+osxmIVcySEIHR XJCQ== X-Gm-Message-State: ABy/qLaCPaUJwfGzkmRUcwgDv6fKlOnhLxrNDtzbVqhl1dHCHL/AAlBR 0IIDz21q1UnQALg5fdV+YownyA== X-Received: by 2002:a05:6000:10c:b0:315:a1d5:a3d5 with SMTP id o12-20020a056000010c00b00315a1d5a3d5mr3843614wrx.22.1690026886543; Sat, 22 Jul 2023 04:54:46 -0700 (PDT) Received: from krzk-bin.. ([178.197.223.104]) by smtp.gmail.com with ESMTPSA id o8-20020adfeac8000000b003143b7449ffsm6726496wrn.25.2023.07.22.04.54.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jul 2023 04:54:46 -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 1/3] media: dt-bindings: samsung,exynos4212-fimc-is: replace duplicate pmu node with phandle Date: Sat, 22 Jul 2023 13:54:39 +0200 Message-Id: <20230722115441.139628-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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: 1772124688516922945 X-GMAIL-MSGID: 1772124688516922945 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. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- .../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 Sat Jul 22 11:54:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 124302 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp776704vqg; Sat, 22 Jul 2023 05:30:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlEpb6XMn6tW683IU66mN9cl04KAg7ivNE/fjGgs/e7XQAJaFiKfdh40Xb6Mp1r7e5ht/2cd X-Received: by 2002:a05:6a20:1385:b0:126:af02:444e with SMTP id hn5-20020a056a20138500b00126af02444emr5180647pzc.8.1690029033140; Sat, 22 Jul 2023 05:30:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690029033; cv=none; d=google.com; s=arc-20160816; b=dbHUb8EMd799Yc/7c00ic8DYtsyE5SOCzpDs/1isxWuaeFstX5atsF/TceLjX4HXNY cwgOaIbiz1j5YlUgPEuqzv+QqkKRYM73IuKgMTNDDSom5+q1M6HBYGh2uc0whoxeuiVY CWeJgWk13gfMPrDorcyMouU/Qu1/rKHri+ktQUUBGs9oz1cESZXI5LrUos0ZOP+DZTjA Y9JV5z01e6THsh0x1T4vaRsULGf3KJl/Y9LT3JfAEjgm8K6XfNBoHo1QiqKy+Ft4TQA4 brWyf9DxFkD0sPT2sBz4Xanu/Nyj5qCy+W6nQZVk40dt0bRjayaAkhQjY0bEQOicym/m /HGQ== 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=XSFvde0MCghYMGJ+cTysg5G2vmHEvabjCrJg5MGa8zU=; fh=l5tDndJEyEuSXH8p3Wx1dfAyiqL2OB2SmLmAQu11EuQ=; b=nnEjTApxER8bjDitfrZyvZcy2al/avS/F4DZHFBQX20cWsN3OXIskqA+PwzvxNs/xT 9sxS+b81wH3nUFxx9+PeB8rATgTjoJV7n7XgHdq9WgkV8yZw8RqY7ZfvzJvFvdgVJP3U K5RPkg85AXFd8PvfdS+IRb8YgEAa8z76x+3vvQzoTAKdu/ygbk134g29ERN/qbT45v/e BLYh15tQ3rf5N4V7IKJzs9qPsgJH4x2UCyX5kacqDvWs4pyDGeBMKB8LD3IFaQR2J7T3 e/Y94Y1SLeBqV++pvhv3RQws/S7XJmM37v4ATivwp8fcsov46frXpnCAMVGg0u4UIRt3 +hBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AJ0wW0mf; 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 s21-20020a63af55000000b005639fa45a28si198832pgo.630.2023.07.22.05.30.20; Sat, 22 Jul 2023 05:30:33 -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=AJ0wW0mf; 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 S230178AbjGVLzJ (ORCPT + 99 others); Sat, 22 Jul 2023 07:55:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230121AbjGVLzF (ORCPT ); Sat, 22 Jul 2023 07:55:05 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E875B3586 for ; Sat, 22 Jul 2023 04:54:49 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-316feb137a7so2380629f8f.1 for ; Sat, 22 Jul 2023 04:54:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690026888; x=1690631688; 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=XSFvde0MCghYMGJ+cTysg5G2vmHEvabjCrJg5MGa8zU=; b=AJ0wW0mfEILVh321hQFNqbf7/MSRnMvsPEoBV/23yswWtY6gfHV77Js/MUkz2pUgZ9 SOuya4zd+jdxBQ6S9qMnutxMXM0x7xSdCrheVvaNnHfMhKSUcm7ZRK7m0xPcJS7aXJnf g5TrwQw89oXuOmRBE1CKYYl4hc+qt+EbnGVONO4X4jwiUtkPtmevXQO7OxiDI3m47wm4 Ggkz7fYlXwHitlq//b73pg/YYPgKgqeeylcgsIwvkuA7nwByirO/Fef05NbsIB7vD3HH Yd6m0D1mdhO1XyyBQVihMIMoGDJcAg7osKFOTEwhcc7Rt6DX9Xzj6aYwiVPW/XpBtYpa x0KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690026888; x=1690631688; 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=XSFvde0MCghYMGJ+cTysg5G2vmHEvabjCrJg5MGa8zU=; b=WGiNkvzJr9y1qCE50lrcbbHzpNkuMXt+wciS/RGk/wadIbcYBmYtuFq9es7K8MYwcz /jpqC7ecMpV3ZDWi1Gy5/vRoC0B2AL8tGVb+YJrYh2f7WcthxxQvG2r2SQGtM0bzft60 f81Q4m2KKsqTcgcXX76fo8EiGecz8rsMui1hh+PXuIbXOcJfDmfhcmXiKO0vTS5fvNcq 2balm9s3qO2bLmJaPQNr+PoU2je4P1EMSlhrpkGKuamr+0cx+orYKbUv/k4KIu+p8u2V pxAKFHTtq7yISb8FSH6BPhbe6tIi0NiANNdYQ2y1SrAqRy1vlUe1/uUv3hAGHt9l6MaU yF/g== X-Gm-Message-State: ABy/qLazLZlYiz68ozEJjCaG6wTSvxq1QA6fNMPOYrV+tgxMl8ORkTiM CnAWpJ5yHyb+ucPtEcKi0lJyMQ== X-Received: by 2002:adf:f592:0:b0:314:13e2:2f6c with SMTP id f18-20020adff592000000b0031413e22f6cmr3604699wro.58.1690026888105; Sat, 22 Jul 2023 04:54:48 -0700 (PDT) Received: from krzk-bin.. ([178.197.223.104]) by smtp.gmail.com with ESMTPSA id o8-20020adfeac8000000b003143b7449ffsm6726496wrn.25.2023.07.22.04.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jul 2023 04:54:47 -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 2/3] media: dt-bindings: samsung,fimc: correct unit addresses in DTS example Date: Sat, 22 Jul 2023 13:54:40 +0200 Message-Id: <20230722115441.139628-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230722115441.139628-1-krzysztof.kozlowski@linaro.org> References: <20230722115441.139628-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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: 1772123883329133419 X-GMAIL-MSGID: 1772123883329133419 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. Signed-off-by: Krzysztof Kozlowski Acked-by: Conor Dooley --- .../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 Sat Jul 22 11:54:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 124296 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp775552vqg; Sat, 22 Jul 2023 05:27:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlHJmnJ9BlZ4cv9DptRrA5sVH5DdbiOinjtRPaRhtTik+QjJ3+LoxLT/aXOeHW1Bjh2uq+tu X-Received: by 2002:a05:6a00:1503:b0:666:7bc5:531c with SMTP id q3-20020a056a00150300b006667bc5531cmr4235487pfu.24.1690028865633; Sat, 22 Jul 2023 05:27:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690028865; cv=none; d=google.com; s=arc-20160816; b=zKBWzt+WkJ8Uxb4RUcX8HmHIFJieQOTOKRlgS9noBBQ8JtciUZbywwLQ5fosRDRN48 LXT7Oh5gdw9vQXvX7Zbfiz6LAxU5QCkKSHQtlVG1TX8VBgFjILCpArFPoH/1GANd/alz UwyLacfDpiizRNxZAlSBEHZVQKfHyzHcYwdtgcA1D2p39Sk3LKUXmtTE+KHlhape5tZg nbFsFwmKSp6UYl4Gc09aWA8cnqFAtt37ckhcYTXxKzbxB9YwupY6TiTVXHMoOgAGybcv 6XkJrGA5vql4K4ufyzaxoxRq/jbhYXiHCRlxba2f+JrkzvwYE7RrTbcBCTxdLeDRiXkW qPnA== 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=TjYyx1DOBe25+JK0YNsnvu9lLSFEE0N2YMpAouIlyww=; fh=l5tDndJEyEuSXH8p3Wx1dfAyiqL2OB2SmLmAQu11EuQ=; b=MC8MpdMHC6ZGarOdg+HjHbBl9mWw7rJqq+dOemaozX6CtJ2DbqhDoOCaOXhDsDhhrY agFuBQK+SrDnPIlheUXCpz3fkI8lV+b89Z2DVHtpEB1d+5RibStqF7PVM7AMBWw3jfCW agjo/NQOMf5OwRzW7JC8Y93OeWY5w4ftkd3jeAid790Ol+XoidGwMx6PPQeX+lMo35kT ioBg+8k3JBtIO6bE1vfn+HPBOPsPUe2b3DTZFXQRDbhJGf5xa8MX6onPuOZf+9d/dW9F iENy2uuaPW7+aeFX8HufuS/hZdvr4CaoPFJtIa3IvLXJijxAlCtdWuu+eOKtv5A7YSd7 uM0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C+TT7ZqG; 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 bt26-20020a056a00439a00b0066e96a581c8si5063458pfb.261.2023.07.22.05.27.33; Sat, 22 Jul 2023 05:27:45 -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=C+TT7ZqG; 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 S230171AbjGVLzM (ORCPT + 99 others); Sat, 22 Jul 2023 07:55:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229545AbjGVLzH (ORCPT ); Sat, 22 Jul 2023 07:55:07 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0243B35AD for ; Sat, 22 Jul 2023 04:54:50 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3fc0aecf107so22174865e9.2 for ; Sat, 22 Jul 2023 04:54:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690026889; x=1690631689; 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=TjYyx1DOBe25+JK0YNsnvu9lLSFEE0N2YMpAouIlyww=; b=C+TT7ZqGhAhjvW9XCQGZwb2gl5+vD14Jy8uq2oZSlz1LmbGcRH4HVqlRbJ7yx0vi+L d3o47Mw6VkqltdTx5xSm7yZqpyGvkPkvtkzk1Dno6M81vIm00sagL8OyBwyYLsjQOspI ZNiqhohXFXHwovf6TVkd1eBhJwA9S4qKMD6xnO+YWT9XRKQjrVO5XJhpJh52U1rHV9fN DCNc8tnmfzNRtHx6GJ1VQ88vcIFKoAeRz6zI5lam2axHjBH1G8DOvwNv/cy/MVRLfsyK hNn2ufh72RwpLDpiZxjWMpv5Iw+tt0uacRFE/0reEUBByjLI+/Zplq/mdFgbCHWUeiWl IbMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690026889; x=1690631689; 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=TjYyx1DOBe25+JK0YNsnvu9lLSFEE0N2YMpAouIlyww=; b=f/l0d832akPFasJjXfK/YqrZVtKllmkg2niGGgbRLclJMl0sda4gmxsf4iWFo8HIz6 /J+7exa7/5oHzDIB4GpndrduoQBktwkcyWNUV9XkAlopD9xARyjsuNadIfLhuue5X0aa 4OWStVbP4SQhHBK0/g/+TB989YoTgZ9xKZ3vyc/m2b7WTgXTIIQs1jXPJcmbEu0ho0H+ Mg6uYHtU7RtZerOhh1AlEUDuvM8gSEE6hMfOcDuEEQh5ZbcosYXs3WRRHIZpeFmIKGqY NlGeCSpYNpDZPmv8GW1MmzwZKUdom6ewlkvxYRPFbWl2ftqwvnEMj47zu83+t0bdnVL1 RCzA== X-Gm-Message-State: ABy/qLbtF/ngrZfEgX/pGxk07BIpooW30K+3m6W/aTlrgnIMNp5B9Hqn Tc7JOYtP8IjVVbNkLcb2yLXKag== X-Received: by 2002:adf:f848:0:b0:317:18a8:5fa1 with SMTP id d8-20020adff848000000b0031718a85fa1mr2615312wrq.69.1690026889447; Sat, 22 Jul 2023 04:54:49 -0700 (PDT) Received: from krzk-bin.. ([178.197.223.104]) by smtp.gmail.com with ESMTPSA id o8-20020adfeac8000000b003143b7449ffsm6726496wrn.25.2023.07.22.04.54.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jul 2023 04:54:49 -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 3/3] media: exynos4-is: fimc-is: replace duplicate pmu node with phandle Date: Sat, 22 Jul 2023 13:54:41 +0200 Message-Id: <20230722115441.139628-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230722115441.139628-1-krzysztof.kozlowski@linaro.org> References: <20230722115441.139628-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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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: 1772123707810830638 X-GMAIL-MSGID: 1772123707810830638 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 --- .../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..c4c191771093 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 ERR_PTR(-ENODEV); + } + + regs = of_iomap(node, 0); + of_node_put(node); + if (!regs) + return 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) {