phy: exynos-video-mipi: Fix regression by adding support for PMU regmap
Subsystems (4)
PATCH 1/2 phy: exynos-video-mipi: Fix regression by adding support for PMU regmap
After the Exynos Power Management Unit (PMU) driver was converted to the platform device driver in commit 14fc8b93d47323561edf5d482 ("ARM: EXYNOS: Add platform driver support for Exynos PMU") and then PMU device nodes added to Exynos4 DTs in commit 7b9613aca42a5522d269 ("ARM: dts: add PMU syscon node for exynos4") the mipi video phy driver started failing probing, due to overlapping memory mapped register region resources.
Now all the Exynos peripheral devices which have registers in the PMU region are supposed to use the regmap provided by the syscon driver. So support for regmap is added in this patch, this unfortunately creates yet another indirection into that supposedly trivial driver.
The additional mutex is required because single register is used by PHY pairs (they share bit in a register). An improvement here could be to allow a PHY instance be created with a driver custom mutex, which would then be common for each PHY pair. This would eliminate one of 3 mutexes which need to be taken in the phy_power_on/ phy_power_off code path. However, I tried to keep this bug fix patch possibly simple.
This change is needed to make MIPI DSI displays and MIPI CSI-2 camera sensors working again on Exynos4 boards.
--- .../devicetree/bindings/phy/samsung-phy.txt | 2 +- drivers/phy/phy-exynos-mipi-video.c | 89 +++++++++++++------- include/linux/mfd/syscon/exynos4-pmu.h | 21 +++++ 3 files changed, 79 insertions(+), 33 deletions(-) create mode 100644 include/linux/mfd/syscon/exynos4-pmu.h
Documentation/devicetree/bindings/phy/samsung-phy.txt +1 -1
@@ -3,8 +3,8 @@ Samsung S5P/EXYNOS SoC series MIPI CSIS/DSIM DPHY Required properties: - compatible : should be "samsung,s5pv210-mipi-video-phy"; -- reg : offset and length of the MIPI DPHY register set; - #phy-cells : from the generic phy bindings, must be 1; +- syscon - phandle to the PMU system controller; For "samsung,s5pv210-mipi-video-phy" compatible PHYs the second cell in the PHY specifier identifies the PHY and its meaning is as follows:
drivers/phy/phy-exynos-mipi-video.c +57 -32
140 lines not on this page · raw message
include/linux/mfd/syscon/exynos4-pmu.h new file +21 -0
@@ -0,0 +1,21 @@ +/* +* Copyright (C) 2015 Samsung Electronics Co., Ltd. +* +* 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. +*/ + +#ifndef _LINUX_MFD_SYSCON_PMU_EXYNOS4_H_ +#define _LINUX_MFD_SYSCON_PMU_EXYNOS4_H_ + +/* Exynos4 PMU register definitions */ + +/* MIPI_PHYn_CONTROL register offset: n = 0..1 */ +#define EXYNOS4_MIPI_PHY_CONTROL (n) (0x710 + (n) * 4) +#define EXYNOS4_MIPI_PHY_ENABLE (1 << 0) +#define EXYNOS4_MIPI_PHY_SRESETN (1 << 1) +#define EXYNOS4_MIPI_PHY_MRESETN (1 << 2) +#define EXYNOS4_MIPI_PHY_RESET_MASK (3 << 1) + +#endif /* _LINUX_MFD_SYSCON_PMU_EXYNOS4_H_ */
--
1.7.9.5
PATCH 2/2 ARM: dts: Add syscon phandle to the video-phy node for Exynos4
This is required to fix regression after introducing the PMU device nodes required for the PMU driver modified in commit 14fc8b93d47323561edf5d482d4a4b3ee1b90286
("ARM: EXYNOS: Add platform driver support for Exynos PMU"). This change is needed to make MIPI DSI displays and MIPI CSI-2 camera sensors working again on Exynos4 boards.
--- arch/arm/boot/dts/exynos4.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/exynos4.dtsi +1 -0
@@ -76,6 +76,7 @@ compatible = "samsung,s5pv210-mipi-video-phy"; reg = <0x10020710 8>; #phy-cells = <1>; + syscon = <&pmu_system_controller>; }; pd_mfc: mfc-power-domain at 10023C40 {
Signature · 1 line
1.7.9.5
PATCH 2/2 ARM: dts: Add syscon phandle to the video-phy node for Exynos4
Hi Kukjin,
Quoted 17 lines · Sylwester Nawrocki
This is required to fix regression after introducing the PMU device nodes required for the PMU driver modified in commit
14fc8b93d47323561edf5d482d4a4b3ee1b90286
("ARM: EXYNOS: Add platform driver support for Exynos PMU"). This change is needed to make MIPI DSI displays and MIPI CSI-2 camera sensors working again on Exynos4 boards.Signed-off-by Sylwester Nawrocki <[email protected]>--- arch/arm/boot/dts/exynos4.dtsi | 1 + 1 file changed, 1 insertion(+)arch/arm/boot/dts/exynos4.dtsi +0
-0
arch/arm/boot/dts/exynos4.dtsi line 82
Quoted 7 lines
arch/arm/boot/dts/exynos4.dtsi +1
-0@@ -76,6 +76,7 @@ compatible = "samsung,s5pv210-mipi-video-phy"; reg = <0x10020710 8>; #phy-cells = <1>; + syscon = <&pmu_system_controller>; }; pd_mfc: mfc-power-domain at 10023C40 {
I'd like to remind you about a few pending dts patches I send to you, except the above one there are:
[PATCH V3 15/15] ARM: dts: Fix I2S1, I2S2 compatible for exynos4 SoCs [PATCH] ARM: dts: Fix CLK_MOUT_CAMn parent clocks assignment for Trats2 [PATCH] ARM: dts: Fix CLK_UART_ISP_SCLK clock assignment in exynos4x12.dtsi
and
[PATCH v2 14/16] ARM: dts: Exynos4 and Odroid X2/U3 sound device nodes update
but this one depends on ASoC patch:
[PATCH V3 11/15] ASoC: samsung: i2s: Add clk provider DT binding documentation
hence it could be probably merged only after 3.20-rc1 release.
--
Thanks,
Sylwester
PATCH 2/2 ARM: dts: Add syscon phandle to the video-phy node for Exynos4
Quoted 3 lines · Sylwester Nawrocki
Hi Kukjin,
Hi,
Quoted 24 lines · Sylwester Nawrocki
Quoted 23 lines
This is required to fix regression after introducing the PMU device nodes required for the PMU driver modified in commit
14fc8b93d47323561edf5d482d4a4b3ee1b90286
("ARM: EXYNOS: Add platform driver support for Exynos PMU"). This change is needed to make MIPI DSI displays and MIPI CSI-2 camera sensors working again on Exynos4 boards.Signed-off-by Sylwester Nawrocki <[email protected]>--- arch/arm/boot/dts/exynos4.dtsi | 1 + 1 file changed, 1 insertion(+)arch/arm/boot/dts/exynos4.dtsi +1
-0@@ -76,6 +76,7 @@ compatible = "samsung,s5pv210-mipi-video-phy"; reg = <0x10020710 8>; #phy-cells = <1>; + syscon = <&pmu_system_controller>; };
Quoted 2 lines
arch/arm/boot/dts/exynos4.dtsi line 82
Quoted 1 line
arch/arm/boot/dts/exynos4.dtsi +0
-0pd_mfc: mfc-power-domain at 10023C40 {
Applied this.
Quoted 4 lines
I'd like to remind you about a few pending dts patches I send to you, except the above one there are:
[PATCH V3 15/15] ARM: dts: Fix I2S1, I2S2 compatible for exynos4 SoCs
I thought Mark applied the whole series including above patch.
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-January/316326.html
And I knew he didn't when I checked his comment on 13/15 patch ;)
Quoted 1 line
[PATCH] ARM: dts: Fix
CLK_MOUT_CAMnparent clocks assignment for Trats2
Done.
Quoted 1 line
[PATCH] ARM: dts: Fix
CLK_UART_ISP_SCLKclock assignment inexynos4x12.dtsi
Done.
Quoted 10 lines
and
[PATCH v2 14/16] ARM: dts: Exynos4 and Odroid X2/U3 sound device nodes update
but this one depends on ASoC patch:
[PATCH V3 11/15] ASoC: samsung: i2s: Add clk provider DT binding documentationhence it could be probably merged only after 3.20-rc1 release.
+ Mark
I see. I'll take 13 to 15 in the series for late DT updates if Mark has no objection. (I commented about that on the mail thread.)
Thanks for your reminder.
- Kukjin