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: 124303 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp776880vqg; Sat, 22 Jul 2023 05:30:55 -0700 (PDT) X-Google-Smtp-Source: APBJJlFnRpuLrjjSWKKMOSGKQrJZ6YClt7hRHiQ8xtRbwdesNY4c47zLP/nHsHx+cT6yvIZD1E9S X-Received: by 2002:aa7:ca55:0:b0:521:985d:7314 with SMTP id j21-20020aa7ca55000000b00521985d7314mr4942900edt.18.1690029054773; Sat, 22 Jul 2023 05:30:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690029054; cv=none; d=google.com; s=arc-20160816; b=cJ76S35F6uhXfJzggx+zmU1v5XAllRqrXZryDP90xZePUNKPCPTJZuswFictcOIvZb 0uHPZkCs2k/Wx1Bzi97/GPvV+kWqrBWW6a7FqKA6f8vwphnZXf3k0YCMheuanX2TR9vQ daiwmvaZQ3e3LDc4qpw2nAFWejKYmdjOsAKzbL1MSMptt8lh64vxGOcEUWCjBONyt1vU z9+ootXM6Eklh2Nm2/EgT7TLyAyjWrFQTH8MbNjOtdsSdHZaPosK/j/AXAgvPNEGKvmO JGnGzy5ekFhnncM1zkUi2moJ9l0xjBkFOefVoiom72buXAYMSsFzmeZEJUpYCaYBumNN N8xw== 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=jx38YAgpp6hIi64Yp6dmi2Ukk67ZvJvPP+5Pl7scxe0=; fh=0wF5EaWROVR5L/uLEzKU7BJpmGtNNKvZ4t5gNBHtG7M=; b=u3xWHy/mRmFq70UCPVA4wH+xVKJK3wT5w3ziyWvfvo9n2d5xBDDNxUegKVtbzwcbYV Ha0aS/M//lWPgy2rzDeZxVu3IXw77DU9NdYzJld+EsoZe5H4rsfGBHPGNc4Izh5Z7KFf dE34yGPwQbDVTOcRoWv2wetjyO8siSyGgQJtjQQOagisvoS1my3+r0WeGLTE4Zdk73vn FgXwUZgIAqyfnpR1YKYXijnLJjlDIHooMWz3UdFdyS5GoovJm2oL6rnc4Z18R6dCOGOD nSZycKLcLfjz8GepYflD//0tond4FkBQz8f+evb9Vf06cvD2Y7zkt+b0VaKi/jSZFE9H YDJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=STdBfm9+; 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 l21-20020a056402029500b00521cc0b3498si3598493edv.289.2023.07.22.05.30.31; Sat, 22 Jul 2023 05:30:54 -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=STdBfm9+; 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 S230200AbjGVL44 (ORCPT + 99 others); Sat, 22 Jul 2023 07:56:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230223AbjGVL4v (ORCPT ); Sat, 22 Jul 2023 07:56:51 -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 1AC693C0D for ; Sat, 22 Jul 2023 04:56:30 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3fbfa811667so23503215e9.1 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=NJ/B8Id6NyAxN3nvAazo7iISCHq10B+Rx7h8uknRJbRGLzFXtDg0MRxIabBX0TvLPL g5plCVq0zygjbn7MW1Hs+KcmdGOoGM3ja1m2GHtufRrjgM+YUtI1DgThWJYvYL5WxpAn Zb41i1W3xzxr7ng6QfWbdhb4fFI6fbPIMC0qOomijV+nUT2kT72yv1L31PSF52166/XQ 9fqJ0whD/oP/uiqBhPaQqOvNHGLtY4ZioP9gG/NXYIcRSkEK/rGGGkLJt1n4T2QJMYA9 baXRzM2CyFwcH/pdnIrWDNTepkhfgR1l76kw6UMvvNDlZ5BygZl14oAYDt4W9GLP0KvO xtfQ== X-Gm-Message-State: ABy/qLZIMHw+wOOJzi++msZVn93lPwT/zEWVHD1dZ+Zl0NbnbiEQBlCF sRZ8q2EYNem4h1iPMp0Dd8HEHg== 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 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: 1772123906035143007 X-GMAIL-MSGID: 1772123906035143007 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: 124299 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp775870vqg; Sat, 22 Jul 2023 05:28:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlGjTSZcnFYxX9YiX89S1jQqygQJiTP5+9Up/uWioO2rmtAxji1R/9DB4eN9ldtylFssHc+c X-Received: by 2002:a05:6358:9494:b0:134:e301:2c21 with SMTP id i20-20020a056358949400b00134e3012c21mr2242762rwb.15.1690028914907; Sat, 22 Jul 2023 05:28:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690028914; cv=none; d=google.com; s=arc-20160816; b=vtUNRHcLuSvI75xYdyGq5GBcwCHMTIvnofSc4KATTjkfDwd5GH+pRbhqYRCikFG0+2 xaJnlI11wtY9Z5UoYvwrwu2GzEhLvppxxl5/eBPXXfNN76rvBOrvHLr+w2F5vbQm95Nr aHZTcje98JucRDgEOLYSc0ugwFr5gWQQDlHTVeHku7RCtAqiUrKTRNm2jWnzD3WcrwYn 5OE3JRqtAyAqXifpVDATBY34IMsmdBUDjycbEQM3nOBgQf3zrY+2QtXDjI52+1/dvpQY MtWV9b9Kehzkm0j9YXFXV9OSzTAbsq3B9DD8glEgcDKefWmWOQLmBXhJAOT0C39DRySt Rkpg== 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=6BvHivSL4TDsPp7ApJR35zlm9ILz6CqpbagGc7qFaLk=; fh=0wF5EaWROVR5L/uLEzKU7BJpmGtNNKvZ4t5gNBHtG7M=; b=xUh+75DniK6eBG7rE0XaRcrWdngjqg93F/RAYfAh8O/n1fQZHfSopEa13tmu6CFYIs nfJ814HKCoTYRU+SKtbwv/TaeSFGRtwu3dsKyXkwfC3dEDav+A+xRnaPrAQvaIZqJtYi m3Hj+68MP5b5AFXwqy+MPMOnUMjwzkoSlL2YPXcmdV3Wkd7be77BQLrf8JxI959MEvDG e3bkrpYmI2lSL8VPBgu2v/1IrYerpsIVOFnv4VHluPhKO/ON4SvPyH1R6h/cixCI843e +qG+PUIIodjhqsx174ShcMoGwxKw45hMIP1toeAyg6L6XR2bSblx12P9UruVnwGbkSWE YIzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rwK5YtBh; 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 i65-20020a636d44000000b005538c5bef9csi5008700pgc.452.2023.07.22.05.28.18; Sat, 22 Jul 2023 05:28:34 -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=rwK5YtBh; 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 S230136AbjGVL5D (ORCPT + 99 others); Sat, 22 Jul 2023 07:57:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230233AbjGVL46 (ORCPT ); Sat, 22 Jul 2023 07:56:58 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A2953C2B for ; Sat, 22 Jul 2023 04:56:34 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3fbc63c2e84so25411245e9.3 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=HZySEEuDNpnEd4GOczlczuQMjI6gfhwl34pJ9oIaKCXPXmewzvtxmMBmL3HFAc0f17 OdZtGE+ZXUsN1gz7V0t8h2pnAlLXQ4nAAyoTr42K9DBtAUngTiN7gEYiQoasrgqs15gh ZhMfyMazDtumTDSm81vlZrfD1aGTvtqa4qC5YNxh6wX5CF5OUmfrghQcXYmg1eQiCvXW jxhI9DF05JnBMQpJqkqIV7ZBmTBq1kR0wwl9eWOnDqMR32+wq3mDMS7p2693OzNoxXJU wNYH9ILEsJKDGdlpBcfQTnO81hpdDlTZPp2V9li5i949fCb/tzZxU9n44LKjOy17LYud dTbQ== X-Gm-Message-State: ABy/qLYIiYLeiu53ijuFXNFFos0wlZpPNWL2mVZ8qwstW8TkYdwBrS6U yxxPg0+B8CmTNrRuiGUua/W0hg== 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 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: 1772123759273590519 X-GMAIL-MSGID: 1772123759273590519 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>;