Skip to contentSkip to conversation

mmc: remove sdhci-bcm2835

PATCH New Stefan Wahren 4 participants 8 messages Jun 3, 2016 – Jun 22, 2016

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

cover mmc: remove sdhci-bcm2835

The sdhci-bcm2835 is no more needed since it has been replaced by sdhci-iproc.

Stefan Wahren (2):
DT: bindings: remove bcm2835-sdhci
mmc: sdhci-bcm2835: remove driver

 .../devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt |   18 --
 drivers/mmc/host/Kconfig                           |   11 --
 drivers/mmc/host/Makefile                          |    1 -
 drivers/mmc/host/sdhci-bcm2835.c                   |  204 --------------------
 4 files changed, 234 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt
 delete mode 100644 drivers/mmc/host/sdhci-bcm2835.c
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/2 DT: bindings: remove bcm2835-sdhci

The sdhci-iproc also supports bcm2835. So this binding is obsolete.

---
 .../devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt |   18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt
Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt deleted +0 -18
deleted file mode 100644
index 59476fb..0000000
@@ -1,18 +0,0 @@
-Broadcom BCM2835 SDHCI controller
-
-This file documents differences between the core properties described
-by mmc.txt and the properties that represent the BCM2835 controller.
-
-Required properties:
-- compatible : Should be "brcm,bcm2835-sdhci".
-- clocks : The clock feeding the SDHCI controller.
-
-Example:
-
-sdhci: sdhci {
-	compatible = "brcm,bcm2835-sdhci";
-	reg = <0x7e300000 0x100>;
-	interrupts = <2 30>;
-	clocks = <&clk_mmc>;
-	bus-width = <4>;
-};
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/2 DT: bindings: remove bcm2835-sdhci

Quoted 1 line · Stefan Wahren

The sdhci-iproc also supports bcm2835. So this binding is obsolete.

sdhci-iproc supports this binding, so I don't believe the binding is obsolete. The duplicate implementations (drivers) can possibly be removed, but not the binding doc, which is (or at least could be) still in use.

#3 lore raw

PATCH 1/2 DT: bindings: remove bcm2835-sdhci

Hi Stephen,

Quoted 11 lines

Stephen Warren <[email protected]> hat am 3. Juni 2016 um 22:00 geschrieben:

Quoted 1 line · Stefan Wahren

The sdhci-iproc also supports bcm2835. So this binding is obsolete.

sdhci-iproc supports this binding, so I don't believe the binding is obsolete. The duplicate implementations (drivers) can possibly be removed, but not the binding doc, which is (or at least could be) still in use.

sorry for my late reply.

So the brcm,bcm2835-sdhci.txt must be kept, even if the compatible string "brcm,bcm2835-sdhci" has been added to brcm,sdhci-iproc.txt?

Do i need to send a new version of this series?

Stefan

Quoted 5 lines

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#4 lore raw

PATCH 1/2 DT: bindings: remove bcm2835-sdhci

Quoted 14 lines · Stefan Wahren

Hi Stephen,

Quoted 11 lines

Stephen Warren <[email protected]> hat am 3. Juni 2016 um 22:00 geschrieben:

Quoted 1 line · Stefan Wahren

The sdhci-iproc also supports bcm2835. So this binding is obsolete.

sdhci-iproc supports this binding, so I don't believe the binding is obsolete. The duplicate implementations (drivers) can possibly be removed, but not the binding doc, which is (or at least could be) still in use.

Quoted 4 lines

sorry for my late reply.

So the brcm,bcm2835-sdhci.txt must be kept, even if the compatible string "brcm,bcm2835-sdhci" has been added to brcm,sdhci-iproc.txt?

Sorry for the slow reply; I was on vacation.

So, if the binding documentation has been collapsed into the other binding document, then it's OK to remove this one. I took a look at the iproc binding doc and it looks completely compatible with this removed binding doc, so I think this patch is OK.

#5 lore raw

PATCH 2/2 mmc: sdhci-bcm2835: remove driver

In reply to Stefan Wahren

The sdhci-bcm2835 is no more needed since it has been replaced by sdhci-iproc.

---
 drivers/mmc/host/Kconfig         |   11 --
 drivers/mmc/host/Makefile        |    1 -
 drivers/mmc/host/sdhci-bcm2835.c |  204 --------------------------------------
 3 files changed, 216 deletions(-)
 delete mode 100644 drivers/mmc/host/sdhci-bcm2835.c
drivers/mmc/host/Kconfig +0 -11
index 0aa484c..2cf124a 100644
@@ -296,17 +296,6 @@ config MMC_SDHCI_BCM_KONA
 
 	  If you have a controller with this interface, say Y or M here.
 
-config MMC_SDHCI_BCM2835
-	tristate "SDHCI platform support for the BCM2835 SD/MMC Controller"
-	depends on ARCH_BCM2835
-	depends on MMC_SDHCI_PLTFM
-	select MMC_SDHCI_IO_ACCESSORS
-	help
-	  This selects the BCM2835 SD/MMC controller. If you have a BCM2835
-	  platform with SD or MMC devices, say Y or M here.
-
-	  If unsure, say N.
-
 config MMC_SDHCI_F_SDH30
 	tristate "SDHCI support for Fujitsu Semiconductor F_SDH30"
 	depends on MMC_SDHCI_PLTFM
drivers/mmc/host/Makefile +0 -1
index af918d2..61a9345 100644
@@ -71,7 +71,6 @@ obj-$(CONFIG_MMC_SDHCI_OF_AT91)		+= sdhci-of-at91.o
 obj-$(CONFIG_MMC_SDHCI_OF_ESDHC)	+= sdhci-of-esdhc.o
 obj-$(CONFIG_MMC_SDHCI_OF_HLWD)		+= sdhci-of-hlwd.o
 obj-$(CONFIG_MMC_SDHCI_BCM_KONA)	+= sdhci-bcm-kona.o
-obj-$(CONFIG_MMC_SDHCI_BCM2835)		+= sdhci-bcm2835.o
 obj-$(CONFIG_MMC_SDHCI_IPROC)		+= sdhci-iproc.o
 obj-$(CONFIG_MMC_SDHCI_MSM)		+= sdhci-msm.o
 obj-$(CONFIG_MMC_SDHCI_ST)		+= sdhci-st.o
drivers/mmc/host/sdhci-bcm2835.c deleted +0 -204

204 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#6 lore raw

PATCH 2/2 mmc: sdhci-bcm2835: remove driver

Quoted 2 lines · Stefan Wahren

The sdhci-bcm2835 is no more needed since it has been replaced by sdhci-iproc.

We've had a cycle to catch regressions from the merged driver, so I'm happy to see the old one go. Thanks Stefan!

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160603/95f6fb38/attachment-0001.sig>

Applied
#7 lore raw

cover mmc: remove sdhci-bcm2835

In reply to Stefan Wahren
Quoted 15 lines · Stefan Wahren

The sdhci-bcm2835 is no more needed since it has been replaced by sdhci-iproc.

Stefan Wahren (2):
DT: bindings: remove bcm2835-sdhci
mmc: sdhci-bcm2835: remove driver

 .../devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt |   18 --
 drivers/mmc/host/Kconfig                           |   11 --
 drivers/mmc/host/Makefile                          |    1 -
 drivers/mmc/host/sdhci-bcm2835.c                   |  204 --------------------
 4 files changed, 234 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhci.txt
 delete mode 100644 drivers/mmc/host/sdhci-bcm2835.c
Quoted 3 lines

--
1.7.9.5

Thanks, applied for next!

Kind regards
Uffe