From patchwork Fri Jul 23 15:23:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 484625 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp1437055jao; Fri, 23 Jul 2021 08:26:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyCXYoeIKBYJpvI379ym3qSELkp2wTP+C4stpSRxn8sP9F/A9DcKnD/IWYFPbZOceoubwPn X-Received: by 2002:a6b:fe19:: with SMTP id x25mr4465630ioh.39.1627053974421; Fri, 23 Jul 2021 08:26:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627053974; cv=none; d=google.com; s=arc-20160816; b=QYaAgrtKB8Gn6bpX+7qo6XCD1JldlEeoFrqRPyHy0YuC8SdMjmwaBfkon0HESH8ebf MctpWjjfmjyh0nn6JyGX1+JsVumR8OKxl2LEwWaUtADA9jn1IzwEQQeNIebC7gJga34J Pjm+g99XQ6h+E7a9kOQQVLRbOkSTib86oVVbnMzmdFwYNr5tuCOAZLQkjhROwQUhs+4v aJZjlQYvP6fSJWbMx5yOZAtPSB9vJ0SZ7dbUSKhSMlGej37/k2qrPagQVPG1V2oORd69 LNlM0iIV6RHw2YzeSuN+CNXlI6/h2aNA4GMsPkWVOA1Ph9Ku2pfkIsal0w7aIG7Iej8n ctQw== 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=lTf0DsiowvBZKkFtZMsmpqp1uJ69RCkXbJy1FYZWtKs=; b=ztabBp7wFt6TduyoAPrlQyCQZ7q4czSTf9AnllR2+X6SK0P/H0hMMx6Y7wwNOId4PP gSwOXf6tSRlj+FDdv+Vq9X3kAY6Qyt0HzPkWsuWdfqZxr0mOmutj7q1ZdrYuyHBUL3Fo jhg/ooa/xHoe06W6S9KUnP0V8otlusXBZjus5T/x3IpzU35an+Zw2lcl5uT6+eVBzYs8 JqC2Z+SArsxvCoEvahtFnIvB0DKMu4RFvTxon4Bi4Lnpr+finBPPqkivsaELYEz5GR8o QVOuwVCZrama7CXWZ3Hvf38OycidzKwExEU8mrpDHuqW4W26O+LTPjpkYIFGg4YcZTIh ifXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="SLVJp/cT"; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 187si33542970iow.86.2021.07.23.08.26.14; Fri, 23 Jul 2021 08:26:14 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="SLVJp/cT"; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-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 S235551AbhGWOpg (ORCPT + 7 others); Fri, 23 Jul 2021 10:45:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235554AbhGWOpe (ORCPT ); Fri, 23 Jul 2021 10:45:34 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D88F5C06175F for ; Fri, 23 Jul 2021 08:26:02 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id n10so2171428ljq.3 for ; Fri, 23 Jul 2021 08:26:02 -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=lTf0DsiowvBZKkFtZMsmpqp1uJ69RCkXbJy1FYZWtKs=; b=SLVJp/cTh2mw0L1Kegosc5UHoVnD/EBGLl9BZ2cG5Wp5XlOrecJ53oz2972WKJuJ1g Cw874pZ5+jsHhJiR97pCtFCXSGJ0FSOi+9PNWYsJIybD4Trk/dIzNLUlDcLZWGlnOnpy 3FhlFtl9lcLvKnHM2gOhMdCJwjo9UJG69nIhoo2vQjGe7f45uLOuNsvNQY/ZLmiulrqv OgX4lKMmzmBn28hj4cO8CRu4Lh03QY9hh2gkB8ZDmMTFobZfPp/0/OOkIf7F8++LWNkC rnxi7G13CndrHnZwJoL8E7CP0Rh7rJKe4q+TW+Xq8zWRo+S3H70EpOI7aUTM/MVwkFCY uYAA== 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=lTf0DsiowvBZKkFtZMsmpqp1uJ69RCkXbJy1FYZWtKs=; b=mtPgLHVMe76YNUn4lNt29wnNokcYJM4oLQKRZafc95gNJueGzsVJCLDDNhzTImrLmg kV78WkDV3ngkQGc7UFEqhmHocFLjrh5ovNBORywI63CIi4NyKx2aSErra21U7zWC92tq qyg4eETtwnOEyo3damLvH5D/B3FR983ZyEGrkAVB1cjEcxN2ac6J7s6CoigyCQYc4yR0 RlKva9Ij+vDP72D7fxnbTjUkcitbRO+jwfXXw4RPpaEGcPMsSRsS6RRjtqKj9VAJalvG ZycKaVH7DJrtpqrk0jzB9KwNS6q5x0u1HZkjzkhsQ55bfnIsWYupLFTbapEO3blsWQFy NxlQ== X-Gm-Message-State: AOAM5317nmqHQNHfkj4sYf54gMXNmEaVyphEuCE40R/n8vPg9mbewpnG 1pS9tNyDLHaWTwI+vDI0KZybBZVMFHmdEA== X-Received: by 2002:a2e:b16b:: with SMTP id a11mr3051528ljm.346.1627053960249; Fri, 23 Jul 2021 08:26:00 -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 r189sm1881380lff.64.2021.07.23.08.25.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jul 2021 08:25:59 -0700 (PDT) From: Linus Walleij To: devicetree@vger.kernel.org, Rob Herring Cc: linux-arm-kernel@lists.infradead.org, Linus Walleij , Corentin Labbe Subject: [PATCH] dt-bindings: arm: Convert Gemini boards to YAML Date: Fri, 23 Jul 2021 17:23:56 +0200 Message-Id: <20210723152356.1874088-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This removes the old plaintext Gemini binding and replace it with a YAML schema, adding some new boards in the process. While we are at it, add the missing vendors to the vendor prefix file. Drop the overly deliberate description of subnodes and the big example from the old document. Keep the elaborate description. I noticed that "wiliboard" is not a real vendor, the vendor is named "wiligear" so deprecated this and replaced with the proper vendor. Cc: Corentin Labbe Signed-off-by: Linus Walleij --- Rob: maybe it's best that you apply this directly to the bindings tree so the vendors file is kept in check. --- .../devicetree/bindings/arm/gemini.txt | 108 ------------------ .../devicetree/bindings/arm/gemini.yaml | 95 +++++++++++++++ .../devicetree/bindings/vendor-prefixes.yaml | 10 ++ 3 files changed, 105 insertions(+), 108 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/gemini.txt create mode 100644 Documentation/devicetree/bindings/arm/gemini.yaml -- 2.31.1 diff --git a/Documentation/devicetree/bindings/arm/gemini.txt b/Documentation/devicetree/bindings/arm/gemini.txt deleted file mode 100644 index 55bf7ce96c44..000000000000 --- a/Documentation/devicetree/bindings/arm/gemini.txt +++ /dev/null @@ -1,108 +0,0 @@ -Cortina systems Gemini platforms - -The Gemini SoC is the project name for an ARMv4 FA525-based SoC originally -produced by Storlink Semiconductor around 2005. The company was renamed -later renamed Storm Semiconductor. The chip product name is Storlink SL3516. -It was derived from earlier products from Storm named SL3316 (Centroid) and -SL3512 (Bulverde). - -Storm Semiconductor was acquired by Cortina Systems in 2008 and the SoC was -produced and used for NAS and similar usecases. In 2014 Cortina Systems was -in turn acquired by Inphi, who seem to have discontinued this product family. - -Many of the IP blocks used in the SoC comes from Faraday Technology. - -Required properties (in root node): - compatible = "cortina,gemini"; - -Required nodes: - -- soc: the SoC should be represented by a simple bus encompassing all the - onchip devices, this is referred to as the soc bus node. - -- syscon: the soc bus node must have a system controller node pointing to the - global control registers, with the compatible string - "cortina,gemini-syscon", "syscon"; - - Required properties on the syscon: - - reg: syscon register location and size. - - #clock-cells: should be set to <1> - the system controller is also a - clock provider. - - #reset-cells: should be set to <1> - the system controller is also a - reset line provider. - - The clock sources have shorthand defines in the include file: - - - The reset lines have shorthand defines in the include file: - - -- timer: the soc bus node must have a timer node pointing to the SoC timer - block, with the compatible string "cortina,gemini-timer" - See: clocksource/cortina,gemini-timer.txt - -- interrupt-controller: the sob bus node must have an interrupt controller - node pointing to the SoC interrupt controller block, with the compatible - string "cortina,gemini-interrupt-controller" - See interrupt-controller/cortina,gemini-interrupt-controller.txt - -Example: - -/ { - model = "Foo Gemini Machine"; - compatible = "cortina,gemini"; - #address-cells = <1>; - #size-cells = <1>; - - memory { - device_type = "memory"; - reg = <0x00000000 0x8000000>; - }; - - soc { - #address-cells = <1>; - #size-cells = <1>; - ranges; - compatible = "simple-bus"; - interrupt-parent = <&intcon>; - - syscon: syscon@40000000 { - compatible = "cortina,gemini-syscon", "syscon"; - reg = <0x40000000 0x1000>; - #clock-cells = <1>; - #reset-cells = <1>; - }; - - uart0: serial@42000000 { - compatible = "ns16550a"; - reg = <0x42000000 0x100>; - resets = <&syscon GEMINI_RESET_UART>; - clocks = <&syscon GEMINI_CLK_UART>; - interrupts = <18 IRQ_TYPE_LEVEL_HIGH>; - reg-shift = <2>; - }; - - timer@43000000 { - compatible = "cortina,gemini-timer"; - reg = <0x43000000 0x1000>; - interrupt-parent = <&intcon>; - interrupts = <14 IRQ_TYPE_EDGE_FALLING>, /* Timer 1 */ - <15 IRQ_TYPE_EDGE_FALLING>, /* Timer 2 */ - <16 IRQ_TYPE_EDGE_FALLING>; /* Timer 3 */ - resets = <&syscon GEMINI_RESET_TIMER>; - /* APB clock or RTC clock */ - clocks = <&syscon GEMINI_CLK_APB>, - <&syscon GEMINI_CLK_RTC>; - clock-names = "PCLK", "EXTCLK"; - syscon = <&syscon>; - }; - - intcon: interrupt-controller@48000000 { - compatible = "cortina,gemini-interrupt-controller"; - reg = <0x48000000 0x1000>; - resets = <&syscon GEMINI_RESET_INTCON0>; - interrupt-controller; - #interrupt-cells = <2>; - }; - }; -}; diff --git a/Documentation/devicetree/bindings/arm/gemini.yaml b/Documentation/devicetree/bindings/arm/gemini.yaml new file mode 100644 index 000000000000..f6a0b675830f --- /dev/null +++ b/Documentation/devicetree/bindings/arm/gemini.yaml @@ -0,0 +1,95 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/arm/gemini.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Cortina systems Gemini platforms + +description: | + The Gemini SoC is the project name for an ARMv4 FA525-based SoC originally + produced by Storlink Semiconductor around 2005. The company was renamed + later renamed Storm Semiconductor. The chip product name is Storlink SL3516. + It was derived from earlier products from Storm named SL3316 (Centroid) and + SL3512 (Bulverde). + + Storm Semiconductor was acquired by Cortina Systems in 2008 and the SoC was + produced and used for NAS and similar usecases. In 2014 Cortina Systems was + in turn acquired by Inphi, who seem to have discontinued this product family. + + Many of the IP blocks used in the SoC comes from Faraday Technology. + +maintainers: + - Linus Walleij + +properties: + $nodename: + const: '/' + compatible: + oneOf: + + - description: Storlink Semiconductor Gemini324 EV-Board also known + as Storm Semiconductor SL93512R_BRD + items: + - const: storlink,gemini324 + - const: storm,sl93512r + - const: cortina,gemini + + - description: D-Link DIR-685 Xtreme N Storage Router + items: + - const: dlink,dir-685 + - const: cortina,gemini + + - description: D-Link DNS-313 1-Bay Network Storage Enclosure + items: + - const: dlink,dns-313 + - const: cortina,gemini + + - description: Edimax NS-2502 + items: + - const: edimax,ns-2502 + - const: cortina,gemini + + - description: ITian Square One SQ201 + items: + - const: itian,sq201 + - const: cortina,gemini + + - description: Raidsonic NAS IB-4220-B + items: + - const: raidsonic,ib-4220-b + - const: cortina,gemini + + - description: SSI 1328 + items: + - const: ssi,1328 + - const: cortina,gemini + + - description: Teltonika RUT1xx Mobile Router + items: + - const: teltonika,rut1xx + - const: cortina,gemini + + - description: Wiligear Wiliboard WBD-111 + items: + - const: wiligear,wiliboard-wbd111 + - const: cortina,gemini + + - description: Wiligear Wiliboard WBD-222 + items: + - const: wiligear,wiliboard-wbd222 + - const: cortina,gemini + + - description: Wiligear Wiliboard WBD-111 - old incorrect binding + items: + - const: wiliboard,wbd111 + - const: cortina,gemini + deprecated: true + + - description: Wiligear Wiliboard WBD-222 - old incorrect binding + items: + - const: wiliboard,wbd222 + - const: cortina,gemini + deprecated: true + +additionalProperties: true diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index 7781bcc35ab8..141d41491f0f 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -565,6 +565,8 @@ patternProperties: description: ITE Tech. Inc. "^itead,.*": description: ITEAD Intelligent Systems Co.Ltd + "^itian,.*": + description: ITian Corporation "^iwave,.*": description: iWave Systems Technologies Pvt. Ltd. "^jdi,.*": @@ -1115,6 +1117,10 @@ patternProperties: "^st-ericsson,.*": description: ST-Ericsson deprecated: true + "^storlink,.*": + description: StorLink Semiconductors, Inc. + "^storm,.*": + description: Storm Semiconductor, Inc. "^summit,.*": description: Summit microelectronics "^sunchip,.*": @@ -1147,6 +1153,8 @@ patternProperties: description: TechNexion "^technologic,.*": description: Technologic Systems + "^teltonika,.*": + description: Teltonika Networks "^tempo,.*": description: Tempo Semiconductor "^techstar,.*": @@ -1272,6 +1280,8 @@ patternProperties: description: Shenzhen whwave Electronics, Inc. "^wi2wi,.*": description: Wi2Wi, Inc. + "^wiligear,.*": + description: Wiligear, Ltd. "^winbond,.*": description: Winbond Electronics corp. "^winstar,.*":