Re: [U-Boot] [PATCH v3 07/19] arm: socfpga: Add clock driver for Arria 10

2017-04-02 Thread Ley Foon Tan
On Fri, Mar 31, 2017 at 6:30 PM, Marek Vasut wrote: > On 03/30/2017 03:08 PM, Ley Foon Tan wrote: >> Add clock driver support for Arria 10. >> >> Signed-off-by: Tien Fong Chee >> Signed-off-by: Ley Foon Tan >> >> Conflicts: >> arch/arm/mach-socfpga/clock_manager.c > > ^ what's this "confli

Re: [U-Boot] [PATCH v3 07/19] arm: socfpga: Add clock driver for Arria 10

2017-03-31 Thread Marek Vasut
On 03/30/2017 03:08 PM, Ley Foon Tan wrote: > Add clock driver support for Arria 10. > > Signed-off-by: Tien Fong Chee > Signed-off-by: Ley Foon Tan > > Conflicts: > arch/arm/mach-socfpga/clock_manager.c ^ what's this "conflicts" about ? -- Best regards, Marek Vasut __

[U-Boot] [PATCH v3 07/19] arm: socfpga: Add clock driver for Arria 10

2017-03-29 Thread Ley Foon Tan
Add clock driver support for Arria 10. Signed-off-by: Tien Fong Chee Signed-off-by: Ley Foon Tan Conflicts: arch/arm/mach-socfpga/clock_manager.c --- arch/arm/mach-socfpga/Makefile |3 +- arch/arm/mach-socfpga/clock_manager.c | 10 + arch/arm/mach