Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5426f4c authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mauro Carvalho Chehab
Browse files

media: staging: atomisp: use clock framework for camera clocks 



The Atom ISP driver initializes and configures PMC clocks which are
already handled by the clock framework.

Remove all legacy vlv2_platform_clock stuff and move to the clk API to
avoid conflicts, e.g. with audio machine drivers enabling the MCLK for
external codecs

Fixes: a49d2536 ("staging/atomisp: Add support for the Intel IPU v2")

Tested-by: default avatarCarlo Caione <carlo@endlessm.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent abe51392

drivers/staging/media/atomisp/Kconfig

+1 −0
Original line number Original line Diff line number Diff line 
menuconfig INTEL_ATOMISP

menuconfig INTEL_ATOMISP

	bool "Enable support to Intel MIPI camera drivers"

	bool "Enable support to Intel MIPI camera drivers"

	depends on X86 && EFI && MEDIA_CONTROLLER && PCI && ACPI

	depends on X86 && EFI && MEDIA_CONTROLLER && PCI && ACPI

	select COMMON_CLK

	help

	help

	  Enable support for the Intel ISP2 camera interfaces and MIPI

	  Enable support for the Intel ISP2 camera interfaces and MIPI

	  sensor drivers.

	  sensor drivers.

drivers/staging/media/atomisp/platform/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -2,5 +2,4 @@ 
# Makefile for camera drivers.

# Makefile for camera drivers.

#

#





obj-$(CONFIG_INTEL_ATOMISP) += clock/

obj-$(CONFIG_INTEL_ATOMISP) += intel-mid/
 
obj-$(CONFIG_INTEL_ATOMISP) += intel-mid/

drivers/staging/media/atomisp/platform/clock/Makefile

deleted100644 → 0
+0 −6
Original line number Original line Diff line number Diff line 
#

# Makefile for clock devices.

#



obj-$(CONFIG_INTEL_ATOMISP)	+= vlv2_plat_clock.o

obj-$(CONFIG_INTEL_ATOMISP)     += platform_vlv2_plat_clk.o

drivers/staging/media/atomisp/platform/clock/platform_vlv2_plat_clk.c

deleted100644 → 0
+0 −40
Original line number Original line Diff line number Diff line 
/*

 * platform_vlv2_plat_clk.c - VLV2 platform clock driver

 * Copyright (C) 2013 Intel Corporation

 *

 * Author: Asutosh Pathak <asutosh.pathak@intel.com>

 * Author: Chandra Sekhar Anagani <chandra.sekhar.anagani@intel.com>

 * Author: Sergio Aguirre <sergio.a.aguirre.rodriguez@intel.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; version 2 of the License.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

 * General Public License for more details.

 *

 */



#include <linux/device.h>

#include <linux/err.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/printk.h>



static int __init vlv2_plat_clk_init(void)

{

	struct platform_device *pdev;



	pdev = platform_device_register_simple("vlv2_plat_clk", -1, NULL, 0);

	if (IS_ERR(pdev)) {

		pr_err("platform_vlv2_plat_clk:register failed: %ld\n",

			PTR_ERR(pdev));

		return PTR_ERR(pdev);

	}



	return 0;

}



device_initcall(vlv2_plat_clk_init);

drivers/staging/media/atomisp/platform/clock/platform_vlv2_plat_clk.h

deleted100644 → 0
+0 −26
Original line number Original line Diff line number Diff line 
/*

 * platform_vlv2_plat_clk.h: platform clock driver library header file

 * Copyright (C) 2013 Intel Corporation

 *

 * Author: Asutosh Pathak <asutosh.pathak@intel.com>

 * Author: Chandra Sekhar Anagani <chandra.sekhar.anagani@intel.com>

 * Author: Sergio Aguirre <sergio.a.aguirre.rodriguez@intel.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; version 2 of the License.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

 * General Public License for more details.

 *

 */

#ifndef _PLATFORM_VLV2_PLAT_CLK_H_

#define _PLATFORM_VLV2_PLAT_CLK_H_



#include <linux/sfi.h>



extern void __init *vlv2_plat_clk_device_platform_data(

				void *info) __attribute__((weak));

#endif