[POWERPC] CPM: Always use new binding.

The kconfig entry can go away once arch/ppc and references to the config in
drivers are removed.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

4 files changed, 1 insertions, 22 deletions

diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 4fad6c7bf9f1..917ac8891555 100644
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -11,7 +11,6 @@ config MPC8272_ADS
         select 8260
         select FSL_SOC
         select PQ2_ADS_PCI_PIC if PCI
-        select PPC_CPM_NEW_BINDING
         help
           This option enables support for the MPC8272 ADS board
 
@@ -22,7 +21,6 @@ config PQ2FADS
         select 8260
         select FSL_SOC
         select PQ2_ADS_PCI_PIC if PCI
-        select PPC_CPM_NEW_BINDING
         help
           This option enables support for the PQ2FADS board
 
@@ -31,7 +29,6 @@ config EP8248E
         select 8272
         select 8260
         select FSL_SOC
-        select PPC_CPM_NEW_BINDING
         select MDIO_BITBANG
         help
           This enables support for the Embedded Planet EP8248E board.
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 28bc6e58a970..7ff29d53dc2d 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -19,7 +19,6 @@ config MPC8540_ADS
 config MPC8560_ADS
         bool "Freescale MPC8560 ADS"
         select DEFAULT_UIMAGE
-        select PPC_CPM_NEW_BINDING
         select CPM2
         help
           This option enables support for the MPC 8560 ADS board
@@ -48,7 +47,6 @@ config MPC85xx_DS
 
 config KSI8560
         bool "Emerson KSI8560"
-        select PPC_CPM_NEW_BINDING
         select DEFAULT_UIMAGE
         help
           This option enables support for the Emerson KSI8560 board
@@ -60,14 +58,12 @@ config STX_GP3
           board.
         select CPM2
         select DEFAULT_UIMAGE
-        select PPC_CPM_NEW_BINDING
 
 config TQM8540
         bool "TQ Components TQM8540"
         help
           This option enables support for the TQ Components TQM8540 board.
         select DEFAULT_UIMAGE
-        select PPC_CPM_NEW_BINDING
         select TQM85xx
 
 config TQM8541
@@ -75,7 +71,6 @@ config TQM8541
         help
           This option enables support for the TQ Components TQM8541 board.
         select DEFAULT_UIMAGE
-        select PPC_CPM_NEW_BINDING
         select TQM85xx
         select CPM2
 
@@ -84,7 +79,6 @@ config TQM8555
         help
           This option enables support for the TQ Components TQM8555 board.
         select DEFAULT_UIMAGE
-        select PPC_CPM_NEW_BINDING
         select TQM85xx
         select CPM2
 
@@ -93,7 +87,6 @@ config TQM8560
         help
           This option enables support for the TQ Components TQM8560 board.
         select DEFAULT_UIMAGE
-        select PPC_CPM_NEW_BINDING
         select TQM85xx
         select CPM2
 
@@ -106,7 +99,6 @@ config SBC8548
 config SBC8560
         bool "Wind River SBC8560"
         select DEFAULT_UIMAGE
-        select PPC_CPM_NEW_BINDING if CPM2
         help
           This option enables support for the Wind River SBC8560 board
 
diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
index 7fd224ca233d..6fc849e51e48 100644
--- a/arch/powerpc/platforms/8xx/Kconfig
+++ b/arch/powerpc/platforms/8xx/Kconfig
@@ -18,7 +18,6 @@ config MPC8XXFADS
 config MPC86XADS
         bool "MPC86XADS"
         select CPM1
-        select PPC_CPM_NEW_BINDING
         help
           MPC86x Application Development System by Freescale Semiconductor.
           The MPC86xADS is meant to serve as a platform for s/w and h/w
@@ -27,7 +26,6 @@ config MPC86XADS
 config MPC885ADS
         bool "MPC885ADS"
         select CPM1
-        select PPC_CPM_NEW_BINDING
         help
           Freescale Semiconductor MPC885 Application Development System (ADS).
           Also known as DUET.
@@ -37,7 +35,6 @@ config MPC885ADS
 config PPC_EP88XC
         bool "Embedded Planet EP88xC (a.k.a. CWH-PPC-885XN-VE)"
         select CPM1
-        select PPC_CPM_NEW_BINDING
         help
           This enables support for the Embedded Planet EP88xC board.
 
@@ -47,7 +44,6 @@ config PPC_EP88XC
 config PPC_ADDER875
         bool "Analogue & Micro Adder 875"
         select CPM1
-        select PPC_CPM_NEW_BINDING
         select REDBOOT
         help
           This enables support for the Analogue & Micro Adder 875
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index a578b966ecbc..f38c50b4ce56 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -290,13 +290,7 @@ config CPM2
 config PPC_CPM_NEW_BINDING
         bool
         depends on CPM1 || CPM2
-        help
-          Select this if your board has been converted to use the new
-          device tree bindings for CPM, and no longer needs the
-          ioport callbacks or the platform device glue code.
-
-          The fs_enet and cpm_uart drivers will be built as
-          of_platform devices.
+        default y
 
 config AXON_RAM
         tristate "Axon DDR2 memory device driver"