From patchwork Fri Aug 7 09:38:22 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: 11705297 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 53FF614B7 for ; Fri, 7 Aug 2020 09:38:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E012206B5 for ; Fri, 7 Aug 2020 09:38:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CzN/UkWw" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726923AbgHGJib (ORCPT ); Fri, 7 Aug 2020 05:38:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727914AbgHGJia (ORCPT ); Fri, 7 Aug 2020 05:38:30 -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 E2E4DC061574; Fri, 7 Aug 2020 02:38:29 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id q76so1218654wme.4; Fri, 07 Aug 2020 02:38: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=oVHDxpk0dQpmXVQrDhF0SiIAm1xo4mNG/B7mphM+NZQ=; b=CzN/UkWw0VhI60//D7uZxUzr0PpitsWbLoZZXhV0dJUtM04KSC06BNrRL171NvaP0b g9Uhr28I0px57C59Q9Akxfji9j0QKqWK8s2dPkSDugAeNGVfUVGbs9UDP1LBUFQwAsHa FIOC1zRz8VknDrEuARt5arVbNIXnEg+G/WbAmuEsK1pdvDyu/7El+lUC7jwlb6nKQ5bF dd7Mxc+cS69q9U6GMeuxgFqd/cUmhrrbay1ozffK/4CatT/T3vTXZsbGhRC3eg2dfKU8 aIijmoOCYHD4DtRZkaIj7fJ9EylC62jNkIah1chN7fL9YMAqDRC4QtWX0uLOdw8crol9 xfIQ== 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=oVHDxpk0dQpmXVQrDhF0SiIAm1xo4mNG/B7mphM+NZQ=; b=aXccOjgyF7LhUt5RMIoqgo4wBFe2WackbugQIFj+lIBBRrafPlCM/UX4i0yvC1NOW3 bhFcmDGju+p+hEwYJ1TkO1a4uF8CFpjDb7g/JM8dn+9duANeJr1UHNDnthS+3RWFx2TS XbMzC2I+FpeI0D4GA+B2Anqk9b+HkwJO+fcdqW25Pv8Wxkp2aVJN70U8RDNJcaqLAemV SMGYNqqWmNeRC4f9f7AKhkd9297s57zqgnh9+0ng0ZpXPzssl5Wh+dOaBxCU4gXFFa9/ CtIRtb5eRi73PxmZSH7CRuOuCr5rYGiviCIF8qIV6Ut/4MnjW3T5U+FkdK5RXUjXb9Iu 8zLQ== X-Gm-Message-State: AOAM531SFFhHZqxUFH6JL5XF4lguUeyrVXAdxYHfjS6CapINODO/MNtL DEU4eiiZQq80NFQiLCKfIdw= X-Google-Smtp-Source: ABdhPJxwm+ds9QvbbRqyHXI9+AkTNPu6xQFkvvAiZjSVGwitqMW1Ma7rz/x/s5xX0d5svGGRZaCcWw== X-Received: by 2002:a7b:cd97:: with SMTP id y23mr12434274wmj.21.1596793108473; Fri, 07 Aug 2020 02:38:28 -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 q19sm9460529wrf.48.2020.08.07.02.38.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 02:38: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 1/4] MIPS: BCM63xx: remove duplicated new lines Date: Fri, 7 Aug 2020 11:38:22 +0200 Message-Id: <20200807093825.2902474-2-noltari@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200807093825.2902474-1-noltari@gmail.com> References: <20200807093825.2902474-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 --- 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 Fri Aug 7 09:38:23 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: 11705299 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 09BFB13B6 for ; Fri, 7 Aug 2020 09:38:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E657622D03 for ; Fri, 7 Aug 2020 09:38:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="U2Q3dsLv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727991AbgHGJii (ORCPT ); Fri, 7 Aug 2020 05:38:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727858AbgHGJib (ORCPT ); Fri, 7 Aug 2020 05:38:31 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA9E9C061575; Fri, 7 Aug 2020 02:38:30 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id g8so1150447wmk.3; Fri, 07 Aug 2020 02:38:30 -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=PvHBHIoB+ScAAg9yLcMcG6JzuWnjVuFMmIuss4QEkjg=; b=U2Q3dsLvieopkx9+Xxa0EghfS5n/PZAnRG+pjymuvrr1FZTFQKFtkHw/LpGqMXqeo+ fEr7arsocl3G2Oe0IPOKX36l2FxxYc25AodnIKkevNQB9ph2U2tPHo+Q72G9G2XB4jNj jVJ+V7rAv52qgSi0Y6fxgKNhX1h+hC6tAeo7w4B9dvTMYekxxgtZ+r/MOqSp6kK8zd1D cT1JXI3rBcqcFoUoyQuAaw/X1INTW48psy2+YWAfiY2Wij9HRjymls4LVMZaOS16xycs NeYXqqH+4JEvi7OuOZmT9+Sy6+QoVvdfiVZct0xGxXQyo1tJL+fGxB+n6k4L7ZzikHH3 oxlg== 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=PvHBHIoB+ScAAg9yLcMcG6JzuWnjVuFMmIuss4QEkjg=; b=WlOrxz0rO3EYniy/WdXh4bW4VyAS0WuskoRAnHqA3vTbWDnK2/Et9PAFTYO3Df8s2c Ka8uo1mPyhu/RrONi8KkEK1Ae2oIBb0w4onIa73SMgE0+QUFjrgxhN5nl2FA8XlK9BnL kLXlf6sJvUlIq+gunck4Xvgl4ZniqcCChv6AjgEFglYVMTEYH4MsPkvE2Ni7P8ekL42G 7DQinKHTKZsiU8uGOVNp/P2Muck+nf3DUYNwLzZRaa93GsNqcMi1BJm/bBXlcYUtwnyu dCeG6o+i3ZEJNJzNxkoVIxcvVYnOvsmPMBT6j9sGhr+ZISIhF8DHboT5VHRSVF/sCT+k gd9w== X-Gm-Message-State: AOAM533o+0XUSiz6emc6EFw9PA2vGQxvdVGC+Fo3xkQwUitJJqah/oox rLSkvguRBuLiTnA+e43DC6zxrGuB X-Google-Smtp-Source: ABdhPJxBnb4MAzk5PImU+oJ32uf8yejYmTkE5G8u+bnrXBY9JbHcGjllTmSDfplANaszrDCay9WjMg== X-Received: by 2002:a1c:4e0d:: with SMTP id g13mr11879540wmh.177.1596793109572; Fri, 07 Aug 2020 02:38:29 -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 q19sm9460529wrf.48.2020.08.07.02.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 02:38:28 -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 2/4] MIPS: BCM63xx: remove EHCI from BCM6348 boards Date: Fri, 7 Aug 2020 11:38:23 +0200 Message-Id: <20200807093825.2902474-3-noltari@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200807093825.2902474-1-noltari@gmail.com> References: <20200807093825.2902474-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 --- 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 Fri Aug 7 09:38:24 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: 11705301 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 D53B813B6 for ; Fri, 7 Aug 2020 09:38:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD9052177B for ; Fri, 7 Aug 2020 09:38:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rnydLoHi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727989AbgHGJih (ORCPT ); Fri, 7 Aug 2020 05:38:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727928AbgHGJic (ORCPT ); Fri, 7 Aug 2020 05:38:32 -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 E2E20C061574; Fri, 7 Aug 2020 02:38:31 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id k8so1227561wma.2; Fri, 07 Aug 2020 02:38:31 -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=WB7bY6PeWX70+Ts0KFMg9NeYXKRvtcv8Jr8oZrBj/mA=; b=rnydLoHi9Ye631isxaAhBWPChgOxw0fmvEETmrf8GANs3IhFzAtyfVL6JdCSwCXZmS p8Tm/YWhA/A/zD/e8qW5nbBhbUhQW5k2qE+WVsY2PEmAZXtK2NaOwTk8gmumCwuhPlkp oLgUzOPjUN0YvZVvLzvDeJUPKy+lbo/tivz9f++Fq8s5iFPwrnP1drzAZwTNkhWfZVe6 njVecTEGSOOuFhN4TRcmnTjuF/YEgZcmZPRMhW3rEBtnVaHWavX9MGp7J9EWbASwINDx eTGBgfEM34Wy8fgE4vSrXnfTKfWo270xv5h/LU62gT9LifmDOMXODxvT2EOs1OP5K1Ia 2nxQ== 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=WB7bY6PeWX70+Ts0KFMg9NeYXKRvtcv8Jr8oZrBj/mA=; b=LS6pEMFuVBAK6p1dcA2VwUnfmJHP7a0HoCeHQBNphl6PAxsS/sZd86slBXgGbUAG4x 0L5y0G+jS9AxmewaFudFgItLQqCxDzjE5R7q1vMLCg4R08aATywzv61tZaPzzHCzZCxv SIvbVTNfAuTjuWUDPsUquQrBujDDOzUziU6GS27eRCGezNcTJkdWMxDHetSx+NZa2syn OEIGSEca581Qb1e2TqlJgwwV4xe17NsQrR4pYnlwIqIY7e4iyLrM6UkzeI+1ZQOHCQyv 2X77qqFOfJyzUe/ftasyTMXLOsQsPpSKEgOBuz3inRwP7SyNQeT/75DcoiFm1uiULo7S 26Bg== X-Gm-Message-State: AOAM533xqys9uB61RxH8B+teSqIBy2UJI4p3Fp40WEYHLWzX5xK3JD10 H8Wtv7H2J/8b2/l4Ztx7qk0= X-Google-Smtp-Source: ABdhPJy34KcoCpyoDNb4Y0HWBVSWOKa9fEu9o2EGa4bNWMMGqVRZOQ6tHUVN4ka//ZvUAx1yD7gXSQ== X-Received: by 2002:a1c:4b0d:: with SMTP id y13mr11724915wma.6.1596793110625; Fri, 07 Aug 2020 02:38:30 -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 q19sm9460529wrf.48.2020.08.07.02.38.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 02:38:30 -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 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board Date: Fri, 7 Aug 2020 11:38:24 +0200 Message-Id: <20200807093825.2902474-4-noltari@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200807093825.2902474-1-noltari@gmail.com> References: <20200807093825.2902474-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 EHCI and OHCI share the same USB ports. Therefore, if the board has OHCI it should also have EHCI. Signed-off-by: Álvaro Fernández Rojas --- 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 Fri Aug 7 09:38:25 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: 11705303 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 1781B1731 for ; Fri, 7 Aug 2020 09:38:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F084522CAF for ; Fri, 7 Aug 2020 09:38:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hEBLv9IY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727914AbgHGJih (ORCPT ); Fri, 7 Aug 2020 05:38:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727946AbgHGJid (ORCPT ); Fri, 7 Aug 2020 05:38:33 -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 3C363C061756; Fri, 7 Aug 2020 02:38:33 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id a15so1048391wrh.10; Fri, 07 Aug 2020 02:38:33 -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=yHl3lbPswZ66K8k2wNl07sQwMw4eSiE6FpMuxKVMh+8=; b=hEBLv9IYInstHDYx3xx4NGDA7T2iRMQLfs8zas3Ob/ChDGYlI+lbBaaE8LDnIMQi5+ rfbmYc0hGsvXhgLWpy/zY2XOjmKqlqM2PE0h7312F7le575rDwmOdRJyY0DPLfQa4OM4 FKRCTbvwk4DWmbLAv/jUjgfMydkSR3cUp1G8LsPOJk96dkRukp9ixwbYrnIPcbdjaubS 87FqVEYCa803KJJH36cyol392wqxhNEry5FonTdVixFciWK+c27bzj31BCRE/p/FZcW3 ztrae7AUGsagShI67jFxhhKjZS9/4rn+uRj/5Fb8Ti6AJQ+WK8xvyO5Ldf/ixWzs7ppc c/ig== 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=yHl3lbPswZ66K8k2wNl07sQwMw4eSiE6FpMuxKVMh+8=; b=XfolISCpZjSW95Xnq10FuNIowU+TyrmWUL5cG/EQhckkP/tNObxDR70MqEEqESYiqD kJsXzEDeGIEcR4OpFXyPsGu71Xulj2NElNB1LiJ8LCxk9U/PQdzMOhyyobmnsXBoeniQ MJhSoJJw67Ipazn/r9YhkRB7+ctLpRL6kapuFtVV8l7lBjgs9NC3t1fL449LYuZAk5cf ThrOit6gnlj/BtgKUtsjaPnRQPjk42xN8o/7q0D6M79Lby0gJmm2HwxY7OeLSu19HgCw RQYRzlYApQbh+asOca8ujzkIK2qz4jyRlQO8m5J9JZ9ECUr07Edbl6Wf8NMVu/H5ETC8 pMag== X-Gm-Message-State: AOAM531+vkR9BLi68xkHcRMOGGG68iRGqK4QufbIEspgW10/i+ypZzlm OK0bZZDS4TQgWLEv7oNA8yM= X-Google-Smtp-Source: ABdhPJzVHr7Cg0XyLXijpWbX/To51NInpSWKKVLa8V/9qWvgiXQvc7JFxL7NxidTeHWJ/SgDvbMjjA== X-Received: by 2002:a5d:5589:: with SMTP id i9mr11165692wrv.91.1596793111713; Fri, 07 Aug 2020 02:38:31 -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 q19sm9460529wrf.48.2020.08.07.02.38.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 02:38:31 -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 4/4] MIPS: BCM63xx: refactor board declarations Date: Fri, 7 Aug 2020 11:38:25 +0200 Message-Id: <20200807093825.2902474-5-noltari@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200807093825.2902474-1-noltari@gmail.com> References: <20200807093825.2902474-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 remove board declarations tabs and double whitespace in the header. Signed-off-by: Álvaro Fernández Rojas --- arch/mips/bcm63xx/boards/board_bcm963xx.c | 617 +++++++++++----------- 1 file changed, 306 insertions(+), 311 deletions(-) diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c index ac9570b66f37..36dd356374b1 100644 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -1,6 +1,6 @@ /* * 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 + * License. See the file "COPYING" in the main directory of this archive * for more details. * * Copyright (C) 2008 Maxime Bizon @@ -41,30 +41,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 +71,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 +119,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 +209,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 +221,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 +505,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 */