From 5f3a7f7badf17feb4c00e99ff5999caff5b9e7fa Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 6 Sep 2024 15:13:21 -0700 Subject: [PATCH] mpc85xx: remove calibrate_decr With upstream commit 0aafbdf35c75cbfec82636d01e6dc7950bc1507c , this is now default. No need to override. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16345 Signed-off-by: Robert Marko --- .../linux/mpc85xx/files/arch/powerpc/platforms/85xx/br200-wp.c | 1 - .../mpc85xx/files/arch/powerpc/platforms/85xx/firebox_t10.c | 1 - .../linux/mpc85xx/files/arch/powerpc/platforms/85xx/hiveap-330.c | 1 - target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/msm460.c | 1 - target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/panda.c | 1 - .../mpc85xx/files/arch/powerpc/platforms/85xx/red15w_rev1.c | 1 - .../mpc85xx/files/arch/powerpc/platforms/85xx/tl_wdr4900_v1.c | 1 - .../linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3710i.c | 1 - .../linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3715i.c | 1 - .../linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3825i.c | 1 - 10 files changed, 10 deletions(-) diff --git a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/br200-wp.c b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/br200-wp.c index 86a925df23..5b9c64501d 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/br200-wp.c +++ b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/br200-wp.c @@ -66,6 +66,5 @@ define_machine(br200_wp) { .pcibios_fixup_phb = fsl_pcibios_fixup_phb, #endif .get_irq = mpic_get_irq, - .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, }; diff --git a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/firebox_t10.c b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/firebox_t10.c index 27a3ef2e86..671066f48a 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/firebox_t10.c +++ b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/firebox_t10.c @@ -71,6 +71,5 @@ define_machine(firebox_t10) { .pcibios_fixup_phb = fsl_pcibios_fixup_phb, #endif .get_irq = mpic_get_irq, - .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, }; diff --git a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/hiveap-330.c b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/hiveap-330.c index b5ee3e646b..48b8bd4433 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/hiveap-330.c +++ b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/hiveap-330.c @@ -73,6 +73,5 @@ define_machine(hiveap_330) { .pcibios_fixup_phb = fsl_pcibios_fixup_phb, #endif .get_irq = mpic_get_irq, - .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, }; diff --git a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/msm460.c b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/msm460.c index f7324406e9..ace7f3d9a2 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/msm460.c +++ b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/msm460.c @@ -75,6 +75,5 @@ define_machine(msm) { .pcibios_fixup_phb = fsl_pcibios_fixup_phb, #endif .get_irq = mpic_get_irq, - .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, }; diff --git a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/panda.c b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/panda.c index 5b8b3e8217..96bd72af2a 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/panda.c +++ b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/panda.c @@ -75,6 +75,5 @@ define_machine(panda) { .pcibios_fixup_phb = fsl_pcibios_fixup_phb, #endif .get_irq = mpic_get_irq, - .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, }; diff --git a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/red15w_rev1.c b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/red15w_rev1.c index 6e6e3aa724..80a835b113 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/red15w_rev1.c +++ b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/red15w_rev1.c @@ -71,6 +71,5 @@ define_machine(red_15w_rev1) { .pcibios_fixup_phb = fsl_pcibios_fixup_phb, #endif .get_irq = mpic_get_irq, - .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, }; diff --git a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/tl_wdr4900_v1.c b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/tl_wdr4900_v1.c index c259b09414..67cc34adc4 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/tl_wdr4900_v1.c +++ b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/tl_wdr4900_v1.c @@ -67,6 +67,5 @@ define_machine(tl_wdr4900_v1) { .pcibios_fixup_bus = fsl_pcibios_fixup_bus, #endif .get_irq = mpic_get_irq, - .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, }; diff --git a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3710i.c b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3710i.c index 0be0165473..c40a7b3f1f 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3710i.c +++ b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3710i.c @@ -75,6 +75,5 @@ define_machine(ws_ap3710i) { .pcibios_fixup_phb = fsl_pcibios_fixup_phb, #endif .get_irq = mpic_get_irq, - .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, }; diff --git a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3715i.c b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3715i.c index 367bb7a794..302022a1d4 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3715i.c +++ b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3715i.c @@ -71,6 +71,5 @@ define_machine(wsap3715i) { .pcibios_fixup_phb = fsl_pcibios_fixup_phb, #endif .get_irq = mpic_get_irq, - .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, }; diff --git a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3825i.c b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3825i.c index 2c285e0e85..202927079a 100644 --- a/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3825i.c +++ b/target/linux/mpc85xx/files/arch/powerpc/platforms/85xx/ws-ap3825i.c @@ -75,6 +75,5 @@ define_machine(ws_ap3825i) { .pcibios_fixup_phb = fsl_pcibios_fixup_phb, #endif .get_irq = mpic_get_irq, - .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, }; -- 2.30.2