Skip to content

Commit

Permalink
[PPC] Remove mpc8272 ads board from arch/ppc
Browse files Browse the repository at this point in the history
We have a board port in arch/powerpc so we dont need this one anymore.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
  • Loading branch information
Kumar Gala committed Apr 21, 2008
1 parent 14b3ca4 commit 546be91
Show file tree
Hide file tree
Showing 11 changed files with 2 additions and 1,562 deletions.
19 changes: 1 addition & 18 deletions arch/ppc/8260_io/fcc_enet.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,23 +165,15 @@ static int fcc_enet_set_mac_address(struct net_device *dev, void *addr);
#ifdef CONFIG_SBC82xx
#define F1_RXCLK 9
#define F1_TXCLK 10
#elif defined(CONFIG_ADS8272)
#define F1_RXCLK 11
#define F1_TXCLK 10
#else
#define F1_RXCLK 12
#define F1_TXCLK 11
#endif

/* FCC2 Clock Source Configuration. There are board specific.
Can only choose from CLK13-16 */
#ifdef CONFIG_ADS8272
#define F2_RXCLK 15
#define F2_TXCLK 16
#else
#define F2_RXCLK 13
#define F2_TXCLK 14
#endif

/* FCC3 Clock Source Configuration. There are board specific.
Can only choose from CLK13-16 */
Expand Down Expand Up @@ -289,10 +281,7 @@ static int fcc_enet_set_mac_address(struct net_device *dev, void *addr);
/* TQM8260 has MDIO and MDCK on PC30 and PC31 respectively */
#define PC_MDIO ((uint)0x00000002)
#define PC_MDCK ((uint)0x00000001)
#elif defined(CONFIG_ADS8272)
#define PC_MDIO ((uint)0x00002000)
#define PC_MDCK ((uint)0x00001000)
#elif defined(CONFIG_EST8260) || defined(CONFIG_ADS8260) || defined(CONFIG_PQ2FADS)
#elif defined(CONFIG_EST8260) || defined(CONFIG_ADS8260)
#define PC_MDIO ((uint)0x00400000)
#define PC_MDCK ((uint)0x00200000)
#else
Expand Down Expand Up @@ -2118,11 +2107,6 @@ init_fcc_startup(fcc_info_t *fip, struct net_device *dev)
printk("Can't get FCC IRQ %d\n", fip->fc_interrupt);

#ifdef PHY_INTERRUPT
#ifdef CONFIG_ADS8272
if (request_irq(PHY_INTERRUPT, mii_link_interrupt, IRQF_SHARED,
"mii", dev) < 0)
printk(KERN_CRIT "Can't get MII IRQ %d\n", PHY_INTERRUPT);
#else
/* Make IRQn edge triggered. This does not work if PHY_INTERRUPT is
* on Port C.
*/
Expand All @@ -2132,7 +2116,6 @@ init_fcc_startup(fcc_info_t *fip, struct net_device *dev)
if (request_irq(PHY_INTERRUPT, mii_link_interrupt, 0,
"mii", dev) < 0)
printk(KERN_CRIT "Can't get MII IRQ %d\n", PHY_INTERRUPT);
#endif
#endif /* PHY_INTERRUPT */

/* Set GFMR to enable Ethernet operating mode.
Expand Down
19 changes: 1 addition & 18 deletions arch/ppc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -666,9 +666,6 @@ config TQM8260
End of Life: not yet :-)
URL: <http://www.denx.de/PDF/TQM82xx_SPEC_Rev005.pdf>

config ADS8272
bool "ADS8272"

config PQ2FADS
bool "Freescale-PQ2FADS"
help
Expand Down Expand Up @@ -698,11 +695,6 @@ config EV64360
platform.
endchoice

config PQ2ADS
bool
depends on ADS8272
default y

config TQM8xxL
bool
depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L)
Expand All @@ -725,15 +717,6 @@ config 8260
this option means that you wish to build a kernel for a machine with
an 8260 class CPU.

config 8272
bool
depends on 6xx
default y if ADS8272
select 8260
help
The MPC8272 CPM has a different internal dpram setup than other CPM2
devices

config CPM1
bool
depends on 8xx
Expand Down Expand Up @@ -1069,7 +1052,7 @@ config PCI_8260

config 8260_PCI9
bool "Enable workaround for MPC826x erratum PCI 9"
depends on PCI_8260 && !ADS8272
depends on PCI_8260
default y

choice
Expand Down
Loading

0 comments on commit 546be91

Please sign in to comment.