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

This project is archived. Its data is read-only.

Commit 2b221790 authored Sep 07, 2014 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Sep 07, 2014

Merge "phy: relocate and rename phy ufs files"

parents 55610550 3ba23ab3

drivers/phy/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -4,3 +4,6 @@

		obj-$(CONFIG_GENERIC_PHY) += phy-core.o
		obj-$(CONFIG_PHY_MSM_SATA) += phy-msm-sata.o
		obj-$(CONFIG_SCSI_UFS_QCOM) += phy-qcom-ufs.o
		obj-$(CONFIG_SCSI_UFS_QCOM) += phy-qcom-ufs-qmp-28nm.o
		obj-$(CONFIG_SCSI_UFS_QCOM) += phy-qcom-ufs-qmp-20nm.o

drivers/scsi/ufs/ufs-msm-phy-qmp-20nm.c→drivers/phy/phy-qcom-ufs-qmp-20nm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,8 +22,8 @@
		#include <linux/platform_device.h>
		#include <linux/msm-bus.h>

		#include "ufs-msm-phy.h"
		#include "ufs-msm-phy-qmp-20nm.h"
		#include <linux/phy/phy-qcom-ufs.h>
		#include "phy-qcom-ufs-qmp-20nm.h"

		#define UFS_PHY_NAME "ufs_phy_qmp_20nm"

drivers/scsi/ufs/ufs-msm-phy-qmp-20nm.h→drivers/phy/phy-qcom-ufs-qmp-20nm.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		#ifndef UFS_QCOM_PHY_QMP_20NM_H_
		#define UFS_QCOM_PHY_QMP_20NM_H_

		#include "ufs-msm-phy.h"
		#include <linux/phy/phy-qcom-ufs.h>

		/* QCOM UFS PHY control registers */

drivers/scsi/ufs/ufs-msm-phy-qmp-28nm.c→drivers/phy/phy-qcom-ufs-qmp-28nm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,8 +23,8 @@
		#include <linux/msm-bus.h>
		#include <linux/phy/phy.h>

		#include "ufs-msm-phy.h"
		#include "ufs-msm-phy-qmp-28nm.h"
		#include <linux/phy/phy-qcom-ufs.h>
		#include "phy-qcom-ufs-qmp-28nm.h"

		#define UFS_PHY_NAME "ufs_qcom_phy_qmp_28nm"

drivers/scsi/ufs/ufs-msm-phy-qmp-28nm.h→drivers/phy/phy-qcom-ufs-qmp-28nm.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		#ifndef UFS_QCOM_PHY_QMP_28NM_H_
		#define UFS_QCOM_PHY_QMP_28NM_H_

		#include "ufs-msm-phy.h"
		#include <linux/phy/phy-qcom-ufs.h>

		/* QCOM UFS PHY control registers */