powerpc: Make generic_calibrate_decr() the default

ppc_md.calibrate_decr() is a mandatory item. Its nullity is never
checked so it must be non null on all platforms.

Most platforms define generic_calibrate_decr() as their
ppc_md.calibrate_decr(). Have time_init() call
generic_calibrate_decr() when ppc_md.calibrate_decr() is NULL,
and remove default assignment from all machines.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/6cb9865d916231c38401ba34ad1a98c249fae135.1676711562.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 9d8665910350c1ea9dedf9eed331c2cac0ae3cf2..df20cf201f74d7938e62ec0d76f5e27f3c2f0817 100644 (file)
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -887,7 +887,11 @@ void __init time_init(void)
        unsigned shift;
 
        /* Normal PowerPC with timebase register */
-       ppc_md.calibrate_decr();
+       if (ppc_md.calibrate_decr)
+               ppc_md.calibrate_decr();
+       else
+               generic_calibrate_decr();
+
        printk(KERN_DEBUG "time_init: decrementer frequency = %lu.%.6lu MHz\n",
               ppc_tb_freq / 1000000, ppc_tb_freq % 1000000);
        printk(KERN_DEBUG "time_init: processor frequency   = %lu.%.6lu MHz\n",

diff --git a/arch/powerpc/platforms/40x/ppc40x_simple.c b/arch/powerpc/platforms/40x/ppc40x_simple.c
index dce696c32679e5ee7feb492f6f82a7186c3c4282..e454e9d2eff17b575a113e8422494a9e4e17230f 100644 (file)
--- a/arch/powerpc/platforms/40x/ppc40x_simple.c
+++ b/arch/powerpc/platforms/40x/ppc40x_simple.c
@@ -74,5 +74,4 @@ define_machine(ppc40x_simple) {
        .init_IRQ = uic_init_tree,
        .get_irq = uic_get_irq,
        .restart = ppc4xx_reset_system,
-       .calibrate_decr = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/44x/canyonlands.c b/arch/powerpc/platforms/44x/canyonlands.c
index ba561ca6c25fea96fee308c4770f03e53c747cdd..8742a10d9e0cfe3227c47e15db4e881f2bb28672 100644 (file)
--- a/arch/powerpc/platforms/44x/canyonlands.c
+++ b/arch/powerpc/platforms/44x/canyonlands.c
@@ -114,5 +114,4 @@ define_machine(canyonlands) {
        .init_IRQ = uic_init_tree,
        .get_irq = uic_get_irq,
        .restart = ppc4xx_reset_system,
-       .calibrate_decr = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c
index 5b9e57b4cd659407a0a520f1acc623b0e16884d8..4861310c8dc0c32813a3b00d4460fbe8cb0c308c 100644 (file)
--- a/arch/powerpc/platforms/44x/ebony.c
+++ b/arch/powerpc/platforms/44x/ebony.c
@@ -58,5 +58,4 @@ define_machine(ebony) {
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,
        .restart                = ppc4xx_reset_system,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/44x/fsp2.c b/arch/powerpc/platforms/44x/fsp2.c
index 56d91dbef5770da5eb6136636f407c5dbe5d9168..f6b8d02e08b017398585e65bb82f3c48e64463eb 100644 (file)
--- a/arch/powerpc/platforms/44x/fsp2.c
+++ b/arch/powerpc/platforms/44x/fsp2.c
@@ -313,5 +313,4 @@ define_machine(fsp2) {
        .init_IRQ               = fsp2_irq_init,
        .get_irq                = uic_get_irq,
        .restart                = ppc4xx_reset_system,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/44x/iss4xx.c b/arch/powerpc/platforms/44x/iss4xx.c
index e779bd3d22916ffc2353411367c9c940f08bc96e..981972e8347ff520e09024e1d0ccf824f7c23d9d 100644 (file)
--- a/arch/powerpc/platforms/44x/iss4xx.c
+++ b/arch/powerpc/platforms/44x/iss4xx.c
@@ -147,5 +147,4 @@ define_machine(iss4xx) {
        .init_IRQ               = iss4xx_init_irq,
        .setup_arch             = iss4xx_setup_arch,
        .restart                = ppc4xx_reset_system,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c
index 2a0dcdf04b217366b6dd85965454c415bacdd27c..971786ff1a7b3d5ed320cb73f9fe806340d7c3e5 100644 (file)
--- a/arch/powerpc/platforms/44x/ppc44x_simple.c
+++ b/arch/powerpc/platforms/44x/ppc44x_simple.c
@@ -82,5 +82,4 @@ define_machine(ppc44x_simple) {
        .init_IRQ = uic_init_tree,
        .get_irq = uic_get_irq,
        .restart = ppc4xx_reset_system,
-       .calibrate_decr = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/44x/ppc476.c b/arch/powerpc/platforms/44x/ppc476.c
index 4641ae8c9b097e54531212d4ef0904f3a3928d02..3135e654a7436b145f328baec2cd9623f69b6401 100644 (file)
--- a/arch/powerpc/platforms/44x/ppc476.c
+++ b/arch/powerpc/platforms/44x/ppc476.c
@@ -277,7 +277,6 @@ define_machine(ppc47x_akebono) {
        .init_IRQ               = ppc47x_init_irq,
        .setup_arch             = ppc47x_setup_arch,
        .restart                = ppc4xx_reset_system,
-       .calibrate_decr         = generic_calibrate_decr,
 };
 
 define_machine(ppc47x_currituck) {
@@ -288,5 +287,4 @@ define_machine(ppc47x_currituck) {
        .pci_irq_fixup          = ppc47x_pci_irq_fixup,
        .setup_arch             = ppc47x_setup_arch,
        .restart                = ppc4xx_reset_system,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/44x/sam440ep.c b/arch/powerpc/platforms/44x/sam440ep.c
index 8b281e0274774832d70aa0369140931bd98d519e..5cdaa4068e416fbb60bbc124a8a265ae5519aa6a 100644 (file)
--- a/arch/powerpc/platforms/44x/sam440ep.c
+++ b/arch/powerpc/platforms/44x/sam440ep.c
@@ -54,7 +54,6 @@ define_machine(sam440ep) {
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,
        .restart                = ppc4xx_reset_system,
-       .calibrate_decr         = generic_calibrate_decr,
 };
 
 static struct i2c_board_info sam440ep_rtc_info = {

diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c
index acbc356e8a19c0abba4c24142afc47d5338fcbb2..bfeb9bdc3258e12b24f2d8d9bea670417431fadb 100644 (file)
--- a/arch/powerpc/platforms/44x/warp.c
+++ b/arch/powerpc/platforms/44x/warp.c
@@ -48,7 +48,6 @@ define_machine(warp) {
        .init_IRQ       = uic_init_tree,
        .get_irq        = uic_get_irq,
        .restart        = ppc4xx_reset_system,
-       .calibrate_decr = generic_calibrate_decr,
 };
 
 

diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.c b/arch/powerpc/platforms/512x/mpc5121_ads.c
index 0b6a2d3fd3436a7a580c59f5d73be7ae3109bb7e..80b25ce076bc5e582e9bf5fcd74675d41455e6e9 100644 (file)
--- a/arch/powerpc/platforms/512x/mpc5121_ads.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads.c
@@ -67,6 +67,5 @@ define_machine(mpc5121_ads) {
        .init                   = mpc512x_init,
        .init_IRQ               = mpc5121_ads_init_IRQ,
        .get_irq                = ipic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .restart                = mpc512x_restart,
 };

diff --git a/arch/powerpc/platforms/512x/mpc512x_generic.c b/arch/powerpc/platforms/512x/mpc512x_generic.c
index 364564c995bdbe9732760063c2926aee869d213f..97dfaac8f7ffe637af36c08a060d71907219a5b8 100644 (file)
--- a/arch/powerpc/platforms/512x/mpc512x_generic.c
+++ b/arch/powerpc/platforms/512x/mpc512x_generic.c
@@ -47,6 +47,5 @@ define_machine(mpc512x_generic) {
        .setup_arch             = mpc512x_setup_arch,
        .init_IRQ               = mpc512x_init_IRQ,
        .get_irq                = ipic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .restart                = mpc512x_restart,
 };

diff --git a/arch/powerpc/platforms/512x/pdm360ng.c b/arch/powerpc/platforms/512x/pdm360ng.c
index d3a4eeb47bb104ae8b9cffa2b1a83121d6a3ad3f..4bdec1c25de752fb8eaeef99c1fd557ec80a27b5 100644 (file)
--- a/arch/powerpc/platforms/512x/pdm360ng.c
+++ b/arch/powerpc/platforms/512x/pdm360ng.c
@@ -121,6 +121,5 @@ define_machine(pdm360ng) {
        .init                   = pdm360ng_init,
        .init_IRQ               = mpc512x_init_IRQ,
        .get_irq                = ipic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .restart                = mpc512x_restart,
 };

diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
index 61dfec74ff85cc23ac89c8e0bb294806f3fb5450..aa82e6b437f31a5c6c9a34c4355660e8e3ced5b8 100644 (file)
--- a/arch/powerpc/platforms/52xx/efika.c
+++ b/arch/powerpc/platforms/52xx/efika.c
@@ -226,7 +226,6 @@ define_machine(efika)
        .get_rtc_time           = rtas_get_rtc_time,
        .progress               = rtas_progress,
        .get_boot_time          = rtas_get_boot_time,
-       .calibrate_decr         = generic_calibrate_decr,
 #ifdef CONFIG_PCI
        .phys_mem_access_prot   = pci_phys_mem_access_prot,
 #endif

diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 7ea9b6ce05917f7587c1a6dacf12fee2d4a99fa9..0fd67b3ffc3e83999cfc46387a0d7aed5513d3e9 100644 (file)
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -189,5 +189,4 @@ define_machine(lite5200) {
        .init_IRQ       = mpc52xx_init_irq,
        .get_irq        = mpc52xx_get_irq,
        .restart        = mpc52xx_restart,
-       .calibrate_decr = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
index a9c92c6ccbcfdb5bdde6862b05f9fe302ae857d3..19626cd42406598a14cb9385efd0bfabcb643180 100644 (file)
--- a/arch/powerpc/platforms/52xx/media5200.c
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -236,5 +236,4 @@ define_machine(media5200_platform) {
        .init_IRQ       = media5200_init_irq,
        .get_irq        = mpc52xx_get_irq,
        .restart        = mpc52xx_restart,
-       .calibrate_decr = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/52xx/mpc5200_simple.c b/arch/powerpc/platforms/52xx/mpc5200_simple.c
index cc349d579061e2038f6a8d908e4782be40681b08..f1e85e86f5e57620621db9b81e9b0f793649e77b 100644 (file)
--- a/arch/powerpc/platforms/52xx/mpc5200_simple.c
+++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c
@@ -76,5 +76,4 @@ define_machine(mpc5200_simple_platform) {
        .init_IRQ       = mpc52xx_init_irq,
        .get_irq        = mpc52xx_get_irq,
        .restart        = mpc52xx_restart,
-       .calibrate_decr = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index 66defdaf816fb7497f31dd7677bbf85ab8948c7b..8f1856ba692e91795d0718e1171c8fbe57228cc5 100644 (file)
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -308,7 +308,6 @@ define_machine(ep8248e)
        .setup_arch = ep8248e_setup_arch,
        .init_IRQ = ep8248e_pic_init,
        .get_irq = cpm2_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .restart = pq2_restart,
        .progress = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/82xx/km82xx.c b/arch/powerpc/platforms/82xx/km82xx.c
index 8ab575d70080a1ef05f43c01d7ed6049dddeb9b2..51c9bfd975925a3b5ab05adae6123d07bde7e85c 100644 (file)
--- a/arch/powerpc/platforms/82xx/km82xx.c
+++ b/arch/powerpc/platforms/82xx/km82xx.c
@@ -195,7 +195,6 @@ define_machine(km82xx)
        .setup_arch = km82xx_setup_arch,
        .init_IRQ = km82xx_pic_init,
        .get_irq = cpm2_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .restart = pq2_restart,
        .progress = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/82xx/mpc8272_ads.c b/arch/powerpc/platforms/82xx/mpc8272_ads.c
index 5dd034ed2c8778acdf7a93e78ec1263d45b9439a..f9b2b1617eeb110e1b23c5845e1ce962db885760 100644 (file)
--- a/arch/powerpc/platforms/82xx/mpc8272_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc8272_ads.c
@@ -199,7 +199,6 @@ define_machine(mpc8272_ads)
        .discover_phbs = pq2_init_pci,
        .init_IRQ = mpc8272_ads_pic_init,
        .get_irq = cpm2_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .restart = pq2_restart,
        .progress = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/82xx/pq2fads.c b/arch/powerpc/platforms/82xx/pq2fads.c
index d91dfdc634e97afbdcfc7caca34723e1846401a2..4080cb4253d36d26a89df2756ef50caab75dbf75 100644 (file)
--- a/arch/powerpc/platforms/82xx/pq2fads.c
+++ b/arch/powerpc/platforms/82xx/pq2fads.c
@@ -177,7 +177,6 @@ define_machine(pq2fads)
        .discover_phbs = pq2_init_pci,
        .init_IRQ = pq2fads_pic_init,
        .get_irq = cpm2_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .restart = pq2_restart,
        .progress = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/asp834x.c b/arch/powerpc/platforms/83xx/asp834x.c
index 8f3d995027febad5f935537def806b952a59909b..6870d0c34f1d283d202259be135eeaaf9e385b60 100644 (file)
--- a/arch/powerpc/platforms/83xx/asp834x.c
+++ b/arch/powerpc/platforms/83xx/asp834x.c
@@ -41,6 +41,5 @@ define_machine(asp834x) {
        .get_irq                = ipic_get_irq,
        .restart                = mpc83xx_restart,
        .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c
index 907acdecc94afea192d390fe301c8f8ce0d416d6..26ddc71365473e9cfec27251b64ece7204206744 100644 (file)
--- a/arch/powerpc/platforms/83xx/km83xx.c
+++ b/arch/powerpc/platforms/83xx/km83xx.c
@@ -184,6 +184,5 @@ define_machine(mpc83xx_km) {
        .get_irq        = ipic_get_irq,
        .restart        = mpc83xx_restart,
        .time_init      = mpc83xx_time_init,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc830x_rdb.c b/arch/powerpc/platforms/83xx/mpc830x_rdb.c
index 956d4389effa23d0392cad0c485f7ef36c3e3171..534bb227480d25dd09a81166a818467db6db1ba2 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc830x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc830x_rdb.c
@@ -53,6 +53,5 @@ define_machine(mpc830x_rdb) {
        .get_irq                = ipic_get_irq,
        .restart                = mpc83xx_restart,
        .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc831x_rdb.c b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
index 3b578f080e3b781dcd2862b9fbf2b36e994461cd..7b901ab3b864632b79e2185d6d0f40f7fa923cec 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc831x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc831x_rdb.c
@@ -53,6 +53,5 @@ define_machine(mpc831x_rdb) {
        .get_irq                = ipic_get_irq,
        .restart                = mpc83xx_restart,
        .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index 01035eff7d2eef8678e16cc56df2ae314b7df856..c08f043e3963c5cca0631f7e651001505feafd14 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -97,6 +97,5 @@ define_machine(mpc832x_mds) {
        .get_irq        = ipic_get_irq,
        .restart        = mpc83xx_restart,
        .time_init      = mpc83xx_time_init,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
index 6b7b852e48bfc9ce17cb53af1ef8581b6f39234f..af6774f145e3d2f302fd484c202f3bc5a766ab92 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@ -221,6 +221,5 @@ define_machine(mpc832x_rdb) {
        .get_irq        = ipic_get_irq,
        .restart        = mpc83xx_restart,
        .time_init      = mpc83xx_time_init,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index 92ff7be472c3092750712f96edb34e1645a545fa..e45b98ff02d84854b9e531ee0b159dcddba98afb 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -66,6 +66,5 @@ define_machine(mpc834x_itx) {
        .get_irq                = ipic_get_irq,
        .restart                = mpc83xx_restart,
        .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c
index 8e45c034daaf557ddbf6bf01a130d142e6d5f78e..d08974a6084864d866ce8cb9fdb20219ca0e6a18 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc834x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -88,6 +88,5 @@ define_machine(mpc834x_mds) {
        .get_irq                = ipic_get_irq,
        .restart                = mpc83xx_restart,
        .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index 4ae2b6e4b513de0fb148875e0a2e1a5bfdbbdd9a..84c08fdf503ceb8279b1952a92955c06cb89e3aa 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -197,6 +197,5 @@ define_machine(mpc836x_mds) {
        .get_irq        = ipic_get_irq,
        .restart        = mpc83xx_restart,
        .time_init      = mpc83xx_time_init,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc836x_rdk.c b/arch/powerpc/platforms/83xx/mpc836x_rdk.c
index 231a5df0399b835d79c4fd92528bc6d7e3007e07..1fc9d1235a7cbc35fb3b292768f18c46d4eca76a 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc836x_rdk.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_rdk.c
@@ -37,6 +37,5 @@ define_machine(mpc836x_rdk) {
        .get_irq        = ipic_get_irq,
        .restart        = mpc83xx_restart,
        .time_init      = mpc83xx_time_init,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c
index 0c10100756d4991ed22cba206d2ea6e8c5439b5e..c2055ef35b63d23b38e541a5889d0a2efdba6a44 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc837x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc837x_mds.c
@@ -90,6 +90,5 @@ define_machine(mpc837x_mds) {
        .get_irq                = ipic_get_irq,
        .restart                = mpc83xx_restart,
        .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/83xx/mpc837x_rdb.c b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
index 5d48c6842098e3f5e02f3804a42fe8b476e767e1..39e78018dd0b7fe993b5e91f61f40a9187c1673f 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc837x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc837x_rdb.c
@@ -78,6 +78,5 @@ define_machine(mpc837x_rdb) {
        .get_irq                = ipic_get_irq,
        .restart                = mpc83xx_restart,
        .time_init              = mpc83xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/bsc913x_qds.c b/arch/powerpc/platforms/85xx/bsc913x_qds.c
index 902a867352c29090f0f51a710fe7c43576264f75..a029aa0905385324bbb965bf3ebd04f216b96fc4 100644 (file)
--- a/arch/powerpc/platforms/85xx/bsc913x_qds.c
+++ b/arch/powerpc/platforms/85xx/bsc913x_qds.c
@@ -59,6 +59,5 @@ define_machine(bsc9132_qds) {
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/bsc913x_rdb.c b/arch/powerpc/platforms/85xx/bsc913x_rdb.c
index 58a44953b936bae8f8fdcd4f4aed61bd69b6f724..361b4371d073b5abad05a05b6d4071047a5f429f 100644 (file)
--- a/arch/powerpc/platforms/85xx/bsc913x_rdb.c
+++ b/arch/powerpc/platforms/85xx/bsc913x_rdb.c
@@ -46,6 +46,5 @@ define_machine(bsc9131_rdb) {
        .setup_arch             = bsc913x_rdb_setup_arch,
        .init_IRQ               = bsc913x_rdb_pic_init,
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/c293pcie.c b/arch/powerpc/platforms/85xx/c293pcie.c
index fbf1875e5835d4b2e92d8fb015df32696811263c..34975708be79f7b7f9911b0a9aaf1ceed67ed0be 100644 (file)
--- a/arch/powerpc/platforms/85xx/c293pcie.c
+++ b/arch/powerpc/platforms/85xx/c293pcie.c
@@ -51,6 +51,5 @@ define_machine(c293_pcie) {
        .setup_arch             = c293_pcie_setup_arch,
        .init_IRQ               = c293_pcie_pic_init,
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c
index 2c539de2d629a01ce6ae9e998b5419fe30f86eb8..bfde391c42f43161edebb01787552a9377bfd36d 100644 (file)
--- a/arch/powerpc/platforms/85xx/corenet_generic.c
+++ b/arch/powerpc/platforms/85xx/corenet_generic.c
@@ -198,7 +198,6 @@ define_machine(corenet_generic) {
 #else
        .get_irq                = mpic_get_coreint_irq,
 #endif
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
        .power_save             = e500_idle,
 };

diff --git a/arch/powerpc/platforms/85xx/ge_imp3a.c b/arch/powerpc/platforms/85xx/ge_imp3a.c
index 1bfd4ea130387f6aaf4da31d6f8ea81201baf06b..3678a1fbf5ad52042625ee1a85b9dc785e1b6c57 100644 (file)
--- a/arch/powerpc/platforms/85xx/ge_imp3a.c
+++ b/arch/powerpc/platforms/85xx/ge_imp3a.c
@@ -203,6 +203,5 @@ define_machine(ge_imp3a) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c
index 548d478e5194e06358c68da05ac68946180828d8..af38c3aec0426ff17df0c544726b9868d9c33024 100644 (file)
--- a/arch/powerpc/platforms/85xx/ksi8560.c
+++ b/arch/powerpc/platforms/85xx/ksi8560.c
@@ -180,5 +180,4 @@ define_machine(ksi8560) {
        .show_cpuinfo           = ksi8560_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .restart                = machine_restart,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/85xx/mpc8536_ds.c b/arch/powerpc/platforms/85xx/mpc8536_ds.c
index 9900cf2cd3925eb15ffc06eca8564f8b428a0db8..58ab3831913fea2faa8a7aa2c3550bcf4076bc30 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc8536_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc8536_ds.c
@@ -62,6 +62,5 @@ define_machine(mpc8536_ds) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index dd5302ab406d3b21bd53994e09719914699a92c7..7c67438e76f84fa54bb0af05c6628c7934ed8c03 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -158,6 +158,5 @@ define_machine(mpc85xx_ads) {
        .init_IRQ               = mpc85xx_ads_pic_init,
        .show_cpuinfo           = mpc85xx_ads_show_cpuinfo,
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index d7568b35ec78936ce05e434ae0d5c400f2783f16..0e6964c7fdd6400510338836720c502f6bed5456 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -383,6 +383,5 @@ define_machine(mpc85xx_cds) {
        .pcibios_fixup_bus      = mpc85xx_cds_fixup_bus,
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index b4feb251b57eb154ffa991f85b75ed4843310f16..70167b8f00a3f227a3537870f4823447bd86c5f2 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -172,7 +172,6 @@ define_machine(mpc8544_ds) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -186,7 +185,6 @@ define_machine(mpc8572_ds) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -200,6 +198,5 @@ define_machine(p2020_ds) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 721322e04c7984a2375bd6e571e4a065db63f59d..28a04928250f921063bb52a57c79930d69338603 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -345,7 +345,6 @@ define_machine(mpc8568_mds) {
        .setup_arch     = mpc85xx_mds_setup_arch,
        .init_IRQ       = mpc85xx_mds_pic_init,
        .get_irq        = mpic_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
@@ -359,7 +358,6 @@ define_machine(mpc8569_mds) {
        .setup_arch     = mpc85xx_mds_setup_arch,
        .init_IRQ       = mpc85xx_mds_pic_init,
        .get_irq        = mpic_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
@@ -373,7 +371,6 @@ define_machine(p1021_mds) {
        .setup_arch     = mpc85xx_mds_setup_arch,
        .init_IRQ       = mpc85xx_mds_pic_init,
        .get_irq        = mpic_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
index 9754feaebcd48864155f9dbdf1016e8c310ab44a..aa24793ad25c90e8a3d41f116b05b0532efe7e9c 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
@@ -129,7 +129,6 @@ define_machine(p2020_rdb) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -143,7 +142,6 @@ define_machine(p1020_rdb) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -157,7 +155,6 @@ define_machine(p1021_rdb_pc) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -171,7 +168,6 @@ define_machine(p2020_rdb_pc) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -185,7 +181,6 @@ define_machine(p1025_rdb) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -199,7 +194,6 @@ define_machine(p1020_mbg_pc) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -213,7 +207,6 @@ define_machine(p1020_utm_pc) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -227,7 +220,6 @@ define_machine(p1020_rdb_pc) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -241,7 +233,6 @@ define_machine(p1020_rdb_pd) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -255,6 +246,5 @@ define_machine(p1024_rdb) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/mvme2500.c b/arch/powerpc/platforms/85xx/mvme2500.c
index ee1383e811d98e3c96812ff3cd9df0b1bbb894d2..1b59e45a0c64f1bd4dc257b52df072b07a555abf 100644 (file)
--- a/arch/powerpc/platforms/85xx/mvme2500.c
+++ b/arch/powerpc/platforms/85xx/mvme2500.c
@@ -53,6 +53,5 @@ define_machine(mvme2500) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/p1010rdb.c b/arch/powerpc/platforms/85xx/p1010rdb.c
index 8ba9306a96b6fdc2679ef234f05a958e667a54fe..14ec79a3274669a693c453ee26b9933db41933c0 100644 (file)
--- a/arch/powerpc/platforms/85xx/p1010rdb.c
+++ b/arch/powerpc/platforms/85xx/p1010rdb.c
@@ -73,6 +73,5 @@ define_machine(p1010_rdb) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index 15a684ce920188d75c2096c8116d8f3a85ecc5d9..23d0926298b96af79c1795828fd81835f2654a8d 100644 (file)
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -559,6 +559,5 @@ define_machine(p1022_ds) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/p1022_rdk.c b/arch/powerpc/platforms/85xx/p1022_rdk.c
index aee9ffc0eb17101c25189218a0db436e112de01e..d1159150c3b5f0c48ce9b5124dcc3d760bc11f17 100644 (file)
--- a/arch/powerpc/platforms/85xx/p1022_rdk.c
+++ b/arch/powerpc/platforms/85xx/p1022_rdk.c
@@ -139,6 +139,5 @@ define_machine(p1022_rdk) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/p1023_rdb.c b/arch/powerpc/platforms/85xx/p1023_rdb.c
index e199fc44fc2f03ddfa358f47f5ccf656540794bb..9df0439a9382c9743381889d2e93ddfd9dcc447e 100644 (file)
--- a/arch/powerpc/platforms/85xx/p1023_rdb.c
+++ b/arch/powerpc/platforms/85xx/p1023_rdb.c
@@ -100,7 +100,6 @@ define_machine(p1023_rdb) {
        .setup_arch             = p1023_rdb_setup_arch,
        .init_IRQ               = p1023_rdb_pic_init,
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/85xx/ppa8548.c b/arch/powerpc/platforms/85xx/ppa8548.c
index b030d0e7b06b6ce6d13f974e913ef834b2db2a91..acd19c52ad43bdaa16f1cee6f544cd636ca25345 100644 (file)
--- a/arch/powerpc/platforms/85xx/ppa8548.c
+++ b/arch/powerpc/platforms/85xx/ppa8548.c
@@ -79,6 +79,5 @@ define_machine(ppa8548) {
        .init_IRQ       = ppa8548_pic_init,
        .show_cpuinfo   = ppa8548_show_cpuinfo,
        .get_irq        = mpic_get_irq,
-       .calibrate_decr = generic_calibrate_decr,
        .progress       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/qemu_e500.c b/arch/powerpc/platforms/85xx/qemu_e500.c
index 335815a2d121ee40c90e6560bd8dc277f7bcbf7d..6e4b1ddf292b7b9062a16c62a7468493df14f3b3 100644 (file)
--- a/arch/powerpc/platforms/85xx/qemu_e500.c
+++ b/arch/powerpc/platforms/85xx/qemu_e500.c
@@ -58,7 +58,6 @@ define_machine(qemu_e500) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_coreint_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
        .power_save             = e500_idle,
 };

diff --git a/arch/powerpc/platforms/85xx/socrates.c b/arch/powerpc/platforms/85xx/socrates.c
index f603a39058013db7a0e3b9d02fdba3262e3a8bd4..9fa1338bc0026406f5f56e72764b23f3116a4c9b 100644 (file)
--- a/arch/powerpc/platforms/85xx/socrates.c
+++ b/arch/powerpc/platforms/85xx/socrates.c
@@ -75,6 +75,5 @@ define_machine(socrates) {
        .setup_arch             = socrates_setup_arch,
        .init_IRQ               = socrates_pic_init,
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c
index 9f37b25e7a821a47be390be249e50616cd2a42aa..5e2646b4c039fb6009a361957dc8f3f79bb4698f 100644 (file)
--- a/arch/powerpc/platforms/85xx/stx_gp3.c
+++ b/arch/powerpc/platforms/85xx/stx_gp3.c
@@ -90,6 +90,5 @@ define_machine(stx_gp3) {
        .init_IRQ               = stx_gp3_pic_init,
        .show_cpuinfo           = stx_gp3_show_cpuinfo,
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index d187f4b8bff635468fe262e8900a0e1a4f808af3..80effb028bf49ef46323c8500bc7b49cd8bba2ce 100644 (file)
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -127,6 +127,5 @@ define_machine(tqm85xx) {
        .init_IRQ               = tqm85xx_pic_init,
        .show_cpuinfo           = tqm85xx_show_cpuinfo,
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/twr_p102x.c b/arch/powerpc/platforms/85xx/twr_p102x.c
index 34b1e9cf9f3485f1f4c631457b05cf3a0baa3347..b88e23a334a4f1e3ea6aea3e1fccb4f5806bafad 100644 (file)
--- a/arch/powerpc/platforms/85xx/twr_p102x.c
+++ b/arch/powerpc/platforms/85xx/twr_p102x.c
@@ -112,6 +112,5 @@ define_machine(twr_p1025) {
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/85xx/xes_mpc85xx.c b/arch/powerpc/platforms/85xx/xes_mpc85xx.c
index 57c38a8f40e86d0a58be806fdf42de7b84acbde3..184013e6601e95380aebba7c340a8204aefd0239 100644 (file)
--- a/arch/powerpc/platforms/85xx/xes_mpc85xx.c
+++ b/arch/powerpc/platforms/85xx/xes_mpc85xx.c
@@ -146,7 +146,6 @@ define_machine(xes_mpc8572) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -160,7 +159,6 @@ define_machine(xes_mpc8548) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };
 
@@ -174,6 +172,5 @@ define_machine(xes_mpc8540) {
        .pcibios_fixup_phb      = fsl_pcibios_fixup_phb,
 #endif
        .get_irq                = mpic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/86xx/gef_ppc9a.c b/arch/powerpc/platforms/86xx/gef_ppc9a.c
index 2b656a763537ccbd456789a981508c8b8dc59522..f0512e51300cc1847ee7395029579273ecb16ade 100644 (file)
--- a/arch/powerpc/platforms/86xx/gef_ppc9a.c
+++ b/arch/powerpc/platforms/86xx/gef_ppc9a.c
@@ -185,7 +185,6 @@ define_machine(gef_ppc9a) {
        .show_cpuinfo           = gef_ppc9a_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .time_init              = mpc86xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/86xx/gef_sbc310.c b/arch/powerpc/platforms/86xx/gef_sbc310.c
index f38ab6bdfeb5710098c85f4b4afa25f308f80dae..1430b524d982e4fda0fd16ecf710afbe8d002785 100644 (file)
--- a/arch/powerpc/platforms/86xx/gef_sbc310.c
+++ b/arch/powerpc/platforms/86xx/gef_sbc310.c
@@ -172,7 +172,6 @@ define_machine(gef_sbc310) {
        .show_cpuinfo           = gef_sbc310_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .time_init              = mpc86xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c
index 09d59f92eaacdb49c8a2a8edcd95ea6f0aa247af..c92af0d964e168dde8fef20aa6c9989611f566ea 100644 (file)
--- a/arch/powerpc/platforms/86xx/gef_sbc610.c
+++ b/arch/powerpc/platforms/86xx/gef_sbc610.c
@@ -162,7 +162,6 @@ define_machine(gef_sbc610) {
        .show_cpuinfo           = gef_sbc610_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .time_init              = mpc86xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index 22ec5d7dc09d520c21fcee181ef589d8f06c6da3..6a403705ae44a755c7b5051191b705b9c90c9347 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -314,7 +314,6 @@ define_machine(mpc86xx_hpcd) {
        .init_IRQ               = mpc86xx_init_irq,
        .get_irq                = mpic_get_irq,
        .time_init              = mpc86xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 61eccb2d689d0320808ed4bb63be2624950e7878..7b00ebd2d7f829cc9883e0f37b722e86511aa08a 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -107,7 +107,6 @@ define_machine(mpc86xx_hpcn) {
        .show_cpuinfo           = mpc86xx_hpcn_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .time_init              = mpc86xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/86xx/mvme7100.c b/arch/powerpc/platforms/86xx/mvme7100.c
index b2cc32a32d0bff068ee7f28022b875fd026d000b..c0ac40514361475b9b1e2c48ebfc276511c1bc5f 100644 (file)
--- a/arch/powerpc/platforms/86xx/mvme7100.c
+++ b/arch/powerpc/platforms/86xx/mvme7100.c
@@ -108,7 +108,6 @@ define_machine(mvme7100) {
        .init_IRQ               = mpc86xx_init_irq,
        .get_irq                = mpic_get_irq,
        .time_init              = mpc86xx_time_init,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 #ifdef CONFIG_PCI
        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,

diff --git a/arch/powerpc/platforms/8xx/adder875.c b/arch/powerpc/platforms/8xx/adder875.c
index 68bb0da3d3ee969b168a7a46312093ab875956ed..7e83eb6746f4acdb39eb736424994fab005acfbc 100644 (file)
--- a/arch/powerpc/platforms/8xx/adder875.c
+++ b/arch/powerpc/platforms/8xx/adder875.c
@@ -102,6 +102,5 @@ define_machine(adder875) {
        .init_IRQ = mpc8xx_pic_init,
        .get_irq = mpc8xx_get_irq,
        .restart = mpc8xx_restart,
-       .calibrate_decr = generic_calibrate_decr,
        .progress = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/amigaone/setup.c b/arch/powerpc/platforms/amigaone/setup.c
index ba3b4a5688fb4bb66fbb6a012176f47663f168e8..6c6e714a7521a4f4d8e9968536134541942ee1b6 100644 (file)
--- a/arch/powerpc/platforms/amigaone/setup.c
+++ b/arch/powerpc/platforms/amigaone/setup.c
@@ -164,6 +164,5 @@ define_machine(amigaone) {
        .show_cpuinfo           = amigaone_show_cpuinfo,
        .init_IRQ               = amigaone_init_IRQ,
        .restart                = amigaone_restart,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 47eaf75349f2fcc1773569bdfaa25f68a54d0a2f..9e07d101bceebc3df1c3839c8581af0d8de93d5e 100644 (file)
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -265,7 +265,6 @@ define_machine(cell) {
        .get_boot_time          = rtas_get_boot_time,
        .get_rtc_time           = rtas_get_rtc_time,
        .set_rtc_time           = rtas_set_rtc_time,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = cell_progress,
        .init_IRQ               = cell_init_irq,
        .pci_setup_phb          = cell_setup_phb,

diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index d9049ceb1046b16bae3b82f39f4f268fa38a1942..36ee3a5056a18f51c6ab2d68262e6f52c975a016 100644 (file)
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -582,6 +582,5 @@ define_machine(chrp) {
        .time_init              = chrp_time_init,
        .set_rtc_time           = chrp_set_rtc_time,
        .get_rtc_time           = chrp_get_rtc_time,
-       .calibrate_decr         = generic_calibrate_decr,
        .phys_mem_access_prot   = pci_phys_mem_access_prot,
 };

diff --git a/arch/powerpc/platforms/embedded6xx/gamecube.c b/arch/powerpc/platforms/embedded6xx/gamecube.c
index 60cdc2852c7a54d7c153b7bd55599c50c539cb13..e3b2c7464732787c0c1a54794aa9533edeac9dd6 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/gamecube.c
+++ b/arch/powerpc/platforms/embedded6xx/gamecube.c
@@ -70,7 +70,6 @@ define_machine(gamecube) {
        .halt                   = gamecube_halt,
        .init_IRQ               = flipper_pic_probe,
        .get_irq                = flipper_pic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
        .machine_shutdown       = gamecube_shutdown,
 };

diff --git a/arch/powerpc/platforms/embedded6xx/holly.c b/arch/powerpc/platforms/embedded6xx/holly.c
index 67949c85c39880972786b158cfbc3f9a35841862..a167ee88fbf973809564dabcad20939b0d263ccc 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/holly.c
+++ b/arch/powerpc/platforms/embedded6xx/holly.c
@@ -264,7 +264,6 @@ define_machine(holly){
        .show_cpuinfo                   = holly_show_cpuinfo,
        .get_irq                        = mpic_get_irq,
        .restart                        = holly_restart,
-       .calibrate_decr                 = generic_calibrate_decr,
        .machine_check_exception        = ppc750_machine_check_exception,
        .progress                       = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index f04fd234c9abe148a4c2bcb185a04b5368aa2c00..9c10aac40c7b11ec8812a1f2243ee91801868d88 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -159,5 +159,4 @@ define_machine(linkstation){
        .get_irq                = mpic_get_irq,
        .restart                = linkstation_restart,
        .halt                   = linkstation_halt,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index 6821fb6644ac7fb749e994a76bf7a28c5f349750..ec93d69dc0ee32f1ee9fab6bd7a4448b370bd21e 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -182,7 +182,6 @@ define_machine(mpc7448_hpc2){
        .show_cpuinfo           = mpc7448_hpc2_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .restart                = mpc7448_hpc2_restart,
-       .calibrate_decr         = generic_calibrate_decr,
        .machine_check_exception= mpc7448_machine_check_exception,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/embedded6xx/mvme5100.c b/arch/powerpc/platforms/embedded6xx/mvme5100.c
index 7e57de576ef7447fc345d10d3ea32332a8c11faf..00bec0f051be108a4b36db15bd7a3e71fa44e1cf 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/mvme5100.c
+++ b/arch/powerpc/platforms/embedded6xx/mvme5100.c
@@ -204,6 +204,5 @@ define_machine(mvme5100) {
        .show_cpuinfo           = mvme5100_show_cpuinfo,
        .get_irq                = mpic_get_irq,
        .restart                = mvme5100_restart,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
 };

diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c
index ab85af37117fa9454af4ad05408a029ac4525439..e49880e8dab8757f4a336384a839564378205641 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/storcenter.c
+++ b/arch/powerpc/platforms/embedded6xx/storcenter.c
@@ -118,5 +118,4 @@ define_machine(storcenter){
        .init_IRQ               = storcenter_init_IRQ,
        .get_irq                = mpic_get_irq,
        .restart                = storcenter_restart,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c
index 635c393d307aedcc96a4b584e916fde6cabffa19..b54382a8ccc6561284410357b33d71817bf1f54d 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -175,7 +175,6 @@ define_machine(wii) {
        .halt                   = wii_halt,
        .init_IRQ               = wii_pic_probe,
        .get_irq                = flipper_pic_get_irq,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = udbg_progress,
        .machine_shutdown       = wii_shutdown,
 };

diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index 98c8e36030641b8aa8aed2b14b8dbebc65deb137..40618513e3f577585c00f31cd62a449fd5cc27b4 100644 (file)
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -357,7 +357,6 @@ define_machine(maple) {
        .get_boot_time          = maple_get_boot_time,
        .set_rtc_time           = maple_set_rtc_time,
        .get_rtc_time           = maple_get_rtc_time,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = maple_progress,
        .power_save             = power4_idle,
 };

diff --git a/arch/powerpc/platforms/microwatt/setup.c b/arch/powerpc/platforms/microwatt/setup.c
index f08edcde7bee81c705075673c20526c8367d302a..5e1c0997170dc2a3abd90ff84c64377bf266481d 100644 (file)
--- a/arch/powerpc/platforms/microwatt/setup.c
+++ b/arch/powerpc/platforms/microwatt/setup.c
@@ -40,5 +40,4 @@ define_machine(microwatt) {
        .init_IRQ               = microwatt_init_IRQ,
        .setup_arch             = microwatt_setup_arch,
        .progress               = udbg_progress,
-       .calibrate_decr         = generic_calibrate_decr,
 };

diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index 2aef49e04dd49615a92098e05c8dd26e63c76a41..5c5b4a034f9ea723dd1a7e6b9eafafd16891a26d 100644 (file)
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -449,7 +449,6 @@ define_machine(pasemi) {
        .get_irq                = mpic_get_irq,
        .restart                = pas_restart,
        .get_boot_time          = pas_get_boot_time,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = pas_progress,
        .machine_check_exception = pas_machine_check_handler,
 };

diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index f89731670448af6a0c56124d53b3258d8b67ef1f..5e9c6b55809fefd227fcd8abc49cb0d7365844a7 100644 (file)
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -585,7 +585,6 @@ define_machine(powernv) {
        .progress               = pnv_progress,
        .machine_shutdown       = pnv_shutdown,
        .power_save             = NULL,
-       .calibrate_decr         = generic_calibrate_decr,
        .machine_check_early    = pnv_machine_check_early,
 #ifdef CONFIG_KEXEC_CORE
        .kexec_cpu_down         = pnv_kexec_cpu_down,

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 94a7617eb044e7250f957a5c44fa6d86b5828d51..e2a57cfa6c837c7c906ed30d449291b727f78726 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -1138,7 +1138,6 @@ define_machine(pseries) {
        .get_boot_time          = rtas_get_boot_time,
        .get_rtc_time           = rtas_get_rtc_time,
        .set_rtc_time           = rtas_set_rtc_time,
-       .calibrate_decr         = generic_calibrate_decr,
        .progress               = rtas_progress,
        .system_reset_exception = pSeries_system_reset_exception,
        .machine_check_early    = pseries_machine_check_realmode,