From: Stephen Boyd Date: Wed, 14 Mar 2018 21:32:29 +0000 (-0700) Subject: Merge tag 'clk-hi3798cv200-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v4.19~1196^2~3^3~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e26a20339d222b538c1174cec2da45202319aa99;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'clk-hi3798cv200-4.17' of git://git./linux/kernel/git/shawnguo/linux into clk-hisi Pull Hi3798CV200 clock driver updates for 4.17 from Shawn Guo: - Add COMBPHY0 and USB2_OTG_UTMI clock support. - Correct the parent clock of HISTB_IR_CLK. - Fix unregister call sequence in hi3798cv200_clk_register() function. - A coding-style improvement on Hi3798CV200 driver code indent. - Add a HiSilicon specific phase clock type and using the type for eMMC clocks on Hi3798CV200. * tag 'clk-hi3798cv200-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: clk: hi3798cv200: add emmc sample and drive clock clk: hisilicon: add hisi phase clock support clk: hi3798cv200: add COMBPHY0 clock support clk: hi3798cv200: fix define indentation clk: hi3798cv200: add support for HISTB_USB2_OTG_UTMI_CLK clk: hi3798cv200: correct IR clock parent clk: hi3798cv200: fix unregister call sequence in error path --- e26a20339d222b538c1174cec2da45202319aa99