From patchwork Tue Aug 11 15:01:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= X-Patchwork-Id: 11709303 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3324B739 for ; Tue, 11 Aug 2020 15:01:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 14A602078B for ; Tue, 11 Aug 2020 15:01:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ri7njzHP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728841AbgHKPB1 (ORCPT ); Tue, 11 Aug 2020 11:01:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728788AbgHKPB0 (ORCPT ); Tue, 11 Aug 2020 11:01:26 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 315D7C06174A; Tue, 11 Aug 2020 08:01:26 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id f7so11810214wrw.1; Tue, 11 Aug 2020 08:01:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+Omhf4JBO1kZHIgbP4gDHiaQBVFEO7TFQZk4NOsjloA=; b=ri7njzHPSdK+1vvpXER+6XhtZxEPcPjHNADeBwkSVNGZazFv+ojx2xY49M9VbK6QO5 u/0Jb/xaoLBFO1V9acq0xegoa8z9x/ebFpODSdvHbPE8csJpxQ2ZtFF7plMoCnsLcdUp c9SwAbuerYK/Z1gT0k12/UJe5MKb7YCAm1fwU5mJgIISEhj+CweDkG+Edz3MNLihZ60r qN/ba3yXsQ7X5mZ0eCi2OZRDbkwC0VVZMHU9K/P6Usb81XOBh/c3Ce5xltOXaQ3hK3WJ YIgCo0dOoDDqeNRP80zcXuUqeF29sGjbGdQAzmn+csIE2MyhSiO+FfHuCNv+HWnEAnwX I6cQ== 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=+Omhf4JBO1kZHIgbP4gDHiaQBVFEO7TFQZk4NOsjloA=; b=gj+nZHdrS//f37F5eZRD3Ce4ZbXgfFzeZTJqRwT11zrGdk6R4kEyYeLQo/jvqwcuOb Kg0VB98+e9GBtQCNlaabCubAu6Z/qChCEx21C5aeDtSIGeSZovuMC6s8yIVn9sVn3PkE JF/m5N6hf+bui81Bb+rV7h/fuhRsNjKIyf9UZTwXIGCxxSiME2oZATkUcfpb78YsqZzw 04TW2Fpl98YbTD3f2AIRD5NamCiF2AjtUTK6KvOcp6VWdXAw/3l+ZMYIVqGhk3TiC+ct NqfEVaZWtR5sUQc61/nSP3CwzE7VG209IOOtrziYCPiGbtgw71pPOOBNB34VCZl+UCpL HBgg== X-Gm-Message-State: AOAM532S7H2Njzddklci3Ejhq+l17q0VRQGNlkNGYiSz3iVftbmzMZTi bUTJ3k44gPZj583QlC4grgA= X-Google-Smtp-Source: ABdhPJw89nJhwhRxpiAc7wtxhctP0JeXOUosd+DiR3bD4tyvj8F6bG+jdppW163PAWiolKNckTx2RQ== X-Received: by 2002:a5d:4a0b:: with SMTP id m11mr29054420wrq.407.1597158084729; Tue, 11 Aug 2020 08:01:24 -0700 (PDT) Received: from skynet.lan (88.red-83-49-60.dynamicip.rima-tde.net. [83.49.60.88]) by smtp.gmail.com with ESMTPSA id 15sm5350494wmo.33.2020.08.11.08.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2020 08:01:24 -0700 (PDT) From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= To: tsbogend@alpha.franken.de, f.fainelli@gmail.com, jonas.gorski@gmail.com, bcm-kernel-feedback-list@broadcom.com, linux-mips@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/4] MIPS: BCM63xx: remove duplicated new lines Date: Tue, 11 Aug 2020 17:01:14 +0200 Message-Id: <20200811150117.254620-2-noltari@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200811150117.254620-1-noltari@gmail.com> References: <20200811150117.254620-1-noltari@gmail.com> MIME-Version: 1.0 Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org There are 3 duplicated new lines, let's remove them. Signed-off-by: Álvaro Fernández Rojas Acked-by: Florian Fainelli Reviewed-by: Philippe Mathieu-Daudé --- v3: no changes. v2: no changes. arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c index 230bf27c1fb8..744aa16bab12 100644 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -32,7 +32,6 @@ #include - #define HCS_OFFSET_128K 0x20000 static struct board_info board; @@ -337,7 +336,6 @@ static struct board_info __initdata board_96348gw_11 = { .force_duplex_full = 1, }, - .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, @@ -580,7 +578,6 @@ static struct board_info __initdata board_96358vw2 = { .force_duplex_full = 1, }, - .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, From patchwork Tue Aug 11 15:01:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= X-Patchwork-Id: 11709315 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69D1816B1 for ; Tue, 11 Aug 2020 15:01:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 520DB2078B for ; Tue, 11 Aug 2020 15:01:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="oYmEnwpI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728879AbgHKPBq (ORCPT ); Tue, 11 Aug 2020 11:01:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728837AbgHKPB1 (ORCPT ); Tue, 11 Aug 2020 11:01:27 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 592C7C061788; Tue, 11 Aug 2020 08:01:27 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id k8so3168449wma.2; Tue, 11 Aug 2020 08:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/PamCJTJWS9McL3YMw+k49gmnnx82kmNjt/V1IJPP/I=; b=oYmEnwpIQfNzxBaW7xyHlYGZ7gBxIlmi7VVyyEY9i+tNIV1xQSkmcPcaNt7ExW8gDT 9vDMuoZUE7maoFTnSoXHDOirn4ztEaKTVHNBozUX8qm+swQHSEH1rX/JXuDDZJCfy/pb TuyjB1LV3W0FuvpXiXYZbRR0wkgNMfWGdyNZQdEyyKPOQUB34I+QYtawzU5+71YLfjAy wvw039t3mNJ1aglJS8/da2lyCVRmgHf7RZQMprMrXIBxuNO0z6J4gjBeOOhvmQwke5TH Yby0cOubgbbPViPvN4v1zwOdWIT745QAmxo8/n9i3SJb4IRv6B0pqCsa0wmGd9K4nbW1 q15Q== 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=/PamCJTJWS9McL3YMw+k49gmnnx82kmNjt/V1IJPP/I=; b=f/8y/F3oNRMSDm9amIlM2aQs9WskoLkm4G9VaPJFob89bKrBsrXDjOy518fWCZyOtH LqInaMK99pfeContxs6hL5Ijqagiq0QaXVlPFvOY2do5C8vrfeqciflMqXcx5KZ+HOGv W8l3AEmMikyGdy8V63uPVXYrxHa21vN7+88mCS9YUo3+LQBXZdiKzQ1cyjc4Qf/Uygvj E1ZX5ynXNh4S/pFWoHhPUT/A6jKHwayj0fLO3rvcjTNb7AAxzcmq2wkkNIJculaq7NaR MwOVQq+zgZRbyvK757zeZJvTLCXIC8YpOisIxVwG1fiawEk7u17uy4UABl2SdHXBneCh 55Hg== X-Gm-Message-State: AOAM532pwGaSmJHgSNoTcBNNMx4zfoJAGJCQ9+60tn0dJV9dR02m5/5D Z8f7YXoj6eR2uLmVweilnsE= X-Google-Smtp-Source: ABdhPJyB6mUBDCgmoeQDB4nnf4wlqRwmDF87BAw3MEbpoX0X0eFFZ3M+TFnnTF51izQ+sNRlvQn2Uw== X-Received: by 2002:a05:600c:21d3:: with SMTP id x19mr4556815wmj.174.1597158085803; Tue, 11 Aug 2020 08:01:25 -0700 (PDT) Received: from skynet.lan (88.red-83-49-60.dynamicip.rima-tde.net. [83.49.60.88]) by smtp.gmail.com with ESMTPSA id 15sm5350494wmo.33.2020.08.11.08.01.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2020 08:01:25 -0700 (PDT) From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= To: tsbogend@alpha.franken.de, f.fainelli@gmail.com, jonas.gorski@gmail.com, bcm-kernel-feedback-list@broadcom.com, linux-mips@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= Subject: [PATCH v3 2/4] MIPS: BCM63xx: remove EHCI from BCM6348 boards Date: Tue, 11 Aug 2020 17:01:15 +0200 Message-Id: <20200811150117.254620-3-noltari@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200811150117.254620-1-noltari@gmail.com> References: <20200811150117.254620-1-noltari@gmail.com> MIME-Version: 1.0 Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org There's no EHCI controller on BCM6348. Signed-off-by: Álvaro Fernández Rojas Acked-by: Florian Fainelli Reviewed-by: Philippe Mathieu-Daudé --- v3: no changes. v2: no changes. arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c index 744aa16bab12..45f1bc437245 100644 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -285,7 +285,6 @@ static struct board_info __initdata board_96348gw_10 = { .has_ohci0 = 1, .has_pccard = 1, - .has_ehci0 = 1, .leds = { { @@ -338,7 +337,6 @@ static struct board_info __initdata board_96348gw_11 = { .has_ohci0 = 1, .has_pccard = 1, - .has_ehci0 = 1, .leds = { { @@ -441,7 +439,6 @@ static struct board_info __initdata board_FAST2404 = { .has_ohci0 = 1, .has_pccard = 1, - .has_ehci0 = 1, }; static struct board_info __initdata board_rta1025w_16 = { From patchwork Tue Aug 11 15:01:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= X-Patchwork-Id: 11709309 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 220CA739 for ; Tue, 11 Aug 2020 15:01:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0585F2078E for ; Tue, 11 Aug 2020 15:01:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="igix8vnt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728904AbgHKPBf (ORCPT ); Tue, 11 Aug 2020 11:01:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728879AbgHKPB2 (ORCPT ); Tue, 11 Aug 2020 11:01:28 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 888BAC06174A; Tue, 11 Aug 2020 08:01:28 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id c19so2295394wmd.1; Tue, 11 Aug 2020 08:01:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=G6V/OqOvjtGyfeK4VfmVQNJE3fnNa+RlZtfmz9pCWl8=; b=igix8vnto1Sx5HkGVypyCf6MUAS2BULEalfhuivAYFfIVX40Yiv4kZFPAurZ2Gtpkb NcnkmfaDL/WhnqA2210ude14/JXZy1LcYQyUkfS1UVKgtDzflhpPtHuBHZRP6ggzyMPr VGWcPk5DhJTru1Z8fyegbuaDap+boweD1BMWebu6l7arKzdRXpMb7ybAJlVs8QRNPTW6 V8dLZVe5lSA0bmF875ndoF9uznO7xFbeSe9bq9ZwVRHsKaM4KqWGZ3El76Jl8iORtFAa P8rYTLVMADg2EWaitC7r9jeqiigo9JEC0a93ZfjNzmuGATJksKmZLKJdgGJucr7K2FmL HCXw== 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=G6V/OqOvjtGyfeK4VfmVQNJE3fnNa+RlZtfmz9pCWl8=; b=deyv8C9FkPPaHjxEt5XmrLeVhDX5QOpHnE1C69VtCBdUWSppY6EIeelg0Xkf5++FTr uaTltqD47J1bf7gS1yiWuR+TGjvM2lXXrzaeLccONrTblJulPQYUPYuQNVCaSaTlpYmG FRaZa/J5uostCHAD31S9efzgI8uedInceLjkfAmmI/WK97/LrNN4vIDAAwhZ58UoQuGz E5n9xZmtyc6DfGooG/qaHDMgopQCzDGC83JF5ytUuCHxKgCo61A5GvBxrXtG9y30nzlT ywXjmOECMuFN61LDuk4oeGKpaN4NaHUOheLoA2uZ/1yWdYLqpDSZAGaqKy3SD3JlSKBt 2csQ== X-Gm-Message-State: AOAM530rDLanOwMDFhE1p9xAV3UYsp/PgQeCNJAjBoZnj4ozkHqrAt8T mGLG0IwOgx8Fh0XmKC5pnzY= X-Google-Smtp-Source: ABdhPJzPdhjMD0Lx53CAXhkpNaKyQ099EdsF6At8pBPi6eXUCFu2H1D9brDvbtCWIci6CUhwboliRg== X-Received: by 2002:a7b:ca4b:: with SMTP id m11mr4251892wml.120.1597158086825; Tue, 11 Aug 2020 08:01:26 -0700 (PDT) Received: from skynet.lan (88.red-83-49-60.dynamicip.rima-tde.net. [83.49.60.88]) by smtp.gmail.com with ESMTPSA id 15sm5350494wmo.33.2020.08.11.08.01.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2020 08:01:26 -0700 (PDT) From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= To: tsbogend@alpha.franken.de, f.fainelli@gmail.com, jonas.gorski@gmail.com, bcm-kernel-feedback-list@broadcom.com, linux-mips@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= Subject: [PATCH v3 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board Date: Tue, 11 Aug 2020 17:01:16 +0200 Message-Id: <20200811150117.254620-4-noltari@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200811150117.254620-1-noltari@gmail.com> References: <20200811150117.254620-1-noltari@gmail.com> MIME-Version: 1.0 Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org BCM6358 SoCs have OHCI and EHCI controllers that share the same USB ports. Therefore, the board should also have EHCI enabled. Signed-off-by: Álvaro Fernández Rojas Acked-by: Florian Fainelli Reviewed-by: Philippe Mathieu-Daudé --- v3: Reword commit description to avoid possible confusions. v2: no changes. arch/mips/bcm63xx/boards/board_bcm963xx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c index 45f1bc437245..ac9570b66f37 100644 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -645,6 +645,7 @@ static struct board_info __initdata board_DWVS0 = { }, .has_ohci0 = 1, + .has_ehci0 = 1, }; #endif /* CONFIG_BCM63XX_CPU_6358 */ From patchwork Tue Aug 11 15:01:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= X-Patchwork-Id: 11709307 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 161DD13A4 for ; Tue, 11 Aug 2020 15:01:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E2CCD2078E for ; Tue, 11 Aug 2020 15:01:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R+wGiLNX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728894AbgHKPBd (ORCPT ); Tue, 11 Aug 2020 11:01:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728891AbgHKPBa (ORCPT ); Tue, 11 Aug 2020 11:01:30 -0400 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D2CEC06174A; Tue, 11 Aug 2020 08:01:30 -0700 (PDT) Received: by mail-wm1-x343.google.com with SMTP id k8so3168609wma.2; Tue, 11 Aug 2020 08:01:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YYso8mvF+Z2YnFhDcuNDr+NTK93QAQJYbSgYDti/U+A=; b=R+wGiLNXKusDmh30pNepJgVVaxvgq4RlgI4PXJzMHNBsq+HI9IvNLj37H+Ec5FKOzR NMcwdxi/yuxE7POPd7ta+ChZ0BfhbyqASqFYcAOrLH75xq/3wlMOxHyn0vX2xPESyD4U KqlMUcrqTHy9EwXwjr5HKHHOl/K3lvyjk5WqDYNeFR7dNuRgpHXkPMrVXmV9BeyRUYzD iWSCqhfCxP+ZAxb3qiLvhB0q5L7O5og0r6bRgNWHPK08Q6Txv6tWz1E1HcUid7gq4MeD zVnWwGuzZ3De8Qxb+ZGlTpZHXEXYfGy3iTj6mnoqmftfXkotsZuPB/3h1x67P+TsU6V3 nDVA== 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=YYso8mvF+Z2YnFhDcuNDr+NTK93QAQJYbSgYDti/U+A=; b=p/uTm/7cqXqG6DUCuda2GKZNXYa1/qXjut0LFsug4lspIAkzBBi8q2HsJxnx0bDg80 Op0yRwKEwFI/EcbvE2tfRKrkPX7ktrCOCa2RJuvWcVw1EcN+JrAIMZZNp9amLsL6n8dv v8gG2nakxnOYuIkKvWptAguVBM5dnuoBo3e2R3ftQ0pg+aUszU4s1xjVblBll/ZupWkk /DAhCwNcMac49TEzbNIAIoxqPrBZbz06fYWUtCKvi9Km1PwXmQaCEfFMX14ICkxGCFkW dOERHHCS7zxcjZEdEqjfcR9OXdHd4A/MBD+m9Q/tAKWuTZdG66nr7kEbmsfc1yDKb/PV ABgw== X-Gm-Message-State: AOAM533NL7KcchvbE1vYDpCmnj9+8/yfocnq5LXwS6qk7JKVO1wtCXeD IjDPh3wfM6Zmr8aLhs3vlW4= X-Google-Smtp-Source: ABdhPJwcaJmTCRX7m4ODyVrNt91kYSqp/nWu7Tdh5B1nWcFMZgzbX+tPYcfV9+Y2jtm3YmnyBd6iWg== X-Received: by 2002:a1c:3dd6:: with SMTP id k205mr4483636wma.61.1597158087887; Tue, 11 Aug 2020 08:01:27 -0700 (PDT) Received: from skynet.lan (88.red-83-49-60.dynamicip.rima-tde.net. [83.49.60.88]) by smtp.gmail.com with ESMTPSA id 15sm5350494wmo.33.2020.08.11.08.01.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2020 08:01:27 -0700 (PDT) From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= To: tsbogend@alpha.franken.de, f.fainelli@gmail.com, jonas.gorski@gmail.com, bcm-kernel-feedback-list@broadcom.com, linux-mips@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= Subject: [PATCH v3 4/4] MIPS: BCM63xx: refactor board declarations Date: Tue, 11 Aug 2020 17:01:17 +0200 Message-Id: <20200811150117.254620-5-noltari@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200811150117.254620-1-noltari@gmail.com> References: <20200811150117.254620-1-noltari@gmail.com> MIME-Version: 1.0 Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Current board declarations are a mess. Let's put some order and make them follow the same structure. Also board declarations tabs. Switch to SPDX license identifier. Signed-off-by: Álvaro Fernández Rojas Acked-by: Florian Fainelli --- v3: no changes. v2: switch to SPDX license identifier. arch/mips/bcm63xx/boards/board_bcm963xx.c | 620 +++++++++++----------- 1 file changed, 306 insertions(+), 314 deletions(-) diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c index ac9570b66f37..01aff80a5967 100644 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -1,8 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-only /* - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * * Copyright (C) 2008 Maxime Bizon * Copyright (C) 2008 Florian Fainelli */ @@ -41,30 +38,28 @@ static struct board_info board; */ #ifdef CONFIG_BCM63XX_CPU_3368 static struct board_info __initdata board_cvg834g = { - .name = "CVG834G_E15R3921", - .expected_cpu_id = 0x3368, + .name = "CVG834G_E15R3921", + .expected_cpu_id = 0x3368, - .has_uart0 = 1, - .has_uart1 = 1, - - .has_enet0 = 1, - .has_pci = 1, + .ephy_reset_gpio = 36, + .ephy_reset_gpio_flags = GPIOF_INIT_HIGH, + .has_pci = 1, + .has_uart0 = 1, + .has_uart1 = 1, + .has_enet0 = 1, .enet0 = { - .has_phy = 1, - .use_internal_phy = 1, + .has_phy = 1, + .use_internal_phy = 1, }, .leds = { { - .name = "CVG834G:green:power", - .gpio = 37, + .name = "CVG834G:green:power", + .gpio = 37, .default_trigger= "default-on", }, }, - - .ephy_reset_gpio = 36, - .ephy_reset_gpio_flags = GPIOF_INIT_HIGH, }; #endif /* CONFIG_BCM63XX_CPU_3368 */ @@ -73,44 +68,44 @@ static struct board_info __initdata board_cvg834g = { */ #ifdef CONFIG_BCM63XX_CPU_6328 static struct board_info __initdata board_96328avng = { - .name = "96328avng", - .expected_cpu_id = 0x6328, + .name = "96328avng", + .expected_cpu_id = 0x6328, - .has_uart0 = 1, - .has_pci = 1, - .has_usbd = 0, + .has_pci = 1, + .has_uart0 = 1, + .has_usbd = 0, .usbd = { - .use_fullspeed = 0, - .port_no = 0, + .use_fullspeed = 0, + .port_no = 0, }, .leds = { { - .name = "96328avng::ppp-fail", - .gpio = 2, - .active_low = 1, + .name = "96328avng::ppp-fail", + .gpio = 2, + .active_low = 1, }, { - .name = "96328avng::power", - .gpio = 4, - .active_low = 1, + .name = "96328avng::power", + .gpio = 4, + .active_low = 1, .default_trigger = "default-on", }, { - .name = "96328avng::power-fail", - .gpio = 8, - .active_low = 1, + .name = "96328avng::power-fail", + .gpio = 8, + .active_low = 1, }, { - .name = "96328avng::wps", - .gpio = 9, - .active_low = 1, + .name = "96328avng::wps", + .gpio = 9, + .active_low = 1, }, { - .name = "96328avng::ppp", - .gpio = 11, - .active_low = 1, + .name = "96328avng::ppp", + .gpio = 11, + .active_low = 1, }, }, }; @@ -121,85 +116,86 @@ static struct board_info __initdata board_96328avng = { */ #ifdef CONFIG_BCM63XX_CPU_6338 static struct board_info __initdata board_96338gw = { - .name = "96338GW", - .expected_cpu_id = 0x6338, + .name = "96338GW", + .expected_cpu_id = 0x6338, + + .has_ohci0 = 1, + .has_uart0 = 1, - .has_uart0 = 1, - .has_enet0 = 1, + .has_enet0 = 1, .enet0 = { - .force_speed_100 = 1, - .force_duplex_full = 1, + .force_speed_100 = 1, + .force_duplex_full = 1, }, - .has_ohci0 = 1, - .leds = { { - .name = "adsl", - .gpio = 3, - .active_low = 1, + .name = "adsl", + .gpio = 3, + .active_low = 1, }, { - .name = "ses", - .gpio = 5, - .active_low = 1, + .name = "ses", + .gpio = 5, + .active_low = 1, }, { - .name = "ppp-fail", - .gpio = 4, - .active_low = 1, + .name = "ppp-fail", + .gpio = 4, + .active_low = 1, }, { - .name = "power", - .gpio = 0, - .active_low = 1, + .name = "power", + .gpio = 0, + .active_low = 1, .default_trigger = "default-on", }, { - .name = "stop", - .gpio = 1, - .active_low = 1, + .name = "stop", + .gpio = 1, + .active_low = 1, } }, }; static struct board_info __initdata board_96338w = { - .name = "96338W", - .expected_cpu_id = 0x6338, + .name = "96338W", + .expected_cpu_id = 0x6338, + + .has_uart0 = 1, - .has_uart0 = 1, - .has_enet0 = 1, + .has_enet0 = 1, .enet0 = { - .force_speed_100 = 1, - .force_duplex_full = 1, + .force_speed_100 = 1, + .force_duplex_full = 1, }, .leds = { { - .name = "adsl", - .gpio = 3, - .active_low = 1, + .name = "adsl", + .gpio = 3, + .active_low = 1, }, { - .name = "ses", - .gpio = 5, - .active_low = 1, + .name = "ses", + .gpio = 5, + .active_low = 1, }, { - .name = "ppp-fail", - .gpio = 4, - .active_low = 1, + .name = "ppp-fail", + .gpio = 4, + .active_low = 1, }, { - .name = "power", - .gpio = 0, - .active_low = 1, + .name = "power", + .gpio = 0, + .active_low = 1, .default_trigger = "default-on", }, { - .name = "stop", - .gpio = 1, - .active_low = 1, + .name = "stop", + .gpio = 1, + .active_low = 1, }, }, }; @@ -210,10 +206,10 @@ static struct board_info __initdata board_96338w = { */ #ifdef CONFIG_BCM63XX_CPU_6345 static struct board_info __initdata board_96345gw2 = { - .name = "96345GW2", - .expected_cpu_id = 0x6345, + .name = "96345GW2", + .expected_cpu_id = 0x6345, - .has_uart0 = 1, + .has_uart0 = 1, }; #endif /* CONFIG_BCM63XX_CPU_6345 */ @@ -222,282 +218,282 @@ static struct board_info __initdata board_96345gw2 = { */ #ifdef CONFIG_BCM63XX_CPU_6348 static struct board_info __initdata board_96348r = { - .name = "96348R", - .expected_cpu_id = 0x6348, + .name = "96348R", + .expected_cpu_id = 0x6348, - .has_uart0 = 1, - .has_enet0 = 1, - .has_pci = 1, + .has_pci = 1, + .has_uart0 = 1, + .has_enet0 = 1, .enet0 = { - .has_phy = 1, - .use_internal_phy = 1, + .has_phy = 1, + .use_internal_phy = 1, }, .leds = { { - .name = "adsl-fail", - .gpio = 2, - .active_low = 1, + .name = "adsl-fail", + .gpio = 2, + .active_low = 1, }, { - .name = "ppp", - .gpio = 3, - .active_low = 1, + .name = "ppp", + .gpio = 3, + .active_low = 1, }, { - .name = "ppp-fail", - .gpio = 4, - .active_low = 1, + .name = "ppp-fail", + .gpio = 4, + .active_low = 1, }, { - .name = "power", - .gpio = 0, - .active_low = 1, + .name = "power", + .gpio = 0, + .active_low = 1, .default_trigger = "default-on", }, { - .name = "stop", - .gpio = 1, - .active_low = 1, + .name = "stop", + .gpio = 1, + .active_low = 1, }, }, }; static struct board_info __initdata board_96348gw_10 = { - .name = "96348GW-10", - .expected_cpu_id = 0x6348, + .name = "96348GW-10", + .expected_cpu_id = 0x6348, - .has_uart0 = 1, - .has_enet0 = 1, - .has_enet1 = 1, - .has_pci = 1, + .has_ohci0 = 1, + .has_pccard = 1, + .has_pci = 1, + .has_uart0 = 1, + .has_enet0 = 1, .enet0 = { - .has_phy = 1, - .use_internal_phy = 1, + .has_phy = 1, + .use_internal_phy = 1, }, + + .has_enet1 = 1, .enet1 = { - .force_speed_100 = 1, - .force_duplex_full = 1, + .force_speed_100 = 1, + .force_duplex_full = 1, }, - .has_ohci0 = 1, - .has_pccard = 1, - .leds = { { - .name = "adsl-fail", - .gpio = 2, - .active_low = 1, + .name = "adsl-fail", + .gpio = 2, + .active_low = 1, }, { - .name = "ppp", - .gpio = 3, - .active_low = 1, + .name = "ppp", + .gpio = 3, + .active_low = 1, }, { - .name = "ppp-fail", - .gpio = 4, - .active_low = 1, + .name = "ppp-fail", + .gpio = 4, + .active_low = 1, }, { - .name = "power", - .gpio = 0, - .active_low = 1, + .name = "power", + .gpio = 0, + .active_low = 1, .default_trigger = "default-on", }, { - .name = "stop", - .gpio = 1, - .active_low = 1, + .name = "stop", + .gpio = 1, + .active_low = 1, }, }, }; static struct board_info __initdata board_96348gw_11 = { - .name = "96348GW-11", - .expected_cpu_id = 0x6348, + .name = "96348GW-11", + .expected_cpu_id = 0x6348, - .has_uart0 = 1, - .has_enet0 = 1, - .has_enet1 = 1, - .has_pci = 1, + .has_ohci0 = 1, + .has_pccard = 1, + .has_pci = 1, + .has_uart0 = 1, + .has_enet0 = 1, .enet0 = { - .has_phy = 1, - .use_internal_phy = 1, + .has_phy = 1, + .use_internal_phy = 1, }, + .has_enet1 = 1, .enet1 = { - .force_speed_100 = 1, - .force_duplex_full = 1, + .force_speed_100 = 1, + .force_duplex_full = 1, }, - .has_ohci0 = 1, - .has_pccard = 1, - .leds = { { - .name = "adsl-fail", - .gpio = 2, - .active_low = 1, + .name = "adsl-fail", + .gpio = 2, + .active_low = 1, }, { - .name = "ppp", - .gpio = 3, - .active_low = 1, + .name = "ppp", + .gpio = 3, + .active_low = 1, }, { - .name = "ppp-fail", - .gpio = 4, - .active_low = 1, + .name = "ppp-fail", + .gpio = 4, + .active_low = 1, }, { - .name = "power", - .gpio = 0, - .active_low = 1, + .name = "power", + .gpio = 0, + .active_low = 1, .default_trigger = "default-on", }, { - .name = "stop", - .gpio = 1, - .active_low = 1, + .name = "stop", + .gpio = 1, + .active_low = 1, }, }, }; static struct board_info __initdata board_96348gw = { - .name = "96348GW", - .expected_cpu_id = 0x6348, + .name = "96348GW", + .expected_cpu_id = 0x6348, - .has_uart0 = 1, - .has_enet0 = 1, - .has_enet1 = 1, - .has_pci = 1, + .has_ohci0 = 1, + .has_pci = 1, + .has_uart0 = 1, + .has_enet0 = 1, .enet0 = { - .has_phy = 1, - .use_internal_phy = 1, + .has_phy = 1, + .use_internal_phy = 1, }, + + .has_enet1 = 1, .enet1 = { - .force_speed_100 = 1, - .force_duplex_full = 1, + .force_speed_100 = 1, + .force_duplex_full = 1, }, - .has_ohci0 = 1, - .leds = { { - .name = "adsl-fail", - .gpio = 2, - .active_low = 1, + .name = "adsl-fail", + .gpio = 2, + .active_low = 1, }, { - .name = "ppp", - .gpio = 3, - .active_low = 1, + .name = "ppp", + .gpio = 3, + .active_low = 1, }, { - .name = "ppp-fail", - .gpio = 4, - .active_low = 1, + .name = "ppp-fail", + .gpio = 4, + .active_low = 1, }, { - .name = "power", - .gpio = 0, - .active_low = 1, + .name = "power", + .gpio = 0, + .active_low = 1, .default_trigger = "default-on", }, { - .name = "stop", - .gpio = 1, - .active_low = 1, + .name = "stop", + .gpio = 1, + .active_low = 1, }, }, }; static struct board_info __initdata board_FAST2404 = { - .name = "F@ST2404", - .expected_cpu_id = 0x6348, + .name = "F@ST2404", + .expected_cpu_id = 0x6348, - .has_uart0 = 1, - .has_enet0 = 1, - .has_enet1 = 1, - .has_pci = 1, + .has_ohci0 = 1, + .has_pccard = 1, + .has_pci = 1, + .has_uart0 = 1, + .has_enet0 = 1, .enet0 = { - .has_phy = 1, - .use_internal_phy = 1, + .has_phy = 1, + .use_internal_phy = 1, }, + .has_enet1 = 1, .enet1 = { - .force_speed_100 = 1, - .force_duplex_full = 1, + .force_speed_100 = 1, + .force_duplex_full = 1, }, - - .has_ohci0 = 1, - .has_pccard = 1, }; static struct board_info __initdata board_rta1025w_16 = { - .name = "RTA1025W_16", - .expected_cpu_id = 0x6348, + .name = "RTA1025W_16", + .expected_cpu_id = 0x6348, - .has_enet0 = 1, - .has_enet1 = 1, - .has_pci = 1, + .has_pci = 1, + .has_enet0 = 1, .enet0 = { - .has_phy = 1, - .use_internal_phy = 1, + .has_phy = 1, + .use_internal_phy = 1, }, + + .has_enet1 = 1, .enet1 = { - .force_speed_100 = 1, - .force_duplex_full = 1, + .force_speed_100 = 1, + .force_duplex_full = 1, }, }; static struct board_info __initdata board_DV201AMR = { - .name = "DV201AMR", - .expected_cpu_id = 0x6348, + .name = "DV201AMR", + .expected_cpu_id = 0x6348, - .has_uart0 = 1, - .has_pci = 1, - .has_ohci0 = 1, + .has_ohci0 = 1, + .has_pci = 1, + .has_uart0 = 1, - .has_enet0 = 1, - .has_enet1 = 1, + .has_enet0 = 1, .enet0 = { - .has_phy = 1, - .use_internal_phy = 1, + .has_phy = 1, + .use_internal_phy = 1, }, + + .has_enet1 = 1, .enet1 = { - .force_speed_100 = 1, - .force_duplex_full = 1, + .force_speed_100 = 1, + .force_duplex_full = 1, }, }; static struct board_info __initdata board_96348gw_a = { - .name = "96348GW-A", - .expected_cpu_id = 0x6348, + .name = "96348GW-A", + .expected_cpu_id = 0x6348, - .has_uart0 = 1, - .has_enet0 = 1, - .has_enet1 = 1, - .has_pci = 1, + .has_ohci0 = 1, + .has_pci = 1, + .has_uart0 = 1, + .has_enet0 = 1, .enet0 = { - .has_phy = 1, - .use_internal_phy = 1, + .has_phy = 1, + .use_internal_phy = 1, }, + + .has_enet1 = 1, .enet1 = { - .force_speed_100 = 1, - .force_duplex_full = 1, + .force_speed_100 = 1, + .force_duplex_full = 1, }, - - .has_ohci0 = 1, }; #endif /* CONFIG_BCM63XX_CPU_6348 */ @@ -506,146 +502,142 @@ static struct board_info __initdata board_96348gw_a = { */ #ifdef CONFIG_BCM63XX_CPU_6358 static struct board_info __initdata board_96358vw = { - .name = "96358VW", - .expected_cpu_id = 0x6358, + .name = "96358VW", + .expected_cpu_id = 0x6358, - .has_uart0 = 1, - .has_enet0 = 1, - .has_enet1 = 1, - .has_pci = 1, + .has_ehci0 = 1, + .has_ohci0 = 1, + .has_pccard = 1, + .has_pci = 1, + .has_uart0 = 1, + .has_enet0 = 1, .enet0 = { - .has_phy = 1, - .use_internal_phy = 1, + .has_phy = 1, + .use_internal_phy = 1, }, + .has_enet1 = 1, .enet1 = { - .force_speed_100 = 1, - .force_duplex_full = 1, + .force_speed_100 = 1, + .force_duplex_full = 1, }, - .has_ohci0 = 1, - .has_pccard = 1, - .has_ehci0 = 1, - .leds = { { - .name = "adsl-fail", - .gpio = 15, - .active_low = 1, + .name = "adsl-fail", + .gpio = 15, + .active_low = 1, }, { - .name = "ppp", - .gpio = 22, - .active_low = 1, + .name = "ppp", + .gpio = 22, + .active_low = 1, }, { - .name = "ppp-fail", - .gpio = 23, - .active_low = 1, + .name = "ppp-fail", + .gpio = 23, + .active_low = 1, }, { - .name = "power", - .gpio = 4, + .name = "power", + .gpio = 4, .default_trigger = "default-on", }, { - .name = "stop", - .gpio = 5, + .name = "stop", + .gpio = 5, }, }, }; static struct board_info __initdata board_96358vw2 = { - .name = "96358VW2", - .expected_cpu_id = 0x6358, + .name = "96358VW2", + .expected_cpu_id = 0x6358, - .has_uart0 = 1, - .has_enet0 = 1, - .has_enet1 = 1, - .has_pci = 1, + .has_ehci0 = 1, + .has_ohci0 = 1, + .has_pccard = 1, + .has_pci = 1, + .has_uart0 = 1, + .has_enet0 = 1, .enet0 = { - .has_phy = 1, - .use_internal_phy = 1, + .has_phy = 1, + .use_internal_phy = 1, }, + .has_enet1 = 1, .enet1 = { - .force_speed_100 = 1, - .force_duplex_full = 1, + .force_speed_100 = 1, + .force_duplex_full = 1, }, - .has_ohci0 = 1, - .has_pccard = 1, - .has_ehci0 = 1, - .leds = { { - .name = "adsl", - .gpio = 22, - .active_low = 1, + .name = "adsl", + .gpio = 22, + .active_low = 1, }, { - .name = "ppp-fail", - .gpio = 23, + .name = "ppp-fail", + .gpio = 23, }, { - .name = "power", - .gpio = 5, - .active_low = 1, + .name = "power", + .gpio = 5, + .active_low = 1, .default_trigger = "default-on", }, { - .name = "stop", - .gpio = 4, - .active_low = 1, + .name = "stop", + .gpio = 4, + .active_low = 1, }, }, }; static struct board_info __initdata board_AGPFS0 = { - .name = "AGPF-S0", - .expected_cpu_id = 0x6358, + .name = "AGPF-S0", + .expected_cpu_id = 0x6358, - .has_uart0 = 1, - .has_enet0 = 1, - .has_enet1 = 1, - .has_pci = 1, + .has_ehci0 = 1, + .has_ohci0 = 1, + .has_pci = 1, + .has_uart0 = 1, + .has_enet0 = 1, .enet0 = { - .has_phy = 1, - .use_internal_phy = 1, + .has_phy = 1, + .use_internal_phy = 1, }, + .has_enet1 = 1, .enet1 = { - .force_speed_100 = 1, - .force_duplex_full = 1, + .force_speed_100 = 1, + .force_duplex_full = 1, }, - - .has_ohci0 = 1, - .has_ehci0 = 1, }; static struct board_info __initdata board_DWVS0 = { - .name = "DWV-S0", - .expected_cpu_id = 0x6358, + .name = "DWV-S0", + .expected_cpu_id = 0x6358, - .has_enet0 = 1, - .has_enet1 = 1, - .has_pci = 1, + .has_ehci0 = 1, + .has_ohci0 = 1, + .has_pci = 1, + .has_enet0 = 1, .enet0 = { - .has_phy = 1, - .use_internal_phy = 1, + .has_phy = 1, + .use_internal_phy = 1, }, + .has_enet1 = 1, .enet1 = { - .force_speed_100 = 1, - .force_duplex_full = 1, + .force_speed_100 = 1, + .force_duplex_full = 1, }, - - .has_ohci0 = 1, - .has_ehci0 = 1, }; #endif /* CONFIG_BCM63XX_CPU_6358 */