Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC DT updates from Olof Johansson:
 "DT changes continue to be the bulk of our merge window contents.

  We continue to have a large set of changes across the board as new
  platforms and drivers are added.

  Some of the new platforms are:
   - Alphascale ASM9260
   - Marvell Armada 388
   - CSR Atlas7
   - TI Davinci DM816x
   - Hisilicon HiP01
   - ST STiH418

  There have also been some sweeping changes, including relicensing of
  DTS contents from GPL to GPLv2+/X11 so that the same files can be
  reused in other non-GPL projects more easily.  There's also been
  changes to the DT Makefile to make it a little less conflict-ridden
  and churny down the road"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (330 commits)
  ARM: dts: Add PPMU node for exynos4412-trats2
  ARM: dts: Add PPMU node for exynos3250-monk and exynos3250-rinato
  ARM: dts: Add PPMU dt node for exynos4 and exynos4210
  ARM: dts: Add PPMU dt node for exynos3250
  ARM: dts: add mipi dsi device node for exynos4415
  ARM: dts: add fimd device node for exynos4415
  ARM: dts: Add syscon phandle to the video-phy node for Exynos4
  ARM: dts: Add sound nodes for exynos4412-trats2
  ARM: dts: Fix CLK_MOUT_CAMn parent clocks assignment for exynos4412-trats2
  ARM: dts: Fix CLK_UART_ISP_SCLK clock assignment in exynos4x12.dtsi
  ARM: dts: Add max77693 charger node for exynos4412-trats2
  ARM: dts: Switch max77686 regulators to GPIO control for exynos4412-trats2
  ARM: dts: Add suspend configuration for max77686 regulators for exynos4412-trats2
  ARM: dts: Add Maxim 77693 fuel gauge node for exynos4412-trats2
  ARM: dts: am57xx-beagle-x15: Fix USB2 mode
  ARM: dts: am57xx-beagle-x15: Add extcon nodes for USB
  ARM: dts: dra72-evm: Add extcon nodes for USB
  ARM: dts: dra7-evm: Add extcon nodes for USB
  ARM: dts: rockchip: move the hdmi ddc-i2c-bus property to the actual boards
  ARM: dts: rockchip: enable vops and hdmi output on rk3288-firefly and -evb
  ...

1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/clk/samsung/clk-exynos5420.c b/drivers/clk/samsung/clk-exynos5420.c
index 848d602efc06..07d666cc6a29 100644
--- a/drivers/clk/samsung/clk-exynos5420.c
+++ b/drivers/clk/samsung/clk-exynos5420.c
@@ -635,8 +635,8 @@ static struct samsung_mux_clock exynos5x_mux_clks[] __initdata = {
                         SRC_TOP3, 0, 1),
         MUX(0, "mout_user_aclk400_mscl", mout_user_aclk400_mscl_p,
                         SRC_TOP3, 4, 1),
-        MUX(0, "mout_user_aclk200_disp1", mout_user_aclk200_disp1_p,
-                        SRC_TOP3, 8, 1),
+        MUX(CLK_MOUT_USER_ACLK200_DISP1, "mout_user_aclk200_disp1",
+                        mout_user_aclk200_disp1_p, SRC_TOP3, 8, 1),
         MUX(0, "mout_user_aclk200_fsys2", mout_user_aclk200_fsys2_p,
                         SRC_TOP3, 12, 1),
         MUX(0, "mout_user_aclk400_wcore", mout_user_aclk400_wcore_p,
@@ -663,8 +663,8 @@ static struct samsung_mux_clock exynos5x_mux_clks[] __initdata = {
         MUX(CLK_MOUT_USER_ACLK333, "mout_user_aclk333", mout_user_aclk333_p,
                         SRC_TOP4, 28, 1),
 
-        MUX(0, "mout_user_aclk400_disp1", mout_user_aclk400_disp1_p,
-                        SRC_TOP5, 0, 1),
+        MUX(CLK_MOUT_USER_ACLK400_DISP1, "mout_user_aclk400_disp1",
+                        mout_user_aclk400_disp1_p, SRC_TOP5, 0, 1),
         MUX(0, "mout_user_aclk66_psgen", mout_user_aclk66_peric_p,
                         SRC_TOP5, 4, 1),
         MUX(0, "mout_user_aclk333_g2d", mout_user_aclk333_g2d_p,
@@ -675,8 +675,8 @@ static struct samsung_mux_clock exynos5x_mux_clks[] __initdata = {
                         SRC_TOP5, 16, 1),
         MUX(0, "mout_user_aclk300_jpeg", mout_user_aclk300_jpeg_p,
                         SRC_TOP5, 20, 1),
-        MUX(0, "mout_user_aclk300_disp1", mout_user_aclk300_disp1_p,
-                        SRC_TOP5, 24, 1),
+        MUX(CLK_MOUT_USER_ACLK300_DISP1, "mout_user_aclk300_disp1",
+                        mout_user_aclk300_disp1_p, SRC_TOP5, 24, 1),
         MUX(0, "mout_user_aclk300_gscl", mout_user_aclk300_gscl_p,
                         SRC_TOP5, 28, 1),
 
@@ -693,7 +693,8 @@ static struct samsung_mux_clock exynos5x_mux_clks[] __initdata = {
                         SRC_TOP10, 0, 1),
         MUX(0, "mout_sw_aclk400_mscl", mout_sw_aclk400_mscl_p,
                         SRC_TOP10, 4, 1),
-        MUX(0, "mout_sw_aclk200", mout_sw_aclk200_p, SRC_TOP10, 8, 1),
+        MUX(CLK_MOUT_SW_ACLK200, "mout_sw_aclk200", mout_sw_aclk200_p,
+                        SRC_TOP10, 8, 1),
         MUX(0, "mout_sw_aclk200_fsys2", mout_sw_aclk200_fsys2_p,
                         SRC_TOP10, 12, 1),
         MUX(0, "mout_sw_aclk400_wcore", mout_sw_aclk400_wcore_p,
@@ -717,8 +718,8 @@ static struct samsung_mux_clock exynos5x_mux_clks[] __initdata = {
         MUX(CLK_MOUT_SW_ACLK333, "mout_sw_aclk333", mout_sw_aclk333_p,
                         SRC_TOP11, 28, 1),
 
-        MUX(0, "mout_sw_aclk400_disp1", mout_sw_aclk400_disp1_p,
-                        SRC_TOP12, 4, 1),
+        MUX(CLK_MOUT_SW_ACLK400, "mout_sw_aclk400_disp1",
+                        mout_sw_aclk400_disp1_p, SRC_TOP12, 4, 1),
         MUX(0, "mout_sw_aclk333_g2d", mout_sw_aclk333_g2d_p,
                         SRC_TOP12, 8, 1),
         MUX(0, "mout_sw_aclk266_g2d", mout_sw_aclk266_g2d_p,
@@ -726,8 +727,8 @@ static struct samsung_mux_clock exynos5x_mux_clks[] __initdata = {
         MUX(0, "mout_sw_aclk_g3d", mout_sw_aclk_g3d_p, SRC_TOP12, 16, 1),
         MUX(0, "mout_sw_aclk300_jpeg", mout_sw_aclk300_jpeg_p,
                         SRC_TOP12, 20, 1),
-        MUX(0, "mout_sw_aclk300_disp1", mout_sw_aclk300_disp1_p,
-                        SRC_TOP12, 24, 1),
+        MUX(CLK_MOUT_SW_ACLK300, "mout_sw_aclk300_disp1",
+                        mout_sw_aclk300_disp1_p, SRC_TOP12, 24, 1),
         MUX(0, "mout_sw_aclk300_gscl", mout_sw_aclk300_gscl_p,
                         SRC_TOP12, 28, 1),