phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
Subsystems (7)
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
Add a PHY provider driver for the Samsung S5P/Exynos SoC MIPI CSI-2 receiver and MIPI DSI transmitter DPHYs.
---
Changes since v1:
- enabled build as module and with CONFIG_OF disabled
- added phy_id enum,
- of_address_to_resource() replaced with platform_get_resource(),
- adapted to changes in the PHY API v7, v8 - added phy labels,
- added MODULE_DEVICE_TABLE() entry,
- driver file renamed to phy-exynos-mipi-video.c,
- changed DT compatible string to "samsung,s5pv210-mipi-video-phy",
- corrected the compatible property's description.
--- .../phy/samsung,s5pv210-mipi-video-phy.txt | 14 ++ drivers/phy/Kconfig | 9 + drivers/phy/Makefile | 3 +- drivers/phy/phy-exynos-mipi-video.c | 173 ++++++++++++++++++++ 4 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/phy/samsung,s5pv210-mipi-video-phy.txt create mode 100644 drivers/phy/phy-exynos-mipi-video.c
Documentation/devicetree/bindings/phy/samsung,s5pv210-mipi-video-phy.txt new file +14 -0
@@ -0,0 +1,14 @@ +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; + +For "samsung,s5pv210-mipi-video-phy" compatible PHYs the second cell in +the PHY specifier identifies the PHY and its meaning is as follows: + 0 - MIPI CSIS 0, + 1 - MIPI DSIM 0, + 2 - MIPI CSIS 1, + 3 - MIPI DSIM 1.
drivers/phy/Kconfig +9 -0
@@ -11,3 +11,12 @@ menuconfig GENERIC_PHY devices present in the kernel. This layer will have the generic API by which phy drivers can create PHY using the phy framework and phy users can obtain reference to the PHY. + +if GENERIC_PHY + +config PHY_EXYNOS_MIPI_VIDEO + tristate "S5P/EXYNOS SoC series MIPI CSI-2/DSI PHY driver" + help + Support for MIPI CSI-2 and MIPI DSI DPHY found on Samsung + S5P and EXYNOS SoCs. +endif
drivers/phy/Makefile +2 -1
@@ -2,4 +2,5 @@ # Makefile for the phy drivers. # -obj-$(CONFIG_GENERIC_PHY) += phy-core.o +obj-$(CONFIG_GENERIC_PHY) += phy-core.o +obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o
drivers/phy/phy-exynos-mipi-video.c new file +173 -0
173 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v2 2/5 ARM: dts: Add MIPI PHY node to exynos4.dtsi
Add PHY provider node for the MIPI CSIS and MIPI DSIM PHYs.
--- arch/arm/boot/dts/exynos4.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+)
arch/arm/boot/dts/exynos4.dtsi +10 -0
@@ -98,6 +98,12 @@ reg = <0x10010000 0x400>; }; + mipi_phy: video-phy at 10020710 { + compatible = "samsung,s5pv210-mipi-video-phy"; + reg = <0x10020710 8>; + #phy-cells = <1>; + }; + camera { compatible = "samsung,fimc", "simple-bus"; status = "disabled";
@@ -147,6 +153,8 @@ interrupts = <0 78 0>; bus-width = <4>; samsung,power-domain = <&pd_cam>; + phys = <&mipi_phy 0>; + phy-names = "csis"; status = "disabled"; };
@@ -156,6 +164,8 @@ interrupts = <0 80 0>; bus-width = <2>; samsung,power-domain = <&pd_cam>; + phys = <&mipi_phy 2>; + phy-names = "csis"; status = "disabled"; }; };
Signature · 1 line
1.7.9.5
PATCH v2 3/5 video: exynos_mipi_dsim: Use generic PHY driver
In reply to Sylwester NawrockiUse the generic PHY API instead of the platform callback to control the MIPI DSIM DPHY. The 'phy_label' field is added to the platform data structure to allow PHY lookup on non-dt platforms.
--- drivers/video/exynos/exynos_mipi_dsi.c | 18 +++++++++--------- include/video/exynos_mipi_dsim.h | 6 ++++-- 2 files changed, 13 insertions(+), 11 deletions(-)
drivers/video/exynos/exynos_mipi_dsi.c +9 -9
@@ -156,8 +156,7 @@ static int exynos_mipi_dsi_blank_mode(struct mipi_dsim_device *dsim, int power)exynos_mipi_regulator_enable (dsim);/* enable MIPI-DSI PHY. */ -if (dsim->pd->phy_enable) - dsim->pd->phy_enable (pdev, true); +phy_power_on (dsim->phy);clk_enable (dsim->clock);
@@ -373,6 +372,10 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)return ret; } + dsim->phy =devm_phy_get (&pdev->dev, dsim_pd->phy_label); +if (IS_ERR (dsim->phy)) +return PTR_ERR (dsim->phy); + dsim->clock =devm_clk_get (&pdev->dev,"dsim0" );if (IS_ERR (dsim->clock)) {dev_err (&pdev->dev,"failed to get dsim clock source\n" );
@@ -439,8 +442,7 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)exynos_mipi_regulator_enable (dsim);/* enable MIPI-DSI PHY. */ -if (dsim->pd->phy_enable) - dsim->pd->phy_enable (pdev, true); +phy_power_on (dsim->phy);exynos_mipi_update_cfg (dsim);
@@ -504,9 +506,8 @@ static int exynos_mipi_dsi_suspend(struct device *dev)if (client_drv && client_drv->suspend) client_drv->suspend (client_dev); -/* enable MIPI-DSI PHY. */ -if (dsim->pd->phy_enable) - dsim->pd->phy_enable (pdev, false); +/* disable MIPI-DSI PHY. */ +phy_power_off (dsim->phy);clk_disable (dsim->clock);
@@ -536,8 +537,7 @@ static int exynos_mipi_dsi_resume(struct device *dev)exynos_mipi_regulator_enable (dsim);/* enable MIPI-DSI PHY. */ -if (dsim->pd->phy_enable) - dsim->pd->phy_enable (pdev, true); +phy_power_on (dsim->phy);clk_enable (dsim->clock);
include/video/exynos_mipi_dsim.h +4 -2
@@ -216,6 +216,7 @@ struct mipi_dsim_config {* automatically. * @e_clk_src: select byte clock source. * @pd: pointer to MIPI-DSI driver platform data. +* @phy: pointer to the generic PHY */ struct mipi_dsim_device {struct device *dev;
@@ -236,6 +237,7 @@ struct mipi_dsim_device {bool suspended;struct mipi_dsim_platform_data *pd; +struct phy *phy; };/*
@@ -248,7 +250,7 @@ struct mipi_dsim_device {* @enabled: indicate whether mipi controller got enabled or not. * @lcd_panel_info: pointer for lcd panel specific structure. * this structure specifies width, height, timing and polarity and so on. -* @phy_enable: pointer to a callback controlling D-PHY enable/reset +* @phy_label: the generic PHY label */ struct mipi_dsim_platform_data {char lcd_panel_name[PANEL_NAME_SIZE ];
@@ -257,7 +259,7 @@ struct mipi_dsim_platform_data {unsigned int enabled;void *lcd_panel_info; -int (*phy_enable)(struct platform_device *pdev,bool on); +const char *phy_label; };/*
Signature · 1 line
1.7.9.5
PATCH v2 3/5 video: exynos_mipi_dsim: Use generic PHY driver
Hi,
Quoted 6 lines · Sylwester Nawrocki
Use the generic PHY API instead of the platform callback to control the MIPI DSIM DPHY. The '
phy_label' field is added to the platform data structure to allow PHY lookup on non-dt platforms.Signed-off-by Sylwester Nawrocki <[email protected]>Signed-off-by Kyungmin Park <[email protected]>
this is awesome :-)
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130625/b4580dab/attachment.sig>
PATCH v2 4/5 exynos4-is: Use generic MIPI CSIS PHY driver
In reply to Sylwester NawrockiUse the generic PHY API instead of the platform callback to control the MIPI CSIS DPHY. The 'phy_label' field is added to the platform data structure to allow PHY lookup on non-dt platforms
--- drivers/media/platform/exynos4-is/mipi-csis.c | 16 +++++++++++++--- include/linux/platform_data/mipi-csis.h | 11 ++--------- 2 files changed, 15 insertions(+), 12 deletions(-)
drivers/media/platform/exynos4-is/mipi-csis.c +13 -3
@@ -20,6 +20,7 @@#include <linux/memory.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/phy/phy.h> #include <linux/platform_data/mipi-csis.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h>
@@ -167,6 +168,7 @@ struct csis_pktbuf {* @sd: v4l2_subdev associated with CSIS device instance * @index: the hardware instance index * @pdev: CSIS platform device +* @phy: pointer to the CSIS generic PHY * @regs: mmaped I/O registers memory * @supplies: CSIS regulator supplies * @clock: CSIS clocks
@@ -189,6 +191,8 @@ struct csis_state {struct v4l2_subdev sd;u8 index;struct platform_device *pdev; +struct phy *phy; +const char *phy_label;void __iomem *regs;struct regulator_bulk_data supplies[CSIS_NUM_SUPPLIES ];struct clk *clock[NUM_CSIS_CLOCKS ];
@@ -726,6 +730,7 @@ static int s5pcsis_get_platform_data(struct platform_device *pdev, state->index =max (0 , pdev->id); state->max_num_lanes = state->index ?CSIS1_MAX_LANES :CSIS0_MAX_LANES ; + state->phy_label = pdata->phy_label;return 0 ; }
@@ -763,8 +768,9 @@ static int s5pcsis_parse_dt(struct platform_device *pdev, "samsung,csis-wclk"); state->num_lanes = endpoint.bus.mipi_csi2.num_data_lanes; -of_node_put (node); + + state->phy_label ="csis" ; return 0; }#else
@@ -800,6 +806,10 @@ static int s5pcsis_probe(struct platform_device *pdev)return -EINVAL ; } + state->phy =devm_phy_get (dev, state->phy_label); +if (IS_ERR (state->phy)) +return PTR_ERR (state->phy); + mem_res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); state->regs =devm_ioremap_resource (dev, mem_res);if (IS_ERR (state->regs))
@@ -893,7 +903,7 @@ static int s5pcsis_pm_suspend(struct device *dev, bool runtime)mutex_lock (&state->lock);if (state->flags &ST_POWERED ) {s5pcsis_stop_stream (state); - ret =s5p_csis_phy_enable (state->index, false); + ret =phy_power_off (state->phy);if (ret) goto unlock; ret = regulator_bulk_disable(CSIS_NUM_SUPPLIES,
@@ -929,7 +939,7 @@ static int s5pcsis_pm_resume(struct device *dev, bool runtime) state->supplies);if (ret) goto unlock; - ret =s5p_csis_phy_enable (state->index, true); + ret =phy_power_on (state->phy);if (!ret) { state->flags |=ST_POWERED ; }else {
include/linux/platform_data/mipi-csis.h +2 -9
@@ -17,21 +17,14 @@* @wclk_source: CSI wrapper clock selection: 0 - bus clock, 1 - ext. SCLK_CAM * @lanes: number of data lanes used * @hs_settle: HS-RX settle time +* @phy_label: the generic PHY label */ struct s5p_platform_mipi_csis {unsigned long clk_rate;u8 wclk_source;u8 lanes;u8 hs_settle; +const char *phy_label; }; -/** -* s5p_csis_phy_enable - global MIPI-CSI receiver D-PHY control -* @id: MIPI-CSIS harware instance index (0...1) -* @on: true to enable D-PHY and deassert its reset -* false to disable D-PHY -* @return: 0 on success, or negative error code on failure -*/ -int s5p_csis_phy_enable (int id,bool on); -#endif /* __PLAT_SAMSUNG_MIPI_CSIS_H_ */
Signature · 1 line
1.7.9.5
PATCH v2 4/5 exynos4-is: Use generic MIPI CSIS PHY driver
Quoted 6 lines · Sylwester Nawrocki
Use the generic PHY API instead of the platform callback to control the MIPI CSIS DPHY. The '
phy_label' field is added to the platform data structure to allow PHY lookup on non-dt platformsSigned-off-by Sylwester Nawrocki <[email protected]>Signed-off-by Kyungmin Park <[email protected]>
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130625/dea5d630/attachment.sig>
PATCH v2 5/5 ARM: Samsung: Remove MIPI PHY setup code
In reply to Sylwester NawrockiGeneric 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.
---
Changes since v1:
- removed S5P_SETUP_MIPIPHY symbol completely from arch/arm/plat-samsung/Kconfig
--- arch/arm/mach-exynos/include/mach/regs-pmu.h | 5 -- arch/arm/mach-s5pv210/include/mach/regs-clock.h | 4 -- arch/arm/plat-samsung/Kconfig | 5 -- arch/arm/plat-samsung/Makefile | 1 - arch/arm/plat-samsung/setup-mipiphy.c | 60 ----------------------- 5 files changed, 75 deletions(-) delete mode 100644 arch/arm/plat-samsung/setup-mipiphy.c
arch/arm/mach-exynos/include/mach/regs-pmu.h +0 -5
@@ -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
@@ -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
@@ -388,11 +388,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
@@ -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 deleted +0 -60
60 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v2 5/5 ARM: Samsung: Remove MIPI PHY setup code
Quoted 8 lines · Sylwester Nawrocki
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.Signed-off-by Sylwester Nawrocki <[email protected]>Signed-off-by Kyungmin Park <[email protected]>
pretty cool stuff
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130625/7ecc4d9b/attachment-0001.sig>
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
In reply to Sylwester NawrockiHi,
drivers/phy/phy-exynos-mipi-video.c line 34
Quoted 6 lines · Sylwester Nawrocki
drivers/phy/phy-exynos-mipi-video.c new file +6
-0+enum phy_id { +PHY_CSIS0 , +PHY_DSIM0 , +PHY_CSIS1 , +PHY_DSIM1 , +NUM_PHYS
please prepend these with EXYNOS_PHY_ or EXYNOS_MIPI_PHY_
drivers/phy/phy-exynos-mipi-video.c line 39
Quoted 3 lines
drivers/phy/phy-exynos-mipi-video.c new file +3
-0+struct exynos_video_phy { +spinlock_t slock; +struct phy *phys[NUM_PHYS ];
more than one phy ? This means you should instantiate driver multiple drivers. Each phy id should call probe again.
drivers/phy/phy-exynos-mipi-video.c line 51
Quoted 9 lines
drivers/phy/phy-exynos-mipi-video.c new file +9
-0+static int __set_phy_state (struct exynos_video_phy *state, +enum phy_id id,unsigned int on) +{ +void __iomem *addr; +unsigned long flags; +u32 reg, reset; + +if (WARN_ON (id >NUM_PHYS )) +return -EINVAL ;
you don't want to do this, actually. It'll bug you everytime you want to add another phy ID :-)
Quoted 16 lines
drivers/phy/phy-exynos-mipi-video.c new file +16
-0+ addr = state->regs +EXYNOS_MIPI_PHY_CONTROL (id /2 ); + +if (id ==PHY_DSIM0 || id ==PHY_DSIM1 ) + reset =EXYNOS_MIPI_PHY_MRESETN ; +else + reset =EXYNOS_MIPI_PHY_SRESETN ; + +spin_lock_irqsave (&state->slock, flags); + reg =readl (addr); +if (on) + reg |= reset; +else + reg &= ~reset; +writel (reg, addr); + +/* Clear ENABLE bit only if MRESETN, SRESETN bits are not set. */
drivers/phy/phy-exynos-mipi-video.c line 78
Quoted 10 lines
drivers/phy/phy-exynos-mipi-video.c new file +10
-0+if (on) + reg |=EXYNOS_MIPI_PHY_ENABLE ; +else if (!(reg &EXYNOS_MIPI_PHY_RESET_MASK )) + reg &= ~EXYNOS_MIPI_PHY_ENABLE ; + +writel (reg, addr); +spin_unlock_irqrestore (&state->slock, flags); + +pr_debug ("%s(): id: %d, on: %d, addr: %#x, base: %#x\n" , + __func__, id, on, (u32 )addr, (u32 )state->regs);
use dev_dbg() instead.
drivers/phy/phy-exynos-mipi-video.c line 85
Quoted 7 lines
drivers/phy/phy-exynos-mipi-video.c new file +7
-0+ +return 0 ; +} + +static int exynos_video_phy_power_on (struct phy *phy) +{ +struct exynos_video_phy *state =dev_get_drvdata (&phy->dev);
looks like we should have phy_get_drvdata() helper :-) Kishon ?
drivers/phy/phy-exynos-mipi-video.c line 101
Quoted 7 lines
drivers/phy/phy-exynos-mipi-video.c new file +7
-0+static struct phy *exynos_video_phy_xlate (struct device *dev, +struct of_phandle_args *args) +{ +struct exynos_video_phy *state =dev_get_drvdata (dev); + +if (WARN_ON (args->args[0 ] >NUM_PHYS )) +return NULL ;
please remove this check.
drivers/phy/phy-exynos-mipi-video.c line 103
Quoted 1 line
drivers/phy/phy-exynos-mipi-video.c new file +1
-0+return state->phys[args->args[0 ]];
and your xlate is 'wrong'.
Quoted 17 lines
drivers/phy/phy-exynos-mipi-video.c new file +17
-0+} + +static struct phy_ops exynos_video_phy_ops = { + .power_on = exynos_video_phy_power_on, + .power_off = exynos_video_phy_power_off, + .owner =THIS_MODULE , +}; + +static int exynos_video_phy_probe (struct platform_device *pdev) +{ +struct exynos_video_phy *state; +struct device *dev = &pdev->dev; +struct resource *res; +struct phy_provider *phy_provider; +int i; + + state =devm_kzalloc (dev,sizeof (*state),GFP_KERNEL );
drivers/phy/phy-exynos-mipi-video.c line 130
Quoted 10 lines
drivers/phy/phy-exynos-mipi-video.c new file +10
-0+if (!state) +return -ENOMEM ; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + + state->regs =devm_ioremap_resource (dev, res); +if (IS_ERR (state->regs)) +return PTR_ERR (state->regs); + +dev_set_drvdata (dev, state);
you can use platform_set_drvdata(pdev, state);
same thing though, no strong feelings.
Quoted 9 lines
drivers/phy/phy-exynos-mipi-video.c new file +9
-0+ phy_provider =devm_of_phy_provider_register (dev, + exynos_video_phy_xlate); +if (IS_ERR (phy_provider)) +return PTR_ERR (phy_provider); + +for (i =0 ; i <NUM_PHYS ; i++) { +char label[8 ]; + + snprintf(label, sizeof(label), "%s.%d",
drivers/phy/phy-exynos-mipi-video.c line 150
Quoted 10 lines
drivers/phy/phy-exynos-mipi-video.c new file +10
-0+ i ==PHY_DSIM0 || i ==PHY_DSIM1 ? + "dsim" : "csis", i / 2); + + state->phys[i] =devm_phy_create (dev, i, &exynos_video_phy_ops, + label, state); +if (IS_ERR (state->phys[i])) { +dev_err (dev,"failed to create PHY %s\n" , label); +return PTR_ERR (state->phys[i]); + } + }
this really doesn't look correct to me. It looks like you have multiple PHYs, one for each ID. So your probe should be called for each PHY ID and you have several phy_providers too.
drivers/phy/phy-exynos-mipi-video.c line 156
Quoted 2 lines
drivers/phy/phy-exynos-mipi-video.c new file +2
-0+static const struct of_device_id exynos_video_phy_of_match[] = { + { .compatible ="samsung,s5pv210-mipi-video-phy" },
and this should contain all PHY IDs:
{ .compatible = "samsung,s5pv210-mipi-video-dsim0-phy",
.data = (const void *) DSIM0, },
{ .compatible = "samsung,s5pv210-mipi-video-dsim1-phy",
.data = (const void *) DSIM1, },
{ .compatible = "samsung,s5pv210-mipi-video-csi0-phy"
.data = (const void *) CSI0, },
{ .compatible = "samsung,s5pv210-mipi-video-csi1-phy"
.data = (const void *) CSI1, },then on your probe you can fetch that data field and use it as phy->id.
drivers/phy/phy-exynos-mipi-video.c line 162
Quoted 2 lines
drivers/phy/phy-exynos-mipi-video.c new file +2
-0+static struct platform_driver exynos_video_phy_driver = { + .probe = exynos_video_phy_probe,
you *must* provide a remove method. drivers with NULL remove are non-removable :-)
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130625/ead349d6/attachment.sig>
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
Hi Felipe,
Thanks for the review.
Quoted 9 lines · Felipe Balbi
drivers/phy/phy-exynos-mipi-video.c line 34
Quoted 6 lines · Sylwester Nawrocki
drivers/phy/phy-exynos-mipi-video.c new file +6
-0+enum phy_id { +PHY_CSIS0 , +PHY_DSIM0 , +PHY_CSIS1 , +PHY_DSIM1 , +NUM_PHYS please prepend these with
EXYNOS_PHY_orEXYNOS_MIPI_PHY_
OK, will fix that.
Quoted 6 lines
drivers/phy/phy-exynos-mipi-video.c line 39
Quoted 3 lines
drivers/phy/phy-exynos-mipi-video.c new file +3
-0+struct exynos_video_phy { +spinlock_t slock; +struct phy *phys[NUM_PHYS ];more than one phy ? This means you should instantiate driver multiple drivers. Each phy id should call probe again.
Why ? This single PHY _provider_ can well handle multiple PHYs. I don't see a good reason to further complicate this driver like this. Please note that MIPI-CSIS 0 and MIPI DSIM 0 share MMIO register, so does MIPI CSIS 1 and MIPI DSIM 1. There are only 2 registers for those 4 PHYs. I could have the involved object multiplied, but it would have been just a waste of resources with no difference to the PHY consumers.
Quoted 4 lines
Quoted 4 lines
drivers/phy/phy-exynos-mipi-video.c new file +4
-0+static int __set_phy_state (struct exynos_video_phy *state, +enum phy_id id,unsigned int on) +{ +void __iomem *addr;
Quoted 8 lines
drivers/phy/phy-exynos-mipi-video.c line 51
Quoted 5 lines
drivers/phy/phy-exynos-mipi-video.c new file +5
-0+unsigned long flags; +u32 reg, reset; + +if (WARN_ON (id >NUM_PHYS )) +return -EINVAL ;you don't want to do this, actually. It'll bug you everytime you want to add another phy ID :-)
If there is an SoC with more PHYs enum phy_id would be extended, and this part would not need to be touched. OTOH @id cannot be normally greater than NUM_PHYS. I think I'll drop that then.
Quoted 29 lines
Quoted 16 lines
drivers/phy/phy-exynos-mipi-video.c new file +16
-0+ addr = state->regs +EXYNOS_MIPI_PHY_CONTROL (id /2 ); + +if (id ==PHY_DSIM0 || id ==PHY_DSIM1 ) + reset =EXYNOS_MIPI_PHY_MRESETN ; +else + reset =EXYNOS_MIPI_PHY_SRESETN ; + +spin_lock_irqsave (&state->slock, flags); + reg =readl (addr); +if (on) + reg |= reset; +else + reg &= ~reset; +writel (reg, addr); + +/* Clear ENABLE bit only if MRESETN, SRESETN bits are not set. */ drivers/phy/phy-exynos-mipi-video.c line 78
Quoted 10 lines
drivers/phy/phy-exynos-mipi-video.c new file +10
-0+if (on) + reg |=EXYNOS_MIPI_PHY_ENABLE ; +else if (!(reg &EXYNOS_MIPI_PHY_RESET_MASK )) + reg &= ~EXYNOS_MIPI_PHY_ENABLE ; + +writel (reg, addr); +spin_unlock_irqrestore (&state->slock, flags); + +pr_debug ("%s(): id: %d, on: %d, addr: %#x, base: %#x\n" , + __func__, id, on, (u32 )addr, (u32 )state->regs);use
dev_dbg()instead.
Quoted 9 lines
drivers/phy/phy-exynos-mipi-video.c line 85
Quoted 7 lines
drivers/phy/phy-exynos-mipi-video.c new file +7
-0+ +return 0 ; +} + +static int exynos_video_phy_power_on (struct phy *phy) +{ +struct exynos_video_phy *state =dev_get_drvdata (&phy->dev);looks like we should have
phy_get_drvdata()helper :-) Kishon ?
Indeed, that might be useful.
Quoted 9 lines
drivers/phy/phy-exynos-mipi-video.c line 101
Quoted 7 lines
drivers/phy/phy-exynos-mipi-video.c new file +7
-0+static struct phy *exynos_video_phy_xlate (struct device *dev, +struct of_phandle_args *args) +{ +struct exynos_video_phy *state =dev_get_drvdata (dev); + +if (WARN_ON (args->args[0 ] >NUM_PHYS )) +return NULL ;please remove this check.
args->args[0] comes from DT as the PHY id and there is nothing preventing it from being greater or equal to the state->phys[] array length, unless I'm missing something. Actually it should have been 'if (args->args[0] >= NUM_PHYS)'.
Quoted 3 lines
drivers/phy/phy-exynos-mipi-video.c line 103
Quoted 1 line
drivers/phy/phy-exynos-mipi-video.c new file +1
-0+return state->phys[args->args[0 ]];and your xlate is 'wrong'.
What exactly is wrong here ?
Quoted 21 lines
Quoted 21 lines
drivers/phy/phy-exynos-mipi-video.c new file +21
-0+} + +static struct phy_ops exynos_video_phy_ops = { + .power_on = exynos_video_phy_power_on, + .power_off = exynos_video_phy_power_off, + .owner =THIS_MODULE , +}; + +static int exynos_video_phy_probe (struct platform_device *pdev) +{ +struct exynos_video_phy *state; +struct device *dev = &pdev->dev; +struct resource *res; +struct phy_provider *phy_provider; +int i; + + state =devm_kzalloc (dev,sizeof (*state),GFP_KERNEL ); +if (!state) +return -ENOMEM ; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
Quoted 8 lines
drivers/phy/phy-exynos-mipi-video.c line 130
Quoted 6 lines
drivers/phy/phy-exynos-mipi-video.c new file +6
-0+ + state->regs =devm_ioremap_resource (dev, res); +if (IS_ERR (state->regs)) +return PTR_ERR (state->regs); + +dev_set_drvdata (dev, state);you can use
platform_set_drvdata(pdev, state);
I had it in the previous version, but changed for symmetry with dev_set_drvdata(). I guess those could be replaced with phy_{get, set}_drvdata as you suggested.
Quoted 17 lines
same thing though, no strong feelings.
Quoted 15 lines
drivers/phy/phy-exynos-mipi-video.c new file +15
-0+ phy_provider =devm_of_phy_provider_register (dev, + exynos_video_phy_xlate); +if (IS_ERR (phy_provider)) +return PTR_ERR (phy_provider); + +for (i =0 ; i <NUM_PHYS ; i++) { +char label[8 ]; + +snprintf (label,sizeof (label),"%s.%d" , + i ==PHY_DSIM0 || i ==PHY_DSIM1 ? +"dsim" :"csis" , i /2 ); + + state->phys[i] =devm_phy_create (dev, i, &exynos_video_phy_ops, + label, state); +if (IS_ERR (state->phys[i])) {
Quoted 8 lines
drivers/phy/phy-exynos-mipi-video.c line 150
Quoted 4 lines
drivers/phy/phy-exynos-mipi-video.c new file +4
-0+dev_err (dev,"failed to create PHY %s\n" , label); +return PTR_ERR (state->phys[i]); + } + }this really doesn't look correct to me. It looks like you have multiple PHYs, one for each ID. So your probe should be called for each PHY ID and you have several
phy_providerstoo.
Yes, multiple PHY objects, but a single provider. There is no need whatsoever for multiple PHY providers.
Quoted 14 lines
drivers/phy/phy-exynos-mipi-video.c line 156
Quoted 2 lines
drivers/phy/phy-exynos-mipi-video.c new file +2
-0+static const struct of_device_id exynos_video_phy_of_match[] = { + { .compatible ="samsung,s5pv210-mipi-video-phy" },and this should contain all PHY IDs:
{ .compatible = "samsung,s5pv210-mipi-video-dsim0-phy", .data = (const void *) DSIM0, }, { .compatible = "samsung,s5pv210-mipi-video-dsim1-phy", .data = (const void *) DSIM1, }, { .compatible = "samsung,s5pv210-mipi-video-csi0-phy" .data = (const void *) CSI0, }, { .compatible = "samsung,s5pv210-mipi-video-csi1-phy" .data = (const void *) CSI1, },
Quoted 1 line
then on your probe you can fetch that data field and use it as
phy->id.
This looks wrong to me, it doesn't look like a right usage of 'compatible' property. MIPI-CSIS0/MIPI-DSIM0, MIPI-CSIS1/MIPI-DSIM1 are identical pairs, so one compatible property would need to be used for them. We don't use different compatible strings for different instances of same device. And MIPI DSIM and MIPI CSIS share one MMIO register, so they need to be handled by one provider, to synchronize accesses. That's one of the main reasons I turned to the generic PHY framework for those devices.
Quoted 5 lines
drivers/phy/phy-exynos-mipi-video.c line 162
Quoted 2 lines
drivers/phy/phy-exynos-mipi-video.c new file +2
-0+static struct platform_driver exynos_video_phy_driver = { + .probe = exynos_video_phy_probe,you *must* provide a remove method. drivers with NULL remove are non-removable :-)
Oops, my bad. I've forgotten to update this, after enabling build as module. Will update and test that. It will be an empty callback though.
Thanks,
Sylwester
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
Hi Sylwester, Felipe,
Quoted 24 lines · On Tuesday 25 of June 2013 19:44:52 Sylwester Nawrocki wrote:
Hi Felipe,
Thanks for the review.
Quoted 9 lines · Felipe Balbi
drivers/phy/phy-exynos-mipi-video.c line 34
Quoted 6 lines · Sylwester Nawrocki
drivers/phy/phy-exynos-mipi-video.c new file +6
-0+enum phy_id { +PHY_CSIS0 , +PHY_DSIM0 , +PHY_CSIS1 , +PHY_DSIM1 , +NUM_PHYS please prepend these with
EXYNOS_PHY_orEXYNOS_MIPI_PHY_OK, will fix that.
Quoted 6 lines
drivers/phy/phy-exynos-mipi-video.c line 39
Quoted 3 lines
drivers/phy/phy-exynos-mipi-video.c new file +3
-0+struct exynos_video_phy { +spinlock_t slock; +struct phy *phys[NUM_PHYS ];more than one phy ? This means you should instantiate driver multiple drivers. Each phy id should call probe again.
Quoted 7 lines
Why ? This single PHY _provider_ can well handle multiple PHYs. I don't see a good reason to further complicate this driver like this. Please note that MIPI-CSIS 0 and MIPI DSIM 0 share MMIO register, so does MIPI CSIS 1 and MIPI DSIM 1. There are only 2 registers for those 4 PHYs. I could have the involved object multiplied, but it would have been just a waste of resources with no difference to the PHY consumers.
IMHO one driver instance should represent one instance of IP block. Since this is a single IP block containing multiple PHYs with shared control interface, I think Sylwester did the right thing.
[snip]
Quoted 10 lines
Quoted 9 lines
drivers/phy/phy-exynos-mipi-video.c line 101
Quoted 7 lines
drivers/phy/phy-exynos-mipi-video.c new file +7
-0+static struct phy *exynos_video_phy_xlate (struct device *dev, +struct of_phandle_args *args) +{ +struct exynos_video_phy *state =dev_get_drvdata (dev); + +if (WARN_ON (args->args[0 ] >NUM_PHYS )) +return NULL ;please remove this check.
Quoted 4 lines
args->args[0] comes from DT as the PHY id and there is nothing preventing it from being greater or equal to the state->phys[] array length, unless I'm missing something. Actually it should have been 'if (args->args[0] >=
NUM_PHYS)'.
The xlate() callback gets directly whatever parsed from device tree, so it is possible for an out of range value to get here and so this check is valid. However I think it should rather return an ERR_PTR, not NULL. See of_phy_get().
Quoted 5 lines
Quoted 3 lines
drivers/phy/phy-exynos-mipi-video.c line 103
Quoted 1 line
drivers/phy/phy-exynos-mipi-video.c new file +1
-0+return state->phys[args->args[0 ]];and your xlate is 'wrong'.
What exactly is wrong here ?
Felipe, could you elaborate a bit more on this? I can't find any serious problems with this code.
[snip]
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/phy/phy-exynos-mipi-video.c new file +5
-0+ phy_provider =devm_of_phy_provider_register (dev, + exynos_video_phy_xlate); +if (IS_ERR (phy_provider)) +return PTR_ERR (phy_provider); +
Quoted 8 lines
Quoted 8 lines
drivers/phy/phy-exynos-mipi-video.c
Quoted 8 lines
drivers/phy/phy-exynos-mipi-video.c new file +8
-0+for (i =0 ; i <NUM_PHYS ; i++) { +char label[8 ]; + +snprintf (label,sizeof (label),"%s.%d" , + i ==PHY_DSIM0 || i ==PHY_DSIM1 ? +"dsim" :"csis" , i /2 ); + + state->phys[i] = devm_phy_create(dev, i,
&exynos_video_phy_ops,
Quoted 1 line
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +1
-0+ label,
state);
Quoted 11 lines
Quoted 10 lines
drivers/phy/phy-exynos-mipi-video.c line 150
Quoted 5 lines
drivers/phy/phy-exynos-mipi-video.c new file +5
-0+if (IS_ERR (state->phys[i])) { +dev_err (dev,"failed to create PHY %s\n" , label); +return PTR_ERR (state->phys[i]); + } + }this really doesn't look correct to me. It looks like you have multiple
PHYs, one for each ID. So your probe should be called for each PHY ID and you have severalphy_providerstoo.
Quoted 2 lines
Yes, multiple PHY objects, but a single provider. There is no need whatsoever for multiple PHY providers.
The whole concept of whatever-provider is to allow managing multiple objects by one parent object, like one clock provider for the whole clock controller, one interrupt controller object for all interrupts of an interrupt controller block, etc.
This is why a phandle has args, to allow addressing subobjects inside a provider.
Best regards,
Tomasz
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
In reply to Sylwester NawrockiHi,
Quoted 7 lines · Sylwester Nawrocki
Quoted 6 lines
drivers/phy/phy-exynos-mipi-video.c line 39
Quoted 3 lines
drivers/phy/phy-exynos-mipi-video.c new file +3
-0+struct exynos_video_phy { +spinlock_t slock; +struct phy *phys[NUM_PHYS ];more than one phy ? This means you should instantiate driver multiple drivers. Each phy id should call probe again.
Quoted 7 lines
Why ? This single PHY _provider_ can well handle multiple PHYs. I don't see a good reason to further complicate this driver like this. Please note that MIPI-CSIS 0 and MIPI DSIM 0 share MMIO register, so does MIPI CSIS 1 and MIPI DSIM 1. There are only 2 registers for those 4 PHYs. I could have the involved object multiplied, but it would have been just a waste of resources with no difference to the PHY consumers.
alright, I misunderstood your code then. When I looked over your id usage I missed the "/2" part and assumed that you would have separate EXYNOS_MIPI_PHY_CONTROL() register for each ;-)
My bad, you can disregard the other comments.
Quoted 22 lines
Quoted 13 lines
Quoted 13 lines
drivers/phy/phy-exynos-mipi-video.c new file +13
-0+static int exynos_video_phy_probe (struct platform_device *pdev) +{ +struct exynos_video_phy *state; +struct device *dev = &pdev->dev; +struct resource *res; +struct phy_provider *phy_provider; +int i; + + state =devm_kzalloc (dev,sizeof (*state),GFP_KERNEL ); +if (!state) +return -ENOMEM ; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );Quoted 8 lines
drivers/phy/phy-exynos-mipi-video.c line 130
Quoted 6 lines
drivers/phy/phy-exynos-mipi-video.c new file +6
-0+ + state->regs =devm_ioremap_resource (dev, res); +if (IS_ERR (state->regs)) +return PTR_ERR (state->regs); + +dev_set_drvdata (dev, state);you can use
platform_set_drvdata(pdev, state);
Quoted 3 lines
I had it in the previous version, but changed for symmetry with
dev_set_drvdata(). I guess those could be replaced with phy_{get, set}_drvdata as you suggested.
hmm, you do need to set the drvdata() to the phy object, but also to the pdev object (should you need it on a suspend/resume callback, for instance). Those are separate struct device instances.
Quoted 16 lines
Quoted 14 lines
drivers/phy/phy-exynos-mipi-video.c line 156
Quoted 2 lines
drivers/phy/phy-exynos-mipi-video.c new file +2
-0+static const struct of_device_id exynos_video_phy_of_match[] = { + { .compatible ="samsung,s5pv210-mipi-video-phy" },and this should contain all PHY IDs:
{ .compatible = "samsung,s5pv210-mipi-video-dsim0-phy", .data = (const void *) DSIM0, }, { .compatible = "samsung,s5pv210-mipi-video-dsim1-phy", .data = (const void *) DSIM1, }, { .compatible = "samsung,s5pv210-mipi-video-csi0-phy" .data = (const void *) CSI0, }, { .compatible = "samsung,s5pv210-mipi-video-csi1-phy" .data = (const void *) CSI1, },Quoted 1 line
then on your probe you can fetch that data field and use it as
phy->id.
Quoted 7 lines
This looks wrong to me, it doesn't look like a right usage of 'compatible' property. MIPI-CSIS0/MIPI-DSIM0, MIPI-CSIS1/MIPI-DSIM1 are identical pairs, so one compatible property would need to be used for them. We don't use different compatible strings for different instances of same device. And MIPI DSIM and MIPI CSIS share one MMIO register, so they need to be handled by one provider, to synchronize accesses. That's one of the main reasons I turned to the generic PHY framework for those devices.
understood :-)
Quoted 9 lines
Quoted 5 lines
drivers/phy/phy-exynos-mipi-video.c line 162
Quoted 2 lines
drivers/phy/phy-exynos-mipi-video.c new file +2
-0+static struct platform_driver exynos_video_phy_driver = { + .probe = exynos_video_phy_probe,you *must* provide a remove method. drivers with NULL remove are non-removable :-)
Oops, my bad. I've forgotten to update this, after enabling build as module. Will update and test that. It will be an empty callback though.
right, because of devm.
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130625/8ce9aa04/attachment.sig>
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
Hi,
Quoted 22 lines · Felipe Balbi
Quoted 22 lines
Quoted 22 lines
Quoted 21 lines
+static int
exynos_video_phy_probe(struct platform_device *pdev)Quoted 20 lines
Quoted 10 lines
Quoted 10 lines
+{
+ structexynos_video_phy*state;
+ struct device *dev =&pdev->dev;
+ struct resource *res;
+ structphy_provider*phy_provider;
+ int i;
+
+ state =devm_kzalloc(dev, sizeof(*state), GFP_KERNEL);
+ if (!state)
+ return-ENOMEM;Quoted 8 lines
Quoted 8 lines
+
+ res =platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+state->regs=devm_ioremap_resource(dev, res);
+ if (IS_ERR(state->regs))
+ returnPTR_ERR(state->regs);
+
+dev_set_drvdata(dev, state);you can use
platform_set_drvdata(pdev, state);
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
I had it in the previous version, but changed for symmetry with
dev_set_drvdata(). I guess those could be replaced with phy_{get, set}_drvdata as you suggested.hmm, you do need to set the
drvdata()to the phy object, but also to the pdev object (should you need it on a suspend/resume callback, for instance). Those are separate struct device instances.
Indeed, I somehow confused phy->dev with with phy->dev.parent. I'm going to just drop the above call, since the pdev drvdata is currently not referenced anywhere.
Thanks,
Sylwester
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
Quoted 29 lines · Sylwester Nawrocki
Hi,
Quoted 26 lines · Felipe Balbi
Quoted 25 lines
Quoted 25 lines
Quoted 21 lines
+static int
exynos_video_phy_probe(struct platform_device *pdev)Quoted 20 lines
Quoted 10 lines
Quoted 10 lines
+{
+ structexynos_video_phy*state;
+ struct device *dev =&pdev->dev;
+ struct resource *res;
+ structphy_provider*phy_provider;
+ int i;
+
+ state =devm_kzalloc(dev, sizeof(*state), GFP_KERNEL);
+ if (!state)
+ return-ENOMEM;Quoted 8 lines
Quoted 8 lines
+
+ res =platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+state->regs=devm_ioremap_resource(dev, res);
+ if (IS_ERR(state->regs))
+ returnPTR_ERR(state->regs);
+
+dev_set_drvdata(dev, state);you can use
platform_set_drvdata(pdev, state);I had it in the previous version, but changed for symmetry with
dev_set_drvdata(). I guess those could be replaced with phy_{get, set}_drvdata as you suggested.
Quoted 7 lines
Quoted 3 lines
hmm, you do need to set the
drvdata()to the phy object, but also to the pdev object (should you need it on a suspend/resume callback, for instance). Those are separate struct device instances.Indeed, I somehow confused
phy->devwith withphy->dev.parent. I'm going to just drop the above call, since the pdev drvdata is currently not referenced anywhere.
ok cool :-)
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130626/dc970476/attachment.sig>
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
In reply to Felipe BalbiHi,
Quoted 18 lines · Felipe Balbi
Hi,
Quoted 7 lines · Sylwester Nawrocki
Quoted 6 lines
drivers/phy/phy-exynos-mipi-video.c line 39
Quoted 3 lines
drivers/phy/phy-exynos-mipi-video.c new file +3
-0+struct exynos_video_phy { +spinlock_t slock; +struct phy *phys[NUM_PHYS ];more than one phy ? This means you should instantiate driver multiple drivers. Each phy id should call probe again.
Quoted 7 lines
Why ? This single PHY _provider_ can well handle multiple PHYs. I don't see a good reason to further complicate this driver like this. Please note that MIPI-CSIS 0 and MIPI DSIM 0 share MMIO register, so does MIPI CSIS 1 and MIPI DSIM 1. There are only 2 registers for those 4 PHYs. I could have the involved object multiplied, but it would have been just a waste of resources with no difference to the PHY consumers.
Quoted 31 lines
alright, I misunderstood your code then. When I looked over your id usage I missed the "/2" part and assumed that you would have separate
EXYNOS_MIPI_PHY_CONTROL()register for each ;-)My bad, you can disregard the other comments.
Quoted 25 lines
Quoted 13 lines
Quoted 13 lines
drivers/phy/phy-exynos-mipi-video.c new file +13
-0+static int exynos_video_phy_probe (struct platform_device *pdev) +{ +struct exynos_video_phy *state; +struct device *dev = &pdev->dev; +struct resource *res; +struct phy_provider *phy_provider; +int i; + + state =devm_kzalloc (dev,sizeof (*state),GFP_KERNEL ); +if (!state) +return -ENOMEM ; + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );Quoted 8 lines
drivers/phy/phy-exynos-mipi-video.c line 130
Quoted 6 lines
drivers/phy/phy-exynos-mipi-video.c new file +6
-0+ + state->regs =devm_ioremap_resource (dev, res); +if (IS_ERR (state->regs)) +return PTR_ERR (state->regs); + +dev_set_drvdata (dev, state);you can use
platform_set_drvdata(pdev, state);I had it in the previous version, but changed for symmetry with
dev_set_drvdata(). I guess those could be replaced with phy_{get, set}_drvdata as you suggested.
right. currently I was setting dev_set_drvdata of phy (core) device in phy-core.c and the corresponding dev_get_drvdata in phy provider driver which is little confusing.
So I'll add phy_set_drvdata and phy_get_drvdata in phy.h (as suggested by Felipe) to be used by phy provider drivers. So after creating the PHY, the phy provider should use phy_set_drvdata and in phy_ops, it can use phy_get_drvdata. (I'll remove the dev_set_drvdata in phy_create).
This also means _void *priv_ in phy_create is useless. So I'll be removing _priv_ from phy_create.
Thanks
Kishon
Quoted 4 lines
hmm, you do need to set the
drvdata()to the phy object, but also to the pdev object (should you need it on a suspend/resume callback, for instance). Those are separate struct device instances.
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
Quoted 34 lines · Kishon Vijay Abraham I
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
+static int
exynos_video_phy_probe(struct platform_device *pdev)Quoted 20 lines
Quoted 20 lines
Quoted 10 lines
Quoted 10 lines
drivers/phy/phy-exynos-mipi-video.c new file +10
-0+{ +struct exynos_video_phy *state; +struct device *dev = &pdev->dev; +struct resource *res; +struct phy_provider *phy_provider; +int i; + + state =devm_kzalloc (dev,sizeof (*state),GFP_KERNEL ); +if (!state) +return -ENOMEM ;Quoted 8 lines
drivers/phy/phy-exynos-mipi-video.c line 130
Quoted 8 lines
drivers/phy/phy-exynos-mipi-video.c new file +8
-0+ + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + + state->regs =devm_ioremap_resource (dev, res); +if (IS_ERR (state->regs)) +return PTR_ERR (state->regs); + +dev_set_drvdata (dev, state);you can use
platform_set_drvdata(pdev, state);Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
I had it in the previous version, but changed for symmetry with
dev_set_drvdata(). I guess those could be replaced with phy_{get, set}_drvdata as you suggested.right. currently I was setting
dev_set_drvdataof phy (core) device inphy-core.cand the correspondingdev_get_drvdatain phy provider driver which is little confusing.
So I'll addphy_set_drvdataandphy_get_drvdatainphy.h(as suggested by Felipe) to be used by phy provider drivers. So after creating the PHY, the phy provider should usephy_set_drvdataand inphy_ops, it can usephy_get_drvdata. (I'll remove thedev_set_drvdatainphy_create).
Quoted 2 lines
This also means
_void*priv_inphy_createis useless. So I'll be removing _priv_ fromphy_create.
Yeah, sounds good. Then in the phy ops phy_get_drvdata(&phy->dev) would be used and in a custom of_xlate dev_get_drvdata(dev) (assuming the phy provider sets drvdata on its device beforehand).
I can't see any races from runtime PM with this approach.
Regards,
Sylwester
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
Quoted 35 lines · Sylwester Nawrocki
Quoted 34 lines · Kishon Vijay Abraham I
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
+static int
exynos_video_phy_probe(struct platform_device *pdev)Quoted 20 lines
Quoted 20 lines
Quoted 10 lines
Quoted 10 lines
drivers/phy/phy-exynos-mipi-video.c new file +10
-0+{ +struct exynos_video_phy *state; +struct device *dev = &pdev->dev; +struct resource *res; +struct phy_provider *phy_provider; +int i; + + state =devm_kzalloc (dev,sizeof (*state),GFP_KERNEL ); +if (!state) +return -ENOMEM ;Quoted 8 lines
drivers/phy/phy-exynos-mipi-video.c line 130
Quoted 8 lines
drivers/phy/phy-exynos-mipi-video.c new file +8
-0+ + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + + state->regs =devm_ioremap_resource (dev, res); +if (IS_ERR (state->regs)) +return PTR_ERR (state->regs); + +dev_set_drvdata (dev, state);you can use
platform_set_drvdata(pdev, state);Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
I had it in the previous version, but changed for symmetry with
dev_set_drvdata(). I guess those could be replaced with phy_{get, set}_drvdata as you suggested.right. currently I was setting
dev_set_drvdataof phy (core) device inphy-core.cand the correspondingdev_get_drvdatain phy provider driver which is little confusing.
So I'll addphy_set_drvdataandphy_get_drvdatainphy.h(as suggested by Felipe) to be used by phy provider drivers. So after creating the PHY, the phy provider should usephy_set_drvdataand inphy_ops, it can usephy_get_drvdata. (I'll remove thedev_set_drvdatainphy_create).
Quoted 4 lines
Quoted 2 lines
This also means
_void*priv_inphy_createis useless. So I'll be removing _priv_ fromphy_create.Yeah, sounds good. Then in the phy ops
phy_get_drvdata(&phy->dev)would
phy_get_drvdata(phy);
accessing the dev pointer will be done inside the helper :-)
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130626/ea45cd95/attachment.sig>
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
Quoted 36 lines · Felipe Balbi
Quoted 35 lines · Sylwester Nawrocki
Quoted 34 lines · Kishon Vijay Abraham I
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
+static int
exynos_video_phy_probe(struct platform_device *pdev)Quoted 20 lines
Quoted 20 lines
Quoted 10 lines
Quoted 10 lines
(quoted diff) +10
-0+{ + struct exynos_video_phy *state; + struct device *dev = &pdev->dev; + struct resource *res; + struct phy_provider *phy_provider; + int i; + + state = devm_kzalloc(dev, sizeof(*state), GFP_KERNEL); + if (!state) + return -ENOMEM;Quoted 8 lines
Review
Quoted 8 lines
(quoted diff) +8
-0+ + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + + state->regs = devm_ioremap_resource(dev, res); + if (IS_ERR(state->regs)) + return PTR_ERR(state->regs); + + dev_set_drvdata(dev, state);you can use
platform_set_drvdata(pdev, state);Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
I had it in the previous version, but changed for symmetry with
dev_set_drvdata(). I guess those could be replaced with phy_{get, set}_drvdata as you suggested.right. currently I was setting
dev_set_drvdataof phy (core) device inphy-core.cand the correspondingdev_get_drvdatain phy provider driver which is little confusing.
So I'll addphy_set_drvdataandphy_get_drvdatainphy.h(as suggested by Felipe) to be used by phy provider drivers. So after creating the PHY, the phy provider should usephy_set_drvdataand inphy_ops, it can usephy_get_drvdata. (I'll remove thedev_set_drvdatainphy_create).
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
This also means
_void*priv_inphy_createis useless. So I'll be removing _priv_ fromphy_create.Yeah, sounds good. Then in the phy ops
phy_get_drvdata(&phy->dev)would
phy_get_drvdata(phy);accessing the dev pointer will be done inside the helper :-)
right :-)
-Kishon
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
In reply to Sylwester NawrockiQuoted 35 lines · Sylwester Nawrocki
Quoted 34 lines · Kishon Vijay Abraham I
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
+static int
exynos_video_phy_probe(struct platform_device *pdev)Quoted 20 lines
Quoted 20 lines
Quoted 10 lines
Quoted 10 lines
drivers/phy/phy-exynos-mipi-video.c new file +10
-0+{ +struct exynos_video_phy *state; +struct device *dev = &pdev->dev; +struct resource *res; +struct phy_provider *phy_provider; +int i; + + state =devm_kzalloc (dev,sizeof (*state),GFP_KERNEL ); +if (!state) +return -ENOMEM ;Quoted 8 lines
drivers/phy/phy-exynos-mipi-video.c line 130
Quoted 8 lines
drivers/phy/phy-exynos-mipi-video.c new file +8
-0+ + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + + state->regs =devm_ioremap_resource (dev, res); +if (IS_ERR (state->regs)) +return PTR_ERR (state->regs); + +dev_set_drvdata (dev, state);you can use
platform_set_drvdata(pdev, state);Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
I had it in the previous version, but changed for symmetry with
dev_set_drvdata(). I guess those could be replaced with phy_{get, set}_drvdata as you suggested.right. currently I was setting
dev_set_drvdataof phy (core) device inphy-core.cand the correspondingdev_get_drvdatain phy provider driver which is little confusing.
So I'll addphy_set_drvdataandphy_get_drvdatainphy.h(as suggested by Felipe) to be used by phy provider drivers. So after creating the PHY, the phy provider should usephy_set_drvdataand inphy_ops, it can usephy_get_drvdata. (I'll remove thedev_set_drvdatainphy_create).
Quoted 6 lines
Quoted 2 lines
This also means
_void*priv_inphy_createis useless. So I'll be removing _priv_ fromphy_create.Yeah, sounds good. Then in the phy ops
phy_get_drvdata(&phy->dev)would be used and in a customof_xlatedev_get_drvdata(dev)(assuming the phy provider sets drvdata on its device beforehand).
thats correct. btw when you send the next version just have MODULE_LICENSE set to GPL v2. Apart from that this patch looks good to me.
Thanks
Kishon
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
In reply to Felipe BalbiHi,
Quoted 5 lines · Felipe Balbi
Quoted 2 lines
+static struct
platform_driverexynos_video_phy_driver= {drivers/phy/phy-exynos-mipi-video.c line 162
Quoted 1 line
drivers/phy/phy-exynos-mipi-video.c new file +1
-0+ .probe = exynos_video_phy_probe,you *must* provide a remove method. drivers with NULL remove are non-removable :-)
Actually the remove() callback can be NULL, it's just missing module_exit function that makes a module not unloadable.
--
Regards,
Sylwester
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
Quoted 11 lines · Sylwester Nawrocki
Hi,
Quoted 5 lines · Felipe Balbi
Quoted 2 lines
+static struct
platform_driverexynos_video_phy_driver= {drivers/phy/phy-exynos-mipi-video.c line 162
Quoted 1 line
drivers/phy/phy-exynos-mipi-video.c new file +1
-0+ .probe = exynos_video_phy_probe,you *must* provide a remove method. drivers with NULL remove are non-removable :-)
Actually the
remove()callback can be NULL, it's just missingmodule_exitfunction that makes a module not unloadable.
look at the implementation of platform_drv_remove():
499 static int platform_drv_remove(struct device *_dev) 500 {
501 struct platform_driver *drv = to_platform_driver(_dev->driver); 502 struct platform_device *dev = to_platform_device(_dev); 503 int ret;
504
505 ret = drv->remove(dev);
506 if (ACPI_HANDLE(_dev))
507 acpi_dev_pm_detach(_dev, true);
508
509 return ret;
510 }
that's not a conditional call right :-)
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130627/a1d667b6/attachment.sig>
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
Hi Felipe,
Quoted 28 lines · Felipe Balbi
Quoted 11 lines · Sylwester Nawrocki
Hi,
Quoted 5 lines · Felipe Balbi
Quoted 2 lines
+static struct
platform_driverexynos_video_phy_driver= {drivers/phy/phy-exynos-mipi-video.c line 162
Quoted 1 line
drivers/phy/phy-exynos-mipi-video.c new file +1
-0+ .probe = exynos_video_phy_probe,you *must* provide a remove method. drivers with NULL remove are non-removable :-)
Actually the
remove()callback can be NULL, it's just missingmodule_exitfunction that makes a module not unloadable.look at the implementation of
platform_drv_remove():499 static int
platform_drv_remove(struct device *_dev)500 {501 struct platform_driver *drv = to_platform_driver(_dev->driver); 502 struct platform_device *dev = to_platform_device(_dev); 503 int ret;504
505 ret =drv->remove(dev);
506 if (ACPI_HANDLE(_dev))
507acpi_dev_pm_detach(_dev, true);
508
509 return ret;
510 }
Quoted 1 line
that's not a conditional call right :-)
It is conditional, just condition check is in different place:
int platform_driver_register(struct platform_driver *drv)
{
(...)
if (drv->remove)
drv->driver.remove = platform_drv_remove;
(...)
}Regards
Andrzej
Quoted 8 lines
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
Quoted 35 lines · Andrzej Hajda
Hi Felipe,
Quoted 28 lines · Felipe Balbi
Quoted 11 lines · Sylwester Nawrocki
Hi,
Quoted 5 lines · Felipe Balbi
Quoted 2 lines
+static struct
platform_driverexynos_video_phy_driver= {drivers/phy/phy-exynos-mipi-video.c line 162
Quoted 1 line
drivers/phy/phy-exynos-mipi-video.c new file +1
-0+ .probe = exynos_video_phy_probe,you *must* provide a remove method. drivers with NULL remove are non-removable :-)
Actually the
remove()callback can be NULL, it's just missingmodule_exitfunction that makes a module not unloadable.look at the implementation of
platform_drv_remove():499 static int
platform_drv_remove(struct device *_dev)500 {501 struct platform_driver *drv = to_platform_driver(_dev->driver); 502 struct platform_device *dev = to_platform_device(_dev); 503 int ret;504
505 ret =drv->remove(dev);
506 if (ACPI_HANDLE(_dev))
507acpi_dev_pm_detach(_dev, true);
508
509 return ret;
510 }Quoted 1 line
that's not a conditional call right :-)
It is conditional, just condition check is in different place:
Quoted 7 lines
int
platform_driver_register(struct platform_driver *drv){ (...) if (drv->remove) drv->driver.remove = platform_drv_remove; (...) }
good point :-) thanks. I'll go ack your driver now
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130627/85af30d3/attachment.sig>
PATCH v2 1/5 phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
In reply to Felipe BalbiQuoted 28 lines · Felipe Balbi
Quoted 11 lines · Sylwester Nawrocki
Hi,
Quoted 5 lines · Felipe Balbi
Quoted 2 lines
+static struct
platform_driverexynos_video_phy_driver= {drivers/phy/phy-exynos-mipi-video.c line 162
Quoted 1 line
drivers/phy/phy-exynos-mipi-video.c new file +1
-0+ .probe = exynos_video_phy_probe,you *must* provide a remove method. drivers with NULL remove are non-removable :-)
Actually the
remove()callback can be NULL, it's just missingmodule_exitfunction that makes a module not unloadable.look at the implementation of
platform_drv_remove():499 static int
platform_drv_remove(struct device *_dev)500 {501 struct platform_driver *drv = to_platform_driver(_dev->driver); 502 struct platform_device *dev = to_platform_device(_dev); 503 int ret;504
505 ret =drv->remove(dev);
506 if (ACPI_HANDLE(_dev))
507acpi_dev_pm_detach(_dev, true);
508
509 return ret;
510 }
Quoted 1 line
that's not a conditional call right :-)
Wrong.
if (drv->remove)
drv->driver.remove = platform_drv_remove;The function you quote will only be used if drv->remove is non-NULL. You do not need to provide a remove method.