From patchwork Sat Dec 8 22:22:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10719805 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 34D13109C for ; Sat, 8 Dec 2018 22:23:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18F2B2AEB3 for ; Sat, 8 Dec 2018 22:23:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D4012AEB8; Sat, 8 Dec 2018 22:23:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E24152AEB3 for ; Sat, 8 Dec 2018 22:23:41 +0000 (UTC) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=G+OHazz9yrlf7CLbRVovtsxY5YvEEdOSZkGuT6REwN0=; b=b2JELQviRtRWiF iLsrVE01reAkkkX1lduco583c9G/hKpjzCzuqQgn0lJYpV3TWU91FNt5f454oGEyIFI8o7w6Vtl/w Jv98x2fZapZlSN0y6/Es3CBOiy6tadToJUijQ+jad+q4/WdEPpI5tKI8Pthtm7ee5r3EfPiwAmLHt KFBuTeA015mMlyzvjNm4PFHF9iV7Q36XR3IwE+CjbTc3GsECzrBaExhIuPJCtj0nwOOVun741qmDy RNbAU1XFbInFBLqXejjZeiP6nBIGwHiFKR9BWZbZuDzjbQ1nbsa1cEHlgogyUY2QRuUBY1ySqRe8z agFboJoG2zgHuguYqwtQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gVl0b-0003eB-NF; Sat, 08 Dec 2018 22:23:37 +0000 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gVl0L-0003LI-3i for linux-arm-kernel@lists.infradead.org; Sat, 08 Dec 2018 22:23:22 +0000 Received: by mail-lj1-x244.google.com with SMTP id k19-v6so6445624lji.11 for ; Sat, 08 Dec 2018 14:23:10 -0800 (PST) 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=SxeQ2RgM6pAXInveUvpv7Wd8q2eUfyUc70lKdcQupf4=; b=gqr3Ddi5eve7Mgqt6oAviU0QiwfUcKg6RsGkvNBagF7lm6joI6b36sA+lr6O/wGZU4 +yG8x7COcsUjotw1mQ4gjnHmmO/nwMu+HUF6nMRdahm369/2Hphjq40ir+YKcNmz0LJ8 1Q81XUn4A5/Jw88BT2t96c9VJ24xozdhKulo0= 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=SxeQ2RgM6pAXInveUvpv7Wd8q2eUfyUc70lKdcQupf4=; b=KpZx0ijVqeCAMd4VIhnIbmk2WfxsVXX+rPXNXBA4pdOJwDL7t+pmd2JQdBwbL3W7/w hj11bzjKG1xzH4VBivITj1Lrvpw9/3BgQhzQjGpFIY8LA8ANbk7XFIALx8CSbOLV46wG fSQ0H/PF+wbFuWLhz1QBqux2nuUpWf3CrfYF/xpk2GPTKzx9cFN9FbKzyLOYlMxwvrvn vFZwAbnoRp9wU/wbRwtoq99mhev4IVljgDtPkqnlw/RLJfhzdgEeHcyyYnER/usApLAs 4ccd4hXhI2enCPyUut7Krfvt3ztxW8hrC1xFhc1dD6irDDCzoQBlih8ksb6qIiGfL3Qj 71ng== X-Gm-Message-State: AA+aEWbxpwcRArpjozzYqHSphDeob1wPqLfvCG99I4QQ8LIl39VKw4Zf qjG5r051JINdq817b7wT0uvBRfWUNTxUOw== X-Google-Smtp-Source: AFSGD/U+hJ2NsiGfQxYeUWT9OOyEHlDyZhVIi5OrXDysa2Dh437HA7JmYFb9CG53x9zqRQ/7GHC0sw== X-Received: by 2002:a2e:21a9:: with SMTP id h41-v6mr4026847lji.103.1544307788291; Sat, 08 Dec 2018 14:23:08 -0800 (PST) Received: from localhost.bredbandsbolaget (c-ae7b71d5.014-348-6c756e10.bbcust.telenor.se. [213.113.123.174]) by smtp.gmail.com with ESMTPSA id b69sm1310884lfl.28.2018.12.08.14.23.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Dec 2018 14:23:06 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Hans Ulli Kroll , Florian Fainelli Subject: [PATCH 1/5] ARM: dts: Fix up the D-Link DIR-685 MTD partition info Date: Sat, 8 Dec 2018 23:22:57 +0100 Message-Id: <20181208222301.5303-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181208_142321_204791_C74B7CB8 X-CRM114-Status: GOOD ( 15.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , Linus Walleij , LEDE Development List Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The vendor firmware was analyzed to get the right idea about this flash layout. /proc/mtd contains: dev: size erasesize name mtd0: 01e7ff40 00020000 "rootfs" mtd1: 01f40000 00020000 "upgrade" mtd2: 00040000 00020000 "rgdb" mtd3: 00020000 00020000 "nvram" mtd4: 00040000 00020000 "RedBoot" mtd5: 00020000 00020000 "LangPack" mtd6: 02000000 00020000 "flash" Here "flash" is obviously the whole device and we know "rootfs" is a bogus hack to point to a squashfs rootfs inside of the main "upgrade partition". We know "RedBoot" is the first 0x40000 of the flash and the "upgrade" partition follows from 0x40000 to 0x1f8000. So we have mtd0, 1, 4 and 6 covered. Remains: mtd2: 00040000 00020000 "rgdb" mtd3: 00020000 00020000 "nvram" mtd5: 00020000 00020000 "LangPack" Inspecting the flash at 0x1f8000 and 0x1fa000 reveals each of these starting with "RGCFG1" so we assume 0x1f8000-1fbfff is "rgdb" of 0x40000. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts index 6f258b50eb44..502a361d1fe9 100644 --- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts @@ -274,20 +274,16 @@ read-only; }; /* - * Between the boot loader and the rootfs is the kernel - * in a custom Storlink format flashed from the boot - * menu. The rootfs is in squashfs format. + * This firmware image contains the kernel catenated + * with the squashfs root filesystem. For some reason + * this is called "upgrade" on the vendor system. */ - partition@1800c0 { - label = "rootfs"; - reg = <0x001800c0 0x01dbff40>; - read-only; - }; - partition@1f40000 { + partition@40000 { label = "upgrade"; - reg = <0x01f40000 0x00040000>; + reg = <0x00040000 0x01f40000>; read-only; }; + /* RGDB, Residental Gateway Database? */ partition@1f80000 { label = "rgdb"; reg = <0x01f80000 0x00040000>; From patchwork Sat Dec 8 22:22:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10719813 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 93F8D13BF for ; Sat, 8 Dec 2018 22:25:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 848042AEC7 for ; Sat, 8 Dec 2018 22:25:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 78ABD2AECC; Sat, 8 Dec 2018 22:25:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EDD882AEC7 for ; Sat, 8 Dec 2018 22:25:42 +0000 (UTC) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Lfgm8ASS9ocDwGz3r3K9pBWMN+eBWEdT47pMkMciVTU=; b=QnEuECYPDecpWX G8mr/SAzS3DfHpTQjA034amHtsV2MtJH6++sPoXD2KCjROD3nJxuoIolbaMC1ViN9lz5a+WwaalXu eoZZg66lxqyr7KeRvR3AkA8tK700UevSd39blfwoW2EH09sv+5vBzHpkUNSyAQyMo6mMPzDJ7N2Hp PZVWefRju86boVwSM58lcRcmpHwNsRgE6Sy8sylUPxJAZaXe0RepZfFcL+fYgQOR9OdcfBQn2y9ei eMehxUCaIy3oHbWMdHuIOq2POWQA7Ps3MTxDl/SEM8yz32M5l6ejVppz/C2kh8rfTQ0ZHgWRxL65H qYER8NFztsG8zORI2QHQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gVl2U-0006nA-7o; Sat, 08 Dec 2018 22:25:34 +0000 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gVl0O-0003LW-0B for linux-arm-kernel@lists.infradead.org; Sat, 08 Dec 2018 22:23:33 +0000 Received: by mail-lf1-x144.google.com with SMTP id p86so5461438lfg.5 for ; Sat, 08 Dec 2018 14:23:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SXLqZDlfykCHPKFucxFJPc50KKjUz6UX5Nb1b4FXJ2w=; b=BqY2imP7sYwWoF/7Xeael0aIxqyOD/Z3UH9rKjP+Cbbxk9Ac89brCMCI1We0Z9MhES ug8XCRTiGOKzQRV+vUSsKyhkq6SfP9T6ZhRwgfeAcVFGkbORKw5MoXkmWZUFidBJ58AH gnfRFLx0IsCnbodMpnekQBSNu+/bT0flDxVbg= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=SXLqZDlfykCHPKFucxFJPc50KKjUz6UX5Nb1b4FXJ2w=; b=SAoLOHqUKShOVjQvyAEqMkWnKB7THjsF4eywLG5Uo1tukegftga04STSF+D2yJiJgV G4zYFSb01WJUy2i08gmC9jJWSpGiDBxFPhKtSPhWjZxdgaf3fuhmf8+q30EzPFZZMTx8 MG21HOQjPOD1ftAMOmnGaIjhE7eJwykf49fSVX3wRgPckHZVO9HCYoRc34PXiz3maAgu c3lHKNF/whcdxIU1jIlUEw91EhUuK2TiJbwo6kkMEUI/A9lNc0H4MkvyXmCL3HzRirWI ZmI1H9Ydg86dr252iFnn+aANzYnhyjEuWfduZXMGTmBKY7w+BVCS7jbf4AzyhAvhBCCn IR/A== X-Gm-Message-State: AA+aEWaym4yCtiTTkxk2GzejrjhgS61+ZJgJfzWf15nox/b8gmCypazY wIpwALfiDf91r9PaStBXx8byFspgToh0Zw== X-Google-Smtp-Source: AFSGD/U+bP4S/3y17CaTzHOQ90AaE85QwGSKMAegg+LFlMOxtGGxqiGDsM5AhdTZDH5+oPxLnR4n7A== X-Received: by 2002:a19:cd50:: with SMTP id d77mr3810048lfg.125.1544307790825; Sat, 08 Dec 2018 14:23:10 -0800 (PST) Received: from localhost.bredbandsbolaget (c-ae7b71d5.014-348-6c756e10.bbcust.telenor.se. [213.113.123.174]) by smtp.gmail.com with ESMTPSA id b69sm1310884lfl.28.2018.12.08.14.23.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Dec 2018 14:23:09 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Hans Ulli Kroll , Florian Fainelli Subject: [PATCH 2/5] ARM: dts: Enable Gemini flash access Date: Sat, 8 Dec 2018 23:22:58 +0100 Message-Id: <20181208222301.5303-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181208222301.5303-1-linus.walleij@linaro.org> References: <20181208222301.5303-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181208_142324_103006_605D4057 X-CRM114-Status: GOOD ( 21.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , Linus Walleij , LEDE Development List Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Some Gemini platforms have a parallel NOR flash which conflicts with use cases reusing some of the flash lines (such as CE1) for GPIO. Fix this on the D-Link DIR-685 and Itian SQ201 by creating "enabled" and "disabled" states for the flash pin control handle, and rely on the flash handling code to switch this in and out when accessed so these lines can be used for GPIO when flash is not accessed, and enable flash access. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 35 +++++++++++++++------- arch/arm/boot/dts/gemini-sq201.dts | 31 ++++++++++--------- 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts index 502a361d1fe9..318e9b2ba7dc 100644 --- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts @@ -64,7 +64,6 @@ gpio-sck = <&gpio1 5 GPIO_ACTIVE_HIGH>; gpio-miso = <&gpio1 8 GPIO_ACTIVE_HIGH>; gpio-mosi = <&gpio1 7 GPIO_ACTIVE_HIGH>; - /* Collides with pflash CE1, not so cool */ cs-gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; num-chipselects = <1>; @@ -253,15 +252,18 @@ soc { flash@30000000 { /* - * Flash access is by default disabled, because it - * collides with the Chip Enable signal for the display - * panel, that reuse the parallel flash Chip Select 1 - * (CS1). Enabling flash makes graphics stop working. - * - * We might be able to hack around this by letting - * GPIO poke around in the flash controller registers. + * Flash access collides with the Chip Enable signal for + * the display panel, that reuse the parallel flash Chip + * Select 1 (CS1). We switch the pin control state so we + * enable these pins for flash access only when we need + * then, and when disabled they can be used for GPIO which + * is what the display panel needs. */ - /* status = "okay"; */ + status = "okay"; + pinctrl-names = "enabled", "disabled"; + pinctrl-0 = <&pflash_default_pins>; + pinctrl-1 = <&pflash_disabled_pins>; + /* 32MB of flash */ reg = <0x30000000 0x02000000>; @@ -327,7 +329,6 @@ "gpio0cgrp", "gpio0egrp", "gpio0fgrp", - "gpio0ggrp", "gpio0hgrp"; }; }; @@ -342,6 +343,18 @@ groups = "gpio1bgrp"; }; }; + /* + * These GPIO groups will be mapped in over some + * of the flash pins when the flash is not in + * active use. + */ + pflash_disabled_pins: pinctrl-pflash-disabled { + mux { + function = "gpio0"; + groups = "gpio0ggrp", "gpio0igrp", "gpio0jgrp", + "gpio0kgrp"; + }; + }; pinctrl-gmii { mux { function = "gmii"; @@ -430,7 +443,7 @@ }; display-controller@6a000000 { - status = "okay"; + status = "disabled"; port@0 { reg = <0>; diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts index 3787cf3763c4..af4be6ecb02c 100644 --- a/arch/arm/boot/dts/gemini-sq201.dts +++ b/arch/arm/boot/dts/gemini-sq201.dts @@ -41,14 +41,12 @@ compatible = "gpio-leds"; led-green-info { label = "sq201:green:info"; - /* Conflict with parallel flash */ gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; default-state = "on"; linux,default-trigger = "heartbeat"; }; led-green-usb { label = "sq201:green:usb"; - /* Conflict with parallel and NAND flash */ gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>; default-state = "off"; linux,default-trigger = "usb-host"; @@ -126,15 +124,10 @@ soc { flash@30000000 { - /* - * Flash access can be enabled, with the side effect - * of disabling access to GPIO LED on GPIO0[20] which - * reuse one of the parallel flash chip select lines. - * Also the default firmware on the machine has the - * problem that since it uses the flash, the two LEDS - * on the right become numb. - */ - /* status = "okay"; */ + status = "okay"; + pinctrl-names = "enabled", "disabled"; + pinctrl-0 = <&pflash_default_pins>; + pinctrl-1 = <&pflash_disabled_pins>; /* 16MB of flash */ reg = <0x30000000 0x01000000>; @@ -184,9 +177,7 @@ mux { function = "gpio0"; groups = "gpio0fgrp", - "gpio0ggrp", - "gpio0hgrp", - "gpio0kgrp"; + "gpio0hgrp"; }; }; /* @@ -199,6 +190,18 @@ groups = "gpio1dgrp"; }; }; + /* + * These GPIO groups will be mapped in over some + * of the flash pins when the flash is not in + * active use. + */ + pflash_disabled_pins: pinctrl-pflash-disabled { + mux { + function = "gpio0"; + groups = "gpio0ggrp", "gpio0igrp", "gpio0jgrp", + "gpio0kgrp"; + }; + }; pinctrl-gmii { mux { function = "gmii"; From patchwork Sat Dec 8 22:22:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10719809 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9D8A1109C for ; Sat, 8 Dec 2018 22:25:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B0272AEC7 for ; Sat, 8 Dec 2018 22:25:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B59F2AECC; Sat, 8 Dec 2018 22:25:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 147322AEC7 for ; Sat, 8 Dec 2018 22:25:12 +0000 (UTC) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ssyA6qTT4yEWR1Jhwxehj3pL/b0TycXoBLptrNaV5Qw=; b=hcrmTBFnuYdrJ4 oRsI9M0E50A661cIOKmnDhSjxGSFTiuXuxKAhydpcV9PTHiQa0g41sTq5plsdCHwd8ZUz/vJ4uXBj dGdJfAUh0Wd5yQUZZ6/yW13p7IOZt6gVapQEBHnbAoH9H7WGgFaYjEbeY5mtqJt9H8/Q/zuvqSpJS 0sEoJOEUXsTPtvHr3PDf3a1KsphVOCTfzEHNZGbT8+q8B6TNd7/WA0pWz3vIBM1ZKOg4iVHTA+Xw5 MuKPjLVi/qK0bzm4QQ+SCyCS/u+gMHegLXQweprtJffsokShZEYMkj3JegjVKQgKm9ZONhtW8wwmH 9giteN47kjyDHRv13peg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gVl21-00051S-7e; Sat, 08 Dec 2018 22:25:05 +0000 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gVl0O-0003Lc-0R for linux-arm-kernel@lists.infradead.org; Sat, 08 Dec 2018 22:23:27 +0000 Received: by mail-lf1-x141.google.com with SMTP id p86so5461460lfg.5 for ; Sat, 08 Dec 2018 14:23:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AKeMSKov7AHQwHfd85g+W8Oq6xXcT+CwfQ8H/UQOhg4=; b=AeNFeV1zmCfVKzsgvqoQGMJJgjLpmYv/wBWFrxYIJHLVuQNOO4hu6pGNV9nG89sp+T 5/0yBMpDXJGPpbfREVjVRr0OTEjPOipfHvYSHp483ui9oipAX+IOh3WJdynn8MzrFozg bebrhiXFPzVG/02yrP+i3Z+xn5CGKHzR/5vlk= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=AKeMSKov7AHQwHfd85g+W8Oq6xXcT+CwfQ8H/UQOhg4=; b=ZAEd+HGad2ENpyzB7X2VUn3cQuAmN5GLUrn4QfuqAqnp7v908E91tYHXPaVNsySV/A Qkn0bxoASsgfZhTMTAVfq1v0Ty/i+G85Ca6yeXKZhoIc2V++b8y3CunHuR76W46VCfCA pPEBtmeLt38bE1lUR0ZnUqrV3yHWOcs6lFYtVfzR6UgWkYuuc+135Rrhw8VyIlTGIDL1 PItJALdLKQKLMxPl3VYjoch4Leoyywxcb6cZcTJOOrLAIOvW4zWCFf/uizwEi2a4AB9q /gkuz8ut+5vS1fYlW0dPUbX1LTMFrWJqpsOCQ/NlaeWQxt6nMorCOttuzBKwleP4BMQf 4YFg== X-Gm-Message-State: AA+aEWbJ3GSr7tqRxmyNM42DuviiqmtKrCPZPtqtf+/JVMQ6c0RL41Kd l5Ks5isDgBVEnHm1iZDogUQVR2atM/7kgg== X-Google-Smtp-Source: AFSGD/Xwkuf1HnFBEA0R/zGio6K6R4GEZl+L7uNmrLUq7sfCdvLEyeoJ+OZv+vj9MODCttIAnIDhZg== X-Received: by 2002:a19:5402:: with SMTP id i2mr3791457lfb.128.1544307793221; Sat, 08 Dec 2018 14:23:13 -0800 (PST) Received: from localhost.bredbandsbolaget (c-ae7b71d5.014-348-6c756e10.bbcust.telenor.se. [213.113.123.174]) by smtp.gmail.com with ESMTPSA id b69sm1310884lfl.28.2018.12.08.14.23.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Dec 2018 14:23:12 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Hans Ulli Kroll , Florian Fainelli Subject: [PATCH 3/5] ARM: dts: Fix up SQ201 flash access Date: Sat, 8 Dec 2018 23:22:59 +0100 Message-Id: <20181208222301.5303-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181208222301.5303-1-linus.walleij@linaro.org> References: <20181208222301.5303-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181208_142324_110444_0844E249 X-CRM114-Status: GOOD ( 13.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , Linus Walleij , LEDE Development List Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This sets the partition information on the SQ201 to be read out from the RedBoot partition table, removes the static partition table and sets our boot options to mount root from /dev/mtdblock2 where the squashfs+JFFS2 resides. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/gemini-sq201.dts | 37 ++++-------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts index af4be6ecb02c..c5bb24102b75 100644 --- a/arch/arm/boot/dts/gemini-sq201.dts +++ b/arch/arm/boot/dts/gemini-sq201.dts @@ -20,7 +20,7 @@ }; chosen { - bootargs = "console=ttyS0,115200n8"; + bootargs = "console=ttyS0,115200n8 root=/dev/mtdblock2 rw rootfstype=squashfs,jffs2 rootwait"; stdout-path = &uart0; }; @@ -131,37 +131,10 @@ /* 16MB of flash */ reg = <0x30000000 0x01000000>; - partition@0 { - label = "RedBoot"; - reg = <0x00000000 0x00120000>; - read-only; - }; - partition@120000 { - label = "Kernel"; - reg = <0x00120000 0x00200000>; - }; - partition@320000 { - label = "Ramdisk"; - reg = <0x00320000 0x00600000>; - }; - partition@920000 { - label = "Application"; - reg = <0x00920000 0x00600000>; - }; - partition@f20000 { - label = "VCTL"; - reg = <0x00f20000 0x00020000>; - read-only; - }; - partition@f40000 { - label = "CurConf"; - reg = <0x00f40000 0x000a0000>; - read-only; - }; - partition@fe0000 { - label = "FIS directory"; - reg = <0x00fe0000 0x00020000>; - read-only; + partitions { + compatible = "redboot-fis"; + /* Eraseblock at 0xfe0000 */ + fis-index-block = <0x1fc>; }; }; From patchwork Sat Dec 8 22:23:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10719811 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D65CD13BF for ; Sat, 8 Dec 2018 22:25:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6C052AEC7 for ; Sat, 8 Dec 2018 22:25:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB2502AECC; Sat, 8 Dec 2018 22:25:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3DAB22AEC7 for ; Sat, 8 Dec 2018 22:25:24 +0000 (UTC) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YB4YQrds7d6hKhniTMW1Z3QNNjktyr+pRi/3GnvTX7Q=; b=M0QzadpCa7SYnP Vs9IsV/gIm/eK31mO9LhUNvjZcw6+qQjxZT4dUvMKXm1zRSxW/6hEPveGQvIB0neAGDNF4JF97GDu 2LGoWG9VQ/eXg9usvKczUi6GRTPl0D/0f3jjWr/1NeIwEgR5IsasgR9ciRzb0TdU1m/ZO1F2vJkTV SsoeGIMj3WPrXsaqm8DzviJeLTsHB5pHQH1xy9SH0xM16JCR/G+9ETHpOZ4zs3rNOHEM++bSGYfx3 L6F7aIwBn+yGPN3FfeXVvyE45yQUrg8T/N4TB4yJ6e3hBOwSuXtX/WSgLgKkvYPpUGj1Zce76Ot+O yEvxjeN6C+eW9iysGjmw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gVl2G-0006Fc-I5; Sat, 08 Dec 2018 22:25:20 +0000 Received: from mail-lf1-x142.google.com ([2a00:1450:4864:20::142]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gVl0O-0003Ln-0I for linux-arm-kernel@lists.infradead.org; Sat, 08 Dec 2018 22:23:34 +0000 Received: by mail-lf1-x142.google.com with SMTP id p86so5461475lfg.5 for ; Sat, 08 Dec 2018 14:23:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rBIWybge8yyBkLL0f+YVGaXW8/WUUWbmc+5k7MS2t0U=; b=JKDvG3FiDMcwN3bu1VOcAh/vAv5RQ0+jbS4pAORRb9KHCpO0ZL4ZDBrOEbNrKy6asU FsHdd4qIQv5fCL7lRsy6zAeWUxlVwzubujf0f5KXziRFdOiQVqHgQHR+bMR45sDm85Hi JcPPKQn5Kv/4KKLPg4izNyKcP9Nk9McvH7XUw= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=rBIWybge8yyBkLL0f+YVGaXW8/WUUWbmc+5k7MS2t0U=; b=NFoI7wjMA9qpjsD/z6CE9F7nfYJc7rHVIo/F68xvu94kAD0YWloqiMc+aFCUGbqNV0 /K6gXrhsL2Zph4a4+nNK+27h05zBmurP+QV3sSFuFVr+Sl0Lco9sKf64rQfjuRqCSYAx WsA3bZjkz9K/a++Sqs6dp+HSmEz3wZyEspveyj52ytWK36C5siPjuJit4IuIJhBnos+6 iR8HWgltP/TtHvCHjUlTO5fkSSkDqxkm3r6eCN4lFEHt3Gei6UTPiOjwArPoNfK67/rT o86dRisODKS1bgFwjIQZpvH0N9gtlIMbolk7Ek6i6GkQjWG6yzxkNFhmkU2147kwjt7J +iGw== X-Gm-Message-State: AA+aEWY0RcCPtouXP8AlKgoVkBTw0OaQVaZQnwFZnfvHpYoKzPjB7ffI RSgoTwZA242bFMHX34km43EnYmOSYjePpA== X-Google-Smtp-Source: AFSGD/XXkXhmgLvMU474CF4EfyQvcmT/MmX/HE5ANIbS3DQa2A9JgSEV3qyQNfuTBadO35UcXFELLQ== X-Received: by 2002:a19:641d:: with SMTP id y29mr3887412lfb.14.1544307795557; Sat, 08 Dec 2018 14:23:15 -0800 (PST) Received: from localhost.bredbandsbolaget (c-ae7b71d5.014-348-6c756e10.bbcust.telenor.se. [213.113.123.174]) by smtp.gmail.com with ESMTPSA id b69sm1310884lfl.28.2018.12.08.14.23.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Dec 2018 14:23:14 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Hans Ulli Kroll , Florian Fainelli Subject: [PATCH 4/5] ARM: dts: Add the FOTG210 USB host to Gemini boards Date: Sat, 8 Dec 2018 23:23:00 +0100 Message-Id: <20181208222301.5303-4-linus.walleij@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181208222301.5303-1-linus.walleij@linaro.org> References: <20181208222301.5303-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181208_142324_166425_3FB0E3C7 X-CRM114-Status: GOOD ( 17.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , Linus Walleij , LEDE Development List Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This adds the FOTG210 USB host controller to the Gemini device trees. In the main SoC DTSI it is flagged as disabled and then it is selectively enabled on the devices that utilize it. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 8 ++++++ arch/arm/boot/dts/gemini-nas4220b.dts | 8 ++++++ arch/arm/boot/dts/gemini-rut1xx.dts | 20 ++++++++++++++ arch/arm/boot/dts/gemini-sl93512r.dts | 8 ++++++ arch/arm/boot/dts/gemini-sq201.dts | 8 ++++++ arch/arm/boot/dts/gemini-wbd111.dts | 8 ++++++ arch/arm/boot/dts/gemini-wbd222.dts | 8 ++++++ arch/arm/boot/dts/gemini.dtsi | 32 ++++++++++++++++++++++ 8 files changed, 100 insertions(+) diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts index 318e9b2ba7dc..5e8e96458903 100644 --- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts @@ -452,5 +452,13 @@ }; }; }; + + usb@68000000 { + status = "okay"; + }; + + usb@69000000 { + status = "okay"; + }; }; }; diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts index 963ea890c87f..53b65ebe8454 100644 --- a/arch/arm/boot/dts/gemini-nas4220b.dts +++ b/arch/arm/boot/dts/gemini-nas4220b.dts @@ -204,5 +204,13 @@ ata@63400000 { status = "okay"; }; + + usb@68000000 { + status = "okay"; + }; + + usb@69000000 { + status = "okay"; + }; }; }; diff --git a/arch/arm/boot/dts/gemini-rut1xx.dts b/arch/arm/boot/dts/gemini-rut1xx.dts index eb4f0bf074da..b2354c215a84 100644 --- a/arch/arm/boot/dts/gemini-rut1xx.dts +++ b/arch/arm/boot/dts/gemini-rut1xx.dts @@ -124,5 +124,25 @@ /* Not used in this platform */ }; }; + + ethernet@60000000 { + status = "okay"; + + ethernet-port@0 { + phy-mode = "rgmii"; + phy-handle = <&phy0>; + }; + ethernet-port@1 { + /* Not used in this platform */ + }; + }; + + usb@68000000 { + status = "okay"; + }; + + usb@69000000 { + status = "okay"; + }; }; }; diff --git a/arch/arm/boot/dts/gemini-sl93512r.dts b/arch/arm/boot/dts/gemini-sl93512r.dts index ebefb7297379..2bb953440793 100644 --- a/arch/arm/boot/dts/gemini-sl93512r.dts +++ b/arch/arm/boot/dts/gemini-sl93512r.dts @@ -324,5 +324,13 @@ ata@63400000 { status = "okay"; }; + + usb@68000000 { + status = "okay"; + }; + + usb@69000000 { + status = "okay"; + }; }; }; diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts index c5bb24102b75..ecbc27d93b2d 100644 --- a/arch/arm/boot/dts/gemini-sq201.dts +++ b/arch/arm/boot/dts/gemini-sq201.dts @@ -292,5 +292,13 @@ ata@63000000 { status = "okay"; }; + + usb@68000000 { + status = "okay"; + }; + + usb@69000000 { + status = "okay"; + }; }; }; diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts index 29af86cd10f7..6831d2aed17a 100644 --- a/arch/arm/boot/dts/gemini-wbd111.dts +++ b/arch/arm/boot/dts/gemini-wbd111.dts @@ -171,5 +171,13 @@ /* Not used in this platform */ }; }; + + usb@68000000 { + status = "okay"; + }; + + usb@69000000 { + status = "okay"; + }; }; }; diff --git a/arch/arm/boot/dts/gemini-wbd222.dts b/arch/arm/boot/dts/gemini-wbd222.dts index 24e6ae3616f7..ed38d48ef5f6 100644 --- a/arch/arm/boot/dts/gemini-wbd222.dts +++ b/arch/arm/boot/dts/gemini-wbd222.dts @@ -183,5 +183,13 @@ phy-handle = <&phy1>; }; }; + + usb@68000000 { + status = "okay"; + }; + + usb@69000000 { + status = "okay"; + }; }; }; diff --git a/arch/arm/boot/dts/gemini.dtsi b/arch/arm/boot/dts/gemini.dtsi index eb752e9495de..8cf67b11751f 100644 --- a/arch/arm/boot/dts/gemini.dtsi +++ b/arch/arm/boot/dts/gemini.dtsi @@ -409,5 +409,37 @@ #size-cells = <0>; status = "disabled"; }; + + usb@68000000 { + compatible = "cortina,gemini-usb", "faraday,fotg210"; + reg = <0x68000000 0x1000>; + interrupts = <10 IRQ_TYPE_LEVEL_HIGH>; + resets = <&syscon GEMINI_RESET_USB0>; + clocks = <&syscon GEMINI_CLK_GATE_USB0>; + clock-names = "PCLK"; + /* + * This will claim pins for USB0 and USB1 at the same + * time as they are using some common pins. If you for + * some reason have a system using USB1 at 96000000 but + * NOT using USB0 at 68000000 you wll have to add the + * usb_default_pins to the USB controller at 96000000 + * in your .dts for the board. + */ + pinctrl-names = "default"; + pinctrl-0 = <&usb_default_pins>; + syscon = <&syscon>; + status = "disabled"; + }; + + usb@69000000 { + compatible = "cortina,gemini-usb", "faraday,fotg210"; + reg = <0x69000000 0x1000>; + interrupts = <11 IRQ_TYPE_LEVEL_HIGH>; + resets = <&syscon GEMINI_RESET_USB1>; + clocks = <&syscon GEMINI_CLK_GATE_USB1>; + clock-names = "PCLK"; + syscon = <&syscon>; + status = "disabled"; + }; }; }; From patchwork Sat Dec 8 22:23:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10719807 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6ADC013BF for ; Sat, 8 Dec 2018 22:24:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B5B12AEB2 for ; Sat, 8 Dec 2018 22:24:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F62B2AEB8; Sat, 8 Dec 2018 22:24:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DC9B32AEB2 for ; Sat, 8 Dec 2018 22:24:40 +0000 (UTC) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1jrBWMohLSNg5FH55WNyzz1T2TU6FRHKiwpRtcY/abk=; b=izBddJv6SnY4Fl tPzNW07AnLXW6S/roFIoKm6FnCq7vx7bJqAXF5ajXiWubrIuZJwl4e5Aw3DY9HD9At2OaG0dvhiZ+ z092fejyeMsr3G/j+OcOiU2Efskf0s1GHuZlaJV3PU6thn7QBlMYYXHTH7fvsrAYjWqpVzTu3+gF8 pbWJr9A7++lq3IMwvXlPr+zk42yoEV75cgOkd4X2Nw7N5chi5cPr1JHMGRpiCYH1O1va9kShcSEhI Iw0Ux59knfYjLze6PbZ84miJb9BH/Rv3+7MM3dtS/EoHLxuqeY7Q7LPUZFh3Crdm73RwjPdt+xN+l f6C49mWITyOtUU9S+l+Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gVl1a-0004dK-UC; Sat, 08 Dec 2018 22:24:38 +0000 Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gVl0L-0003Lu-2m for linux-arm-kernel@lists.infradead.org; Sat, 08 Dec 2018 22:23:24 +0000 Received: by mail-lj1-x241.google.com with SMTP id e5-v6so6492346lja.4 for ; Sat, 08 Dec 2018 14:23:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PTt6n+5fqckoesxLGFZS0o7UEgZWgOK7xniDvS3NX/o=; b=aQdRNqvqZGGFBByZNfapUXWawYV4ddqVzbrwA+I4tOa8DcHwpo0LPJYD4kouQdGfdA BSHBv2i4qFufNAtOxIxWparXBTyr2qTpzrfCkot8uesYx+XQ7xkelfzDUuyPRjmEPXz4 epdmy9DEkObjrcsWVOtUGOx/NohtV03E9BcQM= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=PTt6n+5fqckoesxLGFZS0o7UEgZWgOK7xniDvS3NX/o=; b=bDSDuozGpS18UTznu6bNeu8WpUNTSZB+zKwv2ogB9v0hIgOa6KCugAamL20wleIRtM ZtarMJjaw4EqYgcB07tXADXqS1T7Uraa6RpfFLYPVib3VV5gTHOcIjw5jQtHWwLJTkEV 2r8MmusOLkDCZJZNI7xiW2P4dWDRRCw9EM8H36n/LQ2Thu5bKWLhUANDtt3CJqC87mfv 5dN5RnpcNdbhBia8NqsZZdYGOB7t8i7+3ZP9nZJtVwYdD8uiIEP/jQboc0jabmE1E4io P06+Sb3wdn/A8zKWONlqu9+RojMYAcY94B75HmFIZxZAvhvvcYJygZWx9erYMxQ0MswZ KNCg== X-Gm-Message-State: AA+aEWY714B0JIl3E6fnOMCfJXgdEjxlRYvlm6XVfBzzVG2a2zIPx8O2 t4EVSrK6EEkDnPawevmaDy+h8q6sD3DL5Q== X-Google-Smtp-Source: AFSGD/VKNLRRXN5Lm1P6uY8Mkii00E48ywEcSL70Z2jEeiJfM9dMngAwj4kzOqvLsB+M3jnflxFJzQ== X-Received: by 2002:a2e:2019:: with SMTP id g25-v6mr3981900ljg.20.1544307797694; Sat, 08 Dec 2018 14:23:17 -0800 (PST) Received: from localhost.bredbandsbolaget (c-ae7b71d5.014-348-6c756e10.bbcust.telenor.se. [213.113.123.174]) by smtp.gmail.com with ESMTPSA id b69sm1310884lfl.28.2018.12.08.14.23.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Dec 2018 14:23:16 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Hans Ulli Kroll , Florian Fainelli Subject: [PATCH 5/5] ARM: dts: Bump Gemini platforms to use 100ms debounce Date: Sat, 8 Dec 2018 23:23:01 +0100 Message-Id: <20181208222301.5303-5-linus.walleij@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181208222301.5303-1-linus.walleij@linaro.org> References: <20181208222301.5303-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181208_142321_225681_8812CE16 X-CRM114-Status: GOOD ( 13.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , Linus Walleij , LEDE Development List Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The 50ms debounce is too low and give ghost bounces on some platforms. Bump it to 100ms to make it stable. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 4 ++-- arch/arm/boot/dts/gemini-dlink-dns-313.dts | 2 +- arch/arm/boot/dts/gemini-nas4220b.dts | 4 ++-- arch/arm/boot/dts/gemini-rut1xx.dts | 2 +- arch/arm/boot/dts/gemini-sq201.dts | 2 +- arch/arm/boot/dts/gemini-wbd111.dts | 2 +- arch/arm/boot/dts/gemini-wbd222.dts | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts index 5e8e96458903..cc0c3cf89eaa 100644 --- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts @@ -28,7 +28,7 @@ compatible = "gpio-keys"; button-esc { - debounce-interval = <50>; + debounce-interval = <100>; wakeup-source; linux,code = ; label = "reset"; @@ -36,7 +36,7 @@ gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; button-eject { - debounce-interval = <50>; + debounce-interval = <100>; wakeup-source; linux,code = ; label = "unmount"; diff --git a/arch/arm/boot/dts/gemini-dlink-dns-313.dts b/arch/arm/boot/dts/gemini-dlink-dns-313.dts index d1329322b968..b12504e10f0b 100644 --- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts +++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts @@ -34,7 +34,7 @@ compatible = "gpio-keys"; button-esc { - debounce-interval = <50>; + debounce-interval = <100>; wakeup-source; linux,code = ; label = "reset"; diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts index 53b65ebe8454..f4535d635f3b 100644 --- a/arch/arm/boot/dts/gemini-nas4220b.dts +++ b/arch/arm/boot/dts/gemini-nas4220b.dts @@ -28,7 +28,7 @@ compatible = "gpio-keys"; button-setup { - debounce-interval = <50>; + debounce-interval = <100>; wakeup-source; linux,code = ; label = "Backup button"; @@ -36,7 +36,7 @@ gpios = <&gpio1 29 GPIO_ACTIVE_LOW>; }; button-restart { - debounce-interval = <50>; + debounce-interval = <100>; wakeup-source; linux,code = ; label = "Softreset button"; diff --git a/arch/arm/boot/dts/gemini-rut1xx.dts b/arch/arm/boot/dts/gemini-rut1xx.dts index b2354c215a84..9611ddf06792 100644 --- a/arch/arm/boot/dts/gemini-rut1xx.dts +++ b/arch/arm/boot/dts/gemini-rut1xx.dts @@ -28,7 +28,7 @@ compatible = "gpio-keys"; button-setup { - debounce-interval = <50>; + debounce-interval = <100>; wakeup-source; linux,code = ; label = "Reset to defaults"; diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts index ecbc27d93b2d..239dfacaae4d 100644 --- a/arch/arm/boot/dts/gemini-sq201.dts +++ b/arch/arm/boot/dts/gemini-sq201.dts @@ -28,7 +28,7 @@ compatible = "gpio-keys"; button-setup { - debounce-interval = <50>; + debounce-interval = <100>; wakeup-source; linux,code = ; label = "factory reset"; diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts index 6831d2aed17a..3a2761dd460f 100644 --- a/arch/arm/boot/dts/gemini-wbd111.dts +++ b/arch/arm/boot/dts/gemini-wbd111.dts @@ -29,7 +29,7 @@ compatible = "gpio-keys"; button-setup { - debounce-interval = <50>; + debounce-interval = <100>; wakeup-source; linux,code = ; label = "reset"; diff --git a/arch/arm/boot/dts/gemini-wbd222.dts b/arch/arm/boot/dts/gemini-wbd222.dts index ed38d48ef5f6..52b4dbc0c072 100644 --- a/arch/arm/boot/dts/gemini-wbd222.dts +++ b/arch/arm/boot/dts/gemini-wbd222.dts @@ -28,7 +28,7 @@ compatible = "gpio-keys"; button-setup { - debounce-interval = <50>; + debounce-interval = <100>; wakeup-source; linux,code = ; label = "reset";