Skip to contentSkip to conversation

usb: Remove unused ppc4xx EHCI host driver

PATCH New Stefan Roese 3 participants 8 messages Mar 13, 2018 – Mar 19, 2018

Subsystems (4)
USB Memory technology devices (MTD) NAND flash USB ehci driver
lore
Share & tools
lore

Stefan Roese

author
#0 lore raw

PATCH 1/4 usb: Remove unused ppc4xx EHCI host driver

ppc4xx support was removed some time ago. Lets remove the now unused EHCI driver and all its references for this platform as well.

Signed-off-by Stefan Roese <[email protected]>
Cc Heinrich Schuchardt <[email protected]>
Cc Marek Vasut <[email protected]>
---
 drivers/usb/host/Makefile      |  1 -
 drivers/usb/host/ehci-ppc4xx.c | 35 -----------------------------------
 2 files changed, 36 deletions(-)
 delete mode 100644 drivers/usb/host/ehci-ppc4xx.c
drivers/usb/host/Makefile +0 -1
index 7f9ba24cfe..98194893b9 100644
@@ -35,7 +35,6 @@ obj-$(CONFIG_USB_EHCI_MX5) += ehci-mx5.o
 obj-$(CONFIG_USB_EHCI_MX6) += ehci-mx6.o
 obj-$(CONFIG_USB_EHCI_MX7) += ehci-mx6.o
 obj-$(CONFIG_USB_EHCI_OMAP) += ehci-omap.o
-obj-$(CONFIG_USB_EHCI_PPC4XX) += ehci-ppc4xx.o
 obj-$(CONFIG_USB_EHCI_MARVELL) += ehci-marvell.o
 obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o
 obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o
drivers/usb/host/ehci-ppc4xx.c deleted +0 -35
deleted file mode 100644
index 9d23577642..0000000000
@@ -1,35 +0,0 @@
-/*
- * (C) Copyright 2010, Chris Zhang <[email protected]>
- *
- * Author: Chris Zhang <[email protected]>
- * This code is based on ehci freescale driver
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-#include <common.h>
-#include <usb.h>
-#include <asm/io.h>
-
-#include "ehci.h"
-
-/*
- * Create the appropriate control structures to manage
- * a new EHCI host controller.
- */
-int ehci_hcd_init(int index, enum usb_init_type init,
-		struct ehci_hccr **hccr, struct ehci_hcor **hcor)
-{
-	*hccr = (struct ehci_hccr *)(CONFIG_SYS_PPC4XX_USB_ADDR);
-	*hcor = (struct ehci_hcor *)((uint32_t) *hccr +
-		HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
-	return 0;
-}
-
-/*
- * Destroy the appropriate control structures corresponding
- * the the EHCI host controller.
- */
-int ehci_hcd_stop(int index)
-{
-	return 0;
-}
Signature · 1 line
2.16.2
author
#1 lore raw

PATCH 2/4 nand: Remove unused ppc4xx NAND driver and references

ppc4xx support was removed some time ago. Lets remove the now unused NAND driver and all its references for this platform as well.

Signed-off-by Stefan Roese <[email protected]>
Cc Heinrich Schuchardt <[email protected]>
Cc Scott Wood <[email protected]>
---
 drivers/mtd/nand/Makefile    |   1 -
 drivers/mtd/nand/nand_ecc.c  |  16 ----
 drivers/mtd/nand/ndfc.c      | 200 -------------------------------------------
 scripts/config_whitelist.txt |   2 -
 4 files changed, 219 deletions(-)
 delete mode 100644 drivers/mtd/nand/ndfc.c
drivers/mtd/nand/Makefile +0 -1
index 9f7d9d6ff7..332d905a3a 100644
@@ -57,7 +57,6 @@ obj-$(CONFIG_NAND_LPC32XX_SLC) += lpc32xx_nand_slc.o
 obj-$(CONFIG_NAND_VF610_NFC) += vf610_nfc.o
 obj-$(CONFIG_NAND_MXC) += mxc_nand.o
 obj-$(CONFIG_NAND_MXS) += mxs_nand.o
-obj-$(CONFIG_NAND_NDFC) += ndfc.o
 obj-$(CONFIG_NAND_PXA3XX) += pxa3xx_nand.o
 obj-$(CONFIG_NAND_SPEAR) += spr_nand.o
 obj-$(CONFIG_TEGRA_NAND) += tegra_nand.o
drivers/mtd/nand/nand_ecc.c +0 -16
index 8b548b204d..13a6535bd5 100644
@@ -29,11 +29,6 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand_ecc.h>
 
-/* The PPC4xx NDFC uses Smart Media (SMC) bytes order */
-#ifdef CONFIG_NAND_NDFC
-#define CONFIG_MTD_NAND_ECC_SMC
-#endif
-
 /*
  * NAND-SPL has no sofware ECC for now, so don't include nand_calculate_ecc(),
  * only nand_correct_data() is needed

@@ -110,13 +105,8 @@ int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
 	tmp2 |= (reg2 & 0x01) << 0; /* B7 -> B0 */
 
 	/* Calculate final ECC code */
-#ifdef CONFIG_MTD_NAND_ECC_SMC
-	ecc_code[0] = ~tmp2;
-	ecc_code[1] = ~tmp1;
-#else
 	ecc_code[0] = ~tmp1;
 	ecc_code[1] = ~tmp2;
-#endif
 	ecc_code[2] = ((~reg1) << 2) | 0x03;
 
 	return 0;

@@ -146,15 +136,9 @@ int nand_correct_data(struct mtd_info *mtd, u_char *dat,
 {
 	uint8_t s0, s1, s2;
 
-#ifdef CONFIG_MTD_NAND_ECC_SMC
-	s0 = calc_ecc[0] ^ read_ecc[0];
-	s1 = calc_ecc[1] ^ read_ecc[1];
-	s2 = calc_ecc[2] ^ read_ecc[2];
-#else
 	s1 = calc_ecc[0] ^ read_ecc[0];
 	s0 = calc_ecc[1] ^ read_ecc[1];
 	s2 = calc_ecc[2] ^ read_ecc[2];
-#endif
 	if ((s0 | s1 | s2) == 0)
 		return 0;
drivers/mtd/nand/ndfc.c deleted +0 -200

200 lines not on this page · raw message

scripts/config_whitelist.txt +0 -2
index 3606585c05..0ae6ec77c5 100644
@@ -1335,7 +1335,6 @@ CONFIG_MSHC_FREQ
 CONFIG_MTD_CONCAT
 CONFIG_MTD_DEVICE
 CONFIG_MTD_ECC_SOFT
-CONFIG_MTD_NAND_ECC_SMC
 CONFIG_MTD_NAND_MUSEUM_IDS
 CONFIG_MTD_NAND_VERIFY_WRITE
 CONFIG_MTD_ONENAND_VERIFY_WRITE

@@ -1416,7 +1415,6 @@ CONFIG_NAND_LPC32XX_MLC
 CONFIG_NAND_LPC32XX_SLC
 CONFIG_NAND_MODE_REG
 CONFIG_NAND_MXC_V1_1
-CONFIG_NAND_NDFC
 CONFIG_NAND_OMAP_ECCSCHEME
 CONFIG_NAND_OMAP_GPMC_WSCFG
 CONFIG_NAND_SECBOOT
Signature · 1 line
2.16.2
#2 lore raw

PATCH 2/4 nand: Remove unused ppc4xx NAND driver and references

Quoted 6 lines · Stefan Roese

ppc4xx support was removed some time ago. Lets remove the now unused NAND driver and all its references for this platform as well.

Signed-off-by Stefan Roese <[email protected]>
Cc Heinrich Schuchardt <[email protected]>
Cc Scott Wood <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180319/05af57f7/attachment.sig>
author
#3 lore raw

PATCH 3/4 pci: Remove unused ppc4xx variable from struct pci_controller

In reply to Stefan Roese

ppc4xx support was removed some time ago. Lets remove the now unused "pci_fb" variable from "struct pci_controller" as well.

Signed-off-by Stefan Roese <[email protected]>
Cc Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>
---
 include/pci.h | 2 --
 1 file changed, 2 deletions(-)
include/pci.h +0 -2
index 7adc04301c..31dc7608a7 100644
@@ -585,8 +585,6 @@ struct pci_controller {
 	/* Used by auto config */
 	struct pci_region *pci_mem, *pci_io, *pci_prefetch;
 
-	/* Used by ppc405 autoconfig*/
-	struct pci_region *pci_fb;
 #ifndef CONFIG_DM_PCI
 	int current_busno;
Signature · 1 line
2.16.2
#4 lore raw

PATCH 3/4 pci: Remove unused ppc4xx variable from struct pci_controller

Quoted 6 lines · Stefan Roese

ppc4xx support was removed some time ago. Lets remove the now unused "pci_fb" variable from "struct pci_controller" as well.

Signed-off-by Stefan Roese <[email protected]>
Cc Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180319/64039219/attachment.sig>
author
#5 lore raw

PATCH 4/4 MAINTAINERS: Remove unused ppc4xx entry

In reply to Stefan Roese

ppc4xx support was removed some time ago. Lets remove the now unused entry in MAINTAINERS as well.

Signed-off-by Stefan Roese <[email protected]>
Cc Heinrich Schuchardt <[email protected]>
---
 MAINTAINERS | 6 ------
 1 file changed, 6 deletions(-)
MAINTAINERS +0 -6
index d5059f611d..dd9df8fd07 100644
@@ -426,12 +426,6 @@ S:	Maintained
 T:	git git://git.denx.de/u-boot-mpc86xx.git
 F:	arch/powerpc/cpu/mpc86xx/
 
-POWERPC PPC4XX
-M:	Stefan Roese <[email protected]>
-S:	Maintained
-T:	git git://git.denx.de/u-boot-ppc4xx.git
-F:	arch/powerpc/cpu/ppc4xx/
-
 RISC-V
 M:	Rick Chen <[email protected]>
 S:	Maintained
Signature · 1 line
2.16.2
#6 lore raw

PATCH 4/4 MAINTAINERS: Remove unused ppc4xx entry

Quoted 5 lines · Stefan Roese

ppc4xx support was removed some time ago. Lets remove the now unused entry in MAINTAINERS as well.

Signed-off-by Stefan Roese <[email protected]>
Cc Heinrich Schuchardt <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180319/95a1abe7/attachment.sig>