From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF813C4338F for ; Thu, 22 Jul 2021 18:50:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 909BA60EB5 for ; Thu, 22 Jul 2021 18:50:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 909BA60EB5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=xOT3dlVVDRohM8V7y0fn6Xdu8exGU9+uskz1mTPEEtI=; b=VBHYp3lrCyVsvH W83tf5wz4OhtnAx+mW2KbgEKRr9cQOzrxwc7sFPUiymel/R7hXMKYNqBZwhT7l9DuReQ+kthi4E+V 5z2XOIoGYPk7kzO/AbZ6rp7oCKBDmFFg26CnBlFnXyq+JFv+lqxLu1lxR8GWQTWnmuOJtQzeLndfx um9ZOQqd0H5C68T2sRzBUFdHsgViUkAtFNYNK1qwv2IQQZq2RZ12mQ20Yc0AkhwNWsY9GdgYfwVTZ 21V1FHU3dgbJKga7ssymr2lxLwM9tsVon2wSEXYXoh52ONq+wi6ryTeM/SRRXPRdUZap+i/ftJ773 16Iyzd7Ran8MTPxsfSLQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6dlB-002RoO-FI; Thu, 22 Jul 2021 18:49:29 +0000 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6dl7-002Rna-Gd for linux-arm-kernel@lists.infradead.org; Thu, 22 Jul 2021 18:49:27 +0000 Received: by mail-lf1-x133.google.com with SMTP id a12so10004269lfb.7 for ; Thu, 22 Jul 2021 11:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZvkcrJYCZcc2PVXQk6bRzSuyGrMXW4YkVV43dSiKgHs=; b=rODEQd7prGLyrssTId3BpDo9r9uImBzkR1Qt24Qb4f9W7GvIo3n7Rx2gBt5RgF6dU0 DdSvoTtg/uI0/zTo/sbd2DpNj3K/rx5t7ILD1egQnW3CaFM+gewP2S9xfc13kSytG4Jd DN2RLEhMcric3+QobsDA+Bl85domqjZ34jacysKUD0RC08zg7iV2/ib99uc3jWRFDAhF yHz2mnlrDS8Wyw4xRIm45INoqKR5e3MNk0AH9/kohYfy/OS4le5/VwpBvTYK7s+6yPWH XhJByRq8CgKhFuFluW5t3WfX/uqTtrMi/wWB9bYWjIndok3QZ5jqNvPq3lF3NBoEOJEE pSgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZvkcrJYCZcc2PVXQk6bRzSuyGrMXW4YkVV43dSiKgHs=; b=Q7EXPnbrO5xBLWYSOY8PFUHfWAvhWnpC7HctmVdq1KwKbXH+V5OJWv5Nj+pPSXvqdw XfsXatgBrCkliWDKkZaRulpSLEMPe3N3mn2+c36fdQ8IOskSysQsHHuXINPy3rGcbroo 3lHYwdNUG7SWLwWnlB4/uJmu6OLM6y0EhC1GkMxs0P8MaGUPgX7bYOdBHIW4TTLKLTW6 hVvb48tbmJm3zY/p5sy/PTbWTAVS3DRl4ip5ez3tC+XeYRVz8iXshyEe3vBxRbk1JNdj //+1hAEt3jZZ+jbtA4uzdBXfXtQgFO5ao/vFeDL8q/XbjAIxan4z2HWnu44phFR4mV1j lLYw== X-Gm-Message-State: AOAM533A2T+goerYC3SToCFnOgul3p1+lFCbMQDd7peEqQAKtF/PREwk bvYxmZKeO/dThXC3izH5/tm5k6KPNevtCQ== X-Google-Smtp-Source: ABdhPJyi40OTC8j/gyRKQHAtYcXSt64439koK49mOaV9sasjNPuriI4RnV6hg05+FJrS18bRr8DSCQ== X-Received: by 2002:ac2:545b:: with SMTP id d27mr517155lfn.191.1626979763517; Thu, 22 Jul 2021 11:49:23 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id m25sm2046085lfq.209.2021.07.22.11.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 11:49:23 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Imre Kaloz , Krzysztof Halasa Cc: Linus Walleij Subject: [PATCH] ARM: dts: ixp4xx: Use the expansion bus Date: Thu, 22 Jul 2021 20:47:20 +0200 Message-Id: <20210722184720.1700885-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210722_114925_635784_D6B70A3A X-CRM114-Status: GOOD ( 17.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Replace the "simple-bus" simplification by the proper bus for IXP4xx memory or device expansion. Use chip-select addressing with two address cells on all the flashes mounted on the IXP4xx devices. This includes all flash chips. Change the unit-name from @50000000 to @c4000000 as the DTS validation screams. The registers for controlling the bus are at c4000000 but the actual memory windows and ranges are at 50000000. Well it is just syntax, we can live with it. Signed-off-by: Linus Walleij --- .../boot/dts/intel-ixp42x-dlink-dsm-g600.dts | 6 ++-- .../boot/dts/intel-ixp42x-iomega-nas100d.dts | 6 ++-- .../boot/dts/intel-ixp42x-linksys-nslu2.dts | 6 ++-- .../boot/dts/intel-ixp42x-omicron-mic256.dts | 6 ++-- arch/arm/boot/dts/intel-ixp42x-omicron.dtsi | 6 ++-- .../dts/intel-ixp42x-welltech-epbx100.dts | 6 ++-- arch/arm/boot/dts/intel-ixp42x.dtsi | 4 +++ .../dts/intel-ixp43x-gateworks-gw2358.dts | 8 ++--- arch/arm/boot/dts/intel-ixp43x.dtsi | 4 +++ arch/arm/boot/dts/intel-ixp45x-ixp46x.dtsi | 9 ++++++ arch/arm/boot/dts/intel-ixp4xx.dtsi | 30 ++++++++++++++----- 11 files changed, 61 insertions(+), 30 deletions(-) diff --git a/arch/arm/boot/dts/intel-ixp42x-dlink-dsm-g600.dts b/arch/arm/boot/dts/intel-ixp42x-dlink-dsm-g600.dts index fcc5ffd49227..530be10e25d0 100644 --- a/arch/arm/boot/dts/intel-ixp42x-dlink-dsm-g600.dts +++ b/arch/arm/boot/dts/intel-ixp42x-dlink-dsm-g600.dts @@ -99,16 +99,16 @@ gpio-poweroff { }; soc { - bus@50000000 { + bus@c4000000 { /* The first 16MB region at CS0 on the expansion bus */ - flash@0 { + flash@0,0 { compatible = "intel,ixp4xx-flash", "cfi-flash"; bank-width = <2>; /* * 16 MB of Flash in 128 0x20000 sized blocks * mapped in at CS0. */ - reg = <0x00000000 0x1000000>; + reg = <0 0x00000000 0x1000000>; partitions { compatible = "redboot-fis"; diff --git a/arch/arm/boot/dts/intel-ixp42x-iomega-nas100d.dts b/arch/arm/boot/dts/intel-ixp42x-iomega-nas100d.dts index 16114eb29e6e..283c68ad9387 100644 --- a/arch/arm/boot/dts/intel-ixp42x-iomega-nas100d.dts +++ b/arch/arm/boot/dts/intel-ixp42x-iomega-nas100d.dts @@ -89,16 +89,16 @@ gpio-poweroff { }; soc { - bus@50000000 { + bus@c4000000 { /* The first 16MB region at CS0 on the expansion bus */ - flash@0 { + flash@0,0 { compatible = "intel,ixp4xx-flash", "cfi-flash"; bank-width = <2>; /* * 8 MB of Flash in 0x20000 byte blocks * mapped in at CS0. */ - reg = <0x00000000 0x800000>; + reg = <0 0x00000000 0x800000>; partitions { compatible = "redboot-fis"; diff --git a/arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts b/arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts index 5b8dcc19deee..3feee6aa5c20 100644 --- a/arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts +++ b/arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts @@ -96,16 +96,16 @@ gpio-beeper { }; soc { - bus@50000000 { + bus@c4000000 { /* The first 16MB region at CS0 on the expansion bus */ - flash@0 { + flash@0,0 { compatible = "intel,ixp4xx-flash", "cfi-flash"; bank-width = <2>; /* * 8 MB of Flash in 0x20000 byte blocks * mapped in at CS0. */ - reg = <0x00000000 0x800000>; + reg = <0 0x00000000 0x800000>; partitions { compatible = "redboot-fis"; diff --git a/arch/arm/boot/dts/intel-ixp42x-omicron-mic256.dts b/arch/arm/boot/dts/intel-ixp42x-omicron-mic256.dts index cfde0b35c698..4ff021067c14 100644 --- a/arch/arm/boot/dts/intel-ixp42x-omicron-mic256.dts +++ b/arch/arm/boot/dts/intel-ixp42x-omicron-mic256.dts @@ -19,12 +19,12 @@ memory@0 { soc { /* MIC256 has an addition 16MB of flash memory */ - bus@50000000 { + bus@c4000000 { /* The second 16MB region at CS1 on the expansion bus */ - flash@51000000 { + flash@1,0 { compatible = "intel,ixp4xx-flash", "cfi-flash"; bank-width = <2>; - reg = <0x51000000 0x1000000>; + reg = <1 0x00000000 0x1000000>; }; }; }; diff --git a/arch/arm/boot/dts/intel-ixp42x-omicron.dtsi b/arch/arm/boot/dts/intel-ixp42x-omicron.dtsi index ef959eb39179..a0b7d3379196 100644 --- a/arch/arm/boot/dts/intel-ixp42x-omicron.dtsi +++ b/arch/arm/boot/dts/intel-ixp42x-omicron.dtsi @@ -27,16 +27,16 @@ aliases { }; soc { - bus@50000000 { + bus@c4000000 { /* The first 16MB region at CS0 on the expansion bus */ - flash@0 { + flash@0,0 { compatible = "intel,ixp4xx-flash", "cfi-flash"; bank-width = <2>; /* * 16 MB of Flash in 128 0x20000 sized blocks * mapped in at CS0. */ - reg = <0x00000000 0x1000000>; + reg = <0 0x00000000 0x1000000>; #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/boot/dts/intel-ixp42x-welltech-epbx100.dts b/arch/arm/boot/dts/intel-ixp42x-welltech-epbx100.dts index 220605e297c3..f5846a50e4d4 100644 --- a/arch/arm/boot/dts/intel-ixp42x-welltech-epbx100.dts +++ b/arch/arm/boot/dts/intel-ixp42x-welltech-epbx100.dts @@ -29,14 +29,14 @@ aliases { }; soc { - bus@50000000 { - flash@0 { + bus@c4000000 { + flash@0,0 { compatible = "intel,ixp4xx-flash", "cfi-flash"; bank-width = <2>; /* * 16 MB of Flash */ - reg = <0x00000000 0x1000000>; + reg = <0 0x00000000 0x1000000>; partitions { compatible = "fixed-partitions"; diff --git a/arch/arm/boot/dts/intel-ixp42x.dtsi b/arch/arm/boot/dts/intel-ixp42x.dtsi index 5fa063ed396c..7f5a86524432 100644 --- a/arch/arm/boot/dts/intel-ixp42x.dtsi +++ b/arch/arm/boot/dts/intel-ixp42x.dtsi @@ -7,6 +7,10 @@ / { soc { + bus@c4000000 { + compatible = "intel,ixp42x-expansion-bus-controller"; + }; + pci@c0000000 { compatible = "intel,ixp42x-pci"; }; diff --git a/arch/arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts b/arch/arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts index 60a1228a970f..5d3d353cb03c 100644 --- a/arch/arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts +++ b/arch/arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts @@ -77,15 +77,15 @@ pld1: pld@57 { }; soc { - bus@50000000 { - flash@0 { + bus@c4000000 { + flash@0,0 { compatible = "intel,ixp4xx-flash", "cfi-flash"; bank-width = <2>; /* * 32 MB of Flash in 0x20000 byte blocks - * mapped in at CS0. + * mapped in at CS0 and CS1 */ - reg = <0x00000000 0x2000000>; + reg = <0 0x00000000 0x2000000>; partitions { compatible = "redboot-fis"; diff --git a/arch/arm/boot/dts/intel-ixp43x.dtsi b/arch/arm/boot/dts/intel-ixp43x.dtsi index 1d0817c6e3f9..ba6ffe537985 100644 --- a/arch/arm/boot/dts/intel-ixp43x.dtsi +++ b/arch/arm/boot/dts/intel-ixp43x.dtsi @@ -8,6 +8,10 @@ / { soc { + bus@c4000000 { + compatible = "intel,ixp43x-expansion-bus-controller"; + }; + pci@c0000000 { compatible = "intel,ixp43x-pci"; }; diff --git a/arch/arm/boot/dts/intel-ixp45x-ixp46x.dtsi b/arch/arm/boot/dts/intel-ixp45x-ixp46x.dtsi index cce49e809043..e3edd4e7304b 100644 --- a/arch/arm/boot/dts/intel-ixp45x-ixp46x.dtsi +++ b/arch/arm/boot/dts/intel-ixp45x-ixp46x.dtsi @@ -9,6 +9,15 @@ / { soc { + bus@c4000000 { + compatible = "intel,ixp46x-expansion-bus-controller"; + }; + + rng@70002100 { + compatible = "intel,ixp46x-rng"; + reg = <0x70002100 4>; + }; + interrupt-controller@c8003000 { compatible = "intel,ixp43x-interrupt"; }; diff --git a/arch/arm/boot/dts/intel-ixp4xx.dtsi b/arch/arm/boot/dts/intel-ixp4xx.dtsi index 45cb3ad954c1..2451f96b971d 100644 --- a/arch/arm/boot/dts/intel-ixp4xx.dtsi +++ b/arch/arm/boot/dts/intel-ixp4xx.dtsi @@ -15,16 +15,30 @@ soc { interrupt-parent = <&intcon>; /* - * The IXP4xx expansion bus is a set of 16 or 32MB - * windows in the 256MB space from 0x50000000 to - * 0x5fffffff. + * The IXP4xx expansion bus is a set of up to 7 each up to 16MB + * windows in the 256MB space from 0x50000000 to 0x5fffffff. */ - bus@50000000 { - compatible = "simple-bus"; - #address-cells = <1>; + bus@c4000000 { + /* compatible filled in by per-soc device tree */ + reg = <0xc4000000 0x28>; + #address-cells = <2>; #size-cells = <1>; - ranges = <0x00000000 0x50000000 0x10000000>; - dma-ranges = <0x00000000 0x50000000 0x10000000>; + ranges = <0 0x0 0x50000000 0x01000000>, + <1 0x0 0x51000000 0x01000000>, + <2 0x0 0x52000000 0x01000000>, + <3 0x0 0x53000000 0x01000000>, + <4 0x0 0x54000000 0x01000000>, + <5 0x0 0x55000000 0x01000000>, + <6 0x0 0x56000000 0x01000000>, + <7 0x0 0x57000000 0x01000000>; + dma-ranges = <0 0x0 0x50000000 0x01000000>, + <1 0x0 0x51000000 0x01000000>, + <2 0x0 0x52000000 0x01000000>, + <3 0x0 0x53000000 0x01000000>, + <4 0x0 0x54000000 0x01000000>, + <5 0x0 0x55000000 0x01000000>, + <6 0x0 0x56000000 0x01000000>, + <7 0x0 0x57000000 0x01000000>; }; qmgr: queue-manager@60000000 { -- 2.31.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel