arm: socfpga: Remove unused function socfpga_emac_manage_reset()
Subsystems (3)
PATCH 1/1 arm: socfpga: Remove unused function socfpga_emac_manage_reset()
Remove code from the reset manager that is never called.
--- .../mach-socfpga/include/mach/reset_manager_s10.h | 2 -- arch/arm/mach-socfpga/reset_manager_s10.c | 35 ---------------------- 2 files changed, 37 deletions(-)
arch/arm/mach-socfpga/include/mach/reset_manager_s10.h +0 -2
@@ -108,8 +108,6 @@ struct socfpga_reset_manager {#define RSTMGR_GPIO1 RSTMGR_DEFINE(2, 25)#define RSTMGR_SDR RSTMGR_DEFINE(3, 6) -void socfpga_emac_manage_reset (const unsigned int of_reset_id,u32 state); -/* Create a human-readable reference to SoCFPGA reset. */ #define SOCFPGA_RESET (_name) RSTMGR_##_name
arch/arm/mach-socfpga/reset_manager_s10.c +0 -35
@@ -93,41 +93,6 @@ void socfpga_bridges_reset(int enable) } } -/* of_reset_id: emac reset id -* state: 0 - disable reset, !0 - enable reset -*/ -void socfpga_emac_manage_reset (const unsigned int of_reset_id,u32 state) -{ -u32 reset_emac; -u32 reset_emacocp; - -/* hardcode this now */ -switch (of_reset_id) { -case EMAC0_RESET : - reset_emac =SOCFPGA_RESET (EMAC0 ); - reset_emacocp =SOCFPGA_RESET (EMAC0_OCP ); -break ; -case EMAC1_RESET : - reset_emac =SOCFPGA_RESET (EMAC1 ); - reset_emacocp =SOCFPGA_RESET (EMAC1_OCP ); -break ; -case EMAC2_RESET : - reset_emac =SOCFPGA_RESET (EMAC2 ); - reset_emacocp =SOCFPGA_RESET (EMAC2_OCP ); -break ; -default : -printf ("GMAC: Invalid reset ID (%i)!\n" , of_reset_id); -hang (); -break ; - } - -/* Reset ECC OCP first */ -socfpga_per_reset (reset_emacocp, state); - -/* Release the EMAC controller from reset */ -socfpga_per_reset (reset_emac, state); -} -/* * Release peripherals from reset based on handoff */
Signature · 1 line
2.7.4
PATCH 1/1 arm: socfpga: Remove unused function socfpga_emac_manage_reset()
Quoted 53 lines · Ley Foon Tan
Remove code from the reset manager that is never called.
Signed-off-by Ley Foon Tan <[email protected]>--- .../mach-socfpga/include/mach/reset_manager_s10.h | 2 -- arch/arm/mach-socfpga/reset_manager_s10.c | 35 ---------------------- 2 files changed, 37 deletions(-)arch/arm/mach-socfpga/include/mach/reset_manager_s10.h +0
-2@@ -108,8 +108,6 @@ struct socfpga_reset_manager {#define RSTMGR_GPIO1 RSTMGR_DEFINE(2, 25)#define RSTMGR_SDR RSTMGR_DEFINE(3, 6) -void socfpga_emac_manage_reset (const unsigned int of_reset_id,u32 state); -/* Create a human-readable reference to SoCFPGA reset. */ #define SOCFPGA_RESET (_name) RSTMGR_##_namearch/arm/mach-socfpga/reset_manager_s10.c +0
-24@@ -93,41 +93,6 @@ void socfpga_bridges_reset(int enable) } } -/* of_reset_id: emac reset id -* state: 0 - disable reset, !0 - enable reset -*/ -void socfpga_emac_manage_reset (const unsigned int of_reset_id,u32 state) -{ -u32 reset_emac; -u32 reset_emacocp; - -/* hardcode this now */ -switch (of_reset_id) { -case EMAC0_RESET : - reset_emac =SOCFPGA_RESET (EMAC0 ); - reset_emacocp =SOCFPGA_RESET (EMAC0_OCP ); -break ; -case EMAC1_RESET : - reset_emac =SOCFPGA_RESET (EMAC1 ); - reset_emacocp =SOCFPGA_RESET (EMAC1_OCP ); -break ; -case EMAC2_RESET : - reset_emac =SOCFPGA_RESET (EMAC2 ); - reset_emacocp =SOCFPGA_RESET (EMAC2_OCP ); -break ; -default : -printf ("GMAC: Invalid reset ID (%i)!\n" , of_reset_id);
arch/arm/mach-socfpga/reset_manager_s10.c void socfpga_bridges_reset(int enable) · line 129
Quoted 10 lines
arch/arm/mach-socfpga/reset_manager_s10.c +0
-10-hang (); -break ; - } - -/* Reset ECC OCP first */ -socfpga_per_reset (reset_emacocp, state); - -/* Release the EMAC controller from reset */ -socfpga_per_reset (reset_emac, state); -}
Are you absolutely positive this is correctly handled by the reset manager driver ? Including the OCP resets ? If so, fine.
Signature · 2 lines
Best regards, Marek Vasut
PATCH 1/1 arm: socfpga: Remove unused function socfpga_emac_manage_reset()
Quoted 60 lines · Marek Vasut
Quoted 58 lines · Ley Foon Tan
Remove code from the reset manager that is never called.
Signed-off-by Ley Foon Tan <[email protected]>--- .../mach-socfpga/include/mach/reset_manager_s10.h | 2 -- arch/arm/mach-socfpga/reset_manager_s10.c | 35 ---------------------- 2 files changed, 37 deletions(-)arch/arm/mach-socfpga/include/mach/reset_manager_s10.h +0
-2@@ -108,8 +108,6 @@ struct socfpga_reset_manager {#define RSTMGR_GPIO1 RSTMGR_DEFINE(2, 25)#define RSTMGR_SDR RSTMGR_DEFINE(3, 6) -void socfpga_emac_manage_reset (const unsigned int of_reset_id,u32 state); -/* Create a human-readable reference to SoCFPGA reset. */ #define SOCFPGA_RESET (_name) RSTMGR_##_namearch/arm/mach-socfpga/reset_manager_s10.c +0
-29@@ -93,41 +93,6 @@ void socfpga_bridges_reset(int enable) } } -/* of_reset_id: emac reset id -* state: 0 - disable reset, !0 - enable reset -*/ -void socfpga_emac_manage_reset (const unsigned int of_reset_id,u32 state) -{ -u32 reset_emac; -u32 reset_emacocp; - -/* hardcode this now */ -switch (of_reset_id) { -case EMAC0_RESET : - reset_emac =SOCFPGA_RESET (EMAC0 ); - reset_emacocp =SOCFPGA_RESET (EMAC0_OCP ); -break ; -case EMAC1_RESET : - reset_emac =SOCFPGA_RESET (EMAC1 ); - reset_emacocp =SOCFPGA_RESET (EMAC1_OCP ); -break ; -case EMAC2_RESET : - reset_emac =SOCFPGA_RESET (EMAC2 ); - reset_emacocp =SOCFPGA_RESET (EMAC2_OCP ); -break ; -default : -printf ("GMAC: Invalid reset ID (%i)!\n" , of_reset_id); -hang (); -break ; - } - -/* Reset ECC OCP first */
Quoted 8 lines
arch/arm/mach-socfpga/reset_manager_s10.c void socfpga_bridges_reset(int enable) · line 129
Quoted 5 lines
arch/arm/mach-socfpga/reset_manager_s10.c +0
-5-socfpga_per_reset (reset_emacocp, state); - -/* Release the EMAC controller from reset */ -socfpga_per_reset (reset_emac, state); -}Are you absolutely positive this is correctly handled by the reset manager driver ? Including the OCP resets ? If so, fine.
Yes, reset framework will reset OCP as well.
Regards
Ley Foon
PATCH 1/1 arm: socfpga: Remove unused function socfpga_emac_manage_reset()
Quoted 69 lines · Ley Foon Tan
Quoted 60 lines · Marek Vasut
Quoted 58 lines · Ley Foon Tan
Remove code from the reset manager that is never called.
Signed-off-by Ley Foon Tan <[email protected]>--- .../mach-socfpga/include/mach/reset_manager_s10.h | 2 -- arch/arm/mach-socfpga/reset_manager_s10.c | 35 ---------------------- 2 files changed, 37 deletions(-)arch/arm/mach-socfpga/include/mach/reset_manager_s10.h +0
-2@@ -108,8 +108,6 @@ struct socfpga_reset_manager {#define RSTMGR_GPIO1 RSTMGR_DEFINE(2, 25)#define RSTMGR_SDR RSTMGR_DEFINE(3, 6) -void socfpga_emac_manage_reset (const unsigned int of_reset_id,u32 state); -/* Create a human-readable reference to SoCFPGA reset. */ #define SOCFPGA_RESET (_name) RSTMGR_##_namearch/arm/mach-socfpga/reset_manager_s10.c +0
-29@@ -93,41 +93,6 @@ void socfpga_bridges_reset(int enable) } } -/* of_reset_id: emac reset id -* state: 0 - disable reset, !0 - enable reset -*/ -void socfpga_emac_manage_reset (const unsigned int of_reset_id,u32 state) -{ -u32 reset_emac; -u32 reset_emacocp; - -/* hardcode this now */ -switch (of_reset_id) { -case EMAC0_RESET : - reset_emac =SOCFPGA_RESET (EMAC0 ); - reset_emacocp =SOCFPGA_RESET (EMAC0_OCP ); -break ; -case EMAC1_RESET : - reset_emac =SOCFPGA_RESET (EMAC1 ); - reset_emacocp =SOCFPGA_RESET (EMAC1_OCP ); -break ; -case EMAC2_RESET : - reset_emac =SOCFPGA_RESET (EMAC2 ); - reset_emacocp =SOCFPGA_RESET (EMAC2_OCP ); -break ; -default : -printf ("GMAC: Invalid reset ID (%i)!\n" , of_reset_id); -hang (); -break ; - } - -/* Reset ECC OCP first */ Quoted 8 lines
arch/arm/mach-socfpga/reset_manager_s10.c void socfpga_bridges_reset(int enable) · line 129
Quoted 5 lines
arch/arm/mach-socfpga/reset_manager_s10.c +0
-5-socfpga_per_reset (reset_emacocp, state); - -/* Release the EMAC controller from reset */ -socfpga_per_reset (reset_emac, state); -}Are you absolutely positive this is correctly handled by the reset manager driver ? Including the OCP resets ? If so, fine.
Quoted 1 line
Yes, reset framework will reset OCP as well.
OK, applied
Signature · 2 lines
Best regards, Marek Vasut