From patchwork Sun Apr 26 20:20:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_Gonz=C3=A1lez_Cabanelas?= X-Patchwork-Id: 1277228 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=ujHCzGyS; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=qSsLHl/D; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 499KYK3YjLz9sRY for ; Mon, 27 Apr 2020 06:40:37 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-ID:Date:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ikteoQkqoAjnjMnrch/B6SUrWTqiIf5+jGZq6fK7rb8=; b=ujHCzGySEiTLKQ Hnh7YxrjJMWymAOTRhMG+sOFfHVmwQXsO6i0Ozub79kINJUJIuXPbBaT3q/ebRE43rkygNcBAlCr9 DDiL5l+rchhC7pBhqE3KTF9DDLok1lqrZpTvZdWer/bzJqargFhw1hrwfT/pDkKoigOfPiKYUpBvs 91apP8GBOcSgT5p+Iwmm5+kq4teS8HaA8DQVmrc7QxGPa9Oh87kIdhjz31ggrajo7qsRzRYpxF7cM jVyCWiM9L+RagXMN45tgKX+kOwg4NQtfKVcfBtLoMaedTomLYZpaWTgyVvnp9B4MQqT7yfYMvJ/cg b8+ONFGGAvsshk9JZYeA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jSo4i-0001VQ-On; Sun, 26 Apr 2020 20:40:28 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jSo4g-0001UO-3L for openwrt-devel@lists.openwrt.org; Sun, 26 Apr 2020 20:40:27 +0000 Received: by mail-wr1-x442.google.com with SMTP id j2so18162926wrs.9 for ; Sun, 26 Apr 2020 13:40:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=02M88a0r3MiVr1EcPBZCsPOKDhdMywCsKoCEZWRSk6M=; b=qSsLHl/DfJnt5l6YgUTtzO64io1Zrx+Sh/KuEpEz1mb+ujDoVmvDkxr5RryJYonYkk kvYn0LlOY+3UVi3QdIz8wR2298ByVQKZ2xR/wSckcmzAJZ9wIi26wZ2aj87uP/4+b1YH R/UMw3Bw/JfGg7oXmyMC2uQx62utgYOhBvczz3A/7syCe6qlthmAoYXQXkwrSGivy3io mpQrz+1sQU1lYn1737IBvhQZbpd1EbCD4e8YnDILgjt40XTHwZL9tbjyHVCxoFSgDSTs KpYKkdQpZzmPazvpb/zvuAPlfEWSd0AxX7nEJN5IFANZ0x5vWR5nl8PCuZ0HvZuq91hP Guiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=02M88a0r3MiVr1EcPBZCsPOKDhdMywCsKoCEZWRSk6M=; b=Qa9uIplqZU7tPTbnJPRz6gibZj8XZuMIEXuIbUEUPGiNXfJhB3pvkOMSu5NglEbDUU QxegICI65YVG9kUs3nPIwKLXhRZTY0MxaIQpfqa/5Hk3BtuCAvI6UmYQFtgNN3Aojns/ dOKsjX7slOIK8ZLQpjVGc4GJhGOZ4GRWuoqRL55c0+pN0MpYgvXLYYes7D4UQDPOP2sJ nywEMmDulk07JAO9Ys90qO7hF9xgbU4phO6HJZxEMB6XFLWUmEnW1rKsUTFTczM3JpSD hEWoGOlFUe6Hw6qAo6cVDHq2Zf+MaxGVW+bmZrV47FycTDQG5CF7MWu8ttEhM/xEm1ot SOTg== X-Gm-Message-State: AGi0PuZca1fV+kwJtR5qTCmh6rhI4Q82MbLC9OfuKRFYtkLVxEKjmQeV rNRxMkIqofCmwFf9exBFgixEJWy8 X-Google-Smtp-Source: APiQypLJeG+xnrS/E0RzEJzVNJA/KCKCO+CGgxVlhS+rxv+jCJHCWVlaNoBIw3q6QdyLJsLl7IZNtQ== X-Received: by 2002:adf:edc6:: with SMTP id v6mr23120623wro.8.1587933611889; Sun, 26 Apr 2020 13:40:11 -0700 (PDT) Received: from tool.localnet ([213.177.195.242]) by smtp.googlemail.com with ESMTPSA id f63sm12488013wma.47.2020.04.26.13.40.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2020 13:40:11 -0700 (PDT) From: Daniel =?iso-8859-1?q?Gonz=E1lez?= Cabanelas To: openwrt-devel@lists.openwrt.org Date: Sun, 26 Apr 2020 22:20:24 +0200 Message-ID: <79398488.bS0fr8Jv6B@tool> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200426_134026_145129_283693DB X-CRM114-Status: UNSURE ( 8.63 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:442 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [dgcbueu[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [OpenWrt-Devel] [PATCH] mvebu: LS421DE: dts file improvements X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org - Delete useless HDD presence inputs: they aren't buttons, and probably they are outputs in the stock firmware. - Change the Function Button keycode: the current one isn't mapped by the kernel module. - Use the recommended property names for the ethernet stuff. - Add missing i2c pinmux. - Minor cosmetic changes. Signed-off-by: Daniel González Cabanelas --- .../boot/dts/armada-370-buffalo-ls421de.dts | 53 ++++++++----------- .../boot/dts/armada-370-buffalo-ls421de.dts | 53 ++++++++----------- 2 files changed, 44 insertions(+), 62 deletions(-) diff --git a/target/linux/mvebu/files-4.19/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts b/target/linux/mvebu/files-4.19/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts. index 6b8a964ab3..4d2760eb72 100644 --- a/target/linux/mvebu/files-4.19/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts +++ b/target/linux/mvebu/files-4.19/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts @@ -42,7 +42,7 @@ gpio_fan { gpios = <&gpio0 13 GPIO_ACTIVE_HIGH - &gpio0 14 GPIO_ACTIVE_HIGH>; + &gpio0 14 GPIO_ACTIVE_HIGH>; alarm-gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; }; @@ -50,22 +50,9 @@ compatible = "gpio-keys"; #address-cells = <1>; #size-cells = <0>; - pinctrl-0 = <&pmx_hdd_present &pmx_buttons>; + pinctrl-0 = <&pmx_buttons>; pinctrl-names = "default"; - hdd1-present { - label = "HDD1 Present"; - linux,code = ; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; - }; - - hdd2-present { - label = "HDD2 Present"; - linux,code = ; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; - - }; - power { label = "Power Switch"; linux,code = ; @@ -75,7 +62,7 @@ function { label = "Function Button"; - linux,code = ; + linux,code = ; gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; }; }; @@ -131,11 +118,11 @@ #address-cells = <1>; #size-cells = <0>; pinctrl-0 = <&pmx_power_usb &pmx_power_hdd1 &pmx_power_hdd2>; - pinctrl-names = "default"; - usb_v5_regulator: usb-v5-regulator { + usb_power: regulator@0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "USB"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; @@ -145,7 +132,7 @@ gpio = <&gpio0 5 GPIO_ACTIVE_HIGH>; }; - ata1_regulator: ata1-regulator { + sata1_power: regulator@1 { compatible = "regulator-fixed"; reg = <1>; regulator-name = "HDD1"; @@ -158,7 +145,7 @@ gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>; }; - ata2_regulator: ata2-regulator { + sata2_power: regulator@2 { compatible = "regulator-fixed"; reg = <2>; regulator-name = "HDD2"; @@ -183,11 +170,13 @@ pinctrl-0 = <&ge1_rgmii_pins>; pinctrl-names = "default"; status = "okay"; - phy = <&phy0>; - phy-mode = "rgmii-id"; + phy-handle = <ðphy0>; + phy-connection-type = "rgmii-id"; }; &i2c0 { + pinctrl-0 = <&i2c0_pins>; + pinctrl-names = "default"; clock-frequency = <100000>; status = "okay"; @@ -201,16 +190,18 @@ pinctrl-0 = <&mdio_pins>; pinctrl-names = "default"; - phy0: ethernet-phy@0 { /* Marvell 88E1518 */ + ethphy0: ethernet-phy@0 { /* Marvell 88E1518 */ reg = <0>; - /* LED2 is used to inform uBoot if the power-switch was slided - to the "off" position, and then power off the machine. - Page 0x3, Register 0x10, bit 8: - 0x800: LED2 off, power off the machine - 0x900: LED2 on, boot the machine */ - marvell,reg-init = <0x3 0x10 0x1 0x1991>, /* LED Function */ - <0x3 0x11 0x1 0x4401>, /* LED polarity */ - <0x3 0x12 0x1 0x4905>; /* LED Timer */ + /* + * LED2 is used to inform, at restart time, if the power + * switch was slided to the "off" position. + * Page 0x3, Register 0x10, bits 8-11: + * 0x800: LED2 off, power off the machine + * 0x900: LED2 on, boot the machine + */ + marvell,reg-init = <0x3 0x10 0x1 0x1991>, /* LED function */ + <0x3 0x11 0x1 0x4401>, /* LED polarity */ + <0x3 0x12 0x1 0x4905>; /* LED timer */ }; }; diff --git a/target/linux/mvebu/files-5.4/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts b/target/linux/mvebu/files-5.4/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts index 6b8a964ab3..4d2760eb72 100644 --- a/target/linux/mvebu/files-5.4/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts +++ b/target/linux/mvebu/files-5.4/arch/arm/boot/dts/armada-370-buffalo-ls421de.dts @@ -42,7 +42,7 @@ gpio_fan { gpios = <&gpio0 13 GPIO_ACTIVE_HIGH - &gpio0 14 GPIO_ACTIVE_HIGH>; + &gpio0 14 GPIO_ACTIVE_HIGH>; alarm-gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>; }; @@ -50,22 +50,9 @@ compatible = "gpio-keys"; #address-cells = <1>; #size-cells = <0>; - pinctrl-0 = <&pmx_hdd_present &pmx_buttons>; + pinctrl-0 = <&pmx_buttons>; pinctrl-names = "default"; - hdd1-present { - label = "HDD1 Present"; - linux,code = ; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; - }; - - hdd2-present { - label = "HDD2 Present"; - linux,code = ; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; - - }; - power { label = "Power Switch"; linux,code = ; @@ -75,7 +62,7 @@ function { label = "Function Button"; - linux,code = ; + linux,code = ; gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; }; }; @@ -131,11 +118,11 @@ #address-cells = <1>; #size-cells = <0>; pinctrl-0 = <&pmx_power_usb &pmx_power_hdd1 &pmx_power_hdd2>; - pinctrl-names = "default"; - usb_v5_regulator: usb-v5-regulator { + usb_power: regulator@0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "USB"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; @@ -145,7 +132,7 @@ gpio = <&gpio0 5 GPIO_ACTIVE_HIGH>; }; - ata1_regulator: ata1-regulator { + sata1_power: regulator@1 { compatible = "regulator-fixed"; reg = <1>; regulator-name = "HDD1"; @@ -158,7 +145,7 @@ gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>; }; - ata2_regulator: ata2-regulator { + sata2_power: regulator@2 { compatible = "regulator-fixed"; reg = <2>; regulator-name = "HDD2"; @@ -183,11 +170,13 @@ pinctrl-0 = <&ge1_rgmii_pins>; pinctrl-names = "default"; status = "okay"; - phy = <&phy0>; - phy-mode = "rgmii-id"; + phy-handle = <ðphy0>; + phy-connection-type = "rgmii-id"; }; &i2c0 { + pinctrl-0 = <&i2c0_pins>; + pinctrl-names = "default"; clock-frequency = <100000>; status = "okay"; @@ -201,16 +190,18 @@ pinctrl-0 = <&mdio_pins>; pinctrl-names = "default"; - phy0: ethernet-phy@0 { /* Marvell 88E1518 */ + ethphy0: ethernet-phy@0 { /* Marvell 88E1518 */ reg = <0>; - /* LED2 is used to inform uBoot if the power-switch was slided - to the "off" position, and then power off the machine. - Page 0x3, Register 0x10, bit 8: - 0x800: LED2 off, power off the machine - 0x900: LED2 on, boot the machine */ - marvell,reg-init = <0x3 0x10 0x1 0x1991>, /* LED Function */ - <0x3 0x11 0x1 0x4401>, /* LED polarity */ - <0x3 0x12 0x1 0x4905>; /* LED Timer */ + /* + * LED2 is used to inform, at restart time, if the power + * switch was slided to the "off" position. + * Page 0x3, Register 0x10, bits 8-11: + * 0x800: LED2 off, power off the machine + * 0x900: LED2 on, boot the machine + */ + marvell,reg-init = <0x3 0x10 0x1 0x1991>, /* LED function */ + <0x3 0x11 0x1 0x4401>, /* LED polarity */ + <0x3 0x12 0x1 0x4905>; /* LED timer */ }; };