Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

Pull clk fix from Stephen Boyd:
"One fix for USB clks on Uniphier PXs3 SoCs"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
clk: uniphier: fix clock data for PXs3

+3 -3
+3 -3
drivers/clk/uniphier/clk-uniphier-sys.c
··· 233 233 UNIPHIER_LD20_SYS_CLK_SD, 234 234 UNIPHIER_LD11_SYS_CLK_NAND(2), 235 235 UNIPHIER_LD11_SYS_CLK_EMMC(4), 236 - UNIPHIER_CLK_GATE("usb30", 12, NULL, 0x2104, 4), /* =GIO0 */ 237 - UNIPHIER_CLK_GATE("usb31-0", 13, NULL, 0x2104, 5), /* =GIO1 */ 238 - UNIPHIER_CLK_GATE("usb31-1", 14, NULL, 0x2104, 6), /* =GIO1-1 */ 236 + UNIPHIER_CLK_GATE("usb30", 12, NULL, 0x210c, 4), /* =GIO0 */ 237 + UNIPHIER_CLK_GATE("usb31-0", 13, NULL, 0x210c, 5), /* =GIO1 */ 238 + UNIPHIER_CLK_GATE("usb31-1", 14, NULL, 0x210c, 6), /* =GIO1-1 */ 239 239 UNIPHIER_CLK_GATE("usb30-phy0", 16, NULL, 0x210c, 16), 240 240 UNIPHIER_CLK_GATE("usb30-phy1", 17, NULL, 0x210c, 18), 241 241 UNIPHIER_CLK_GATE("usb30-phy2", 18, NULL, 0x210c, 20),