From patchwork Sat Jul 22 11:56:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13322925 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79EE5EB64DC for ; Sat, 22 Jul 2023 11:56:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230151AbjGVL4z (ORCPT ); Sat, 22 Jul 2023 07:56:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230137AbjGVL4w (ORCPT ); Sat, 22 Jul 2023 07:56:52 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE1363C10 for ; Sat, 22 Jul 2023 04:56:30 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3fb4146e8fcso17107065e9.0 for ; Sat, 22 Jul 2023 04:56:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690026988; x=1690631788; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jx38YAgpp6hIi64Yp6dmi2Ukk67ZvJvPP+5Pl7scxe0=; b=STdBfm9+Ix8aU0/LpfmXkOsCFdEV/PThsfDm6CBgSDhfTfc5qHdp19fkQHB4HWhtR2 ba+FWXnmkWvaLZOZ4wHE+0QuX0zJXgc1qenAzcMKY0W6xWgQVZ7qc88/KvZm8OurxdpV fcsb4oWcquMN4qFO3A0SuLkdUMBTRBURH/ftEEpWEV0lOu4TZX6uoL+jXAW/77D/xLMp EDKEhV10rMW9REFCr2Lwu0jrjfkue3dOLul3hTnGp1N01SGUYdb6brGXjZjrVRn9GtHE jWiMeUvblxq0GuW3ByI4oGluEtiqJIk246UI3hWJv6r7utyrcaxcOshWQQb/xVksdp0M j9eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690026988; x=1690631788; 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=jx38YAgpp6hIi64Yp6dmi2Ukk67ZvJvPP+5Pl7scxe0=; b=QsyhkpANIkFvvMmvogbw81470cl7TZJpVh/q5vDsE+eFf+f9164/78rozq55EomVuQ Z1MrF53eeAXVzTndSX/X+IyyokBBI7Bi2Hnpgnp8ZAAHYgBu5f6wBI+6HLkq62hqfcnI pvRWOyDwd2J1TTIyXhqOHV2k+K2fkri5tLw/tRoU2J0vrrBLvELm0YMA5moD/RDoi/h8 gKHhm97n1G59sdHcJ7ebU3siCt9OrdT2Avzk08ilTFBF8bYk41qH3ceGawj1P0QL14Tc TCXUblFy+pl+HPEyCPWCqRKdZZjFwtLzDkjUBy7cy7rvLK4dKjnFDH3j2aUdzM0Y9so2 hCpA== X-Gm-Message-State: ABy/qLY8VfBU5hnINszZjGN7ajn/EnG3y0WBMFbiWxGOUpwkS39x7cix x0f3O3cd3Yqi8cv3tKHGq6jVAA== X-Google-Smtp-Source: APBJJlH2wxdhqpfxwFfsZe3/7Q4M5ZjqvxDZQv3rEbLOcDQxMxiCn47vrxpTMvZwclDTRlGTATvpcg== X-Received: by 2002:a05:600c:1d8e:b0:3fb:ebe2:6f5f with SMTP id p14-20020a05600c1d8e00b003fbebe26f5fmr9682739wms.13.1690026988311; Sat, 22 Jul 2023 04:56:28 -0700 (PDT) Received: from krzk-bin.. ([178.197.223.104]) by smtp.gmail.com with ESMTPSA id f18-20020a7bc8d2000000b003fc01189b0dsm5242365wml.42.2023.07.22.04.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jul 2023 04:56:26 -0700 (PDT) From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar , 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/2] ARM: dts: samsung: exynos4x12: replace duplicate pmu node with phandle Date: Sat, 22 Jul 2023 13:56:17 +0200 Message-Id: <20230722115618.140002-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org Devicetree for the FIMC IS camera included duplicated PMU node as its child. 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. The change is not compatible with older Linux kernel, which does not parse samsung,pmu-syscon property. Signed-off-by: Krzysztof Kozlowski --- Depends on: https://lore.kernel.org/linux-devicetree/20230722115441.139628-1-krzysztof.kozlowski@linaro.org/T/#t --- arch/arm/boot/dts/samsung/exynos4x12.dtsi | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/samsung/exynos4x12.dtsi b/arch/arm/boot/dts/samsung/exynos4x12.dtsi index 84c1db221c98..4524c1e6bb2f 100644 --- a/arch/arm/boot/dts/samsung/exynos4x12.dtsi +++ b/arch/arm/boot/dts/samsung/exynos4x12.dtsi @@ -516,15 +516,12 @@ fimc_is: fimc-is@12000000 { iommus = <&sysmmu_fimc_isp>, <&sysmmu_fimc_drc>, <&sysmmu_fimc_fd>, <&sysmmu_fimc_mcuctl>; iommu-names = "isp", "drc", "fd", "mcuctl"; + samsung,pmu-syscon = <&pmu_system_controller>; #address-cells = <1>; #size-cells = <1>; ranges; status = "disabled"; - pmu@10020000 { - reg = <0x10020000 0x3000>; - }; - i2c1_isp: i2c-isp@12140000 { compatible = "samsung,exynos4212-i2c-isp"; reg = <0x12140000 0x100>; From patchwork Sat Jul 22 11:56:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 13322926 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04830C0015E for ; Sat, 22 Jul 2023 11:57:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229914AbjGVL5A (ORCPT ); Sat, 22 Jul 2023 07:57:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230229AbjGVL45 (ORCPT ); Sat, 22 Jul 2023 07:56:57 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A0D53C2A for ; Sat, 22 Jul 2023 04:56:34 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3fbef8ad9bbso25574735e9.0 for ; Sat, 22 Jul 2023 04:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690026990; x=1690631790; 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=6BvHivSL4TDsPp7ApJR35zlm9ILz6CqpbagGc7qFaLk=; b=rwK5YtBhXJhDWAb2vCcDDqlmV0/wgV6wW3CkjjLP/Efg8NiMuJs64b5CzGliZzf2LM M29ArF7YkYgjxLVayRO/iqYdjQCpXS+9zMuzYw/COWkhLRkm+/bMKoCc3GaNZjK08z5t gMlBqNsSDmi8B4zp7kkEkv2sxuvL7pL/v5oL2gKGvEeo4ZoYN9wL9bf8ESgfiFm+Avuu BGuTPMtpe+kxaFAJnJ2g/6Ov/RnUs2Uw/lHKQ2Z6LF/w9M/EeJQL+3XLA46MJQj9dt7x BcDtk4MQuhc7MJ68b3vxZ32ai+NPTXprthDTu0TD6Sc9/5jM+I9gmfnZRAcUowCevbG7 nWYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690026990; x=1690631790; 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=6BvHivSL4TDsPp7ApJR35zlm9ILz6CqpbagGc7qFaLk=; b=Mour1hI5azT6KjID6AaP/wSf1I+nehotBFcuizUsVqcDH0K2OEXDN5kmGA6ndZv2El GZsDDgFIxWxQWqLsmRwKZGZuxyJVj5eLc3glJEcaIhe+cysWPqQ8XyFChwbEtV+tSMHZ snUlKe7XPkvmcWXJ79AltX3Y51datYXZ+2Kr3fJaAzbwCUkXBYFdKnaUfyVRle7mus5e ugL7/yfudlQ6q0gNy27u08JQfx9ouRySIzhLCOlQdvyHhpELw75QG6NKcQIcLsGtJVT7 o7S2tfO/Zd638eEUB0PBemO1iyJQup8NOc0shhDvVqOU5DaX3pTYyhT3cLTvd2XPILJq mOtA== X-Gm-Message-State: ABy/qLbpwi3pHC2JIYSN2JdBTAyVeYxx4e//D5PFXDhFFyVtHcyo0E1s XCkXgKbVAqsUE/nscVyf+nscHA== X-Google-Smtp-Source: APBJJlE+WIYolOHapba/dlLU7JGvwghdvgQ1Avc9/xLrghjzn22beGDZFwyI4mQYj8tMEgIpmLdthA== X-Received: by 2002:a5d:5223:0:b0:314:34f3:aa2 with SMTP id i3-20020a5d5223000000b0031434f30aa2mr3977681wra.13.1690026990523; Sat, 22 Jul 2023 04:56:30 -0700 (PDT) Received: from krzk-bin.. ([178.197.223.104]) by smtp.gmail.com with ESMTPSA id f18-20020a7bc8d2000000b003fc01189b0dsm5242365wml.42.2023.07.22.04.56.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jul 2023 04:56:29 -0700 (PDT) From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar , 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/2] ARM: dts: samsung: exynos4: fix camera unit addresses/ranges Date: Sat, 22 Jul 2023 13:56:18 +0200 Message-Id: <20230722115618.140002-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230722115618.140002-1-krzysztof.kozlowski@linaro.org> References: <20230722115618.140002-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org The camera node has both unit address and children within the same bus mapping, thus needs proper ranges property to fix dtc W=1 warnings: Warning (unit_address_vs_reg): /soc/camera@11800000: node has a unit name, but no reg or ranges property Warning (simple_bus_reg): /soc/camera@11800000: missing or empty reg/ranges property Subtract 0x11800000 from all its children nodes. No functional impact expected. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/samsung/exynos4.dtsi | 26 +++++++++++------------ arch/arm/boot/dts/samsung/exynos4x12.dtsi | 17 ++++++++------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/samsung/exynos4.dtsi b/arch/arm/boot/dts/samsung/exynos4.dtsi index f775b9377a38..f557ea48c795 100644 --- a/arch/arm/boot/dts/samsung/exynos4.dtsi +++ b/arch/arm/boot/dts/samsung/exynos4.dtsi @@ -208,11 +208,11 @@ camera: camera@11800000 { #size-cells = <1>; #clock-cells = <1>; clock-output-names = "cam_a_clkout", "cam_b_clkout"; - ranges; + ranges = <0x0 0x11800000 0xa0000>; - fimc_0: fimc@11800000 { + fimc_0: fimc@0 { compatible = "samsung,exynos4210-fimc"; - reg = <0x11800000 0x1000>; + reg = <0x0 0x1000>; interrupts = ; clocks = <&clock CLK_FIMC0>, <&clock CLK_SCLK_FIMC0>; @@ -223,9 +223,9 @@ fimc_0: fimc@11800000 { status = "disabled"; }; - fimc_1: fimc@11810000 { + fimc_1: fimc@10000 { compatible = "samsung,exynos4210-fimc"; - reg = <0x11810000 0x1000>; + reg = <0x00010000 0x1000>; interrupts = ; clocks = <&clock CLK_FIMC1>, <&clock CLK_SCLK_FIMC1>; @@ -236,9 +236,9 @@ fimc_1: fimc@11810000 { status = "disabled"; }; - fimc_2: fimc@11820000 { + fimc_2: fimc@20000 { compatible = "samsung,exynos4210-fimc"; - reg = <0x11820000 0x1000>; + reg = <0x00020000 0x1000>; interrupts = ; clocks = <&clock CLK_FIMC2>, <&clock CLK_SCLK_FIMC2>; @@ -249,9 +249,9 @@ fimc_2: fimc@11820000 { status = "disabled"; }; - fimc_3: fimc@11830000 { + fimc_3: fimc@30000 { compatible = "samsung,exynos4210-fimc"; - reg = <0x11830000 0x1000>; + reg = <0x00030000 0x1000>; interrupts = ; clocks = <&clock CLK_FIMC3>, <&clock CLK_SCLK_FIMC3>; @@ -262,9 +262,9 @@ fimc_3: fimc@11830000 { status = "disabled"; }; - csis_0: csis@11880000 { + csis_0: csis@80000 { compatible = "samsung,exynos4210-csis"; - reg = <0x11880000 0x4000>; + reg = <0x00080000 0x4000>; interrupts = ; clocks = <&clock CLK_CSIS0>, <&clock CLK_SCLK_CSIS0>; @@ -278,9 +278,9 @@ csis_0: csis@11880000 { #size-cells = <0>; }; - csis_1: csis@11890000 { + csis_1: csis@90000 { compatible = "samsung,exynos4210-csis"; - reg = <0x11890000 0x4000>; + reg = <0x00090000 0x4000>; interrupts = ; clocks = <&clock CLK_CSIS1>, <&clock CLK_SCLK_CSIS1>; diff --git a/arch/arm/boot/dts/samsung/exynos4x12.dtsi b/arch/arm/boot/dts/samsung/exynos4x12.dtsi index 4524c1e6bb2f..b4b5e769145b 100644 --- a/arch/arm/boot/dts/samsung/exynos4x12.dtsi +++ b/arch/arm/boot/dts/samsung/exynos4x12.dtsi @@ -451,14 +451,15 @@ &combiner { }; &camera { + ranges = <0x0 0x11800000 0xba1000>; clocks = <&clock CLK_SCLK_CAM0>, <&clock CLK_SCLK_CAM1>, <&clock CLK_PIXELASYNCM0>, <&clock CLK_PIXELASYNCM1>; clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1"; /* fimc_[0-3] are configured outside, under phandles */ - fimc_lite_0: fimc-lite@12390000 { + fimc_lite_0: fimc-lite@b90000 { compatible = "samsung,exynos4212-fimc-lite"; - reg = <0x12390000 0x1000>; + reg = <0x00b90000 0x1000>; interrupts = ; power-domains = <&pd_isp>; clocks = <&isp_clock CLK_ISP_FIMC_LITE0>; @@ -467,9 +468,9 @@ fimc_lite_0: fimc-lite@12390000 { status = "disabled"; }; - fimc_lite_1: fimc-lite@123a0000 { + fimc_lite_1: fimc-lite@ba0000 { compatible = "samsung,exynos4212-fimc-lite"; - reg = <0x123a0000 0x1000>; + reg = <0x00ba0000 0x1000>; interrupts = ; power-domains = <&pd_isp>; clocks = <&isp_clock CLK_ISP_FIMC_LITE1>; @@ -478,9 +479,9 @@ fimc_lite_1: fimc-lite@123a0000 { status = "disabled"; }; - fimc_is: fimc-is@12000000 { + fimc_is: fimc-is@800000 { compatible = "samsung,exynos4212-fimc-is"; - reg = <0x12000000 0x260000>; + reg = <0x00800000 0x260000>; interrupts = , ; power-domains = <&pd_isp>; @@ -522,9 +523,9 @@ fimc_is: fimc-is@12000000 { ranges; status = "disabled"; - i2c1_isp: i2c-isp@12140000 { + i2c1_isp: 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"; #address-cells = <1>;