phy: for 4.3 -rc
Subsystems (2)
Hi Greg,
Please find the pull request for 4.3 -rc cycle below. This includes misc fixes in three of the PHY drivers. Please see the tag message for the details.
Let me know if I have to change something.
Cheers
Kishon
The following changes since commit 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f:
Linux 4.3-rc1 (2015-09-12 16:35:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/phy-for-4.3-rc
for you to fetch changes up to f9fef6181a9590261c296be9e2a19b6aa3c13ba7:
phy: berlin-sata: Fix module autoload for OF platform driver (2015-09-25 17:01:14 +0530)
----------------------------------------------------------------
phy: for 4.3-rc
*) Fix compiler error in qcom-ufs when it is built as module *) Power down rockchip-usb PHY during probe to save power consumption *) Fix module autoload for berlin-sata PHY driver
----------------------------------------------------------------
Luis de Bethencourt (1):
phy: berlin-sata: Fix module autoload for OF platform driver
Yaniv Gardi (1):
phy: qcom-ufs: fix build error when the component is built as a module
huang lin (1):
phy: rockchip-usb: power down phy when rockchip phy probe
drivers/phy/phy-berlin-sata.c | 1 + drivers/phy/phy-qcom-ufs.c | 11 +++++++++++ drivers/phy/phy-rockchip-usb.c | 6 ++++++ 3 files changed, 18 insertions(+)
Signature · 1 line
1.7.9.5
PATCH 1/3 phy: qcom-ufs: fix build error when the component is built as a module
From: Yaniv Gardi <[email protected]>
Export the following functions in order to avoid build errors when the component PHY_QCOM_UFS is compiled as a module:
ERROR: "ufs_qcom_phy_disable_ref_clk"
[drivers/scsi/ufs/ufs-qcom.ko] undefined!
ERROR: "ufs_qcom_phy_enable_ref_clk"
[drivers/scsi/ufs/ufs-qcom.ko] undefined!
ERROR: "ufs_qcom_phy_is_pcs_ready"
[drivers/scsi/ufs/ufs-qcom.ko] undefined!
ERROR: "ufs_qcom_phy_disable_iface_clk"
[drivers/scsi/ufs/ufs-qcom.ko] undefined!
ERROR: "ufs_qcom_phy_start_serdes"
[drivers/scsi/ufs/ufs-qcom.ko] undefined!
ERROR: "ufs_qcom_phy_calibrate_phy"
[drivers/scsi/ufs/ufs-qcom.ko] undefined!
ERROR: "ufs_qcom_phy_enable_dev_ref_clk"
[drivers/scsi/ufs/ufs-qcom.ko] undefined!
ERROR: "ufs_qcom_phy_set_tx_lane_enable"
[drivers/scsi/ufs/ufs-qcom.ko] undefined!
ERROR: "ufs_qcom_phy_disable_dev_ref_clk"
[drivers/scsi/ufs/ufs-qcom.ko] undefined!
ERROR: "ufs_qcom_phy_save_controller_version"
[drivers/scsi/ufs/ufs-qcom.ko] undefined!
ERROR: "ufs_qcom_phy_enable_iface_clk"
[drivers/scsi/ufs/ufs-qcom.ko] undefined!
make[1]: *** [__modpost] Error 1
--- drivers/phy/phy-qcom-ufs.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/phy/phy-qcom-ufs.c +11 -0
@@ -432,6 +432,7 @@ out_disable_src: out:return ret; } +EXPORT_SYMBOL_GPL (ufs_qcom_phy_enable_ref_clk); static int ufs_qcom_phy_disable_vreg(struct phy *phy,
@@ -474,6 +475,7 @@ void ufs_qcom_phy_disable_ref_clk(struct phy *generic_phy) phy->is_ref_clk_enabled = false; } } +EXPORT_SYMBOL_GPL (ufs_qcom_phy_disable_ref_clk);#define UFS_REF_CLK_EN (1 << 5)
@@ -517,11 +519,13 @@ void ufs_qcom_phy_enable_dev_ref_clk(struct phy *generic_phy) {ufs_qcom_phy_dev_ref_clk_ctrl (generic_phy, true); } +EXPORT_SYMBOL_GPL (ufs_qcom_phy_enable_dev_ref_clk);void ufs_qcom_phy_disable_dev_ref_clk (struct phy *generic_phy) {ufs_qcom_phy_dev_ref_clk_ctrl (generic_phy, false); } +EXPORT_SYMBOL_GPL (ufs_qcom_phy_disable_dev_ref_clk);/* Turn ON M-PHY RMMI interface clocks */ int ufs_qcom_phy_enable_iface_clk (struct phy *generic_phy)
@@ -550,6 +554,7 @@ int ufs_qcom_phy_enable_iface_clk(struct phy *generic_phy) out:return ret; } +EXPORT_SYMBOL_GPL (ufs_qcom_phy_enable_iface_clk);/* Turn OFF M-PHY RMMI interface clocks */ void ufs_qcom_phy_disable_iface_clk (struct phy *generic_phy)
@@ -562,6 +567,7 @@ void ufs_qcom_phy_disable_iface_clk(struct phy *generic_phy) phy->is_iface_clk_enabled = false; } } +EXPORT_SYMBOL_GPL (ufs_qcom_phy_disable_iface_clk);int ufs_qcom_phy_start_serdes (struct phy *generic_phy) {
@@ -578,6 +584,7 @@ int ufs_qcom_phy_start_serdes(struct phy *generic_phy)return ret; } +EXPORT_SYMBOL_GPL (ufs_qcom_phy_start_serdes);int ufs_qcom_phy_set_tx_lane_enable (struct phy *generic_phy,u32 tx_lanes) {
@@ -595,6 +602,7 @@ int ufs_qcom_phy_set_tx_lane_enable(struct phy *generic_phy, u32 tx_lanes)return ret; } +EXPORT_SYMBOL_GPL (ufs_qcom_phy_set_tx_lane_enable);void ufs_qcom_phy_save_controller_version (struct phy *generic_phy,u8 major,u16 minor,u16 step)
@@ -605,6 +613,7 @@ void ufs_qcom_phy_save_controller_version(struct phy *generic_phy, ufs_qcom_phy->host_ctrl_rev_minor = minor; ufs_qcom_phy->host_ctrl_rev_step = step; } +EXPORT_SYMBOL_GPL (ufs_qcom_phy_save_controller_version);int ufs_qcom_phy_calibrate_phy (struct phy *generic_phy,bool is_rate_B) {
@@ -625,6 +634,7 @@ int ufs_qcom_phy_calibrate_phy(struct phy *generic_phy, bool is_rate_B)return ret; } +EXPORT_SYMBOL_GPL (ufs_qcom_phy_calibrate_phy);int ufs_qcom_phy_remove (struct phy *generic_phy,struct ufs_qcom_phy *ufs_qcom_phy)
@@ -662,6 +672,7 @@ int ufs_qcom_phy_is_pcs_ready(struct phy *generic_phy)return ufs_qcom_phy->phy_spec_ops->is_physical_coding_sublayer_ready (ufs_qcom_phy); } +EXPORT_SYMBOL_GPL (ufs_qcom_phy_is_pcs_ready);int ufs_qcom_phy_power_on (struct phy *generic_phy) {
Signature · 1 line
1.7.9.5
PATCH 2/3 phy: rockchip-usb: power down phy when rockchip phy probe
In reply to Kishon Vijay Abraham IFrom: huang lin <[email protected]>
rockchip phy are enable when soc reset, to save power consumption, we disable it when probe, and enable each phy when it use
--- drivers/phy/phy-rockchip-usb.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/phy/phy-rockchip-usb.c +6 -0
@@ -98,6 +98,7 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev)struct device_node *child;struct regmap *grf;unsigned int reg_offset; +int err; grf =syscon_regmap_lookup_by_phandle (dev->of_node,"rockchip,grf" );if (IS_ERR (grf)) {
@@ -129,6 +130,11 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev)return PTR_ERR (rk_phy->phy); }phy_set_drvdata (rk_phy->phy, rk_phy); + +/* only power up usb phy when it use, so disable it when init*/ + err =rockchip_usb_phy_power (rk_phy,1 ); +if (err) +return err; } phy_provider =devm_of_phy_provider_register (dev, of_phy_simple_xlate);
Signature · 1 line
1.7.9.5
PATCH 3/3 phy: berlin-sata: Fix module autoload for OF platform driver
In reply to Kishon Vijay Abraham IFrom: Luis de Bethencourt <[email protected]>
This platform driver has a OF device ID table but the OF module alias information is not created so module autoloading won't work.
--- drivers/phy/phy-berlin-sata.c | 1 + 1 file changed, 1 insertion(+)
drivers/phy/phy-berlin-sata.c +1 -0
@@ -276,6 +276,7 @@ static const struct of_device_id phy_berlin_sata_of_match[] = { { .compatible = "marvell,berlin2q-sata-phy" }, { }, }; +MODULE_DEVICE_TABLE (of, phy_berlin_sata_of_match);static struct platform_driver phy_berlin_sata_driver = { .probe = phy_berlin_sata_probe,
Signature · 1 line
1.7.9.5
Quoted 11 lines · Kishon Vijay Abraham I
Hi Greg,
Please find the pull request for 4.3 -rc cycle below. This includes misc fixes in three of the PHY drivers. Please see the tag message for the details.
Let me know if I have to change something.
Cheers
Kishon
Quoted 7 lines
The following changes since commit
6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f:Linux 4.3-rc1 (2015-09-12 16:35:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.gittags/phy-for-4.3-rc
Pulled into my tree now, thanks.
greg k-h