ARM: mach-pnx4008: Remove architecture

This patch removes the ARM architecture mach-pnx4008. No direct support or user
feedback since 2006. Acknowledgements from NXP/Philips and Linux arm-soc
maintainers.

Signed-off-by: Roland Stigge <stigge@antcom.de>

4 files changed, 3 insertions, 86 deletions

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 7065df6036ca..7de2285d9fa9 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -13,7 +13,6 @@ config USB_ARCH_HAS_OHCI
         default y if PXA3xx
         default y if ARCH_EP93XX
         default y if ARCH_AT91
-        default y if ARCH_PNX4008
         default y if MFD_TC6393XB
         default y if ARCH_W90X900
         default y if ARCH_DAVINCI_DA8XX
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 075d2eca8108..276add2358a1 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -292,7 +292,7 @@ config USB_OHCI_HCD
         depends on USB && USB_ARCH_HAS_OHCI
         select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
         select USB_OTG_UTILS if ARCH_OMAP
-        select USB_ISP1301 if ARCH_LPC32XX || ARCH_PNX4008
+        select USB_ISP1301 if ARCH_LPC32XX
         ---help---
           The Open Host Controller Interface (OHCI) is a standard for accessing
           USB 1.1 host controller hardware.  It does more in hardware than Intel's
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 2b1e8d84c873..6780010e9c3c 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1049,7 +1049,7 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER         ohci_hcd_at91_driver
 #endif
 
-#if defined(CONFIG_ARCH_PNX4008) || defined(CONFIG_ARCH_LPC32XX)
+#ifdef CONFIG_ARCH_LPC32XX
 #include "ohci-nxp.c"
 #define PLATFORM_DRIVER         usb_hcd_nxp_driver
 #endif
diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c
index a446386bf779..119966603d8d 100644
--- a/drivers/usb/host/ohci-nxp.c
+++ b/drivers/usb/host/ohci-nxp.c
@@ -2,7 +2,6 @@
  * driver for NXP USB Host devices
  *
  * Currently supported OHCI host devices:
- * - Philips PNX4008
  * - NXP LPC32xx
  *
  * Authors: Dmitry Chigirev <source@mvista.com>
@@ -66,38 +65,6 @@ static struct clk *usb_pll_clk;
 static struct clk *usb_dev_clk;
 static struct clk *usb_otg_clk;
 
-static void isp1301_configure_pnx4008(void)
-{
-        /* PNX4008 only supports DAT_SE0 USB mode */
-        /* PNX4008 R2A requires setting the MAX603 to output 3.6V */
-        /* Power up externel charge-pump */
-
-        i2c_smbus_write_byte_data(isp1301_i2c_client,
-                ISP1301_I2C_MODE_CONTROL_1, MC1_DAT_SE0 | MC1_SPEED_REG);
-        i2c_smbus_write_byte_data(isp1301_i2c_client,
-                ISP1301_I2C_MODE_CONTROL_1 | ISP1301_I2C_REG_CLEAR_ADDR,
-                ~(MC1_DAT_SE0 | MC1_SPEED_REG));
-        i2c_smbus_write_byte_data(isp1301_i2c_client,
-                ISP1301_I2C_MODE_CONTROL_2,
-                MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL);
-        i2c_smbus_write_byte_data(isp1301_i2c_client,
-                ISP1301_I2C_MODE_CONTROL_2 | ISP1301_I2C_REG_CLEAR_ADDR,
-                ~(MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL));
-        i2c_smbus_write_byte_data(isp1301_i2c_client,
-                ISP1301_I2C_OTG_CONTROL_1, OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN);
-        i2c_smbus_write_byte_data(isp1301_i2c_client,
-                ISP1301_I2C_OTG_CONTROL_1 | ISP1301_I2C_REG_CLEAR_ADDR,
-                ~(OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN));
-        i2c_smbus_write_byte_data(isp1301_i2c_client,
-                ISP1301_I2C_INTERRUPT_LATCH | ISP1301_I2C_REG_CLEAR_ADDR, 0xFF);
-        i2c_smbus_write_byte_data(isp1301_i2c_client,
-                ISP1301_I2C_INTERRUPT_FALLING | ISP1301_I2C_REG_CLEAR_ADDR,
-                0xFF);
-        i2c_smbus_write_byte_data(isp1301_i2c_client,
-                ISP1301_I2C_INTERRUPT_RISING | ISP1301_I2C_REG_CLEAR_ADDR,
-                0xFF);
-}
-
 static void isp1301_configure_lpc32xx(void)
 {
         /* LPC32XX only supports DAT_SE0 USB mode */
@@ -149,10 +116,7 @@ static void isp1301_configure_lpc32xx(void)
 
 static void isp1301_configure(void)
 {
-        if (machine_is_pnx4008())
-                isp1301_configure_pnx4008();
-        else
-                isp1301_configure_lpc32xx();
+        isp1301_configure_lpc32xx();
 }
 
 static inline void isp1301_vbus_on(void)
@@ -241,47 +205,6 @@ static const struct hc_driver ohci_nxp_hc_driver = {
         .start_port_reset = ohci_start_port_reset,
 };
 
-static void nxp_set_usb_bits(void)
-{
-        if (machine_is_pnx4008()) {
-                start_int_set_falling_edge(SE_USB_OTG_ATX_INT_N);
-                start_int_ack(SE_USB_OTG_ATX_INT_N);
-                start_int_umask(SE_USB_OTG_ATX_INT_N);
-
-                start_int_set_rising_edge(SE_USB_OTG_TIMER_INT);
-                start_int_ack(SE_USB_OTG_TIMER_INT);
-                start_int_umask(SE_USB_OTG_TIMER_INT);
-
-                start_int_set_rising_edge(SE_USB_I2C_INT);
-                start_int_ack(SE_USB_I2C_INT);
-                start_int_umask(SE_USB_I2C_INT);
-
-                start_int_set_rising_edge(SE_USB_INT);
-                start_int_ack(SE_USB_INT);
-                start_int_umask(SE_USB_INT);
-
-                start_int_set_rising_edge(SE_USB_NEED_CLK_INT);
-                start_int_ack(SE_USB_NEED_CLK_INT);
-                start_int_umask(SE_USB_NEED_CLK_INT);
-
-                start_int_set_rising_edge(SE_USB_AHB_NEED_CLK_INT);
-                start_int_ack(SE_USB_AHB_NEED_CLK_INT);
-                start_int_umask(SE_USB_AHB_NEED_CLK_INT);
-        }
-}
-
-static void nxp_unset_usb_bits(void)
-{
-        if (machine_is_pnx4008()) {
-                start_int_mask(SE_USB_OTG_ATX_INT_N);
-                start_int_mask(SE_USB_OTG_TIMER_INT);
-                start_int_mask(SE_USB_I2C_INT);
-                start_int_mask(SE_USB_INT);
-                start_int_mask(SE_USB_NEED_CLK_INT);
-                start_int_mask(SE_USB_AHB_NEED_CLK_INT);
-        }
-}
-
 static int __devinit usb_hcd_nxp_probe(struct platform_device *pdev)
 {
         struct usb_hcd *hcd = 0;
@@ -376,9 +299,6 @@ static int __devinit usb_hcd_nxp_probe(struct platform_device *pdev)
                 goto out8;
         }
 
-        /* Set all USB bits in the Start Enable register */
-        nxp_set_usb_bits();
-
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
                 dev_err(&pdev->dev, "Failed to get MEM resource\n");
@@ -413,7 +333,6 @@ static int __devinit usb_hcd_nxp_probe(struct platform_device *pdev)
 
         nxp_stop_hc();
 out8:
-        nxp_unset_usb_bits();
         usb_put_hcd(hcd);
 out7:
         clk_disable(usb_otg_clk);
@@ -441,7 +360,6 @@ static int usb_hcd_nxp_remove(struct platform_device *pdev)
         nxp_stop_hc();
         release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
         usb_put_hcd(hcd);
-        nxp_unset_usb_bits();
         clk_disable(usb_pll_clk);
         clk_put(usb_pll_clk);
         clk_disable(usb_dev_clk);