| Message ID | 1474346599-29925-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | bcf4f311e034dc661b5e641595ef1f50af27b5bf |
| Headers | show |
Hi Philipp, 2016-09-20 16:30 GMT+09:00 Philipp Zabel <p.zabel@pengutronix.de>: > Hi Masahiro, > > Am Dienstag, den 20.09.2016, 13:43 +0900 schrieb Masahiro Yamada: >> The UniPhier reset driver (drivers/reset/reset-uniphier.c) has been >> merged. Select ARCH_HAS_RESET_CONTROLLER from the SoC Kconfig. >> >> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> >> --- >> >> Philipp, >> >> IIRC, you mentioned that you were planning to consolidate the double >> gurad by CONFIG_RESET_CONTROLLER and CONFIG_ARCH_HAS_RESET_CONTROLLER. >> >> I have not seen it in the ML, so I am sending this. >> >> Please let me know if you have some updates. > > I had started to doodle a bit, see > > git fetch git://git.pengutronix.de/git/pza/linux.git refs/heads/reset/kconfig > > but I haven't found time for cleanup and testing. OK, I will merge this patch for now. BTW, I did not understand some of your commits under way. commit 7fe911f9c83737449565db03bebf953d3d94bbbf Author: Philipp Zabel <p.zabel@pengutronix.de> Date: Tue Aug 9 11:18:51 2016 +0200 dmaengine: sunx6i: do not depend on reset controller framework The reset controller framework provides inline function stubs if disabled. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> As far as I see from drivers/dma/sun6i-dma.c, the reset control is mandatory for this driver. Why are you removing the dependency? Don't you care if it works on run-time as long as it can build? -- Best Regards Masahiro Yamada
Hi Philipp, 2016-09-20 19:44 GMT+09:00 Philipp Zabel <p.zabel@pengutronix.de>: > Am Dienstag, den 20.09.2016, 17:47 +0900 schrieb Masahiro Yamada: >> Hi Philipp, >> >> >> 2016-09-20 16:30 GMT+09:00 Philipp Zabel <p.zabel@pengutronix.de>: >> > Hi Masahiro, >> > >> > Am Dienstag, den 20.09.2016, 13:43 +0900 schrieb Masahiro Yamada: >> >> The UniPhier reset driver (drivers/reset/reset-uniphier.c) has been >> >> merged. Select ARCH_HAS_RESET_CONTROLLER from the SoC Kconfig. >> >> >> >> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> >> >> --- >> >> >> >> Philipp, >> >> >> >> IIRC, you mentioned that you were planning to consolidate the double >> >> gurad by CONFIG_RESET_CONTROLLER and CONFIG_ARCH_HAS_RESET_CONTROLLER. >> >> >> >> I have not seen it in the ML, so I am sending this. >> >> >> >> Please let me know if you have some updates. >> > >> > I had started to doodle a bit, see >> > >> > git fetch git://git.pengutronix.de/git/pza/linux.git refs/heads/reset/kconfig >> > >> > but I haven't found time for cleanup and testing. >> >> >> OK, I will merge this patch for now. >> >> >> >> BTW, I did not understand some of your commits under way. >> >> >> commit 7fe911f9c83737449565db03bebf953d3d94bbbf >> Author: Philipp Zabel <p.zabel@pengutronix.de> >> Date: Tue Aug 9 11:18:51 2016 +0200 >> >> dmaengine: sunx6i: do not depend on reset controller framework >> >> The reset controller framework provides inline function stubs if >> disabled. >> >> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> >> >> >> >> >> >> As far as I see from drivers/dma/sun6i-dma.c, >> the reset control is mandatory for this driver. >> >> Why are you removing the dependency? >> >> >> Don't you care if it works on run-time >> as long as it can build? > > I have not thought about this too hard, it's just there because the > reset framework is not a build dependency (anymore). Some patches were > necessary to remove dependency loops, but I think this one could just be > dropped. I have not taken a close look at it, but if "dependency loops" is the reason for the change, please mention it in the git-log. I do not think we should remove the "depends on" only for the reason "inline function stubs are already provided". -- Best Regards Masahiro Yamada
2016-09-20 16:30 GMT+09:00 Philipp Zabel <p.zabel@pengutronix.de>: > Am Dienstag, den 20.09.2016, 13:43 +0900 schrieb Masahiro Yamada: >> The UniPhier reset driver (drivers/reset/reset-uniphier.c) has been >> merged. Select ARCH_HAS_RESET_CONTROLLER from the SoC Kconfig. >> >> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > > Acked-by: Philipp Zabel <p.zabel@pengutronix.de> > > regards > Philipp Applied. -- Best Regards Masahiro Yamada
diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig index 82dddee..3930fbb 100644 --- a/arch/arm/mach-uniphier/Kconfig +++ b/arch/arm/mach-uniphier/Kconfig @@ -1,6 +1,7 @@ config ARCH_UNIPHIER bool "Socionext UniPhier SoCs" depends on ARCH_MULTI_V7 + select ARCH_HAS_RESET_CONTROLLER select ARM_AMBA select ARM_GLOBAL_TIMER select ARM_GIC
The UniPhier reset driver (drivers/reset/reset-uniphier.c) has been merged. Select ARCH_HAS_RESET_CONTROLLER from the SoC Kconfig. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Philipp, IIRC, you mentioned that you were planning to consolidate the double gurad by CONFIG_RESET_CONTROLLER and CONFIG_ARCH_HAS_RESET_CONTROLLER. I have not seen it in the ML, so I am sending this. Please let me know if you have some updates. arch/arm/mach-uniphier/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 1.9.1