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

Pull ARM SoC updates from Olof Johansson:
 "This contains the bulk of new SoC development for this merge window.

  Two new platforms have been added, the sunxi platforms (Allwinner A1x
  SoCs) by Maxime Ripard, and a generic Broadcom platform for a new
  series of ARMv7 platforms from them, where the hope is that we can
  keep the platform code generic enough to have them all share one mach
  directory.  The new Broadcom platform is contributed by Christian
  Daudt.

  Highbank has grown support for Calxeda's next generation of hardware,
  ECX-2000.

  clps711x has seen a lot of cleanup from Alexander Shiyan, and he's
  also taken on maintainership of the platform.

  Beyond this there has been a bunch of work from a number of people on
  converting more platforms to IRQ domains, pinctrl conversion, cleanup
  and general feature enablement across most of the active platforms."

Fix up trivial conflicts as per Olof.

* tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (174 commits)
  mfd: vexpress-sysreg: Remove LEDs code
  irqchip: irq-sunxi: Add terminating entry for sunxi_irq_dt_ids
  clocksource: sunxi_timer: Add terminating entry for sunxi_timer_dt_ids
  irq: versatile: delete dangling variable
  ARM: sunxi: add missing include for mdelay()
  ARM: EXYNOS: Avoid early use of of_machine_is_compatible()
  ARM: dts: add node for PL330 MDMA1 controller for exynos4
  ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
  ARM: EXYNOS: add UART3 to DEBUG_LL ports
  ARM: S3C24XX: Add clkdev entry for camif-upll clock
  ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers
  ARM: sunxi: Add missing sun4i.dtsi file
  pinctrl: samsung: Do not initialise statics to 0
  ARM i.MX6: remove gate_mask from pllv3
  ARM i.MX6: Fix ethernet PLL clocks
  ARM i.MX6: rename PLLs according to datasheet
  ARM i.MX6: Add pwm support
  ARM i.MX51: Add pwm support
  ARM i.MX53: Add pwm support
  ARM: mx5: Replace clk_register_clkdev with clock DT lookup
  ...

1 files changed, 29 insertions, 10 deletions

diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 8ac9b72b5ec7..791cd1d54a76 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -278,7 +278,8 @@ struct mx2_camera_dev {
         struct device           *dev;
         struct soc_camera_host  soc_host;
         struct soc_camera_device *icd;
-        struct clk              *clk_csi, *clk_emma_ahb, *clk_emma_ipg;
+        struct clk              *clk_emma_ahb, *clk_emma_ipg;
+        struct clk              *clk_csi_ahb, *clk_csi_per;
 
         void __iomem            *base_csi, *base_emma;
 
@@ -464,7 +465,8 @@ static void mx2_camera_deactivate(struct mx2_camera_dev *pcdev)
 {
         unsigned long flags;
 
-        clk_disable_unprepare(pcdev->clk_csi);
+        clk_disable_unprepare(pcdev->clk_csi_ahb);
+        clk_disable_unprepare(pcdev->clk_csi_per);
         writel(0, pcdev->base_csi + CSICR1);
         if (is_imx27_camera(pcdev)) {
                 writel(0, pcdev->base_emma + PRP_CNTL);
@@ -492,10 +494,14 @@ static int mx2_camera_add_device(struct soc_camera_device *icd)
         if (pcdev->icd)
                 return -EBUSY;
 
-        ret = clk_prepare_enable(pcdev->clk_csi);
+        ret = clk_prepare_enable(pcdev->clk_csi_ahb);
         if (ret < 0)
                 return ret;
 
+        ret = clk_prepare_enable(pcdev->clk_csi_per);
+        if (ret < 0)
+                goto exit_csi_ahb;
+
         csicr1 = CSICR1_MCLKEN;
 
         if (is_imx27_camera(pcdev))
@@ -512,6 +518,11 @@ static int mx2_camera_add_device(struct soc_camera_device *icd)
                  icd->devnum);
 
         return 0;
+
+exit_csi_ahb:
+        clk_disable_unprepare(pcdev->clk_csi_ahb);
+
+        return ret;
 }
 
 static void mx2_camera_remove_device(struct soc_camera_device *icd)
@@ -1777,10 +1788,17 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev)
                 break;
         }
 
-        pcdev->clk_csi = devm_clk_get(&pdev->dev, "ahb");
-        if (IS_ERR(pcdev->clk_csi)) {
-                dev_err(&pdev->dev, "Could not get csi clock\n");
-                err = PTR_ERR(pcdev->clk_csi);
+        pcdev->clk_csi_ahb = devm_clk_get(&pdev->dev, "ahb");
+        if (IS_ERR(pcdev->clk_csi_ahb)) {
+                dev_err(&pdev->dev, "Could not get csi ahb clock\n");
+                err = PTR_ERR(pcdev->clk_csi_ahb);
+                goto exit;
+        }
+
+        pcdev->clk_csi_per = devm_clk_get(&pdev->dev, "per");
+        if (IS_ERR(pcdev->clk_csi_per)) {
+                dev_err(&pdev->dev, "Could not get csi per clock\n");
+                err = PTR_ERR(pcdev->clk_csi_per);
                 goto exit;
         }
 
@@ -1790,12 +1808,13 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev)
 
                 pcdev->platform_flags = pcdev->pdata->flags;
 
-                rate = clk_round_rate(pcdev->clk_csi, pcdev->pdata->clk * 2);
+                rate = clk_round_rate(pcdev->clk_csi_per,
+                                                pcdev->pdata->clk * 2);
                 if (rate <= 0) {
                         err = -ENODEV;
                         goto exit;
                 }
-                err = clk_set_rate(pcdev->clk_csi, rate);
+                err = clk_set_rate(pcdev->clk_csi_per, rate);
                 if (err < 0)
                         goto exit;
         }
@@ -1853,7 +1872,7 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev)
                 goto exit_free_emma;
 
         dev_info(&pdev->dev, "MX2 Camera (CSI) driver probed, clock frequency: %ld\n",
-                        clk_get_rate(pcdev->clk_csi));
+                        clk_get_rate(pcdev->clk_csi_per));
 
         return 0;