* Re: [PATCH v3 1/5] phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
From: Kishon Vijay Abraham I @ 2013-06-29 8:58 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <51CD6153.5050406@samsung.com>
Hi,
On Friday 28 June 2013 03:41 PM, Sylwester Nawrocki wrote:
> On 06/28/2013 10:17 AM, Hui Wang wrote:
>> On 06/26/2013 11:02 PM, Sylwester Nawrocki wrote:
>>> Add a PHY provider driver for the Samsung S5P/Exynos SoC MIPI CSI-2
>>> receiver and MIPI DSI transmitter DPHYs.
>>>
>>> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>>> ---
>>> Changes since v2:
>>> - adapted to the generic PHY API v9: use phy_set/get_drvdata(),
>>> - fixed of_xlate callback to return ERR_PTR() instead of NULL,
>>> - namespace cleanup, put "GPL v2" as MODULE_LICENSE, removed pr_debug,
>>> - removed phy id check in __set_phy_state().
>>> ---
>> [...]
>>> +
>>> + if (IS_EXYNOS_MIPI_DSIM_PHY_ID(id))
>>> + reset = EXYNOS_MIPI_PHY_MRESETN;
>>> + else
>>> + reset = EXYNOS_MIPI_PHY_SRESETN;
>>> +
>>> + spin_lock_irqsave(&state->slock, flags);
>>
>> Sorry for one stupid question here, why do you use spin_lock_irqsave()
>> rather than spin_lock(),
>> I don't see the irq handler will use this spinlock anywhere in this c file.
>
> Yes, there is no chance the PHY users could call the phy ops from within
> an interrupt context. Especially now when there is a per phy object
> mutex used in the PHY operation helpers. So I'll replace it with plain
> spin_lock/unlock. Thank you for the review.
Now that PHY ops is already protected, do you really need a spin_lock here?
Thanks
Kishon
^ permalink raw reply
* Re: [PATCH V2 1/3] phy: Add driver for Exynos DP PHY
From: Kishon Vijay Abraham I @ 2013-06-29 9:12 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <001f01ce73cf$46d8c940$d48a5bc0$@samsung.com>
Hi,
On Friday 28 June 2013 12:45 PM, Jingoo Han wrote:
> Add a PHY provider driver for the Samsung Exynos SoC DP PHY.
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
> .../phy/samsung,exynos5250-dp-video-phy.txt | 7 ++
> drivers/phy/Kconfig | 8 ++
> drivers/phy/Makefile | 3 +-
> drivers/phy/phy-exynos-dp-video.c | 122 ++++++++++++++++++++
> 4 files changed, 139 insertions(+), 1 deletion(-)
> create mode 100644 Documentation/devicetree/bindings/phy/samsung,exynos5250-dp-video-phy.txt
> create mode 100644 drivers/phy/phy-exynos-dp-video.c
>
> diff --git a/Documentation/devicetree/bindings/phy/samsung,exynos5250-dp-video-phy.txt
> b/Documentation/devicetree/bindings/phy/samsung,exynos5250-dp-video-phy.txt
> new file mode 100644
> index 0000000..d1771ef
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/phy/samsung,exynos5250-dp-video-phy.txt
> @@ -0,0 +1,7 @@
> +Samsung EXYNOS SoC series DP PHY
> +-------------------------------------------------
> +
> +Required properties:
> +- compatible : should be "samsung,exynos5250-dp-video-phy";
> +- reg : offset and length of the DP PHY register set;
> +- #phy-cells : from the generic phy bindings, must be 0;
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index 5f85909..6d10e3b 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -11,3 +11,11 @@ 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_DP_VIDEO
> + tristate "EXYNOS SoC series DP PHY driver"
> + help
> + Support for DP PHY found on Samsung EXYNOS SoCs.
> +endif
> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> index 9e9560f..d8d861c 100644
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@ -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_DP_VIDEO) += phy-exynos-dp-video.o
> diff --git a/drivers/phy/phy-exynos-dp-video.c b/drivers/phy/phy-exynos-dp-video.c
> new file mode 100644
> index 0000000..9a3d6f1
> --- /dev/null
> +++ b/drivers/phy/phy-exynos-dp-video.c
> @@ -0,0 +1,122 @@
> +/*
> + * Samsung EXYNOS SoC series DP PHY driver
> + *
> + * Copyright (C) 2013 Samsung Electronics Co., Ltd.
> + * Author: Jingoo Han <jg1.han@samsung.com>
> + *
> + * 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/io.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/of_address.h>
> +#include <linux/phy/phy.h>
> +#include <linux/platform_device.h>
> +#include <linux/spinlock.h>
> +
> +/* DPTX_PHY_CONTROL register */
> +#define EXYNOS_DPTX_PHY_ENABLE (1 << 0)
> +
> +struct exynos_dp_video_phy {
> + spinlock_t slock;
I think spinlock is not needed at all since the PHY ops is already protected
by a mutex.
> + struct phy *phys;
_phys_ no longer need to part of this structure.
> + void __iomem *regs;
> +};
Thanks
Kishon
^ permalink raw reply
* Re: [PATCH v3 1/5] phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
From: Sylwester Nawrocki @ 2013-06-29 19:34 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <51CEA197.8070207@ti.com>
Hi,
On 06/29/2013 10:57 AM, Kishon Vijay Abraham I wrote:
> On Friday 28 June 2013 03:41 PM, Sylwester Nawrocki wrote:
>> On 06/28/2013 10:17 AM, Hui Wang wrote:
>>> On 06/26/2013 11:02 PM, Sylwester Nawrocki wrote:
>>>> Add a PHY provider driver for the Samsung S5P/Exynos SoC MIPI CSI-2
>>>> receiver and MIPI DSI transmitter DPHYs.
>>>>
>>>> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>>>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>>>> ---
>>>> Changes since v2:
>>>> - adapted to the generic PHY API v9: use phy_set/get_drvdata(),
>>>> - fixed of_xlate callback to return ERR_PTR() instead of NULL,
>>>> - namespace cleanup, put "GPL v2" as MODULE_LICENSE, removed pr_debug,
>>>> - removed phy id check in __set_phy_state().
>>>> ---
>>> [...]
>>>> +
>>>> + if (IS_EXYNOS_MIPI_DSIM_PHY_ID(id))
>>>> + reset = EXYNOS_MIPI_PHY_MRESETN;
>>>> + else
>>>> + reset = EXYNOS_MIPI_PHY_SRESETN;
>>>> +
>>>> + spin_lock_irqsave(&state->slock, flags);
>>>
>>> Sorry for one stupid question here, why do you use spin_lock_irqsave()
>>> rather than spin_lock(),
>>> I don't see the irq handler will use this spinlock anywhere in this c
>>> file.
>>
>> Yes, there is no chance the PHY users could call the phy ops from within
>> an interrupt context. Especially now when there is a per phy object
>> mutex used in the PHY operation helpers. So I'll replace it with plain
>> spin_lock/unlock. Thank you for the review.
>
> Now that PHY ops is already protected, do you really need a spin_lock here?
It is still needed, to synchronize access to the control register from
two separate PHY objects. The mutex is per PHY object, while the spinlock
is per PHY provider.
Thanks,
Sylwester
^ permalink raw reply
* [PATCH] fbmem: Export fb_get_options and (un)register_framebuffer symbols
From: Ismael Luceno @ 2013-06-30 17:36 UTC (permalink / raw)
To: linux-fbdev
Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
---
drivers/video/fbmem.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 098bfc6..910909c 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1743,6 +1743,7 @@ register_framebuffer(struct fb_info *fb_info)
return ret;
}
+EXPORT_SYMBOL(register_framebuffer);
/**
* unregister_framebuffer - releases a frame buffer device
@@ -1771,6 +1772,7 @@ unregister_framebuffer(struct fb_info *fb_info)
return ret;
}
+EXPORT_SYMBOL(unregister_framebuffer);
/**
* fb_set_suspend - low level driver signals suspend
@@ -1910,6 +1912,7 @@ int fb_get_options(char *name, char **option)
return retval;
}
+EXPORT_SYMBOL(fb_get_options);
#ifndef MODULE
/**
--
1.8.3
^ permalink raw reply related
* Re: [PATCH] fbmem: Export fb_get_options and (un)register_framebuffer symbols
From: David Herrmann @ 2013-06-30 17:42 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <1372624575-7664-1-git-send-email-ismael.luceno@gmail.com>
Hi
On Sun, Jun 30, 2013 at 10:36 PM, Ismael Luceno <ismael.luceno@gmail.com> wrote:
> Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
> ---
> drivers/video/fbmem.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
> index 098bfc6..910909c 100644
> --- a/drivers/video/fbmem.c
> +++ b/drivers/video/fbmem.c
> @@ -1743,6 +1743,7 @@ register_framebuffer(struct fb_info *fb_info)
>
> return ret;
> }
> +EXPORT_SYMBOL(register_framebuffer);
These EXPORT_SYMBOL() calls should all be available at the end of fbmem.c.
Cheers
David
>
> /**
> * unregister_framebuffer - releases a frame buffer device
> @@ -1771,6 +1772,7 @@ unregister_framebuffer(struct fb_info *fb_info)
>
> return ret;
> }
> +EXPORT_SYMBOL(unregister_framebuffer);
>
> /**
> * fb_set_suspend - low level driver signals suspend
> @@ -1910,6 +1912,7 @@ int fb_get_options(char *name, char **option)
>
> return retval;
> }
> +EXPORT_SYMBOL(fb_get_options);
>
> #ifndef MODULE
> /**
> --
> 1.8.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH] fbmem: Export fb_get_options and (un)register_framebuffer symbols
From: Ismael Luceno @ 2013-06-30 17:54 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <1372624575-7664-1-git-send-email-ismael.luceno@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1038 bytes --]
On Sun, 30 Jun 2013 19:42:36 +0200
David Herrmann <dh.herrmann@gmail.com> wrote:
> Hi
>
> On Sun, Jun 30, 2013 at 10:36 PM, Ismael Luceno
> <ismael.luceno@gmail.com> wrote:
> > Signed-off-by: Ismael Luceno <ismael.luceno@gmail.com>
> > ---
> > drivers/video/fbmem.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
> > index 098bfc6..910909c 100644
> > --- a/drivers/video/fbmem.c
> > +++ b/drivers/video/fbmem.c
> > @@ -1743,6 +1743,7 @@ register_framebuffer(struct fb_info *fb_info)
> >
> > return ret;
> > }
> > +EXPORT_SYMBOL(register_framebuffer);
>
> These EXPORT_SYMBOL() calls should all be available at the end of
> fbmem.c.
>
> Cheers
> David
I noticed that just after sending the patch :/. Sorry for the noise.
I'm getting the following errors while trying to load ttm and nouveau on
a vanilla kernel:
drm_kms_helper: Unknown symbol register_framebuffer (err 0)
drm_kms_helper: Unknown symbol fb_get_options (err 0)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [PATCH 3/3] video: exynos_dp: Use the generic PHY driver
From: Jingoo Han @ 2013-07-01 0:35 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <51CD56FE.4020302@ti.com>
On Friday, June 28, 2013 6:27 PM, Kishon Vijay Abraham I wrote:
>
> Hi,
>
> On Friday 28 June 2013 11:34 AM, Jingoo Han wrote:
> > On Friday, June 28, 2013 2:58 PM, Kishon Vijay Abraham I wrote:
> >>
> >> Hi,
> >>
> >> On Friday 28 June 2013 10:54 AM, Jingoo Han wrote:
> >>> Use the generic PHY API instead of the platform callback to control
> >>> the DP PHY. The 'phy_label' field is added to the platform data
> >>> structure to allow PHY lookup on non-dt platforms.
> >>>
> >>> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> >>> ---
> >>> .../devicetree/bindings/video/exynos_dp.txt | 17 ---
> >>> drivers/video/exynos/exynos_dp_core.c | 118 ++------------------
> >>> drivers/video/exynos/exynos_dp_core.h | 2 +
> >>> include/video/exynos_dp.h | 6 +-
> >>> 4 files changed, 15 insertions(+), 128 deletions(-)
> >>>
> >>> diff --git a/Documentation/devicetree/bindings/video/exynos_dp.txt
> >> b/Documentation/devicetree/bindings/video/exynos_dp.txt
> >>> index 84f10c1..a8320e3 100644
> >>> --- a/Documentation/devicetree/bindings/video/exynos_dp.txt
> >>> +++ b/Documentation/devicetree/bindings/video/exynos_dp.txt
> >>> @@ -1,17 +1,6 @@
> >>> The Exynos display port interface should be configured based on
> >>> the type of panel connected to it.
> >>>
> >>> -We use two nodes:
> >>> - -dp-controller node
> >>> - -dptx-phy node(defined inside dp-controller node)
> >>> -
> >>> -For the DP-PHY initialization, we use the dptx-phy node.
> >>> -Required properties for dptx-phy:
> >>> - -reg:
> >>> - Base address of DP PHY register.
> >>> - -samsung,enable-mask:
> >>> - The bit-mask used to enable/disable DP PHY.
> >>> -
> >>> For the Panel initialization, we read data from dp-controller node.
> >>> Required properties for dp-controller:
> >>> -compatible:
> >>> @@ -67,12 +56,6 @@ SOC specific portion:
> >>> interrupt-parent = <&combiner>;
> >>> clocks = <&clock 342>;
> >>> clock-names = "dp";
> >>> -
> >>> - dptx-phy {
> >>> - reg = <0x10040720>;
> >>> - samsung,enable-mask = <1>;
> >>> - };
> >>> -
> >>> };
> >>>
> >>> Board Specific portion:
> >>> diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
> >>> index 12bbede..bac515b 100644
> >>> --- a/drivers/video/exynos/exynos_dp_core.c
> >>> +++ b/drivers/video/exynos/exynos_dp_core.c
> >>> @@ -19,6 +19,7 @@
> >>> #include <linux/interrupt.h>
> >>> #include <linux/delay.h>
> >>> #include <linux/of.h>
> >>> +#include <linux/phy/phy.h>
> >>>
> >>> #include <video/exynos_dp.h>
> >>>
> >>> @@ -960,84 +961,15 @@ static struct exynos_dp_platdata *exynos_dp_dt_parse_pdata(struct device
> *dev)
> >>> return ERR_PTR(-EINVAL);
> >>> }
> >>>
> >>> - return pd;
> >>> -}
> >>> -
> >>> -static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp)
> >>> -{
> >>> - struct device_node *dp_phy_node = of_node_get(dp->dev->of_node);
> >>> - u32 phy_base;
> >>> - int ret = 0;
> >>> -
> >>> - dp_phy_node = of_find_node_by_name(dp_phy_node, "dptx-phy");
> >>> - if (!dp_phy_node) {
> >>> - dev_err(dp->dev, "could not find dptx-phy node\n");
> >>> - return -ENODEV;
> >>> - }
> >>> -
> >>> - if (of_property_read_u32(dp_phy_node, "reg", &phy_base)) {
> >>> - dev_err(dp->dev, "failed to get reg for dptx-phy\n");
> >>> - ret = -EINVAL;
> >>> - goto err;
> >>> - }
> >>> -
> >>> - if (of_property_read_u32(dp_phy_node, "samsung,enable-mask",
> >>> - &dp->enable_mask)) {
> >>> - dev_err(dp->dev, "failed to get enable-mask for dptx-phy\n");
> >>> - ret = -EINVAL;
> >>> - goto err;
> >>> - }
> >>> -
> >>> - dp->phy_addr = ioremap(phy_base, SZ_4);
> >>> - if (!dp->phy_addr) {
> >>> - dev_err(dp->dev, "failed to ioremap dp-phy\n");
> >>> - ret = -ENOMEM;
> >>> - goto err;
> >>> - }
> >>> -
> >>> -err:
> >>> - of_node_put(dp_phy_node);
> >>> -
> >>> - return ret;
> >>> -}
> >>> -
> >>> -static void exynos_dp_phy_init(struct exynos_dp_device *dp)
> >>> -{
> >>> - u32 reg;
> >>> -
> >>> - reg = __raw_readl(dp->phy_addr);
> >>> - reg |= dp->enable_mask;
> >>> - __raw_writel(reg, dp->phy_addr);
> >>> -}
> >>> -
> >>> -static void exynos_dp_phy_exit(struct exynos_dp_device *dp)
> >>> -{
> >>> - u32 reg;
> >>> + pd->phy_label = "dp";
> >>
> >> In the case of non-dt boot, this phy_label should have ideally come from
> >> platform code.
> >
> > No, this is NOT the case of non-dt.
> >
> > 'pd->phy_label = "dp";' is included in exynos_dp_dt_parse_pdata(),
> > not exynos_dp_phy_exit().
> > Also, exynos_dp_dt_parse_pdata() is called in the case of dt.
>
> ah.. right. Do you support non-dt boot. I dont see any modifications in
> the platform code?
Platform code for non-DT has not been added; thus, there is no modification
in the platform code.
Best regards,
Jingoo Han
>
> Thanks
> Kishon
^ permalink raw reply
* Re: [PATCH V2 1/3] phy: Add driver for Exynos DP PHY
From: Jingoo Han @ 2013-07-01 1:08 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <51CEA219.8030001@ti.com>
On Saturday, June 29, 2013 6:00 PM, Kishon Vijay Abraham I wrote:
>
> Hi,
>
> On Friday 28 June 2013 12:45 PM, Jingoo Han wrote:
> > Add a PHY provider driver for the Samsung Exynos SoC DP PHY.
> >
> > Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> > ---
> > .../phy/samsung,exynos5250-dp-video-phy.txt | 7 ++
> > drivers/phy/Kconfig | 8 ++
> > drivers/phy/Makefile | 3 +-
> > drivers/phy/phy-exynos-dp-video.c | 122 ++++++++++++++++++++
> > 4 files changed, 139 insertions(+), 1 deletion(-)
> > create mode 100644 Documentation/devicetree/bindings/phy/samsung,exynos5250-dp-video-phy.txt
> > create mode 100644 drivers/phy/phy-exynos-dp-video.c
> >
> > diff --git a/Documentation/devicetree/bindings/phy/samsung,exynos5250-dp-video-phy.txt
> > b/Documentation/devicetree/bindings/phy/samsung,exynos5250-dp-video-phy.txt
> > new file mode 100644
> > index 0000000..d1771ef
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/phy/samsung,exynos5250-dp-video-phy.txt
> > @@ -0,0 +1,7 @@
> > +Samsung EXYNOS SoC series DP PHY
> > +-------------------------------------------------
> > +
> > +Required properties:
> > +- compatible : should be "samsung,exynos5250-dp-video-phy";
> > +- reg : offset and length of the DP PHY register set;
> > +- #phy-cells : from the generic phy bindings, must be 0;
> > diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> > index 5f85909..6d10e3b 100644
> > --- a/drivers/phy/Kconfig
> > +++ b/drivers/phy/Kconfig
> > @@ -11,3 +11,11 @@ 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_DP_VIDEO
> > + tristate "EXYNOS SoC series DP PHY driver"
> > + help
> > + Support for DP PHY found on Samsung EXYNOS SoCs.
> > +endif
> > diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> > index 9e9560f..d8d861c 100644
> > --- a/drivers/phy/Makefile
> > +++ b/drivers/phy/Makefile
> > @@ -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_DP_VIDEO) += phy-exynos-dp-video.o
> > diff --git a/drivers/phy/phy-exynos-dp-video.c b/drivers/phy/phy-exynos-dp-video.c
> > new file mode 100644
> > index 0000000..9a3d6f1
> > --- /dev/null
> > +++ b/drivers/phy/phy-exynos-dp-video.c
> > @@ -0,0 +1,122 @@
> > +/*
> > + * Samsung EXYNOS SoC series DP PHY driver
> > + *
> > + * Copyright (C) 2013 Samsung Electronics Co., Ltd.
> > + * Author: Jingoo Han <jg1.han@samsung.com>
> > + *
> > + * 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/io.h>
> > +#include <linux/kernel.h>
> > +#include <linux/module.h>
> > +#include <linux/of.h>
> > +#include <linux/of_address.h>
> > +#include <linux/phy/phy.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/spinlock.h>
> > +
> > +/* DPTX_PHY_CONTROL register */
> > +#define EXYNOS_DPTX_PHY_ENABLE (1 << 0)
> > +
> > +struct exynos_dp_video_phy {
> > + spinlock_t slock;
>
> I think spinlock is not needed at all since the PHY ops is already protected
> by a mutex.
Yes, you're right.
Only one PHY object access the control register; thus,
there is no need to add spinlock.
I will remove it.
> > + struct phy *phys;
>
> _phys_ no longer need to part of this structure.
OK, I see.
'struct phy' is only used at exynos_dp_video_phy_probe().
So, I will remove 'struct phy *phys' from 'struct exynos_dp_video_phy'.
Thank you for your comment.
Best regards,
Jingoo Han
> > + void __iomem *regs;
> > +};
>
> Thanks
> Kishon
^ permalink raw reply
* linux-next: manual merge of the trivial tree with the fbdev tree
From: Stephen Rothwell @ 2013-07-01 4:38 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Jean-Christophe PLAGNIOL-VILLARD,
Florian Tobias Schandinat, Tomi Valkeinen, linux-fbdev,
Masanari Iida
[-- Attachment #1: Type: text/plain, Size: 1056 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/video/omap2/displays/panel-n8x0.c between commit ecc8b3708986
("OMAPDSS: Add panel dev pointer to dssdev") from the fbdev tree and
commit 8b513d0cf603 ("treewide: Fix typo in printk") from the trivial
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/video/omap2/displays/panel-n8x0.c
index d3860c5,860b180..0000000
--- a/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@@ -527,7 -527,7 +527,7 @@@ static int n8x0_panel_update(struct oma
dh = dssdev->panel.timings.y_res;
if (x != 0 || y != 0 || w != dw || h != dh) {
- dev_err(dssdev->dev, "invaid update region %d, %d, %d, %d\n",
- dev_err(&dssdev->dev, "invalid update region %d, %d, %d, %d\n",
++ dev_err(dssdev->dev, "invalid update region %d, %d, %d, %d\n",
x, y, w, h);
return -EINVAL;
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH V3 0/3] Generic PHY driver for the Exynos SoC DP PHY
From: Jingoo Han @ 2013-07-01 5:22 UTC (permalink / raw)
To: linux-arm-kernel
This patch series adds a simple driver for the Samsung Exynos SoC
series DP transmitter PHY, using the generic PHY framework [1].
Previously the DP PHY used a platform callback or internal DT node
to control the PHY power enable bit.
The platform callback and internal DT node can be dropped and this
driver does not need any calls back to the platform code.
These patches was tested on Exynos5250.
This PATCH v3 follows:
* PATCH v2, sent on June, 28th 2013
* PATCH v1, sent on June, 28th 2013
Changes between v2 and v3:
* Removed redundant spinlock
* Removed 'struct phy' from 'struct exynos_dp_video_phy'
* Updated 'samsung-phy.txt', instead of creating
'samsung,exynos5250-dp-video-phy.txt'.
* Removed unnecessary additional specifier from 'phys'
DT property.
* Added 'phys', 'phy-names' properties to 'exynos_dp.txt' file.
* Added Felipe Balbi's Acked-by.
Changes between v1 and v2:
* Replaced exynos_dp_video_phy_xlate() with of_phy_simple_xlate(),
as Kishon Vijay Abraham I guided.
* Set the value of phy-cells as 0, because the phy_provider implements
only one PHY.
* Removed unnecessary header include.
* Added '#ifdef CONFIG_OF' and of_match_ptr macro.
This series depends on the generic PHY framework [1]. These patches
refer to Sylwester Nawrocki's patches about Exynos MIPI [2].
[1] https://lkml.org/lkml/2013/6/26/259
[2] http://www.spinics.net/lists/linux-samsung-soc/msg20098.html
Jingoo Han (3):
ARM: dts: Add DP PHY node to exynos5250.dtsi
phy: Add driver for Exynos DP PHY
video: exynos_dp: Use the generic PHY driver
.../devicetree/bindings/phy/samsung-phy.txt | 8 ++
.../devicetree/bindings/video/exynos_dp.txt | 23 +---
arch/arm/boot/dts/exynos5250.dtsi | 13 ++++++++-----
drivers/phy/Kconfig | 5 +
drivers/phy/Makefile | 1 +
drivers/phy/phy-exynos-dp-video.c | 118 ++++++++++++++++++++
drivers/video/exynos/exynos_dp_core.c | 118 ++------------------
drivers/video/exynos/exynos_dp_core.h | 2 +
include/video/exynos_dp.h | 6 +-
9 files changed, 161 insertions(+), 133 deletions(-)
create mode 100644 Documentation/devicetree/bindings/phy/samsung,exynos5250-dp-video-phy.txt
create mode 100644 drivers/phy/phy-exynos-dp-video.c
--
1.7.10.4
^ permalink raw reply
* [PATCH V3 1/3] ARM: dts: Add DP PHY node to exynos5250.dtsi
From: Jingoo Han @ 2013-07-01 5:23 UTC (permalink / raw)
To: linux-arm-kernel
Add PHY provider node for the DP PHY.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/boot/dts/exynos5250.dtsi | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 41cd625..7e397c6 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -614,6 +614,12 @@
interrupts = <0 94 0>;
};
+ dp_phy: video-phy@10040720 {
+ compatible = "samsung,exynos5250-dp-video-phy";
+ reg = <0x10040720 4>;
+ #phy-cells = <0>;
+ };
+
dp-controller {
compatible = "samsung,exynos5-dp";
reg = <0x145b0000 0x1000>;
@@ -623,11 +629,8 @@
clock-names = "dp";
#address-cells = <1>;
#size-cells = <0>;
-
- dptx-phy {
- reg = <0x10040720>;
- samsung,enable-mask = <1>;
- };
+ phys = <&dp_phy>;
+ phy-names = "dp";
};
fimd {
--
1.7.10.4
^ permalink raw reply related
* [PATCH V3 2/3] phy: Add driver for Exynos DP PHY
From: Jingoo Han @ 2013-07-01 5:24 UTC (permalink / raw)
To: linux-arm-kernel
Add a PHY provider driver for the Samsung Exynos SoC DP PHY.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Felipe Balbi <balbi@ti.com>
---
.../devicetree/bindings/phy/samsung-phy.txt | 8 ++
drivers/phy/Kconfig | 5 +
drivers/phy/Makefile | 1 +
drivers/phy/phy-exynos-dp-video.c | 118 ++++++++++++++++++++
4 files changed, 132 insertions(+)
create mode 100644 drivers/phy/phy-exynos-dp-video.c
diff --git a/Documentation/devicetree/bindings/phy/samsung-phy.txt b/Documentation/devicetree/bindings/phy/samsung-phy.txt
index 5ff208c..3fb656a 100644
--- a/Documentation/devicetree/bindings/phy/samsung-phy.txt
+++ b/Documentation/devicetree/bindings/phy/samsung-phy.txt
@@ -12,3 +12,11 @@ the PHY specifier identifies the PHY and its meaning is as follows:
1 - MIPI DSIM 0,
2 - MIPI CSIS 1,
3 - MIPI DSIM 1.
+
+Samsung EXYNOS SoC series DP PHY
+-------------------------------------------------
+
+Required properties:
+- compatible : should be "samsung,exynos5250-dp-video-phy";
+- reg : offset and length of the DP PHY register set;
+- #phy-cells : from the generic phy bindings, must be 0;
\ No newline at end of file
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 6f446d0..760f55a 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -19,4 +19,9 @@ config PHY_EXYNOS_MIPI_VIDEO
help
Support for MIPI CSI-2 and MIPI DSI DPHY found on Samsung
S5P and EXYNOS SoCs.
+
+config PHY_EXYNOS_DP_VIDEO
+ tristate "EXYNOS SoC series DP PHY driver"
+ help
+ Support for DP PHY found on Samsung EXYNOS SoCs.
endif
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 71d8841..0fd1340 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -4,3 +4,4 @@
obj-$(CONFIG_GENERIC_PHY) += phy-core.o
obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o
+obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o
diff --git a/drivers/phy/phy-exynos-dp-video.c b/drivers/phy/phy-exynos-dp-video.c
new file mode 100644
index 0000000..75e1d11
--- /dev/null
+++ b/drivers/phy/phy-exynos-dp-video.c
@@ -0,0 +1,118 @@
+/*
+ * Samsung EXYNOS SoC series DP PHY driver
+ *
+ * Copyright (C) 2013 Samsung Electronics Co., Ltd.
+ * Author: Jingoo Han <jg1.han@samsung.com>
+ *
+ * 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/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+
+/* DPTX_PHY_CONTROL register */
+#define EXYNOS_DPTX_PHY_ENABLE (1 << 0)
+
+struct exynos_dp_video_phy {
+ void __iomem *regs;
+};
+
+static int __set_phy_state(struct exynos_dp_video_phy *state, unsigned int on)
+{
+ void __iomem *addr;
+ u32 reg;
+
+ addr = state->regs;
+
+ reg = readl(addr);
+ if (on)
+ reg |= EXYNOS_DPTX_PHY_ENABLE;
+ else
+ reg &= ~EXYNOS_DPTX_PHY_ENABLE;
+ writel(reg, addr);
+
+ return 0;
+}
+
+static int exynos_dp_video_phy_power_on(struct phy *phy)
+{
+ struct exynos_dp_video_phy *state = phy_get_drvdata(phy);
+
+ return __set_phy_state(state, 1);
+}
+
+static int exynos_dp_video_phy_power_off(struct phy *phy)
+{
+ struct exynos_dp_video_phy *state = phy_get_drvdata(phy);
+
+ return __set_phy_state(state, 0);
+}
+
+static struct phy_ops exynos_dp_video_phy_ops = {
+ .power_on = exynos_dp_video_phy_power_on,
+ .power_off = exynos_dp_video_phy_power_off,
+ .owner = THIS_MODULE,
+};
+
+static int exynos_dp_video_phy_probe(struct platform_device *pdev)
+{
+ struct exynos_dp_video_phy *state;
+ struct device *dev = &pdev->dev;
+ struct resource *res;
+ struct phy_provider *phy_provider;
+ struct phy *phy;
+
+ state = devm_kzalloc(dev, sizeof(*state), GFP_KERNEL);
+ 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);
+
+ phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
+ if (IS_ERR(phy_provider))
+ return PTR_ERR(phy_provider);
+
+ phy = devm_phy_create(dev, 0, &exynos_dp_video_phy_ops, "dp");
+ if (IS_ERR(phy)) {
+ dev_err(dev, "failed to create DP PHY\n");
+ return PTR_ERR(phy);
+ }
+ phy_set_drvdata(phy, state);
+
+ return 0;
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id exynos_dp_video_phy_of_match[] = {
+ { .compatible = "samsung,exynos5250-dp-video-phy" },
+ { },
+};
+MODULE_DEVICE_TABLE(of, exynos_dp_video_phy_of_match);
+#endif
+
+static struct platform_driver exynos_dp_video_phy_driver = {
+ .probe = exynos_dp_video_phy_probe,
+ .driver = {
+ .name = "exynos-dp-video-phy",
+ .owner = THIS_MODULE,
+ .of_match_table = exynos_dp_video_phy_of_match,
+ }
+};
+module_platform_driver(exynos_dp_video_phy_driver);
+
+MODULE_AUTHOR("Jingoo Han <jg1.han@samsung.com>");
+MODULE_DESCRIPTION("Samsung EXYNOS SoC DP PHY driver");
+MODULE_LICENSE("GPL v2");
--
1.7.10.4
^ permalink raw reply related
* [PATCH V3 3/3] video: exynos_dp: Use the generic PHY driver
From: Jingoo Han @ 2013-07-01 5:24 UTC (permalink / raw)
To: linux-arm-kernel
Use the generic PHY API instead of the platform callback to control
the DP PHY. The 'phy_label' field is added to the platform data
structure to allow PHY lookup on non-dt platforms.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Felipe Balbi <balbi@ti.com>
---
.../devicetree/bindings/video/exynos_dp.txt | 23 +---
drivers/video/exynos/exynos_dp_core.c | 118 ++------------------
drivers/video/exynos/exynos_dp_core.h | 2 +
include/video/exynos_dp.h | 6 +-
4 files changed, 21 insertions(+), 128 deletions(-)
diff --git a/Documentation/devicetree/bindings/video/exynos_dp.txt b/Documentation/devicetree/bindings/video/exynos_dp.txt
index 84f10c1..71645dc 100644
--- a/Documentation/devicetree/bindings/video/exynos_dp.txt
+++ b/Documentation/devicetree/bindings/video/exynos_dp.txt
@@ -1,17 +1,6 @@
The Exynos display port interface should be configured based on
the type of panel connected to it.
-We use two nodes:
- -dp-controller node
- -dptx-phy node(defined inside dp-controller node)
-
-For the DP-PHY initialization, we use the dptx-phy node.
-Required properties for dptx-phy:
- -reg:
- Base address of DP PHY register.
- -samsung,enable-mask:
- The bit-mask used to enable/disable DP PHY.
-
For the Panel initialization, we read data from dp-controller node.
Required properties for dp-controller:
-compatible:
@@ -25,6 +14,10 @@ Required properties for dp-controller:
from common clock binding: handle to dp clock.
-clock-names:
from common clock binding: Shall be "dp".
+ -phys:
+ from general phy binding: the phandle for the PHY device.
+ -phy-names:
+ from general phy binding: Should be "dp".
-interrupt-parent:
phandle to Interrupt combiner node.
-samsung,color-space:
@@ -67,12 +60,8 @@ SOC specific portion:
interrupt-parent = <&combiner>;
clocks = <&clock 342>;
clock-names = "dp";
-
- dptx-phy {
- reg = <0x10040720>;
- samsung,enable-mask = <1>;
- };
-
+ phys = <&dp_phy>;
+ phy-names = "dp";
};
Board Specific portion:
diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
index 12bbede..bac515b 100644
--- a/drivers/video/exynos/exynos_dp_core.c
+++ b/drivers/video/exynos/exynos_dp_core.c
@@ -19,6 +19,7 @@
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/of.h>
+#include <linux/phy/phy.h>
#include <video/exynos_dp.h>
@@ -960,84 +961,15 @@ static struct exynos_dp_platdata *exynos_dp_dt_parse_pdata(struct device *dev)
return ERR_PTR(-EINVAL);
}
- return pd;
-}
-
-static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp)
-{
- struct device_node *dp_phy_node = of_node_get(dp->dev->of_node);
- u32 phy_base;
- int ret = 0;
-
- dp_phy_node = of_find_node_by_name(dp_phy_node, "dptx-phy");
- if (!dp_phy_node) {
- dev_err(dp->dev, "could not find dptx-phy node\n");
- return -ENODEV;
- }
-
- if (of_property_read_u32(dp_phy_node, "reg", &phy_base)) {
- dev_err(dp->dev, "failed to get reg for dptx-phy\n");
- ret = -EINVAL;
- goto err;
- }
-
- if (of_property_read_u32(dp_phy_node, "samsung,enable-mask",
- &dp->enable_mask)) {
- dev_err(dp->dev, "failed to get enable-mask for dptx-phy\n");
- ret = -EINVAL;
- goto err;
- }
-
- dp->phy_addr = ioremap(phy_base, SZ_4);
- if (!dp->phy_addr) {
- dev_err(dp->dev, "failed to ioremap dp-phy\n");
- ret = -ENOMEM;
- goto err;
- }
-
-err:
- of_node_put(dp_phy_node);
-
- return ret;
-}
-
-static void exynos_dp_phy_init(struct exynos_dp_device *dp)
-{
- u32 reg;
-
- reg = __raw_readl(dp->phy_addr);
- reg |= dp->enable_mask;
- __raw_writel(reg, dp->phy_addr);
-}
-
-static void exynos_dp_phy_exit(struct exynos_dp_device *dp)
-{
- u32 reg;
+ pd->phy_label = "dp";
- reg = __raw_readl(dp->phy_addr);
- reg &= ~(dp->enable_mask);
- __raw_writel(reg, dp->phy_addr);
+ return pd;
}
#else
static struct exynos_dp_platdata *exynos_dp_dt_parse_pdata(struct device *dev)
{
return NULL;
}
-
-static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp)
-{
- return -EINVAL;
-}
-
-static void exynos_dp_phy_init(struct exynos_dp_device *dp)
-{
- return;
-}
-
-static void exynos_dp_phy_exit(struct exynos_dp_device *dp)
-{
- return;
-}
#endif /* CONFIG_OF */
static int exynos_dp_probe(struct platform_device *pdev)
@@ -1061,10 +993,6 @@ static int exynos_dp_probe(struct platform_device *pdev)
pdata = exynos_dp_dt_parse_pdata(&pdev->dev);
if (IS_ERR(pdata))
return PTR_ERR(pdata);
-
- ret = exynos_dp_dt_parse_phydata(dp);
- if (ret)
- return ret;
} else {
pdata = pdev->dev.platform_data;
if (!pdata) {
@@ -1073,6 +1001,10 @@ static int exynos_dp_probe(struct platform_device *pdev)
}
}
+ dp->phy = devm_phy_get(&pdev->dev, pdata->phy_label);
+ if (IS_ERR(dp->phy))
+ return PTR_ERR(dp->phy);
+
dp->clock = devm_clk_get(&pdev->dev, "dp");
if (IS_ERR(dp->clock)) {
dev_err(&pdev->dev, "failed to get clock\n");
@@ -1097,13 +1029,7 @@ static int exynos_dp_probe(struct platform_device *pdev)
dp->video_info = pdata->video_info;
- if (pdev->dev.of_node) {
- if (dp->phy_addr)
- exynos_dp_phy_init(dp);
- } else {
- if (pdata->phy_init)
- pdata->phy_init();
- }
+ phy_power_on(dp->phy);
exynos_dp_init_dp(dp);
@@ -1121,42 +1047,27 @@ static int exynos_dp_probe(struct platform_device *pdev)
static int exynos_dp_remove(struct platform_device *pdev)
{
- struct exynos_dp_platdata *pdata = pdev->dev.platform_data;
struct exynos_dp_device *dp = platform_get_drvdata(pdev);
flush_work(&dp->hotplug_work);
- if (pdev->dev.of_node) {
- if (dp->phy_addr)
- exynos_dp_phy_exit(dp);
- } else {
- if (pdata->phy_exit)
- pdata->phy_exit();
- }
+ phy_power_off(dp->phy);
clk_disable_unprepare(dp->clock);
-
return 0;
}
#ifdef CONFIG_PM_SLEEP
static int exynos_dp_suspend(struct device *dev)
{
- struct exynos_dp_platdata *pdata = dev->platform_data;
struct exynos_dp_device *dp = dev_get_drvdata(dev);
disable_irq(dp->irq);
flush_work(&dp->hotplug_work);
- if (dev->of_node) {
- if (dp->phy_addr)
- exynos_dp_phy_exit(dp);
- } else {
- if (pdata->phy_exit)
- pdata->phy_exit();
- }
+ phy_power_off(dp->phy);
clk_disable_unprepare(dp->clock);
@@ -1165,16 +1076,9 @@ static int exynos_dp_suspend(struct device *dev)
static int exynos_dp_resume(struct device *dev)
{
- struct exynos_dp_platdata *pdata = dev->platform_data;
struct exynos_dp_device *dp = dev_get_drvdata(dev);
- if (dev->of_node) {
- if (dp->phy_addr)
- exynos_dp_phy_init(dp);
- } else {
- if (pdata->phy_init)
- pdata->phy_init();
- }
+ phy_power_on(dp->phy);
clk_prepare_enable(dp->clock);
diff --git a/drivers/video/exynos/exynos_dp_core.h b/drivers/video/exynos/exynos_dp_core.h
index 6c567bbf..b3d0328 100644
--- a/drivers/video/exynos/exynos_dp_core.h
+++ b/drivers/video/exynos/exynos_dp_core.h
@@ -42,6 +42,8 @@ struct exynos_dp_device {
struct video_info *video_info;
struct link_train link_train;
struct work_struct hotplug_work;
+
+ struct phy *phy;
};
/* exynos_dp_reg.c */
diff --git a/include/video/exynos_dp.h b/include/video/exynos_dp.h
index bd8cabd..f38c9af 100644
--- a/include/video/exynos_dp.h
+++ b/include/video/exynos_dp.h
@@ -122,10 +122,8 @@ struct video_info {
};
struct exynos_dp_platdata {
- struct video_info *video_info;
-
- void (*phy_init)(void);
- void (*phy_exit)(void);
+ struct video_info *video_info;
+ const char *phy_label;
};
#endif /* _EXYNOS_DP_H */
--
1.7.10.4
^ permalink raw reply related
* Re: [PATCH v3 1/5] phy: Add driver for Exynos MIPI CSIS/DSIM DPHYs
From: Kishon Vijay Abraham I @ 2013-07-01 5:36 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <51CF36AB.4010300@gmail.com>
Hi,
On Sunday 30 June 2013 01:04 AM, Sylwester Nawrocki wrote:
> Hi,
>
> On 06/29/2013 10:57 AM, Kishon Vijay Abraham I wrote:
>> On Friday 28 June 2013 03:41 PM, Sylwester Nawrocki wrote:
>>> On 06/28/2013 10:17 AM, Hui Wang wrote:
>>>> On 06/26/2013 11:02 PM, Sylwester Nawrocki wrote:
>>>>> Add a PHY provider driver for the Samsung S5P/Exynos SoC MIPI CSI-2
>>>>> receiver and MIPI DSI transmitter DPHYs.
>>>>>
>>>>> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>>>>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>>>>> ---
>>>>> Changes since v2:
>>>>> - adapted to the generic PHY API v9: use phy_set/get_drvdata(),
>>>>> - fixed of_xlate callback to return ERR_PTR() instead of NULL,
>>>>> - namespace cleanup, put "GPL v2" as MODULE_LICENSE, removed pr_debug,
>>>>> - removed phy id check in __set_phy_state().
>>>>> ---
>>>> [...]
>>>>> +
>>>>> + if (IS_EXYNOS_MIPI_DSIM_PHY_ID(id))
>>>>> + reset = EXYNOS_MIPI_PHY_MRESETN;
>>>>> + else
>>>>> + reset = EXYNOS_MIPI_PHY_SRESETN;
>>>>> +
>>>>> + spin_lock_irqsave(&state->slock, flags);
>>>>
>>>> Sorry for one stupid question here, why do you use spin_lock_irqsave()
>>>> rather than spin_lock(),
>>>> I don't see the irq handler will use this spinlock anywhere in this c
>>>> file.
>>>
>>> Yes, there is no chance the PHY users could call the phy ops from within
>>> an interrupt context. Especially now when there is a per phy object
>>> mutex used in the PHY operation helpers. So I'll replace it with plain
>>> spin_lock/unlock. Thank you for the review.
>>
>> Now that PHY ops is already protected, do you really need a spin_lock here?
>
> It is still needed, to synchronize access to the control register from
> two separate PHY objects. The mutex is per PHY object, while the spinlock
> is per PHY provider.
Ok. Makes sense.
Thanks
Kishon
^ permalink raw reply
* Re: [PATCH V3 3/3] video: exynos_dp: Use the generic PHY driver
From: Kishon Vijay Abraham I @ 2013-07-01 6:39 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <005401ce761b$504d7090$f0e851b0$@samsung.com>
Hi,
On Monday 01 July 2013 10:54 AM, Jingoo Han wrote:
> Use the generic PHY API instead of the platform callback to control
> the DP PHY. The 'phy_label' field is added to the platform data
> structure to allow PHY lookup on non-dt platforms.
>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> .../devicetree/bindings/video/exynos_dp.txt | 23 +---
> drivers/video/exynos/exynos_dp_core.c | 118 ++------------------
> drivers/video/exynos/exynos_dp_core.h | 2 +
> include/video/exynos_dp.h | 6 +-
> 4 files changed, 21 insertions(+), 128 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/video/exynos_dp.txt b/Documentation/devicetree/bindings/video/exynos_dp.txt
> index 84f10c1..71645dc 100644
> --- a/Documentation/devicetree/bindings/video/exynos_dp.txt
> +++ b/Documentation/devicetree/bindings/video/exynos_dp.txt
> @@ -1,17 +1,6 @@
> The Exynos display port interface should be configured based on
> the type of panel connected to it.
>
> -We use two nodes:
> - -dp-controller node
> - -dptx-phy node(defined inside dp-controller node)
> -
> -For the DP-PHY initialization, we use the dptx-phy node.
> -Required properties for dptx-phy:
> - -reg:
> - Base address of DP PHY register.
> - -samsung,enable-mask:
> - The bit-mask used to enable/disable DP PHY.
> -
> For the Panel initialization, we read data from dp-controller node.
> Required properties for dp-controller:
> -compatible:
> @@ -25,6 +14,10 @@ Required properties for dp-controller:
> from common clock binding: handle to dp clock.
> -clock-names:
> from common clock binding: Shall be "dp".
> + -phys:
> + from general phy binding: the phandle for the PHY device.
> + -phy-names:
> + from general phy binding: Should be "dp".
> -interrupt-parent:
> phandle to Interrupt combiner node.
> -samsung,color-space:
> @@ -67,12 +60,8 @@ SOC specific portion:
> interrupt-parent = <&combiner>;
> clocks = <&clock 342>;
> clock-names = "dp";
> -
> - dptx-phy {
> - reg = <0x10040720>;
> - samsung,enable-mask = <1>;
> - };
> -
> + phys = <&dp_phy>;
> + phy-names = "dp";
> };
>
> Board Specific portion:
> diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
> index 12bbede..bac515b 100644
> --- a/drivers/video/exynos/exynos_dp_core.c
> +++ b/drivers/video/exynos/exynos_dp_core.c
> @@ -19,6 +19,7 @@
> #include <linux/interrupt.h>
> #include <linux/delay.h>
> #include <linux/of.h>
> +#include <linux/phy/phy.h>
>
> #include <video/exynos_dp.h>
>
> @@ -960,84 +961,15 @@ static struct exynos_dp_platdata *exynos_dp_dt_parse_pdata(struct device *dev)
> return ERR_PTR(-EINVAL);
> }
>
> - return pd;
> -}
> -
> -static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp)
> -{
> - struct device_node *dp_phy_node = of_node_get(dp->dev->of_node);
> - u32 phy_base;
> - int ret = 0;
> -
> - dp_phy_node = of_find_node_by_name(dp_phy_node, "dptx-phy");
> - if (!dp_phy_node) {
> - dev_err(dp->dev, "could not find dptx-phy node\n");
> - return -ENODEV;
> - }
> -
> - if (of_property_read_u32(dp_phy_node, "reg", &phy_base)) {
> - dev_err(dp->dev, "failed to get reg for dptx-phy\n");
> - ret = -EINVAL;
> - goto err;
> - }
> -
> - if (of_property_read_u32(dp_phy_node, "samsung,enable-mask",
> - &dp->enable_mask)) {
> - dev_err(dp->dev, "failed to get enable-mask for dptx-phy\n");
> - ret = -EINVAL;
> - goto err;
> - }
> -
> - dp->phy_addr = ioremap(phy_base, SZ_4);
> - if (!dp->phy_addr) {
> - dev_err(dp->dev, "failed to ioremap dp-phy\n");
> - ret = -ENOMEM;
> - goto err;
> - }
> -
> -err:
> - of_node_put(dp_phy_node);
> -
> - return ret;
> -}
> -
> -static void exynos_dp_phy_init(struct exynos_dp_device *dp)
> -{
> - u32 reg;
> -
> - reg = __raw_readl(dp->phy_addr);
> - reg |= dp->enable_mask;
> - __raw_writel(reg, dp->phy_addr);
> -}
> -
> -static void exynos_dp_phy_exit(struct exynos_dp_device *dp)
> -{
> - u32 reg;
> + pd->phy_label = "dp";
Felipe had a comment to change the label to *display-port* no?
Thanks
Kishon
^ permalink raw reply
* Re: [PATCH V3 3/3] video: exynos_dp: Use the generic PHY driver
From: Jingoo Han @ 2013-07-01 7:07 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <51D12164.6030507@ti.com>
On Monday, July 01, 2013 3:28 PM, Kishon Vijay Abraham I wrote:
>
> Hi,
>
> On Monday 01 July 2013 10:54 AM, Jingoo Han wrote:
> > Use the generic PHY API instead of the platform callback to control
> > the DP PHY. The 'phy_label' field is added to the platform data
> > structure to allow PHY lookup on non-dt platforms.
> >
> > Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> > Acked-by: Felipe Balbi <balbi@ti.com>
> > ---
> > .../devicetree/bindings/video/exynos_dp.txt | 23 +---
> > drivers/video/exynos/exynos_dp_core.c | 118 ++------------------
> > drivers/video/exynos/exynos_dp_core.h | 2 +
> > include/video/exynos_dp.h | 6 +-
> > 4 files changed, 21 insertions(+), 128 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/video/exynos_dp.txt
> b/Documentation/devicetree/bindings/video/exynos_dp.txt
> > index 84f10c1..71645dc 100644
> > --- a/Documentation/devicetree/bindings/video/exynos_dp.txt
> > +++ b/Documentation/devicetree/bindings/video/exynos_dp.txt
> > @@ -1,17 +1,6 @@
> > The Exynos display port interface should be configured based on
> > the type of panel connected to it.
> >
> > -We use two nodes:
> > - -dp-controller node
> > - -dptx-phy node(defined inside dp-controller node)
> > -
> > -For the DP-PHY initialization, we use the dptx-phy node.
> > -Required properties for dptx-phy:
> > - -reg:
> > - Base address of DP PHY register.
> > - -samsung,enable-mask:
> > - The bit-mask used to enable/disable DP PHY.
> > -
> > For the Panel initialization, we read data from dp-controller node.
> > Required properties for dp-controller:
> > -compatible:
> > @@ -25,6 +14,10 @@ Required properties for dp-controller:
> > from common clock binding: handle to dp clock.
> > -clock-names:
> > from common clock binding: Shall be "dp".
> > + -phys:
> > + from general phy binding: the phandle for the PHY device.
> > + -phy-names:
> > + from general phy binding: Should be "dp".
> > -interrupt-parent:
> > phandle to Interrupt combiner node.
> > -samsung,color-space:
> > @@ -67,12 +60,8 @@ SOC specific portion:
> > interrupt-parent = <&combiner>;
> > clocks = <&clock 342>;
> > clock-names = "dp";
> > -
> > - dptx-phy {
> > - reg = <0x10040720>;
> > - samsung,enable-mask = <1>;
> > - };
> > -
> > + phys = <&dp_phy>;
> > + phy-names = "dp";
> > };
> >
> > Board Specific portion:
> > diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
> > index 12bbede..bac515b 100644
> > --- a/drivers/video/exynos/exynos_dp_core.c
> > +++ b/drivers/video/exynos/exynos_dp_core.c
> > @@ -19,6 +19,7 @@
> > #include <linux/interrupt.h>
> > #include <linux/delay.h>
> > #include <linux/of.h>
> > +#include <linux/phy/phy.h>
> >
> > #include <video/exynos_dp.h>
> >
> > @@ -960,84 +961,15 @@ static struct exynos_dp_platdata *exynos_dp_dt_parse_pdata(struct device *dev)
> > return ERR_PTR(-EINVAL);
> > }
> >
> > - return pd;
> > -}
> > -
> > -static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp)
> > -{
> > - struct device_node *dp_phy_node = of_node_get(dp->dev->of_node);
> > - u32 phy_base;
> > - int ret = 0;
> > -
> > - dp_phy_node = of_find_node_by_name(dp_phy_node, "dptx-phy");
> > - if (!dp_phy_node) {
> > - dev_err(dp->dev, "could not find dptx-phy node\n");
> > - return -ENODEV;
> > - }
> > -
> > - if (of_property_read_u32(dp_phy_node, "reg", &phy_base)) {
> > - dev_err(dp->dev, "failed to get reg for dptx-phy\n");
> > - ret = -EINVAL;
> > - goto err;
> > - }
> > -
> > - if (of_property_read_u32(dp_phy_node, "samsung,enable-mask",
> > - &dp->enable_mask)) {
> > - dev_err(dp->dev, "failed to get enable-mask for dptx-phy\n");
> > - ret = -EINVAL;
> > - goto err;
> > - }
> > -
> > - dp->phy_addr = ioremap(phy_base, SZ_4);
> > - if (!dp->phy_addr) {
> > - dev_err(dp->dev, "failed to ioremap dp-phy\n");
> > - ret = -ENOMEM;
> > - goto err;
> > - }
> > -
> > -err:
> > - of_node_put(dp_phy_node);
> > -
> > - return ret;
> > -}
> > -
> > -static void exynos_dp_phy_init(struct exynos_dp_device *dp)
> > -{
> > - u32 reg;
> > -
> > - reg = __raw_readl(dp->phy_addr);
> > - reg |= dp->enable_mask;
> > - __raw_writel(reg, dp->phy_addr);
> > -}
> > -
> > -static void exynos_dp_phy_exit(struct exynos_dp_device *dp)
> > -{
> > - u32 reg;
> > + pd->phy_label = "dp";
>
> Felipe had a comment to change the label to *display-port* no?
No, I don't think so. :)
I would like to use 'dp'.
Best regards,
Jingoo Han
>
> Thanks
> Kishon
^ permalink raw reply
* Re: [RFC 2/6] x86: provide platform-devices for boot-framebuffers
From: Stephen Warren @ 2013-07-01 15:48 UTC (permalink / raw)
To: David Herrmann
Cc: dri-devel@lists.freedesktop.org, linux-kernel, Dave Airlie,
linux-fbdev, Stephen Warren, Olof Johansson
In-Reply-To: <CANq1E4TJjmq2UFfarkdUF7s5KUPuzfUDiDU5BFfF-5QUsjpDwA@mail.gmail.com>
On 06/28/2013 04:11 AM, David Herrmann wrote:
> Hi
>
> On Wed, Jun 26, 2013 at 10:49 PM, Stephen Warren <swarren@wwwdotorg.org> wrote:
>> On 06/24/2013 04:27 PM, David Herrmann wrote:
>>> The current situation regarding boot-framebuffers (VGA, VESA/VBE, EFI) on
>>> x86 causes troubles when loading multiple fbdev drivers. The global
>>> "struct screen_info" does not provide any state-tracking about which
>>> drivers use the FBs. request_mem_region() theoretically works, but
>>> unfortunately vesafb/efifb ignore it due to quirks for broken boards.
>>>
>>> Avoid this by creating a "platform-framebuffer" device with a pointer
>>> to the "struct screen_info" as platform-data. Drivers can now create
>>> platform-drivers and the driver-core will refuse multiple drivers being
>>> active simultaneously.
>>>
>>> We keep the screen_info available for backwards-compatibility. Drivers
>>> can be converted in follow-up patches.
>>>
>>> Apart from "platform-framebuffer" devices, this also introduces a
>>> compatibility option for "simple-framebuffer" drivers which recently got
>>> introduced for OF based systems. If CONFIG_X86_SYSFB is selected, we
>>> try to match the screen_info against a simple-framebuffer supported
>>> format. If we succeed, we create a "simple-framebuffer" device instead
>>> of a platform-framebuffer.
...
>>> diff --git a/arch/x86/kernel/sysfb.c b/arch/x86/kernel/sysfb.c
...
>>> +#else /* CONFIG_X86_SYSFB */
>>> +
>>> +static bool parse_mode(const struct screen_info *si,
>>> + struct simplefb_platform_data *mode)
>>> +{
>>> + return false;
>>> +}
>>> +
>>> +static int create_simplefb(const struct screen_info *si,
>>> + const struct simplefb_platform_data *mode)
>>> +{
>>> + return -EINVAL;
>>> +}
>>> +
>>> +#endif /* CONFIG_X86_SYSFB */
>>
>> Following on from my ifdef comment above, I believe those versions of
>> those functions will always cause add_sysfb() to return -ENODEV, so you
>> may as well provide a static inline for add_sysfb() instead.
>
> No. add_sysfb() is supposed to always succeed. However, if
> parse_mode/create_simplefb fail, it creates a "platform-framebuffer"
> as fallback. I don't see any way to avoid these ifdefs. Considering
> the explanation above, could you elaborate how you think this should
> work?
Ah, I wasn't getting the fallback mechanism; that if creating a simplefb
wasn't possible or didn't succeed, a platformfb device would be created
instead.
Perhaps the following might be slightly clearer; there are certainly
fewer nesting levels:
static __init int add_sysfb(void)
{
const struct screen_info *si = &screen_info;
struct simplefb_platform_data mode;
struct platform_device *pd;
bool compatible = false;
int ret;
compatible = parse_mode(si, &mode);
if (compatible) {
ret = create_simplefb(si, &mode);
if (!ret)
return 0;
}
pd = platform_device_register_resndata(NULL,
"platform-framebuffer", 0,
NULL, 0, si, sizeof(*si));
ret = IS_ERR(pd) ? PTR_ERR(pd) : 0;
return ret;
}
^ permalink raw reply
* Re: [PATCH V3 3/3] video: exynos_dp: Use the generic PHY driver
From: Sylwester Nawrocki @ 2013-07-01 19:35 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <005401ce761b$504d7090$f0e851b0$@samsung.com>
Hi Jingoo,
On 07/01/2013 07:24 AM, Jingoo Han wrote:
> Use the generic PHY API instead of the platform callback to control
> the DP PHY. The 'phy_label' field is added to the platform data
> structure to allow PHY lookup on non-dt platforms.
Since Exynos is currently a dt-only platform upstream, how about
first making a pre-requisite patch that would remove support for
non-dt platforms from this driver ? I think you could now move the
content of file include/video/exynos_dp.h to e.g. drivers/video/
exynos/exynos_dp_core.h and remove the public exynos_dp.h file.
pdata->phy_init/exit could also be dropped and you wouldn't need
to care about non-dt support with the generic PHY API.
> Signed-off-by: Jingoo Han<jg1.han@samsung.com>
> Acked-by: Felipe Balbi<balbi@ti.com>
> ---
> .../devicetree/bindings/video/exynos_dp.txt | 23 +---
> drivers/video/exynos/exynos_dp_core.c | 118 ++------------------
> drivers/video/exynos/exynos_dp_core.h | 2 +
> include/video/exynos_dp.h | 6 +-
> 4 files changed, 21 insertions(+), 128 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/video/exynos_dp.txt b/Documentation/devicetree/bindings/video/exynos_dp.txt
> index 84f10c1..71645dc 100644
> --- a/Documentation/devicetree/bindings/video/exynos_dp.txt
> +++ b/Documentation/devicetree/bindings/video/exynos_dp.txt
> @@ -1,17 +1,6 @@
> The Exynos display port interface should be configured based on
> the type of panel connected to it.
>
> -We use two nodes:
> - -dp-controller node
> - -dptx-phy node(defined inside dp-controller node)
> -
> -For the DP-PHY initialization, we use the dptx-phy node.
> -Required properties for dptx-phy:
> - -reg:
> - Base address of DP PHY register.
> - -samsung,enable-mask:
> - The bit-mask used to enable/disable DP PHY.
> -
> For the Panel initialization, we read data from dp-controller node.
> Required properties for dp-controller:
> -compatible:
> @@ -25,6 +14,10 @@ Required properties for dp-controller:
> from common clock binding: handle to dp clock.
> -clock-names:
> from common clock binding: Shall be "dp".
> + -phys:
> + from general phy binding: the phandle for the PHY device.
> + -phy-names:
> + from general phy binding: Should be "dp".
> -interrupt-parent:
> phandle to Interrupt combiner node.
> -samsung,color-space:
> @@ -67,12 +60,8 @@ SOC specific portion:
> interrupt-parent =<&combiner>;
> clocks =<&clock 342>;
> clock-names = "dp";
> -
> - dptx-phy {
> - reg =<0x10040720>;
> - samsung,enable-mask =<1>;
> - };
> -
> + phys =<&dp_phy>;
> + phy-names = "dp";
> };
>
> Board Specific portion:
> diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
> index 12bbede..bac515b 100644
> --- a/drivers/video/exynos/exynos_dp_core.c
> +++ b/drivers/video/exynos/exynos_dp_core.c
> @@ -19,6 +19,7 @@
> #include<linux/interrupt.h>
> #include<linux/delay.h>
> #include<linux/of.h>
> +#include<linux/phy/phy.h>
>
> #include<video/exynos_dp.h>
>
> @@ -960,84 +961,15 @@ static struct exynos_dp_platdata *exynos_dp_dt_parse_pdata(struct device *dev)
> return ERR_PTR(-EINVAL);
> }
>
> - return pd;
> -}
> -
> -static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp)
> -{
> - struct device_node *dp_phy_node = of_node_get(dp->dev->of_node);
> - u32 phy_base;
> - int ret = 0;
> -
> - dp_phy_node = of_find_node_by_name(dp_phy_node, "dptx-phy");
> - if (!dp_phy_node) {
> - dev_err(dp->dev, "could not find dptx-phy node\n");
> - return -ENODEV;
> - }
> -
> - if (of_property_read_u32(dp_phy_node, "reg",&phy_base)) {
> - dev_err(dp->dev, "failed to get reg for dptx-phy\n");
> - ret = -EINVAL;
> - goto err;
> - }
> -
> - if (of_property_read_u32(dp_phy_node, "samsung,enable-mask",
> - &dp->enable_mask)) {
> - dev_err(dp->dev, "failed to get enable-mask for dptx-phy\n");
> - ret = -EINVAL;
> - goto err;
> - }
> -
> - dp->phy_addr = ioremap(phy_base, SZ_4);
> - if (!dp->phy_addr) {
> - dev_err(dp->dev, "failed to ioremap dp-phy\n");
> - ret = -ENOMEM;
> - goto err;
> - }
> -
> -err:
> - of_node_put(dp_phy_node);
> -
> - return ret;
> -}
> -
> -static void exynos_dp_phy_init(struct exynos_dp_device *dp)
> -{
> - u32 reg;
> -
> - reg = __raw_readl(dp->phy_addr);
> - reg |= dp->enable_mask;
> - __raw_writel(reg, dp->phy_addr);
> -}
> -
> -static void exynos_dp_phy_exit(struct exynos_dp_device *dp)
> -{
> - u32 reg;
> + pd->phy_label = "dp";
>
> - reg = __raw_readl(dp->phy_addr);
> - reg&= ~(dp->enable_mask);
> - __raw_writel(reg, dp->phy_addr);
> + return pd;
> }
I'm afraid you cannot simply remove the above code, the original binding
still needs to be supported. As far as I can see Arndale and smdk5250 are
already users of that binding in mainline now.
Thus the benefits of adding the generic PHY support to this Display Port
controller driver are starting to be a bit questionable.
> #else
> static struct exynos_dp_platdata *exynos_dp_dt_parse_pdata(struct device *dev)
> {
> return NULL;
> }
> -
> -static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp)
> -{
> - return -EINVAL;
> -}
> -
> -static void exynos_dp_phy_init(struct exynos_dp_device *dp)
> -{
> - return;
> -}
> -
> -static void exynos_dp_phy_exit(struct exynos_dp_device *dp)
> -{
> - return;
> -}
> #endif /* CONFIG_OF */
I think you could make the driver dependent on CONFIG_OF now and
related #ifdefs and !CONFIG_OF function stubs could be removed.
> static int exynos_dp_probe(struct platform_device *pdev)
> @@ -1061,10 +993,6 @@ static int exynos_dp_probe(struct platform_device *pdev)
> pdata = exynos_dp_dt_parse_pdata(&pdev->dev);
> if (IS_ERR(pdata))
> return PTR_ERR(pdata);
> -
> - ret = exynos_dp_dt_parse_phydata(dp);
> - if (ret)
> - return ret;
> } else {
> pdata = pdev->dev.platform_data;
> if (!pdata) {
> @@ -1073,6 +1001,10 @@ static int exynos_dp_probe(struct platform_device *pdev)
> }
> }
>
> + dp->phy = devm_phy_get(&pdev->dev, pdata->phy_label);
> + if (IS_ERR(dp->phy))
> + return PTR_ERR(dp->phy);
> +
> dp->clock = devm_clk_get(&pdev->dev, "dp");
> if (IS_ERR(dp->clock)) {
> dev_err(&pdev->dev, "failed to get clock\n");
> @@ -1097,13 +1029,7 @@ static int exynos_dp_probe(struct platform_device *pdev)
>
> dp->video_info = pdata->video_info;
>
> - if (pdev->dev.of_node) {
> - if (dp->phy_addr)
> - exynos_dp_phy_init(dp);
> - } else {
> - if (pdata->phy_init)
> - pdata->phy_init();
> - }
> + phy_power_on(dp->phy);
>
> exynos_dp_init_dp(dp);
>
> @@ -1121,42 +1047,27 @@ static int exynos_dp_probe(struct platform_device *pdev)
>
> static int exynos_dp_remove(struct platform_device *pdev)
> {
> - struct exynos_dp_platdata *pdata = pdev->dev.platform_data;
> struct exynos_dp_device *dp = platform_get_drvdata(pdev);
>
> flush_work(&dp->hotplug_work);
>
> - if (pdev->dev.of_node) {
> - if (dp->phy_addr)
> - exynos_dp_phy_exit(dp);
> - } else {
> - if (pdata->phy_exit)
> - pdata->phy_exit();
> - }
> + phy_power_off(dp->phy);
>
> clk_disable_unprepare(dp->clock);
>
> -
> return 0;
> }
>
> #ifdef CONFIG_PM_SLEEP
> static int exynos_dp_suspend(struct device *dev)
> {
> - struct exynos_dp_platdata *pdata = dev->platform_data;
> struct exynos_dp_device *dp = dev_get_drvdata(dev);
>
> disable_irq(dp->irq);
>
> flush_work(&dp->hotplug_work);
>
> - if (dev->of_node) {
> - if (dp->phy_addr)
> - exynos_dp_phy_exit(dp);
> - } else {
> - if (pdata->phy_exit)
> - pdata->phy_exit();
> - }
> + phy_power_off(dp->phy);
>
> clk_disable_unprepare(dp->clock);
>
> @@ -1165,16 +1076,9 @@ static int exynos_dp_suspend(struct device *dev)
>
> static int exynos_dp_resume(struct device *dev)
> {
> - struct exynos_dp_platdata *pdata = dev->platform_data;
> struct exynos_dp_device *dp = dev_get_drvdata(dev);
>
> - if (dev->of_node) {
> - if (dp->phy_addr)
> - exynos_dp_phy_init(dp);
> - } else {
> - if (pdata->phy_init)
> - pdata->phy_init();
> - }
> + phy_power_on(dp->phy);
>
> clk_prepare_enable(dp->clock);
>
> diff --git a/drivers/video/exynos/exynos_dp_core.h b/drivers/video/exynos/exynos_dp_core.h
> index 6c567bbf..b3d0328 100644
> --- a/drivers/video/exynos/exynos_dp_core.h
> +++ b/drivers/video/exynos/exynos_dp_core.h
> @@ -42,6 +42,8 @@ struct exynos_dp_device {
> struct video_info *video_info;
> struct link_train link_train;
> struct work_struct hotplug_work;
> +
> + struct phy *phy;
> };
>
> /* exynos_dp_reg.c */
> diff --git a/include/video/exynos_dp.h b/include/video/exynos_dp.h
> index bd8cabd..f38c9af 100644
> --- a/include/video/exynos_dp.h
> +++ b/include/video/exynos_dp.h
> @@ -122,10 +122,8 @@ struct video_info {
> };
>
> struct exynos_dp_platdata {
Since Exynos doesn't support non-dt boot now this platform data structure
is not used, is it ?
> - struct video_info *video_info;
> -
> - void (*phy_init)(void);
> - void (*phy_exit)(void);
> + struct video_info *video_info;
> + const char *phy_label;
> };
>
> #endif /* _EXYNOS_DP_H */
Regards,
Sylwester
^ permalink raw reply
* Re: [PATCH V3 2/3] phy: Add driver for Exynos DP PHY
From: Sylwester Nawrocki @ 2013-07-01 19:48 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <005301ce761b$32adf960$9809ec20$@samsung.com>
On 07/01/2013 07:24 AM, Jingoo Han wrote:
> Add a PHY provider driver for the Samsung Exynos SoC DP PHY.
>
> Signed-off-by: Jingoo Han<jg1.han@samsung.com>
> Cc: Sylwester Nawrocki<s.nawrocki@samsung.com>
> Acked-by: Felipe Balbi<balbi@ti.com>
> ---
> .../devicetree/bindings/phy/samsung-phy.txt | 8 ++
> drivers/phy/Kconfig | 5 +
> drivers/phy/Makefile | 1 +
> drivers/phy/phy-exynos-dp-video.c | 118 ++++++++++++++++++++
> 4 files changed, 132 insertions(+)
> create mode 100644 drivers/phy/phy-exynos-dp-video.c
>
> diff --git a/Documentation/devicetree/bindings/phy/samsung-phy.txt b/Documentation/devicetree/bindings/phy/samsung-phy.txt
> index 5ff208c..3fb656a 100644
> --- a/Documentation/devicetree/bindings/phy/samsung-phy.txt
> +++ b/Documentation/devicetree/bindings/phy/samsung-phy.txt
> @@ -12,3 +12,11 @@ the PHY specifier identifies the PHY and its meaning is as follows:
> 1 - MIPI DSIM 0,
> 2 - MIPI CSIS 1,
> 3 - MIPI DSIM 1.
> +
> +Samsung EXYNOS SoC series DP PHY
I would make it "Samsung EXYNOS SoC series Display Port PHY"
> +-------------------------------------------------
> +
> +Required properties:
> +- compatible : should be "samsung,exynos5250-dp-video-phy";
> +- reg : offset and length of the DP PHY register set;
> +- #phy-cells : from the generic phy bindings, must be 0;
s/phy/PHY ?
> \ No newline at end of file
Missing new line character.
> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> index 6f446d0..760f55a 100644
> --- a/drivers/phy/Kconfig
> +++ b/drivers/phy/Kconfig
> @@ -19,4 +19,9 @@ config PHY_EXYNOS_MIPI_VIDEO
> help
> Support for MIPI CSI-2 and MIPI DSI DPHY found on Samsung
> S5P and EXYNOS SoCs.
> +
> +config PHY_EXYNOS_DP_VIDEO
> + tristate "EXYNOS SoC series DP PHY driver"
"EXYNOS SoC series Display Port PHY driver" ?
> + help
> + Support for DP PHY found on Samsung EXYNOS SoCs.
s/DP/Display Port ?
> endif
> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> index 71d8841..0fd1340 100644
> --- a/drivers/phy/Makefile
> +++ b/drivers/phy/Makefile
> @@ -4,3 +4,4 @@
>
> obj-$(CONFIG_GENERIC_PHY) += phy-core.o
> obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o
> +obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o
> diff --git a/drivers/phy/phy-exynos-dp-video.c b/drivers/phy/phy-exynos-dp-video.c
> new file mode 100644
> index 0000000..75e1d11
> --- /dev/null
> +++ b/drivers/phy/phy-exynos-dp-video.c
> @@ -0,0 +1,118 @@
> +/*
> + * Samsung EXYNOS SoC series DP PHY driver
s/DP/Display Port ?
> + *
> + * Copyright (C) 2013 Samsung Electronics Co., Ltd.
> + * Author: Jingoo Han<jg1.han@samsung.com>
> + *
> + * 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/io.h>
> +#include<linux/kernel.h>
> +#include<linux/module.h>
> +#include<linux/of.h>
> +#include<linux/of_address.h>
> +#include<linux/phy/phy.h>
> +#include<linux/platform_device.h>
> +
> +/* DPTX_PHY_CONTROL register */
> +#define EXYNOS_DPTX_PHY_ENABLE (1<< 0)
> +
> +struct exynos_dp_video_phy {
> + void __iomem *regs;
> +};
> +
> +static int __set_phy_state(struct exynos_dp_video_phy *state, unsigned int on)
> +{
> + void __iomem *addr;
How about just dropping this local variable ?
> + u32 reg;
> +
> + addr = state->regs;
> +
> + reg = readl(addr);
> + if (on)
> + reg |= EXYNOS_DPTX_PHY_ENABLE;
> + else
> + reg&= ~EXYNOS_DPTX_PHY_ENABLE;
> + writel(reg, addr);
> +
> + return 0;
> +}
> +
> +static int exynos_dp_video_phy_power_on(struct phy *phy)
> +{
> + struct exynos_dp_video_phy *state = phy_get_drvdata(phy);
> +
> + return __set_phy_state(state, 1);
> +}
> +
> +static int exynos_dp_video_phy_power_off(struct phy *phy)
> +{
> + struct exynos_dp_video_phy *state = phy_get_drvdata(phy);
> +
> + return __set_phy_state(state, 0);
> +}
> +
> +static struct phy_ops exynos_dp_video_phy_ops = {
> + .power_on = exynos_dp_video_phy_power_on,
> + .power_off = exynos_dp_video_phy_power_off,
> + .owner = THIS_MODULE,
> +};
> +
> +static int exynos_dp_video_phy_probe(struct platform_device *pdev)
> +{
> + struct exynos_dp_video_phy *state;
> + struct device *dev =&pdev->dev;
> + struct resource *res;
> + struct phy_provider *phy_provider;
> + struct phy *phy;
> +
> + state = devm_kzalloc(dev, sizeof(*state), GFP_KERNEL);
> + 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);
I can't see any corresponding dev_get_drvdata(), it should be safe
to remove this assignment.
> + phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
> + if (IS_ERR(phy_provider))
> + return PTR_ERR(phy_provider);
> +
> + phy = devm_phy_create(dev, 0,&exynos_dp_video_phy_ops, "dp");
The label could be NULL, since there is no need to support non-dt config.
> + if (IS_ERR(phy)) {
> + dev_err(dev, "failed to create DP PHY\n");
> + return PTR_ERR(phy);
> + }
> + phy_set_drvdata(phy, state);
> +
> + return 0;
> +}
> +
> +#ifdef CONFIG_OF
You don't use of_match_ptr() macro to assign of_match_table to the driver
structure below. This means build with CONFIG_OF disabled is broken now.
I would just remove that #ifdef and would make the driver depends on
CONFIG_OF.
> +static const struct of_device_id exynos_dp_video_phy_of_match[] = {
> + { .compatible = "samsung,exynos5250-dp-video-phy" },
> + { },
> +};
> +MODULE_DEVICE_TABLE(of, exynos_dp_video_phy_of_match);
> +#endif
> +
> +static struct platform_driver exynos_dp_video_phy_driver = {
> + .probe = exynos_dp_video_phy_probe,
> + .driver = {
> + .name = "exynos-dp-video-phy",
> + .owner = THIS_MODULE,
> + .of_match_table = exynos_dp_video_phy_of_match,
> + }
> +};
> +module_platform_driver(exynos_dp_video_phy_driver);
> +
> +MODULE_AUTHOR("Jingoo Han<jg1.han@samsung.com>");
> +MODULE_DESCRIPTION("Samsung EXYNOS SoC DP PHY driver");
> +MODULE_LICENSE("GPL v2");
Thanks,
Sylwester
^ permalink raw reply
* [patch -next] fb: fix recent breakage in correct_chipset()
From: Dan Carpenter @ 2013-07-02 6:28 UTC (permalink / raw)
To: linux-fbdev
The 6e36308a6f "fb: fix atyfb build warning" isn't right. It makes all
the indexes off by one. This patch reverts it and casts the
ARRAY_SIZE() to int to silence the build warning.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index a89c15d..9b0f12c 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -435,8 +435,8 @@ static int correct_chipset(struct atyfb_par *par)
const char *name;
int i;
- for (i = ARRAY_SIZE(aty_chips); i > 0; i--)
- if (par->pci_id = aty_chips[i - 1].pci_id)
+ for (i = (int)ARRAY_SIZE(aty_chips) - 1; i >= 0; i--)
+ if (par->pci_id = aty_chips[i].pci_id)
break;
if (i < 0)
^ permalink raw reply related
* Re: [PATCH V3 2/3] phy: Add driver for Exynos DP PHY
From: Jingoo Han @ 2013-07-02 6:58 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <51D1DCF0.50803@gmail.com>
On Tuesday, July 02, 2013 4:48 AM, Sylwester Nawrocki wrote:
> On 07/01/2013 07:24 AM, Jingoo Han wrote:
> > Add a PHY provider driver for the Samsung Exynos SoC DP PHY.
> >
> > Signed-off-by: Jingoo Han<jg1.han@samsung.com>
> > Cc: Sylwester Nawrocki<s.nawrocki@samsung.com>
> > Acked-by: Felipe Balbi<balbi@ti.com>
> > ---
> > .../devicetree/bindings/phy/samsung-phy.txt | 8 ++
> > drivers/phy/Kconfig | 5 +
> > drivers/phy/Makefile | 1 +
> > drivers/phy/phy-exynos-dp-video.c | 118 ++++++++++++++++++++
> > 4 files changed, 132 insertions(+)
> > create mode 100644 drivers/phy/phy-exynos-dp-video.c
> >
> > diff --git a/Documentation/devicetree/bindings/phy/samsung-phy.txt
> b/Documentation/devicetree/bindings/phy/samsung-phy.txt
> > index 5ff208c..3fb656a 100644
> > --- a/Documentation/devicetree/bindings/phy/samsung-phy.txt
> > +++ b/Documentation/devicetree/bindings/phy/samsung-phy.txt
> > @@ -12,3 +12,11 @@ the PHY specifier identifies the PHY and its meaning is as follows:
> > 1 - MIPI DSIM 0,
> > 2 - MIPI CSIS 1,
> > 3 - MIPI DSIM 1.
> > +
> > +Samsung EXYNOS SoC series DP PHY
>
> I would make it "Samsung EXYNOS SoC series Display Port PHY"
OK.
>
> > +-------------------------------------------------
> > +
> > +Required properties:
> > +- compatible : should be "samsung,exynos5250-dp-video-phy";
> > +- reg : offset and length of the DP PHY register set;
> > +- #phy-cells : from the generic phy bindings, must be 0;
>
> s/phy/PHY ?
OK.
>
> > \ No newline at end of file
>
> Missing new line character.
OK.
>
> > diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
> > index 6f446d0..760f55a 100644
> > --- a/drivers/phy/Kconfig
> > +++ b/drivers/phy/Kconfig
> > @@ -19,4 +19,9 @@ config PHY_EXYNOS_MIPI_VIDEO
> > help
> > Support for MIPI CSI-2 and MIPI DSI DPHY found on Samsung
> > S5P and EXYNOS SoCs.
> > +
> > +config PHY_EXYNOS_DP_VIDEO
> > + tristate "EXYNOS SoC series DP PHY driver"
>
> "EXYNOS SoC series Display Port PHY driver" ?
>
> > + help
> > + Support for DP PHY found on Samsung EXYNOS SoCs.
>
> s/DP/Display Port ?
OK.
>
> > endif
> > diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
> > index 71d8841..0fd1340 100644
> > --- a/drivers/phy/Makefile
> > +++ b/drivers/phy/Makefile
> > @@ -4,3 +4,4 @@
> >
> > obj-$(CONFIG_GENERIC_PHY) += phy-core.o
> > obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o
> > +obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o
> > diff --git a/drivers/phy/phy-exynos-dp-video.c b/drivers/phy/phy-exynos-dp-video.c
> > new file mode 100644
> > index 0000000..75e1d11
> > --- /dev/null
> > +++ b/drivers/phy/phy-exynos-dp-video.c
> > @@ -0,0 +1,118 @@
> > +/*
> > + * Samsung EXYNOS SoC series DP PHY driver
>
> s/DP/Display Port ?
OK.
>
> > + *
> > + * Copyright (C) 2013 Samsung Electronics Co., Ltd.
> > + * Author: Jingoo Han<jg1.han@samsung.com>
> > + *
> > + * 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/io.h>
> > +#include<linux/kernel.h>
> > +#include<linux/module.h>
> > +#include<linux/of.h>
> > +#include<linux/of_address.h>
> > +#include<linux/phy/phy.h>
> > +#include<linux/platform_device.h>
> > +
> > +/* DPTX_PHY_CONTROL register */
> > +#define EXYNOS_DPTX_PHY_ENABLE (1<< 0)
> > +
> > +struct exynos_dp_video_phy {
> > + void __iomem *regs;
> > +};
> > +
> > +static int __set_phy_state(struct exynos_dp_video_phy *state, unsigned int on)
> > +{
> > + void __iomem *addr;
>
> How about just dropping this local variable ?
OK.
I will drop this local variable.
>
> > + u32 reg;
> > +
> > + addr = state->regs;
> > +
> > + reg = readl(addr);
> > + if (on)
> > + reg |= EXYNOS_DPTX_PHY_ENABLE;
> > + else
> > + reg&= ~EXYNOS_DPTX_PHY_ENABLE;
> > + writel(reg, addr);
> > +
> > + return 0;
> > +}
> > +
> > +static int exynos_dp_video_phy_power_on(struct phy *phy)
> > +{
> > + struct exynos_dp_video_phy *state = phy_get_drvdata(phy);
> > +
> > + return __set_phy_state(state, 1);
> > +}
> > +
> > +static int exynos_dp_video_phy_power_off(struct phy *phy)
> > +{
> > + struct exynos_dp_video_phy *state = phy_get_drvdata(phy);
> > +
> > + return __set_phy_state(state, 0);
> > +}
> > +
> > +static struct phy_ops exynos_dp_video_phy_ops = {
> > + .power_on = exynos_dp_video_phy_power_on,
> > + .power_off = exynos_dp_video_phy_power_off,
> > + .owner = THIS_MODULE,
> > +};
> > +
> > +static int exynos_dp_video_phy_probe(struct platform_device *pdev)
> > +{
> > + struct exynos_dp_video_phy *state;
> > + struct device *dev =&pdev->dev;
> > + struct resource *res;
> > + struct phy_provider *phy_provider;
> > + struct phy *phy;
> > +
> > + state = devm_kzalloc(dev, sizeof(*state), GFP_KERNEL);
> > + 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);
>
> I can't see any corresponding dev_get_drvdata(), it should be safe
> to remove this assignment.
OK.
I will remove 'dev_set_drvdata(dev, state)'.
>
> > + phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
> > + if (IS_ERR(phy_provider))
> > + return PTR_ERR(phy_provider);
> > +
> > + phy = devm_phy_create(dev, 0,&exynos_dp_video_phy_ops, "dp");
>
> The label could be NULL, since there is no need to support non-dt config.
OK.
I will replace "dp" with NULL.
>
> > + if (IS_ERR(phy)) {
> > + dev_err(dev, "failed to create DP PHY\n");
> > + return PTR_ERR(phy);
> > + }
> > + phy_set_drvdata(phy, state);
> > +
> > + return 0;
> > +}
> > +
> > +#ifdef CONFIG_OF
>
> You don't use of_match_ptr() macro to assign of_match_table to the driver
> structure below. This means build with CONFIG_OF disabled is broken now.
> I would just remove that #ifdef and would make the driver depends on
> CONFIG_OF.
OK.
I will add 'depends on OF', then remove '#ifdef CONFIG_OF'.
Thank you for your detailed comment. :)
Best regards,
Jingoo Han
>
> > +static const struct of_device_id exynos_dp_video_phy_of_match[] = {
> > + { .compatible = "samsung,exynos5250-dp-video-phy" },
> > + { },
> > +};
> > +MODULE_DEVICE_TABLE(of, exynos_dp_video_phy_of_match);
> > +#endif
> > +
> > +static struct platform_driver exynos_dp_video_phy_driver = {
> > + .probe = exynos_dp_video_phy_probe,
> > + .driver = {
> > + .name = "exynos-dp-video-phy",
> > + .owner = THIS_MODULE,
> > + .of_match_table = exynos_dp_video_phy_of_match,
> > + }
> > +};
> > +module_platform_driver(exynos_dp_video_phy_driver);
> > +
> > +MODULE_AUTHOR("Jingoo Han<jg1.han@samsung.com>");
> > +MODULE_DESCRIPTION("Samsung EXYNOS SoC DP PHY driver");
> > +MODULE_LICENSE("GPL v2");
>
> Thanks,
> Sylwester
^ permalink raw reply
* Re: [PATCH V3 3/3] video: exynos_dp: Use the generic PHY driver
From: Jingoo Han @ 2013-07-02 7:05 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <51D1DA07.3010803@gmail.com>
On Tuesday, July 02, 2013 4:36 AM, Sylwester Nawrocki wrote:
>
> Hi Jingoo,
>
> On 07/01/2013 07:24 AM, Jingoo Han wrote:
> > Use the generic PHY API instead of the platform callback to control
> > the DP PHY. The 'phy_label' field is added to the platform data
> > structure to allow PHY lookup on non-dt platforms.
>
> Since Exynos is currently a dt-only platform upstream, how about
> first making a pre-requisite patch that would remove support for
> non-dt platforms from this driver ? I think you could now move the
> content of file include/video/exynos_dp.h to e.g. drivers/video/
> exynos/exynos_dp_core.h and remove the public exynos_dp.h file.
> pdata->phy_init/exit could also be dropped and you wouldn't need
> to care about non-dt support with the generic PHY API.
Yes, you're right.
I will make the pre-requisite patch that would remove support for
non-dt platforms from exynos_dp_core.c.
Then, I will move the content of file include/video/exynos_dp.h
and remove 'exynos_dp.h' file.
>
> > Signed-off-by: Jingoo Han<jg1.han@samsung.com>
> > Acked-by: Felipe Balbi<balbi@ti.com>
> > ---
> > .../devicetree/bindings/video/exynos_dp.txt | 23 +---
> > drivers/video/exynos/exynos_dp_core.c | 118 ++------------------
> > drivers/video/exynos/exynos_dp_core.h | 2 +
> > include/video/exynos_dp.h | 6 +-
> > 4 files changed, 21 insertions(+), 128 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/video/exynos_dp.txt
> b/Documentation/devicetree/bindings/video/exynos_dp.txt
> > index 84f10c1..71645dc 100644
> > --- a/Documentation/devicetree/bindings/video/exynos_dp.txt
> > +++ b/Documentation/devicetree/bindings/video/exynos_dp.txt
> > @@ -1,17 +1,6 @@
> > The Exynos display port interface should be configured based on
> > the type of panel connected to it.
> >
> > -We use two nodes:
> > - -dp-controller node
> > - -dptx-phy node(defined inside dp-controller node)
> > -
> > -For the DP-PHY initialization, we use the dptx-phy node.
> > -Required properties for dptx-phy:
> > - -reg:
> > - Base address of DP PHY register.
> > - -samsung,enable-mask:
> > - The bit-mask used to enable/disable DP PHY.
> > -
> > For the Panel initialization, we read data from dp-controller node.
> > Required properties for dp-controller:
> > -compatible:
> > @@ -25,6 +14,10 @@ Required properties for dp-controller:
> > from common clock binding: handle to dp clock.
> > -clock-names:
> > from common clock binding: Shall be "dp".
> > + -phys:
> > + from general phy binding: the phandle for the PHY device.
> > + -phy-names:
> > + from general phy binding: Should be "dp".
> > -interrupt-parent:
> > phandle to Interrupt combiner node.
> > -samsung,color-space:
> > @@ -67,12 +60,8 @@ SOC specific portion:
> > interrupt-parent =<&combiner>;
> > clocks =<&clock 342>;
> > clock-names = "dp";
> > -
> > - dptx-phy {
> > - reg =<0x10040720>;
> > - samsung,enable-mask =<1>;
> > - };
> > -
> > + phys =<&dp_phy>;
> > + phy-names = "dp";
> > };
> >
> > Board Specific portion:
> > diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
> > index 12bbede..bac515b 100644
> > --- a/drivers/video/exynos/exynos_dp_core.c
> > +++ b/drivers/video/exynos/exynos_dp_core.c
> > @@ -19,6 +19,7 @@
> > #include<linux/interrupt.h>
> > #include<linux/delay.h>
> > #include<linux/of.h>
> > +#include<linux/phy/phy.h>
> >
> > #include<video/exynos_dp.h>
> >
> > @@ -960,84 +961,15 @@ static struct exynos_dp_platdata *exynos_dp_dt_parse_pdata(struct device *dev)
> > return ERR_PTR(-EINVAL);
> > }
> >
> > - return pd;
> > -}
> > -
> > -static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp)
> > -{
> > - struct device_node *dp_phy_node = of_node_get(dp->dev->of_node);
> > - u32 phy_base;
> > - int ret = 0;
> > -
> > - dp_phy_node = of_find_node_by_name(dp_phy_node, "dptx-phy");
> > - if (!dp_phy_node) {
> > - dev_err(dp->dev, "could not find dptx-phy node\n");
> > - return -ENODEV;
> > - }
> > -
> > - if (of_property_read_u32(dp_phy_node, "reg",&phy_base)) {
> > - dev_err(dp->dev, "failed to get reg for dptx-phy\n");
> > - ret = -EINVAL;
> > - goto err;
> > - }
> > -
> > - if (of_property_read_u32(dp_phy_node, "samsung,enable-mask",
> > - &dp->enable_mask)) {
> > - dev_err(dp->dev, "failed to get enable-mask for dptx-phy\n");
> > - ret = -EINVAL;
> > - goto err;
> > - }
> > -
> > - dp->phy_addr = ioremap(phy_base, SZ_4);
> > - if (!dp->phy_addr) {
> > - dev_err(dp->dev, "failed to ioremap dp-phy\n");
> > - ret = -ENOMEM;
> > - goto err;
> > - }
> > -
> > -err:
> > - of_node_put(dp_phy_node);
> > -
> > - return ret;
> > -}
> > -
> > -static void exynos_dp_phy_init(struct exynos_dp_device *dp)
> > -{
> > - u32 reg;
> > -
> > - reg = __raw_readl(dp->phy_addr);
> > - reg |= dp->enable_mask;
> > - __raw_writel(reg, dp->phy_addr);
> > -}
> > -
> > -static void exynos_dp_phy_exit(struct exynos_dp_device *dp)
> > -{
> > - u32 reg;
> > + pd->phy_label = "dp";
> >
> > - reg = __raw_readl(dp->phy_addr);
> > - reg&= ~(dp->enable_mask);
> > - __raw_writel(reg, dp->phy_addr);
> > + return pd;
> > }
>
> I'm afraid you cannot simply remove the above code, the original binding
> still needs to be supported. As far as I can see Arndale and smdk5250 are
> already users of that binding in mainline now.
>
> Thus the benefits of adding the generic PHY support to this Display Port
> controller driver are starting to be a bit questionable.
OK.
I will keep supporting this original DT binding.
>
> > #else
> > static struct exynos_dp_platdata *exynos_dp_dt_parse_pdata(struct device *dev)
> > {
> > return NULL;
> > }
> > -
> > -static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp)
> > -{
> > - return -EINVAL;
> > -}
> > -
> > -static void exynos_dp_phy_init(struct exynos_dp_device *dp)
> > -{
> > - return;
> > -}
> > -
> > -static void exynos_dp_phy_exit(struct exynos_dp_device *dp)
> > -{
> > - return;
> > -}
> > #endif /* CONFIG_OF */
>
> I think you could make the driver dependent on CONFIG_OF now and
> related #ifdefs and !CONFIG_OF function stubs could be removed.
OK.
I will add 'depends on OF', then remove '#ifdef CONFIG_OF'
as well as !CONFIG_OF function stubs.
>
> > static int exynos_dp_probe(struct platform_device *pdev)
> > @@ -1061,10 +993,6 @@ static int exynos_dp_probe(struct platform_device *pdev)
> > pdata = exynos_dp_dt_parse_pdata(&pdev->dev);
> > if (IS_ERR(pdata))
> > return PTR_ERR(pdata);
> > -
> > - ret = exynos_dp_dt_parse_phydata(dp);
> > - if (ret)
> > - return ret;
> > } else {
> > pdata = pdev->dev.platform_data;
> > if (!pdata) {
> > @@ -1073,6 +1001,10 @@ static int exynos_dp_probe(struct platform_device *pdev)
> > }
> > }
> >
> > + dp->phy = devm_phy_get(&pdev->dev, pdata->phy_label);
> > + if (IS_ERR(dp->phy))
> > + return PTR_ERR(dp->phy);
> > +
> > dp->clock = devm_clk_get(&pdev->dev, "dp");
> > if (IS_ERR(dp->clock)) {
> > dev_err(&pdev->dev, "failed to get clock\n");
> > @@ -1097,13 +1029,7 @@ static int exynos_dp_probe(struct platform_device *pdev)
> >
> > dp->video_info = pdata->video_info;
> >
> > - if (pdev->dev.of_node) {
> > - if (dp->phy_addr)
> > - exynos_dp_phy_init(dp);
> > - } else {
> > - if (pdata->phy_init)
> > - pdata->phy_init();
> > - }
> > + phy_power_on(dp->phy);
> >
> > exynos_dp_init_dp(dp);
> >
> > @@ -1121,42 +1047,27 @@ static int exynos_dp_probe(struct platform_device *pdev)
> >
> > static int exynos_dp_remove(struct platform_device *pdev)
> > {
> > - struct exynos_dp_platdata *pdata = pdev->dev.platform_data;
> > struct exynos_dp_device *dp = platform_get_drvdata(pdev);
> >
> > flush_work(&dp->hotplug_work);
> >
> > - if (pdev->dev.of_node) {
> > - if (dp->phy_addr)
> > - exynos_dp_phy_exit(dp);
> > - } else {
> > - if (pdata->phy_exit)
> > - pdata->phy_exit();
> > - }
> > + phy_power_off(dp->phy);
> >
> > clk_disable_unprepare(dp->clock);
> >
> > -
> > return 0;
> > }
> >
> > #ifdef CONFIG_PM_SLEEP
> > static int exynos_dp_suspend(struct device *dev)
> > {
> > - struct exynos_dp_platdata *pdata = dev->platform_data;
> > struct exynos_dp_device *dp = dev_get_drvdata(dev);
> >
> > disable_irq(dp->irq);
> >
> > flush_work(&dp->hotplug_work);
> >
> > - if (dev->of_node) {
> > - if (dp->phy_addr)
> > - exynos_dp_phy_exit(dp);
> > - } else {
> > - if (pdata->phy_exit)
> > - pdata->phy_exit();
> > - }
> > + phy_power_off(dp->phy);
> >
> > clk_disable_unprepare(dp->clock);
> >
> > @@ -1165,16 +1076,9 @@ static int exynos_dp_suspend(struct device *dev)
> >
> > static int exynos_dp_resume(struct device *dev)
> > {
> > - struct exynos_dp_platdata *pdata = dev->platform_data;
> > struct exynos_dp_device *dp = dev_get_drvdata(dev);
> >
> > - if (dev->of_node) {
> > - if (dp->phy_addr)
> > - exynos_dp_phy_init(dp);
> > - } else {
> > - if (pdata->phy_init)
> > - pdata->phy_init();
> > - }
> > + phy_power_on(dp->phy);
> >
> > clk_prepare_enable(dp->clock);
> >
> > diff --git a/drivers/video/exynos/exynos_dp_core.h b/drivers/video/exynos/exynos_dp_core.h
> > index 6c567bbf..b3d0328 100644
> > --- a/drivers/video/exynos/exynos_dp_core.h
> > +++ b/drivers/video/exynos/exynos_dp_core.h
> > @@ -42,6 +42,8 @@ struct exynos_dp_device {
> > struct video_info *video_info;
> > struct link_train link_train;
> > struct work_struct hotplug_work;
> > +
> > + struct phy *phy;
> > };
> >
> > /* exynos_dp_reg.c */
> > diff --git a/include/video/exynos_dp.h b/include/video/exynos_dp.h
> > index bd8cabd..f38c9af 100644
> > --- a/include/video/exynos_dp.h
> > +++ b/include/video/exynos_dp.h
> > @@ -122,10 +122,8 @@ struct video_info {
> > };
> >
> > struct exynos_dp_platdata {
>
> Since Exynos doesn't support non-dt boot now this platform data structure
> is not used, is it ?
You're right.
It can be removed, if Exynos DP driver does not non-DT.
Best regards,
Jingoo Han
>
> > - struct video_info *video_info;
> > -
> > - void (*phy_init)(void);
> > - void (*phy_exit)(void);
> > + struct video_info *video_info;
> > + const char *phy_label;
> > };
> >
> > #endif /* _EXYNOS_DP_H */
>
> Regards,
> Sylwester
^ permalink raw reply
* [PATCH V4 0/4] Generic PHY driver for the Exynos SoC DP PHY
From: Jingoo Han @ 2013-07-02 8:38 UTC (permalink / raw)
To: linux-arm-kernel
This patch series adds a simple driver for the Samsung Exynos SoC
series DP transmitter PHY, using the generic PHY framework [1].
Previously the DP PHY used an internal DT node to control the PHY
power enable bit.
These patches was tested on Exynos5250.
This PATCH v4 follows:
* PATCH v3, sent on July, 1st 2013
* PATCH v2, sent on June, 28th 2013
* PATCH v1, sent on June, 28th 2013
Changes between v3 and v4:
* Added OF dependancy.
* Removed redundant local variable 'void __iomem *addr'.
* Removed unnecessary dev_set_drvdata().
* Added a patch that remove non-DT support for Exynos
Display Port driver.
* Removed unnecessary 'struct exynos_dp_platdata'.
* Kept supporting the original bindings for DT compatibility.
Changes between v2 and v3:
* Removed redundant spinlock
* Removed 'struct phy' from 'struct exynos_dp_video_phy'
* Updated 'samsung-phy.txt', instead of creating
'samsung,exynos5250-dp-video-phy.txt'.
* Removed unnecessary additional specifier from 'phys'
DT property.
* Added 'phys', 'phy-names' properties to 'exynos_dp.txt' file.
* Added Felipe Balbi's Acked-by.
Changes between v1 and v2:
* Replaced exynos_dp_video_phy_xlate() with of_phy_simple_xlate(),
as Kishon Vijay Abraham I guided.
* Set the value of phy-cells as 0, because the phy_provider implements
only one PHY.
* Removed unnecessary header include.
* Added '#ifdef CONFIG_OF' and of_match_ptr macro.
This series depends on the generic PHY framework [1]. These patches
refer to Sylwester Nawrocki's patches about Exynos MIPI [2].
[1] https://lkml.org/lkml/2013/6/26/259
[2] http://www.spinics.net/lists/linux-samsung-soc/msg20098.html
Jingoo Han (4):
ARM: dts: Add DP PHY node to exynos5250.dtsi
phy: Add driver for Exynos DP PHY
video: exynos_dp: remove non-DT support for Exynos Display Port
video: exynos_dp: Use the generic PHY driver
.../devicetree/bindings/phy/samsung-phy.txt | 8 ++
.../devicetree/bindings/video/exynos_dp.txt | 23 +++++---------------
arch/arm/boot/dts/exynos5250.dtsi | 13 ++++++++-----
drivers/phy/Kconfig | 6 ++
drivers/phy/Makefile | 1 +
drivers/phy/phy-exynos-dp-video.c | 111 ++++++++++++++++++++
drivers/video/exynos/Kconfig | 2 +-
drivers/video/exynos/exynos_dp_core.c | 132 +++++++----------------------
drivers/video/exynos/exynos_dp_core.h | 111 +++++++++++++++++++++++++++
drivers/video/exynos/exynos_dp_reg.c | 2 -
include/video/exynos_dp.h | 131 ---------------------------------
11 files changed, 289 insertions(+), 251 deletions(-)
create mode 100644 drivers/phy/phy-exynos-dp-video.c
delete mode 100644 include/video/exynos_dp.h
--
1.7.10.4
^ permalink raw reply
* [PATCH V4 1/4] ARM: dts: Add DP PHY node to exynos5250.dtsi
From: Jingoo Han @ 2013-07-02 8:39 UTC (permalink / raw)
To: linux-arm-kernel
Add PHY provider node for the DP PHY.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Felipe Balbi <balbi@ti.com>
---
arch/arm/boot/dts/exynos5250.dtsi | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 41cd625..7e397c6 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -614,6 +614,12 @@
interrupts = <0 94 0>;
};
+ dp_phy: video-phy@10040720 {
+ compatible = "samsung,exynos5250-dp-video-phy";
+ reg = <0x10040720 4>;
+ #phy-cells = <0>;
+ };
+
dp-controller {
compatible = "samsung,exynos5-dp";
reg = <0x145b0000 0x1000>;
@@ -623,11 +629,8 @@
clock-names = "dp";
#address-cells = <1>;
#size-cells = <0>;
-
- dptx-phy {
- reg = <0x10040720>;
- samsung,enable-mask = <1>;
- };
+ phys = <&dp_phy>;
+ phy-names = "dp";
};
fimd {
--
1.7.10.4
^ permalink raw reply related
* [PATCH V4 2/4] phy: Add driver for Exynos DP PHY
From: Jingoo Han @ 2013-07-02 8:40 UTC (permalink / raw)
To: linux-arm-kernel
Add a PHY provider driver for the Samsung Exynos SoC DP PHY.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Felipe Balbi <balbi@ti.com>
---
.../devicetree/bindings/phy/samsung-phy.txt | 8 ++
drivers/phy/Kconfig | 6 ++
drivers/phy/Makefile | 1 +
drivers/phy/phy-exynos-dp-video.c | 111 ++++++++++++++++++++
4 files changed, 126 insertions(+)
create mode 100644 drivers/phy/phy-exynos-dp-video.c
diff --git a/Documentation/devicetree/bindings/phy/samsung-phy.txt b/Documentation/devicetree/bindings/phy/samsung-phy.txt
index 5ff208c..c0fccaa 100644
--- a/Documentation/devicetree/bindings/phy/samsung-phy.txt
+++ b/Documentation/devicetree/bindings/phy/samsung-phy.txt
@@ -12,3 +12,11 @@ the PHY specifier identifies the PHY and its meaning is as follows:
1 - MIPI DSIM 0,
2 - MIPI CSIS 1,
3 - MIPI DSIM 1.
+
+Samsung EXYNOS SoC series Display Port PHY
+-------------------------------------------------
+
+Required properties:
+- compatible : should be "samsung,exynos5250-dp-video-phy";
+- reg : offset and length of the Display Port PHY register set;
+- #phy-cells : from the generic PHY bindings, must be 0;
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 6f446d0..ed0b1b8 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -19,4 +19,10 @@ config PHY_EXYNOS_MIPI_VIDEO
help
Support for MIPI CSI-2 and MIPI DSI DPHY found on Samsung
S5P and EXYNOS SoCs.
+
+config PHY_EXYNOS_DP_VIDEO
+ tristate "EXYNOS SoC series Display Port PHY driver"
+ depends on OF
+ help
+ Support for Display Port PHY found on Samsung EXYNOS SoCs.
endif
diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
index 71d8841..0fd1340 100644
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@ -4,3 +4,4 @@
obj-$(CONFIG_GENERIC_PHY) += phy-core.o
obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o
+obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o
diff --git a/drivers/phy/phy-exynos-dp-video.c b/drivers/phy/phy-exynos-dp-video.c
new file mode 100644
index 0000000..3c8e247
--- /dev/null
+++ b/drivers/phy/phy-exynos-dp-video.c
@@ -0,0 +1,111 @@
+/*
+ * Samsung EXYNOS SoC series Display Port PHY driver
+ *
+ * Copyright (C) 2013 Samsung Electronics Co., Ltd.
+ * Author: Jingoo Han <jg1.han@samsung.com>
+ *
+ * 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/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/phy/phy.h>
+#include <linux/platform_device.h>
+
+/* DPTX_PHY_CONTROL register */
+#define EXYNOS_DPTX_PHY_ENABLE (1 << 0)
+
+struct exynos_dp_video_phy {
+ void __iomem *regs;
+};
+
+static int __set_phy_state(struct exynos_dp_video_phy *state, unsigned int on)
+{
+ u32 reg;
+
+ reg = readl(state->regs);
+ if (on)
+ reg |= EXYNOS_DPTX_PHY_ENABLE;
+ else
+ reg &= ~EXYNOS_DPTX_PHY_ENABLE;
+ writel(reg, state->regs);
+
+ return 0;
+}
+
+static int exynos_dp_video_phy_power_on(struct phy *phy)
+{
+ struct exynos_dp_video_phy *state = phy_get_drvdata(phy);
+
+ return __set_phy_state(state, 1);
+}
+
+static int exynos_dp_video_phy_power_off(struct phy *phy)
+{
+ struct exynos_dp_video_phy *state = phy_get_drvdata(phy);
+
+ return __set_phy_state(state, 0);
+}
+
+static struct phy_ops exynos_dp_video_phy_ops = {
+ .power_on = exynos_dp_video_phy_power_on,
+ .power_off = exynos_dp_video_phy_power_off,
+ .owner = THIS_MODULE,
+};
+
+static int exynos_dp_video_phy_probe(struct platform_device *pdev)
+{
+ struct exynos_dp_video_phy *state;
+ struct device *dev = &pdev->dev;
+ struct resource *res;
+ struct phy_provider *phy_provider;
+ struct phy *phy;
+
+ state = devm_kzalloc(dev, sizeof(*state), GFP_KERNEL);
+ 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);
+
+ phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
+ if (IS_ERR(phy_provider))
+ return PTR_ERR(phy_provider);
+
+ phy = devm_phy_create(dev, 0, &exynos_dp_video_phy_ops, NULL);
+ if (IS_ERR(phy)) {
+ dev_err(dev, "failed to create Display Port PHY\n");
+ return PTR_ERR(phy);
+ }
+ phy_set_drvdata(phy, state);
+
+ return 0;
+}
+
+static const struct of_device_id exynos_dp_video_phy_of_match[] = {
+ { .compatible = "samsung,exynos5250-dp-video-phy" },
+ { },
+};
+MODULE_DEVICE_TABLE(of, exynos_dp_video_phy_of_match);
+
+static struct platform_driver exynos_dp_video_phy_driver = {
+ .probe = exynos_dp_video_phy_probe,
+ .driver = {
+ .name = "exynos-dp-video-phy",
+ .owner = THIS_MODULE,
+ .of_match_table = exynos_dp_video_phy_of_match,
+ }
+};
+module_platform_driver(exynos_dp_video_phy_driver);
+
+MODULE_AUTHOR("Jingoo Han <jg1.han@samsung.com>");
+MODULE_DESCRIPTION("Samsung EXYNOS SoC DP PHY driver");
+MODULE_LICENSE("GPL v2");
--
1.7.10.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox