| Message ID | 1493979992-7584-2-git-send-email-tien.fong.chee@intel.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Marek Vasut |
| Headers | show |
On 05/05/2017 12:26 PM, tien.fong.chee@intel.com wrote: > From: Tien Fong Chee <tien.fong.chee@intel.com> > > Remove unused passing parameter of socfpga_bridges_reset function in > SoCFPGA Arria10. So how do you un-reset the bridges if you drop this $enable argument ? > Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> > --- > .../include/mach/reset_manager_arria10.h | 2 +- > arch/arm/mach-socfpga/reset_manager_arria10.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h b/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h > index 7922db8..b6d7f4f 100644 > --- a/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h > +++ b/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h > @@ -17,7 +17,7 @@ int socfpga_reset_deassert_bridges_handoff(void); > void socfpga_reset_assert_fpga_connected_peripherals(void); > void socfpga_reset_deassert_osc1wd0(void); > void socfpga_reset_uart(int assert); > -int socfpga_bridges_reset(int enable); > +int socfpga_bridges_reset(void); > > struct socfpga_reset_manager { > u32 stat; > diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c b/arch/arm/mach-socfpga/reset_manager_arria10.c > index d8c858c..66f1ec2 100644 > --- a/arch/arm/mach-socfpga/reset_manager_arria10.c > +++ b/arch/arm/mach-socfpga/reset_manager_arria10.c > @@ -318,13 +318,13 @@ void socfpga_per_reset_all(void) > } > > #if defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) > -int socfpga_bridges_reset(int enable) > +int socfpga_bridges_reset(void) > { > /* For SoCFPGA-VT, this is NOP. */ > return 0; > } > #else > -int socfpga_bridges_reset(int enable) > +int socfpga_bridges_reset(void) > { > int ret; > >
On Jum, 2017-05-05 at 13:09 +0200, Marek Vasut wrote: > On 05/05/2017 12:26 PM, tien.fong.chee@intel.com wrote: > > > > From: Tien Fong Chee <tien.fong.chee@intel.com> > > > > Remove unused passing parameter of socfpga_bridges_reset function > > in > > SoCFPGA Arria10. > So how do you un-reset the bridges if you drop this $enable argument > ? > This socfpga_reset_deassert_bridges_handoff() would be called, bridges are released based on DTS. > > > > Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> > > --- > > .../include/mach/reset_manager_arria10.h | 2 +- > > arch/arm/mach-socfpga/reset_manager_arria10.c | 4 ++-- > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm/mach- > > socfpga/include/mach/reset_manager_arria10.h b/arch/arm/mach- > > socfpga/include/mach/reset_manager_arria10.h > > index 7922db8..b6d7f4f 100644 > > --- a/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h > > +++ b/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h > > @@ -17,7 +17,7 @@ int socfpga_reset_deassert_bridges_handoff(void); > > void socfpga_reset_assert_fpga_connected_peripherals(void); > > void socfpga_reset_deassert_osc1wd0(void); > > void socfpga_reset_uart(int assert); > > -int socfpga_bridges_reset(int enable); > > +int socfpga_bridges_reset(void); > > > > struct socfpga_reset_manager { > > u32 stat; > > diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c > > b/arch/arm/mach-socfpga/reset_manager_arria10.c > > index d8c858c..66f1ec2 100644 > > --- a/arch/arm/mach-socfpga/reset_manager_arria10.c > > +++ b/arch/arm/mach-socfpga/reset_manager_arria10.c > > @@ -318,13 +318,13 @@ void socfpga_per_reset_all(void) > > } > > > > #if defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) > > -int socfpga_bridges_reset(int enable) > > +int socfpga_bridges_reset(void) > > { > > /* For SoCFPGA-VT, this is NOP. */ > > return 0; > > } > > #else > > -int socfpga_bridges_reset(int enable) > > +int socfpga_bridges_reset(void) > > { > > int ret; > > > > >
On 05/08/2017 06:17 AM, Chee, Tien Fong wrote: > On Jum, 2017-05-05 at 13:09 +0200, Marek Vasut wrote: >> On 05/05/2017 12:26 PM, tien.fong.chee@intel.com wrote: >>> >>> From: Tien Fong Chee <tien.fong.chee@intel.com> >>> >>> Remove unused passing parameter of socfpga_bridges_reset function >>> in >>> SoCFPGA Arria10. >> So how do you un-reset the bridges if you drop this $enable argument >> ? >> > This socfpga_reset_deassert_bridges_handoff() would be called, bridges > are released based on DTS. Seems the naming needs some work, it's quite chaotic and inobvious then. >>> >>> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> >>> --- >>> .../include/mach/reset_manager_arria10.h | 2 +- >>> arch/arm/mach-socfpga/reset_manager_arria10.c | 4 ++-- >>> 2 files changed, 3 insertions(+), 3 deletions(-) >>> >>> diff --git a/arch/arm/mach- >>> socfpga/include/mach/reset_manager_arria10.h b/arch/arm/mach- >>> socfpga/include/mach/reset_manager_arria10.h >>> index 7922db8..b6d7f4f 100644 >>> --- a/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h >>> +++ b/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h >>> @@ -17,7 +17,7 @@ int socfpga_reset_deassert_bridges_handoff(void); >>> void socfpga_reset_assert_fpga_connected_peripherals(void); >>> void socfpga_reset_deassert_osc1wd0(void); >>> void socfpga_reset_uart(int assert); >>> -int socfpga_bridges_reset(int enable); >>> +int socfpga_bridges_reset(void); >>> >>> struct socfpga_reset_manager { >>> u32 stat; >>> diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c >>> b/arch/arm/mach-socfpga/reset_manager_arria10.c >>> index d8c858c..66f1ec2 100644 >>> --- a/arch/arm/mach-socfpga/reset_manager_arria10.c >>> +++ b/arch/arm/mach-socfpga/reset_manager_arria10.c >>> @@ -318,13 +318,13 @@ void socfpga_per_reset_all(void) >>> } >>> >>> #if defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) >>> -int socfpga_bridges_reset(int enable) >>> +int socfpga_bridges_reset(void) >>> { >>> /* For SoCFPGA-VT, this is NOP. */ >>> return 0; >>> } >>> #else >>> -int socfpga_bridges_reset(int enable) >>> +int socfpga_bridges_reset(void) >>> { >>> int ret; >>> >>>
On Isn, 2017-05-08 at 11:52 +0200, Marek Vasut wrote: > On 05/08/2017 06:17 AM, Chee, Tien Fong wrote: > > > > On Jum, 2017-05-05 at 13:09 +0200, Marek Vasut wrote: > > > > > > On 05/05/2017 12:26 PM, tien.fong.chee@intel.com wrote: > > > > > > > > > > > > From: Tien Fong Chee <tien.fong.chee@intel.com> > > > > > > > > Remove unused passing parameter of socfpga_bridges_reset > > > > function > > > > in > > > > SoCFPGA Arria10. > > > So how do you un-reset the bridges if you drop this $enable > > > argument > > > ? > > > > > This socfpga_reset_deassert_bridges_handoff() would be called, > > bridges > > are released based on DTS. > Seems the naming needs some work, it's quite chaotic and inobvious > then. > It is okay for "socfpga_bridges_unreset_byfdt()? > > > > > > > > > > > > > > > > > Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> > > > > --- > > > > .../include/mach/reset_manager_arria10.h | 2 +- > > > > arch/arm/mach-socfpga/reset_manager_arria10.c | 4 ++-- > > > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > > > > > diff --git a/arch/arm/mach- > > > > socfpga/include/mach/reset_manager_arria10.h b/arch/arm/mach- > > > > socfpga/include/mach/reset_manager_arria10.h > > > > index 7922db8..b6d7f4f 100644 > > > > --- a/arch/arm/mach- > > > > socfpga/include/mach/reset_manager_arria10.h > > > > +++ b/arch/arm/mach- > > > > socfpga/include/mach/reset_manager_arria10.h > > > > @@ -17,7 +17,7 @@ int > > > > socfpga_reset_deassert_bridges_handoff(void); > > > > void socfpga_reset_assert_fpga_connected_peripherals(void); > > > > void socfpga_reset_deassert_osc1wd0(void); > > > > void socfpga_reset_uart(int assert); > > > > -int socfpga_bridges_reset(int enable); > > > > +int socfpga_bridges_reset(void); > > > > > > > > struct socfpga_reset_manager { > > > > u32 stat; > > > > diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c > > > > b/arch/arm/mach-socfpga/reset_manager_arria10.c > > > > index d8c858c..66f1ec2 100644 > > > > --- a/arch/arm/mach-socfpga/reset_manager_arria10.c > > > > +++ b/arch/arm/mach-socfpga/reset_manager_arria10.c > > > > @@ -318,13 +318,13 @@ void socfpga_per_reset_all(void) > > > > } > > > > > > > > #if defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) > > > > -int socfpga_bridges_reset(int enable) > > > > +int socfpga_bridges_reset(void) > > > > { > > > > /* For SoCFPGA-VT, this is NOP. */ > > > > return 0; > > > > } > > > > #else > > > > -int socfpga_bridges_reset(int enable) > > > > +int socfpga_bridges_reset(void) > > > > { > > > > int ret; > > > > > > > > >
On 05/09/2017 06:23 AM, Chee, Tien Fong wrote: > On Isn, 2017-05-08 at 11:52 +0200, Marek Vasut wrote: >> On 05/08/2017 06:17 AM, Chee, Tien Fong wrote: >>> >>> On Jum, 2017-05-05 at 13:09 +0200, Marek Vasut wrote: >>>> >>>> On 05/05/2017 12:26 PM, tien.fong.chee@intel.com wrote: >>>>> >>>>> >>>>> From: Tien Fong Chee <tien.fong.chee@intel.com> >>>>> >>>>> Remove unused passing parameter of socfpga_bridges_reset >>>>> function >>>>> in >>>>> SoCFPGA Arria10. >>>> So how do you un-reset the bridges if you drop this $enable >>>> argument >>>> ? >>>> >>> This socfpga_reset_deassert_bridges_handoff() would be called, >>> bridges >>> are released based on DTS. >> Seems the naming needs some work, it's quite chaotic and inobvious >> then. >> > It is okay for "socfpga_bridges_unreset_byfdt()? Just keep it as-is for now ... >>>> >>>>> >>>>> >>>>> Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> >>>>> --- >>>>> .../include/mach/reset_manager_arria10.h | 2 +- >>>>> arch/arm/mach-socfpga/reset_manager_arria10.c | 4 ++-- >>>>> 2 files changed, 3 insertions(+), 3 deletions(-) >>>>> >>>>> diff --git a/arch/arm/mach- >>>>> socfpga/include/mach/reset_manager_arria10.h b/arch/arm/mach- >>>>> socfpga/include/mach/reset_manager_arria10.h >>>>> index 7922db8..b6d7f4f 100644 >>>>> --- a/arch/arm/mach- >>>>> socfpga/include/mach/reset_manager_arria10.h >>>>> +++ b/arch/arm/mach- >>>>> socfpga/include/mach/reset_manager_arria10.h >>>>> @@ -17,7 +17,7 @@ int >>>>> socfpga_reset_deassert_bridges_handoff(void); >>>>> void socfpga_reset_assert_fpga_connected_peripherals(void); >>>>> void socfpga_reset_deassert_osc1wd0(void); >>>>> void socfpga_reset_uart(int assert); >>>>> -int socfpga_bridges_reset(int enable); >>>>> +int socfpga_bridges_reset(void); >>>>> >>>>> struct socfpga_reset_manager { >>>>> u32 stat; >>>>> diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c >>>>> b/arch/arm/mach-socfpga/reset_manager_arria10.c >>>>> index d8c858c..66f1ec2 100644 >>>>> --- a/arch/arm/mach-socfpga/reset_manager_arria10.c >>>>> +++ b/arch/arm/mach-socfpga/reset_manager_arria10.c >>>>> @@ -318,13 +318,13 @@ void socfpga_per_reset_all(void) >>>>> } >>>>> >>>>> #if defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) >>>>> -int socfpga_bridges_reset(int enable) >>>>> +int socfpga_bridges_reset(void) >>>>> { >>>>> /* For SoCFPGA-VT, this is NOP. */ >>>>> return 0; >>>>> } >>>>> #else >>>>> -int socfpga_bridges_reset(int enable) >>>>> +int socfpga_bridges_reset(void) >>>>> { >>>>> int ret; >>>>> >>>>>
On Sel, 2017-05-09 at 09:56 +0200, Marek Vasut wrote: > On 05/09/2017 06:23 AM, Chee, Tien Fong wrote: > > > > On Isn, 2017-05-08 at 11:52 +0200, Marek Vasut wrote: > > > > > > On 05/08/2017 06:17 AM, Chee, Tien Fong wrote: > > > > > > > > > > > > On Jum, 2017-05-05 at 13:09 +0200, Marek Vasut wrote: > > > > > > > > > > > > > > > On 05/05/2017 12:26 PM, tien.fong.chee@intel.com wrote: > > > > > > > > > > > > > > > > > > > > > > > > From: Tien Fong Chee <tien.fong.chee@intel.com> > > > > > > > > > > > > Remove unused passing parameter of socfpga_bridges_reset > > > > > > function > > > > > > in > > > > > > SoCFPGA Arria10. > > > > > So how do you un-reset the bridges if you drop this $enable > > > > > argument > > > > > ? > > > > > > > > > This socfpga_reset_deassert_bridges_handoff() would be called, > > > > bridges > > > > are released based on DTS. > > > Seems the naming needs some work, it's quite chaotic and > > > inobvious > > > then. > > > > > It is okay for "socfpga_bridges_unreset_byfdt()? > Just keep it as-is for now ... > Okay. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com> > > > > > > --- > > > > > > .../include/mach/reset_manager_arria10.h | 2 > > > > > > +- > > > > > > arch/arm/mach-socfpga/reset_manager_arria10.c | 4 > > > > > > ++-- > > > > > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > > > > > > > > > diff --git a/arch/arm/mach- > > > > > > socfpga/include/mach/reset_manager_arria10.h > > > > > > b/arch/arm/mach- > > > > > > socfpga/include/mach/reset_manager_arria10.h > > > > > > index 7922db8..b6d7f4f 100644 > > > > > > --- a/arch/arm/mach- > > > > > > socfpga/include/mach/reset_manager_arria10.h > > > > > > +++ b/arch/arm/mach- > > > > > > socfpga/include/mach/reset_manager_arria10.h > > > > > > @@ -17,7 +17,7 @@ int > > > > > > socfpga_reset_deassert_bridges_handoff(void); > > > > > > void > > > > > > socfpga_reset_assert_fpga_connected_peripherals(void); > > > > > > void socfpga_reset_deassert_osc1wd0(void); > > > > > > void socfpga_reset_uart(int assert); > > > > > > -int socfpga_bridges_reset(int enable); > > > > > > +int socfpga_bridges_reset(void); > > > > > > > > > > > > struct socfpga_reset_manager { > > > > > > u32 stat; > > > > > > diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c > > > > > > b/arch/arm/mach-socfpga/reset_manager_arria10.c > > > > > > index d8c858c..66f1ec2 100644 > > > > > > --- a/arch/arm/mach-socfpga/reset_manager_arria10.c > > > > > > +++ b/arch/arm/mach-socfpga/reset_manager_arria10.c > > > > > > @@ -318,13 +318,13 @@ void socfpga_per_reset_all(void) > > > > > > } > > > > > > > > > > > > #if defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) > > > > > > -int socfpga_bridges_reset(int enable) > > > > > > +int socfpga_bridges_reset(void) > > > > > > { > > > > > > /* For SoCFPGA-VT, this is NOP. */ > > > > > > return 0; > > > > > > } > > > > > > #else > > > > > > -int socfpga_bridges_reset(int enable) > > > > > > +int socfpga_bridges_reset(void) > > > > > > { > > > > > > int ret; > > > > > > > > > > > > >
diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h b/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h index 7922db8..b6d7f4f 100644 --- a/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h +++ b/arch/arm/mach-socfpga/include/mach/reset_manager_arria10.h @@ -17,7 +17,7 @@ int socfpga_reset_deassert_bridges_handoff(void); void socfpga_reset_assert_fpga_connected_peripherals(void); void socfpga_reset_deassert_osc1wd0(void); void socfpga_reset_uart(int assert); -int socfpga_bridges_reset(int enable); +int socfpga_bridges_reset(void); struct socfpga_reset_manager { u32 stat; diff --git a/arch/arm/mach-socfpga/reset_manager_arria10.c b/arch/arm/mach-socfpga/reset_manager_arria10.c index d8c858c..66f1ec2 100644 --- a/arch/arm/mach-socfpga/reset_manager_arria10.c +++ b/arch/arm/mach-socfpga/reset_manager_arria10.c @@ -318,13 +318,13 @@ void socfpga_per_reset_all(void) } #if defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) -int socfpga_bridges_reset(int enable) +int socfpga_bridges_reset(void) { /* For SoCFPGA-VT, this is NOP. */ return 0; } #else -int socfpga_bridges_reset(int enable) +int socfpga_bridges_reset(void) { int ret;