From patchwork Fri May 20 18:38:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 9129995 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8D37B60221 for ; Fri, 20 May 2016 18:41:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 79C1127CAF for ; Fri, 20 May 2016 18:41:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AA2427CF9; Fri, 20 May 2016 18:41:16 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E386227CAF for ; Fri, 20 May 2016 18:41:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b3pKr-00021S-Eq; Fri, 20 May 2016 18:39:45 +0000 Received: from mail-pa0-x244.google.com ([2607:f8b0:400e:c03::244]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b3pKo-00020e-0b for linux-arm-kernel@lists.infradead.org; Fri, 20 May 2016 18:39:42 +0000 Received: by mail-pa0-x244.google.com with SMTP id gh9so11708204pac.0 for ; Fri, 20 May 2016 11:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=9dB4417tzo8Ic5l1izgO9oi8u2IALnBQ3JGbm9+sLno=; b=V+YRbNJsmg6ae59gATNfemxkxMoyUg78Nbqwbn0nJh0JOj6XWOB8H2vroOGRwwm3tM tNbyCKAF++GgD3XOwSI5/Z3pUBVelKkN1rL/aD+jIsE4cuMJwk8e3JaX8QN7Q9nUKrLW 0/krJEk/5ePSCclbH78XxH73bPBwn3OnadwF2aBtxbPMNzdQCm75ZxmAmQLTBxlgy8pX 1NFCNPtkpksaKWqQ/GqClzgmqnFfvnYIYbzmnRgtI9mdS6Jx63SMepB3YOT7ngN3sjOc OmLPZNnTN328oRrYAZLjTjy0WmHO0c/u9icF/1XK+vyYWWGv93hQFTRQDUW5jKUCJQnR pQzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9dB4417tzo8Ic5l1izgO9oi8u2IALnBQ3JGbm9+sLno=; b=dx0OLLzNgpygBRZvctT9xADvHdrwQgCQEqudCovoSgyNC7mCI2Dps8GBBX9vEsGvAN +9cRCbtbHyhFH1Ax7aqhBsK2wJUnQhvZDFsXi7JU6G/M/yA5gzzF61EyDjvbbR0Gjdnj 44O9pb3EK/YFJsDd77I3XNbZ6Y/HTV3ykPyGoEmmZb9KccE0QIlkSg3Ry3dkIOsHZBUh C/pl5Qae1y/njCXkiteRl6/UkfORuIwuNqvnOwJTwxRWxhf9HjNet0SZ8x3X0+ijywGE wWDnoNoM7wftG+He+umdhNi7Aeyl8BX2vOvjrkH3UhMhnp4kJPxQvmDQq+EZovb8GpyR 40IQ== X-Gm-Message-State: AOPr4FX5wMqVZWJksKHfXvS78LlVJ+Bx6jtq58ywE4XOQhU1RS9U3cmAB9xGeYgVtTirXw== X-Received: by 10.66.54.35 with SMTP id g3mr7206553pap.30.1463769560617; Fri, 20 May 2016 11:39:20 -0700 (PDT) Received: from fainelli-desktop.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by smtp.gmail.com with ESMTPSA id uf5sm6105534pac.44.2016.05.20.11.39.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 May 2016 11:39:19 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Subject: [PATCH] soc: Move brcmstb to bcm/brcmstb Date: Fri, 20 May 2016 11:38:15 -0700 Message-Id: <1463769495-10072-1-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160520_113942_106692_2DE00034 X-CRM114-Status: GOOD ( 12.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 Unify the different Broadcom SoCs directory and have everybody live under drivers/soc/bcm/*. Signed-off-by: Florian Fainelli Acked-by: Scott Branden --- drivers/soc/Kconfig | 1 - drivers/soc/Makefile | 1 - drivers/soc/bcm/Kconfig | 15 +++++++++++++++ drivers/soc/bcm/Makefile | 1 + drivers/soc/{ => bcm}/brcmstb/Makefile | 0 drivers/soc/{ => bcm}/brcmstb/biuctrl.c | 0 drivers/soc/{ => bcm}/brcmstb/common.c | 0 drivers/soc/brcmstb/Kconfig | 10 ---------- 8 files changed, 16 insertions(+), 12 deletions(-) rename drivers/soc/{ => bcm}/brcmstb/Makefile (100%) rename drivers/soc/{ => bcm}/brcmstb/biuctrl.c (100%) rename drivers/soc/{ => bcm}/brcmstb/common.c (100%) delete mode 100644 drivers/soc/brcmstb/Kconfig diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig index cb58ef0d9b2c..91d5c05d395f 100644 --- a/drivers/soc/Kconfig +++ b/drivers/soc/Kconfig @@ -1,7 +1,6 @@ menu "SOC (System On Chip) specific Drivers" source "drivers/soc/bcm/Kconfig" -source "drivers/soc/brcmstb/Kconfig" source "drivers/soc/fsl/qe/Kconfig" source "drivers/soc/mediatek/Kconfig" source "drivers/soc/qcom/Kconfig" diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 380230f03874..b75e3bd0a01e 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -3,7 +3,6 @@ # obj-y += bcm/ -obj-$(CONFIG_SOC_BRCMSTB) += brcmstb/ obj-$(CONFIG_ARCH_DOVE) += dove/ obj-$(CONFIG_MACH_DOVE) += dove/ obj-y += fsl/ diff --git a/drivers/soc/bcm/Kconfig b/drivers/soc/bcm/Kconfig index 3066edea184d..97156aeed286 100644 --- a/drivers/soc/bcm/Kconfig +++ b/drivers/soc/bcm/Kconfig @@ -1,3 +1,5 @@ +menu "Broadcom SoC drivers" + config RASPBERRYPI_POWER bool "Raspberry Pi power domain driver" depends on ARCH_BCM2835 || COMPILE_TEST @@ -7,3 +9,16 @@ config RASPBERRYPI_POWER help This enables support for the RPi power domains which can be enabled or disabled via the RPi firmware. + +config SOC_BRCMSTB + bool "Broadcom STB SoC drivers" + depends on ARM + select SOC_BUS + help + Enables drivers for the Broadcom Set-Top Box (STB) series of chips. + This option alone enables only some support code, while the drivers + can be enabled individually within this menu. + + If unsure, say N. + +endmenu diff --git a/drivers/soc/bcm/Makefile b/drivers/soc/bcm/Makefile index 63aa3eb23087..dc4fced72d21 100644 --- a/drivers/soc/bcm/Makefile +++ b/drivers/soc/bcm/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_RASPBERRYPI_POWER) += raspberrypi-power.o +obj-$(CONFIG_SOC_BRCMSTB) += brcmstb/ diff --git a/drivers/soc/brcmstb/Makefile b/drivers/soc/bcm/brcmstb/Makefile similarity index 100% rename from drivers/soc/brcmstb/Makefile rename to drivers/soc/bcm/brcmstb/Makefile diff --git a/drivers/soc/brcmstb/biuctrl.c b/drivers/soc/bcm/brcmstb/biuctrl.c similarity index 100% rename from drivers/soc/brcmstb/biuctrl.c rename to drivers/soc/bcm/brcmstb/biuctrl.c diff --git a/drivers/soc/brcmstb/common.c b/drivers/soc/bcm/brcmstb/common.c similarity index 100% rename from drivers/soc/brcmstb/common.c rename to drivers/soc/bcm/brcmstb/common.c diff --git a/drivers/soc/brcmstb/Kconfig b/drivers/soc/brcmstb/Kconfig deleted file mode 100644 index 7fec3b4c80a1..000000000000 --- a/drivers/soc/brcmstb/Kconfig +++ /dev/null @@ -1,10 +0,0 @@ -menuconfig SOC_BRCMSTB - bool "Broadcom STB SoC drivers" - depends on ARM - select SOC_BUS - help - Enables drivers for the Broadcom Set-Top Box (STB) series of chips. - This option alone enables only some support code, while the drivers - can be enabled individually within this menu. - - If unsure, say N.