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

Commit e66f233d authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Greg Kroah-Hartman
Browse files

ARM: Samsung: Remove the MIPI PHY setup code 



Generic PHY drivers are used to handle the MIPI CSIS and MIPI DSIM
DPHYs so we can remove now unused code at arch/arm/plat-samsung.
In case there is any board file for S5PV210 platforms using MIPI
CSIS/DSIM (not any upstream currently) it should use the generic
PHY API to bind the PHYs to respective PHY consumer drivers and
a platform device for the PHY provider should be defined.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7e0be9f9

arch/arm/mach-exynos/include/mach/regs-pmu.h

+0 −5
Original line number Diff line number Diff line
@@ -44,11 +44,6 @@ 
#define S5P_DAC_PHY_CONTROL			S5P_PMUREG(0x070C)

#define S5P_DAC_PHY_ENABLE			(1 << 0)



#define S5P_MIPI_DPHY_CONTROL(n)		S5P_PMUREG(0x0710 + (n) * 4)

#define S5P_MIPI_DPHY_ENABLE			(1 << 0)

#define S5P_MIPI_DPHY_SRESETN			(1 << 1)

#define S5P_MIPI_DPHY_MRESETN			(1 << 2)



#define S5P_INFORM0				S5P_PMUREG(0x0800)

#define S5P_INFORM1				S5P_PMUREG(0x0804)

#define S5P_INFORM2				S5P_PMUREG(0x0808)

arch/arm/mach-s5pv210/include/mach/regs-clock.h

+0 −4
Original line number Diff line number Diff line
@@ -147,10 +147,6 @@ 
#define S5P_HDMI_PHY_CONTROL	S5P_CLKREG(0xE804)

#define S5P_USB_PHY_CONTROL	S5P_CLKREG(0xE80C)

#define S5P_DAC_PHY_CONTROL	S5P_CLKREG(0xE810)

#define S5P_MIPI_DPHY_CONTROL(x) S5P_CLKREG(0xE814)

#define S5P_MIPI_DPHY_ENABLE	(1 << 0)

#define S5P_MIPI_DPHY_SRESETN	(1 << 1)

#define S5P_MIPI_DPHY_MRESETN	(1 << 2)



#define S5P_INFORM0		S5P_CLKREG(0xF000)

#define S5P_INFORM1		S5P_CLKREG(0xF004)

arch/arm/plat-samsung/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -390,11 +390,6 @@ config S3C24XX_PWM 
	  Support for exporting the PWM timer blocks via the pwm device

	  system



config S5P_SETUP_MIPIPHY

	bool

	help

	  Compile in common setup code for MIPI-CSIS and MIPI-DSIM devices



config S3C_SETUP_CAMIF

	bool

	help

arch/arm/plat-samsung/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ obj-$(CONFIG_S5P_DEV_UART) += s5p-dev-uart.o 
obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT)	+= dev-backlight.o



obj-$(CONFIG_S3C_SETUP_CAMIF)	+= setup-camif.o

obj-$(CONFIG_S5P_SETUP_MIPIPHY)	+= setup-mipiphy.o



# DMA support

arch/arm/plat-samsung/setup-mipiphy.c

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

 * Copyright (C) 2011 Samsung Electronics Co., Ltd.

 *

 * S5P - Helper functions for MIPI-CSIS and MIPI-DSIM D-PHY control

 *

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

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/export.h>

#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/spinlock.h>

#include <mach/regs-clock.h>



static int __s5p_mipi_phy_control(int id, bool on, u32 reset)

{

	static DEFINE_SPINLOCK(lock);

	void __iomem *addr;

	unsigned long flags;

	u32 cfg;



	id = max(0, id);

	if (id > 1)

		return -EINVAL;



	addr = S5P_MIPI_DPHY_CONTROL(id);



	spin_lock_irqsave(&lock, flags);



	cfg = __raw_readl(addr);

	cfg = on ? (cfg | reset) : (cfg & ~reset);

	__raw_writel(cfg, addr);



	if (on) {

		cfg |= S5P_MIPI_DPHY_ENABLE;

	} else if (!(cfg & (S5P_MIPI_DPHY_SRESETN |

			    S5P_MIPI_DPHY_MRESETN) & ~reset)) {

		cfg &= ~S5P_MIPI_DPHY_ENABLE;

	}



	__raw_writel(cfg, addr);

	spin_unlock_irqrestore(&lock, flags);



	return 0;

}



int s5p_csis_phy_enable(int id, bool on)

{

	return __s5p_mipi_phy_control(id, on, S5P_MIPI_DPHY_SRESETN);

}

EXPORT_SYMBOL(s5p_csis_phy_enable);



int s5p_dsim_phy_enable(struct platform_device *pdev, bool on)

{

	return __s5p_mipi_phy_control(pdev->id, on, S5P_MIPI_DPHY_MRESETN);

}

EXPORT_SYMBOL(s5p_dsim_phy_enable);