| Message ID | 1425764475-27691-11-git-send-email-sakari.ailus@iki.fi (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Sakari, Thank you for the patch. (CC'ing linux-omap and Tony) On Saturday 07 March 2015 23:41:07 Sakari Ailus wrote: > The syscon register isn't part of the ISP, use it through the syscom driver > regmap instead. The syscom block is considered to be from 343x on ISP > revision 2.0 whereas 15.0 is assumed to have 3630 syscon. > > Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> > --- > arch/arm/boot/dts/omap3.dtsi | 2 +- > arch/arm/mach-omap2/devices.c | 10 ---------- > drivers/media/platform/omap3isp/isp.c | 19 +++++++++++++++---- > drivers/media/platform/omap3isp/isp.h | 19 +++++++++++++++++-- > drivers/media/platform/omap3isp/ispcsiphy.c | 20 +++++++++----------- You might be asked to split the patch into two, let's see what Tony says. > 5 files changed, 42 insertions(+), 28 deletions(-) > > diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi > index 01b7111..fe0b293 100644 > --- a/arch/arm/boot/dts/omap3.dtsi > +++ b/arch/arm/boot/dts/omap3.dtsi > @@ -183,7 +183,7 @@ > > omap3_scm_general: tisyscon@48002270 { > compatible = "syscon"; > - reg = <0x48002270 0x2f0>; > + reg = <0x48002270 0x2f4>; > }; > > pbias_regulator: pbias_regulator { > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > index 1afb50d..e945957 100644 > --- a/arch/arm/mach-omap2/devices.c > +++ b/arch/arm/mach-omap2/devices.c > @@ -143,16 +143,6 @@ static struct resource omap3isp_resources[] = { > .flags = IORESOURCE_MEM, > }, > { > - .start = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE, > - .end = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE + 3, > - .flags = IORESOURCE_MEM, > - }, > - { > - .start = OMAP343X_CTRL_BASE + OMAP3630_CONTROL_CAMERA_PHY_CTRL, > - .end = OMAP343X_CTRL_BASE + OMAP3630_CONTROL_CAMERA_PHY_CTRL + 3, > - .flags = IORESOURCE_MEM, > - }, > - { > .start = 24 + OMAP_INTC_START, > .flags = IORESOURCE_IRQ, > } > diff --git a/drivers/media/platform/omap3isp/isp.c > b/drivers/media/platform/omap3isp/isp.c index 68d7edfc..4ff4bbd 100644 > --- a/drivers/media/platform/omap3isp/isp.c > +++ b/drivers/media/platform/omap3isp/isp.c > @@ -51,6 +51,7 @@ > #include <linux/dma-mapping.h> > #include <linux/i2c.h> > #include <linux/interrupt.h> > +#include <linux/mfd/syscon.h> > #include <linux/module.h> > #include <linux/omap-iommu.h> > #include <linux/platform_device.h> > @@ -94,8 +95,9 @@ static const struct isp_res_mapping isp_res_maps[] = { > 1 << OMAP3_ISP_IOMEM_RESZ | > 1 << OMAP3_ISP_IOMEM_SBL | > 1 << OMAP3_ISP_IOMEM_CSI2A_REGS1 | > - 1 << OMAP3_ISP_IOMEM_CSIPHY2 | > - 1 << OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, > + 1 << OMAP3_ISP_IOMEM_CSIPHY2, > + .syscon_offset = 0xdc, > + .phy_type = ISP_PHY_TYPE_3430, > }, > { > .isp_rev = ISP_REVISION_15_0, > @@ -112,8 +114,9 @@ static const struct isp_res_mapping isp_res_maps[] = { > 1 << OMAP3_ISP_IOMEM_CSI2A_REGS2 | > 1 << OMAP3_ISP_IOMEM_CSI2C_REGS1 | > 1 << OMAP3_ISP_IOMEM_CSIPHY1 | > - 1 << OMAP3_ISP_IOMEM_CSI2C_REGS2 | > - 1 << OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, > + 1 << OMAP3_ISP_IOMEM_CSI2C_REGS2, > + .syscon_offset = 0x2f0, > + .phy_type = ISP_PHY_TYPE_3630, > }, > }; > > @@ -2352,6 +2355,14 @@ static int isp_probe(struct platform_device *pdev) > } > } > > + isp->syscon = syscon_regmap_lookup_by_pdevname("syscon.0"); > + isp->syscon_offset = isp_res_maps[m].syscon_offset; > + isp->phy_type = isp_res_maps[m].phy_type; You could move those two lines after the error check to keep the check closer to the source of error. Apart from that, Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > + if (IS_ERR(isp->syscon)) { > + ret = PTR_ERR(isp->syscon); > + goto error_isp; > + } > + > /* IOMMU */ > ret = isp_attach_iommu(isp); > if (ret < 0) { > diff --git a/drivers/media/platform/omap3isp/isp.h > b/drivers/media/platform/omap3isp/isp.h index 9535524..03d2129 100644 > --- a/drivers/media/platform/omap3isp/isp.h > +++ b/drivers/media/platform/omap3isp/isp.h > @@ -59,8 +59,6 @@ enum isp_mem_resources { > OMAP3_ISP_IOMEM_CSI2C_REGS1, > OMAP3_ISP_IOMEM_CSIPHY1, > OMAP3_ISP_IOMEM_CSI2C_REGS2, > - OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, > - OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, > OMAP3_ISP_IOMEM_LAST > }; > > @@ -93,14 +91,25 @@ enum isp_subclk_resource { > /* ISP2P: OMAP 36xx */ > #define ISP_REVISION_15_0 0xF0 > > +#define ISP_PHY_TYPE_3430 0 > +#define ISP_PHY_TYPE_3630 1 > + > +struct regmap; > + > /* > * struct isp_res_mapping - Map ISP io resources to ISP revision. > * @isp_rev: ISP_REVISION_x_x > * @map: bitmap for enum isp_mem_resources > + * @syscon_offset: offset of the syscon register for 343x / 3630 > + * (CONTROL_CSIRXFE / CONTROL_CAMERA_PHY_CTRL, respectively) > + * from the syscon base address > + * @phy_type: ISP_PHY_TYPE_{3430,3630} > */ > struct isp_res_mapping { > u32 isp_rev; > u32 map; > + u32 syscon_offset; > + u32 phy_type; > }; > > /* > @@ -140,6 +149,9 @@ struct isp_xclk { > * regions. > * @mmio_hist_base_phys: Physical L4 bus address for ISP hist block > register > * region. > + * @syscon: Regmap for the syscon register space > + * @syscon_offset: Offset of the CSIPHY control register in syscon > + * @phy_type: ISP_PHY_TYPE_{3430,3630} > * @mapping: IOMMU mapping > * @stat_lock: Spinlock for handling statistics > * @isp_mutex: Mutex for serializing requests to ISP. > @@ -176,6 +188,9 @@ struct isp_device { > > void __iomem *mmio_base[OMAP3_ISP_IOMEM_LAST]; > unsigned long mmio_hist_base_phys; > + struct regmap *syscon; > + u32 syscon_offset; > + u32 phy_type; > > struct dma_iommu_mapping *mapping; > > diff --git a/drivers/media/platform/omap3isp/ispcsiphy.c > b/drivers/media/platform/omap3isp/ispcsiphy.c index 4486e9f..d91dde1 100644 > --- a/drivers/media/platform/omap3isp/ispcsiphy.c > +++ b/drivers/media/platform/omap3isp/ispcsiphy.c > @@ -16,6 +16,7 @@ > > #include <linux/delay.h> > #include <linux/device.h> > +#include <linux/regmap.h> > #include <linux/regulator/consumer.h> > > #include "isp.h" > @@ -26,10 +27,11 @@ static void csiphy_routing_cfg_3630(struct isp_csiphy > *phy, enum isp_interface_type iface, > bool ccp2_strobe) > { > - u32 reg = isp_reg_readl( > - phy->isp, OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, 0); > + u32 reg; > u32 shift, mode; > > + regmap_read(phy->isp->syscon, phy->isp->syscon_offset, ®); > + > switch (iface) { > default: > /* Should not happen in practice, but let's keep the compiler happy. */ > @@ -63,8 +65,7 @@ static void csiphy_routing_cfg_3630(struct isp_csiphy > *phy, reg &= ~(OMAP3630_CONTROL_CAMERA_PHY_CTRL_CAMMODE_MASK << shift); reg > |= mode << shift; > > - isp_reg_writel(phy->isp, reg, > - OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, 0); > + regmap_write(phy->isp->syscon, phy->isp->syscon_offset, reg); > } > > static void csiphy_routing_cfg_3430(struct isp_csiphy *phy, u32 iface, bool > on, @@ -78,16 +79,14 @@ static void csiphy_routing_cfg_3430(struct > isp_csiphy *phy, u32 iface, bool on, return; > > if (!on) { > - isp_reg_writel(phy->isp, 0, > - OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, 0); > + regmap_write(phy->isp->syscon, phy->isp->syscon_offset, 0); > return; > } > > if (ccp2_strobe) > csirxfe |= OMAP343X_CONTROL_CSIRXFE_SELFORM; > > - isp_reg_writel(phy->isp, csirxfe, > - OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, 0); > + regmap_write(phy->isp->syscon, phy->isp->syscon_offset, csirxfe); > } > > /* > @@ -106,10 +105,9 @@ static void csiphy_routing_cfg(struct isp_csiphy *phy, > enum isp_interface_type iface, bool on, > bool ccp2_strobe) > { > - if (phy->isp->mmio_base[OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL] > - && on) > + if (phy->isp->phy_type == ISP_PHY_TYPE_3630 && on) > return csiphy_routing_cfg_3630(phy, iface, ccp2_strobe); > - if (phy->isp->mmio_base[OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE]) > + if (phy->isp->phy_type == ISP_PHY_TYPE_3430) > return csiphy_routing_cfg_3430(phy, iface, on, ccp2_strobe); > }
Hi Laurent, On Sun, Mar 08, 2015 at 01:34:17AM +0200, Laurent Pinchart wrote: > Hi Sakari, > > Thank you for the patch. > > (CC'ing linux-omap and Tony) Thanks. > On Saturday 07 March 2015 23:41:07 Sakari Ailus wrote: > > The syscon register isn't part of the ISP, use it through the syscom driver > > regmap instead. The syscom block is considered to be from 343x on ISP > > revision 2.0 whereas 15.0 is assumed to have 3630 syscon. > > > > Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> > > --- > > arch/arm/boot/dts/omap3.dtsi | 2 +- > > arch/arm/mach-omap2/devices.c | 10 ---------- > > drivers/media/platform/omap3isp/isp.c | 19 +++++++++++++++---- > > drivers/media/platform/omap3isp/isp.h | 19 +++++++++++++++++-- > > drivers/media/platform/omap3isp/ispcsiphy.c | 20 +++++++++----------- > > You might be asked to split the patch into two, let's see what Tony says. > > > 5 files changed, 42 insertions(+), 28 deletions(-) > > > > diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi > > index 01b7111..fe0b293 100644 > > --- a/arch/arm/boot/dts/omap3.dtsi > > +++ b/arch/arm/boot/dts/omap3.dtsi > > @@ -183,7 +183,7 @@ > > > > omap3_scm_general: tisyscon@48002270 { > > compatible = "syscon"; > > - reg = <0x48002270 0x2f0>; > > + reg = <0x48002270 0x2f4>; > > }; > > > > pbias_regulator: pbias_regulator { > > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > > index 1afb50d..e945957 100644 > > --- a/arch/arm/mach-omap2/devices.c > > +++ b/arch/arm/mach-omap2/devices.c > > @@ -143,16 +143,6 @@ static struct resource omap3isp_resources[] = { > > .flags = IORESOURCE_MEM, > > }, > > { > > - .start = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE, > > - .end = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE + 3, > > - .flags = IORESOURCE_MEM, > > - }, > > - { > > - .start = OMAP343X_CTRL_BASE + OMAP3630_CONTROL_CAMERA_PHY_CTRL, > > - .end = OMAP343X_CTRL_BASE + OMAP3630_CONTROL_CAMERA_PHY_CTRL + 3, > > - .flags = IORESOURCE_MEM, > > - }, > > - { > > .start = 24 + OMAP_INTC_START, > > .flags = IORESOURCE_IRQ, > > } > > diff --git a/drivers/media/platform/omap3isp/isp.c > > b/drivers/media/platform/omap3isp/isp.c index 68d7edfc..4ff4bbd 100644 > > --- a/drivers/media/platform/omap3isp/isp.c > > +++ b/drivers/media/platform/omap3isp/isp.c > > @@ -51,6 +51,7 @@ > > #include <linux/dma-mapping.h> > > #include <linux/i2c.h> > > #include <linux/interrupt.h> > > +#include <linux/mfd/syscon.h> > > #include <linux/module.h> > > #include <linux/omap-iommu.h> > > #include <linux/platform_device.h> > > @@ -94,8 +95,9 @@ static const struct isp_res_mapping isp_res_maps[] = { > > 1 << OMAP3_ISP_IOMEM_RESZ | > > 1 << OMAP3_ISP_IOMEM_SBL | > > 1 << OMAP3_ISP_IOMEM_CSI2A_REGS1 | > > - 1 << OMAP3_ISP_IOMEM_CSIPHY2 | > > - 1 << OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, > > + 1 << OMAP3_ISP_IOMEM_CSIPHY2, > > + .syscon_offset = 0xdc, > > + .phy_type = ISP_PHY_TYPE_3430, > > }, > > { > > .isp_rev = ISP_REVISION_15_0, > > @@ -112,8 +114,9 @@ static const struct isp_res_mapping isp_res_maps[] = { > > 1 << OMAP3_ISP_IOMEM_CSI2A_REGS2 | > > 1 << OMAP3_ISP_IOMEM_CSI2C_REGS1 | > > 1 << OMAP3_ISP_IOMEM_CSIPHY1 | > > - 1 << OMAP3_ISP_IOMEM_CSI2C_REGS2 | > > - 1 << OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, > > + 1 << OMAP3_ISP_IOMEM_CSI2C_REGS2, > > + .syscon_offset = 0x2f0, > > + .phy_type = ISP_PHY_TYPE_3630, > > }, > > }; > > > > @@ -2352,6 +2355,14 @@ static int isp_probe(struct platform_device *pdev) > > } > > } > > > > + isp->syscon = syscon_regmap_lookup_by_pdevname("syscon.0"); > > + isp->syscon_offset = isp_res_maps[m].syscon_offset; > > + isp->phy_type = isp_res_maps[m].phy_type; > > You could move those two lines after the error check to keep the check closer > to the source of error. Ack. > Apart from that, > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Thanks for the acks!
* Sakari Ailus <sakari.ailus@iki.fi> [150307 15:44]: > Hi Laurent, > > On Sun, Mar 08, 2015 at 01:34:17AM +0200, Laurent Pinchart wrote: > > Hi Sakari, > > > > Thank you for the patch. > > > > (CC'ing linux-omap and Tony) > > Thanks. > > > On Saturday 07 March 2015 23:41:07 Sakari Ailus wrote: > > > The syscon register isn't part of the ISP, use it through the syscom driver > > > regmap instead. The syscom block is considered to be from 343x on ISP > > > revision 2.0 whereas 15.0 is assumed to have 3630 syscon. > > > > > > Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> > > > --- > > > arch/arm/boot/dts/omap3.dtsi | 2 +- > > > arch/arm/mach-omap2/devices.c | 10 ---------- > > > drivers/media/platform/omap3isp/isp.c | 19 +++++++++++++++---- > > > drivers/media/platform/omap3isp/isp.h | 19 +++++++++++++++++-- > > > drivers/media/platform/omap3isp/ispcsiphy.c | 20 +++++++++----------- > > > > You might be asked to split the patch into two, let's see what Tony says. > > > > > 5 files changed, 42 insertions(+), 28 deletions(-) > > > > > > diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi > > > index 01b7111..fe0b293 100644 > > > --- a/arch/arm/boot/dts/omap3.dtsi > > > +++ b/arch/arm/boot/dts/omap3.dtsi > > > @@ -183,7 +183,7 @@ > > > > > > omap3_scm_general: tisyscon@48002270 { > > > compatible = "syscon"; > > > - reg = <0x48002270 0x2f0>; > > > + reg = <0x48002270 0x2f4>; > > > }; > > > > > > pbias_regulator: pbias_regulator { Can you please send the above dts change separately as a fix describing what goes wrong? Let's get that out of the way for the -rc, otherwise we're going to probably get conflicts with Tero's dts changes. > > > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > > > index 1afb50d..e945957 100644 > > > --- a/arch/arm/mach-omap2/devices.c > > > +++ b/arch/arm/mach-omap2/devices.c > > > @@ -143,16 +143,6 @@ static struct resource omap3isp_resources[] = { > > > .flags = IORESOURCE_MEM, > > > }, > > > { > > > - .start = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE, > > > - .end = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE + 3, > > > - .flags = IORESOURCE_MEM, > > > - }, > > > - { > > > - .start = OMAP343X_CTRL_BASE + OMAP3630_CONTROL_CAMERA_PHY_CTRL, > > > - .end = OMAP343X_CTRL_BASE + OMAP3630_CONTROL_CAMERA_PHY_CTRL + 3, > > > - .flags = IORESOURCE_MEM, > > > - }, > > > - { > > > .start = 24 + OMAP_INTC_START, > > > .flags = IORESOURCE_IRQ, > > > } Looks good to me, teel free to merge this part along with the other isp changes: Acked-by: Tony Lindgren <tony@atomide.com> > > > diff --git a/drivers/media/platform/omap3isp/isp.c > > > b/drivers/media/platform/omap3isp/isp.c index 68d7edfc..4ff4bbd 100644 > > > --- a/drivers/media/platform/omap3isp/isp.c > > > +++ b/drivers/media/platform/omap3isp/isp.c > > > @@ -51,6 +51,7 @@ > > > #include <linux/dma-mapping.h> > > > #include <linux/i2c.h> > > > #include <linux/interrupt.h> > > > +#include <linux/mfd/syscon.h> > > > #include <linux/module.h> > > > #include <linux/omap-iommu.h> > > > #include <linux/platform_device.h> > > > @@ -94,8 +95,9 @@ static const struct isp_res_mapping isp_res_maps[] = { > > > 1 << OMAP3_ISP_IOMEM_RESZ | > > > 1 << OMAP3_ISP_IOMEM_SBL | > > > 1 << OMAP3_ISP_IOMEM_CSI2A_REGS1 | > > > - 1 << OMAP3_ISP_IOMEM_CSIPHY2 | > > > - 1 << OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, > > > + 1 << OMAP3_ISP_IOMEM_CSIPHY2, > > > + .syscon_offset = 0xdc, > > > + .phy_type = ISP_PHY_TYPE_3430, > > > }, > > > { > > > .isp_rev = ISP_REVISION_15_0, > > > @@ -112,8 +114,9 @@ static const struct isp_res_mapping isp_res_maps[] = { > > > 1 << OMAP3_ISP_IOMEM_CSI2A_REGS2 | > > > 1 << OMAP3_ISP_IOMEM_CSI2C_REGS1 | > > > 1 << OMAP3_ISP_IOMEM_CSIPHY1 | > > > - 1 << OMAP3_ISP_IOMEM_CSI2C_REGS2 | > > > - 1 << OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, > > > + 1 << OMAP3_ISP_IOMEM_CSI2C_REGS2, > > > + .syscon_offset = 0x2f0, > > > + .phy_type = ISP_PHY_TYPE_3630, > > > }, > > > }; > > > > > > @@ -2352,6 +2355,14 @@ static int isp_probe(struct platform_device *pdev) > > > } > > > } > > > > > > + isp->syscon = syscon_regmap_lookup_by_pdevname("syscon.0"); > > > + isp->syscon_offset = isp_res_maps[m].syscon_offset; > > > + isp->phy_type = isp_res_maps[m].phy_type; > > > > You could move those two lines after the error check to keep the check closer > > to the source of error. > > Ack. > > > Apart from that, > > > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Thanks for the acks! > > -- > Kind regards, > > Sakari Ailus > e-mail: sakari.ailus@iki.fi XMPP: sailus@retiisi.org.uk -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Tony, Thanks for the comments!! On Mon, Mar 09, 2015 at 08:20:38AM -0700, Tony Lindgren wrote: > * Sakari Ailus <sakari.ailus@iki.fi> [150307 15:44]: > > Hi Laurent, > > > > On Sun, Mar 08, 2015 at 01:34:17AM +0200, Laurent Pinchart wrote: > > > Hi Sakari, > > > > > > Thank you for the patch. > > > > > > (CC'ing linux-omap and Tony) > > > > Thanks. > > > > > On Saturday 07 March 2015 23:41:07 Sakari Ailus wrote: > > > > The syscon register isn't part of the ISP, use it through the syscom driver > > > > regmap instead. The syscom block is considered to be from 343x on ISP > > > > revision 2.0 whereas 15.0 is assumed to have 3630 syscon. > > > > > > > > Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> > > > > --- > > > > arch/arm/boot/dts/omap3.dtsi | 2 +- > > > > arch/arm/mach-omap2/devices.c | 10 ---------- > > > > drivers/media/platform/omap3isp/isp.c | 19 +++++++++++++++---- > > > > drivers/media/platform/omap3isp/isp.h | 19 +++++++++++++++++-- > > > > drivers/media/platform/omap3isp/ispcsiphy.c | 20 +++++++++----------- > > > > > > You might be asked to split the patch into two, let's see what Tony says. > > > > > > > 5 files changed, 42 insertions(+), 28 deletions(-) > > > > > > > > diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi > > > > index 01b7111..fe0b293 100644 > > > > --- a/arch/arm/boot/dts/omap3.dtsi > > > > +++ b/arch/arm/boot/dts/omap3.dtsi > > > > @@ -183,7 +183,7 @@ > > > > > > > > omap3_scm_general: tisyscon@48002270 { > > > > compatible = "syscon"; > > > > - reg = <0x48002270 0x2f0>; > > > > + reg = <0x48002270 0x2f4>; > > > > }; > > > > > > > > pbias_regulator: pbias_regulator { > > Can you please send the above dts change separately as a fix describing > what goes wrong? Let's get that out of the way for the -rc, otherwise > we're going to probably get conflicts with Tero's dts changes. Sure. There's one register that didn't used to be mapped to syscon. > > > > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > > > > index 1afb50d..e945957 100644 > > > > --- a/arch/arm/mach-omap2/devices.c > > > > +++ b/arch/arm/mach-omap2/devices.c > > > > @@ -143,16 +143,6 @@ static struct resource omap3isp_resources[] = { > > > > .flags = IORESOURCE_MEM, > > > > }, > > > > { > > > > - .start = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE, > > > > - .end = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE + 3, > > > > - .flags = IORESOURCE_MEM, > > > > - }, > > > > - { > > > > - .start = OMAP343X_CTRL_BASE + OMAP3630_CONTROL_CAMERA_PHY_CTRL, > > > > - .end = OMAP343X_CTRL_BASE + OMAP3630_CONTROL_CAMERA_PHY_CTRL + 3, > > > > - .flags = IORESOURCE_MEM, > > > > - }, > > > > - { > > > > .start = 24 + OMAP_INTC_START, > > > > .flags = IORESOURCE_IRQ, > > > > } > > Looks good to me, teel free to merge this part along with the other > isp changes: > > Acked-by: Tony Lindgren <tony@atomide.com> Thanks!
Hi Sakari, On Saturday 07 March 2015 23:41:07 Sakari Ailus wrote: > The syscon register isn't part of the ISP, use it through the syscom driver > regmap instead. The syscom block is considered to be from 343x on ISP > revision 2.0 whereas 15.0 is assumed to have 3630 syscon. > > Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> > --- > arch/arm/boot/dts/omap3.dtsi | 2 +- > arch/arm/mach-omap2/devices.c | 10 ---------- > drivers/media/platform/omap3isp/isp.c | 19 +++++++++++++++---- > drivers/media/platform/omap3isp/isp.h | 19 +++++++++++++++++-- > drivers/media/platform/omap3isp/ispcsiphy.c | 20 +++++++++----------- I've noticed another issue, you need a "select MFD_SYSCON" in Kconfig. > 5 files changed, 42 insertions(+), 28 deletions(-) > > diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi > index 01b7111..fe0b293 100644 > --- a/arch/arm/boot/dts/omap3.dtsi > +++ b/arch/arm/boot/dts/omap3.dtsi > @@ -183,7 +183,7 @@ > > omap3_scm_general: tisyscon@48002270 { > compatible = "syscon"; > - reg = <0x48002270 0x2f0>; > + reg = <0x48002270 0x2f4>; > }; > > pbias_regulator: pbias_regulator { > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > index 1afb50d..e945957 100644 > --- a/arch/arm/mach-omap2/devices.c > +++ b/arch/arm/mach-omap2/devices.c > @@ -143,16 +143,6 @@ static struct resource omap3isp_resources[] = { > .flags = IORESOURCE_MEM, > }, > { > - .start = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE, > - .end = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE + 3, > - .flags = IORESOURCE_MEM, > - }, > - { > - .start = OMAP343X_CTRL_BASE + OMAP3630_CONTROL_CAMERA_PHY_CTRL, > - .end = OMAP343X_CTRL_BASE + OMAP3630_CONTROL_CAMERA_PHY_CTRL + 3, > - .flags = IORESOURCE_MEM, > - }, > - { > .start = 24 + OMAP_INTC_START, > .flags = IORESOURCE_IRQ, > } > diff --git a/drivers/media/platform/omap3isp/isp.c > b/drivers/media/platform/omap3isp/isp.c index 68d7edfc..4ff4bbd 100644 > --- a/drivers/media/platform/omap3isp/isp.c > +++ b/drivers/media/platform/omap3isp/isp.c > @@ -51,6 +51,7 @@ > #include <linux/dma-mapping.h> > #include <linux/i2c.h> > #include <linux/interrupt.h> > +#include <linux/mfd/syscon.h> > #include <linux/module.h> > #include <linux/omap-iommu.h> > #include <linux/platform_device.h> > @@ -94,8 +95,9 @@ static const struct isp_res_mapping isp_res_maps[] = { > 1 << OMAP3_ISP_IOMEM_RESZ | > 1 << OMAP3_ISP_IOMEM_SBL | > 1 << OMAP3_ISP_IOMEM_CSI2A_REGS1 | > - 1 << OMAP3_ISP_IOMEM_CSIPHY2 | > - 1 << OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, > + 1 << OMAP3_ISP_IOMEM_CSIPHY2, > + .syscon_offset = 0xdc, > + .phy_type = ISP_PHY_TYPE_3430, > }, > { > .isp_rev = ISP_REVISION_15_0, > @@ -112,8 +114,9 @@ static const struct isp_res_mapping isp_res_maps[] = { > 1 << OMAP3_ISP_IOMEM_CSI2A_REGS2 | > 1 << OMAP3_ISP_IOMEM_CSI2C_REGS1 | > 1 << OMAP3_ISP_IOMEM_CSIPHY1 | > - 1 << OMAP3_ISP_IOMEM_CSI2C_REGS2 | > - 1 << OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, > + 1 << OMAP3_ISP_IOMEM_CSI2C_REGS2, > + .syscon_offset = 0x2f0, > + .phy_type = ISP_PHY_TYPE_3630, > }, > }; > > @@ -2352,6 +2355,14 @@ static int isp_probe(struct platform_device *pdev) > } > } > > + isp->syscon = syscon_regmap_lookup_by_pdevname("syscon.0"); > + isp->syscon_offset = isp_res_maps[m].syscon_offset; > + isp->phy_type = isp_res_maps[m].phy_type; > + if (IS_ERR(isp->syscon)) { > + ret = PTR_ERR(isp->syscon); > + goto error_isp; > + } > + > /* IOMMU */ > ret = isp_attach_iommu(isp); > if (ret < 0) { > diff --git a/drivers/media/platform/omap3isp/isp.h > b/drivers/media/platform/omap3isp/isp.h index 9535524..03d2129 100644 > --- a/drivers/media/platform/omap3isp/isp.h > +++ b/drivers/media/platform/omap3isp/isp.h > @@ -59,8 +59,6 @@ enum isp_mem_resources { > OMAP3_ISP_IOMEM_CSI2C_REGS1, > OMAP3_ISP_IOMEM_CSIPHY1, > OMAP3_ISP_IOMEM_CSI2C_REGS2, > - OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, > - OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, > OMAP3_ISP_IOMEM_LAST > }; > > @@ -93,14 +91,25 @@ enum isp_subclk_resource { > /* ISP2P: OMAP 36xx */ > #define ISP_REVISION_15_0 0xF0 > > +#define ISP_PHY_TYPE_3430 0 > +#define ISP_PHY_TYPE_3630 1 > + > +struct regmap; > + > /* > * struct isp_res_mapping - Map ISP io resources to ISP revision. > * @isp_rev: ISP_REVISION_x_x > * @map: bitmap for enum isp_mem_resources > + * @syscon_offset: offset of the syscon register for 343x / 3630 > + * (CONTROL_CSIRXFE / CONTROL_CAMERA_PHY_CTRL, respectively) > + * from the syscon base address > + * @phy_type: ISP_PHY_TYPE_{3430,3630} > */ > struct isp_res_mapping { > u32 isp_rev; > u32 map; > + u32 syscon_offset; > + u32 phy_type; > }; > > /* > @@ -140,6 +149,9 @@ struct isp_xclk { > * regions. > * @mmio_hist_base_phys: Physical L4 bus address for ISP hist block > register * region. > + * @syscon: Regmap for the syscon register space > + * @syscon_offset: Offset of the CSIPHY control register in syscon > + * @phy_type: ISP_PHY_TYPE_{3430,3630} > * @mapping: IOMMU mapping > * @stat_lock: Spinlock for handling statistics > * @isp_mutex: Mutex for serializing requests to ISP. > @@ -176,6 +188,9 @@ struct isp_device { > > void __iomem *mmio_base[OMAP3_ISP_IOMEM_LAST]; > unsigned long mmio_hist_base_phys; > + struct regmap *syscon; > + u32 syscon_offset; > + u32 phy_type; > > struct dma_iommu_mapping *mapping; > > diff --git a/drivers/media/platform/omap3isp/ispcsiphy.c > b/drivers/media/platform/omap3isp/ispcsiphy.c index 4486e9f..d91dde1 100644 > --- a/drivers/media/platform/omap3isp/ispcsiphy.c > +++ b/drivers/media/platform/omap3isp/ispcsiphy.c > @@ -16,6 +16,7 @@ > > #include <linux/delay.h> > #include <linux/device.h> > +#include <linux/regmap.h> > #include <linux/regulator/consumer.h> > > #include "isp.h" > @@ -26,10 +27,11 @@ static void csiphy_routing_cfg_3630(struct isp_csiphy > *phy, enum isp_interface_type iface, > bool ccp2_strobe) > { > - u32 reg = isp_reg_readl( > - phy->isp, OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, 0); > + u32 reg; > u32 shift, mode; > > + regmap_read(phy->isp->syscon, phy->isp->syscon_offset, ®); > + > switch (iface) { > default: > /* Should not happen in practice, but let's keep the compiler happy. */ > @@ -63,8 +65,7 @@ static void csiphy_routing_cfg_3630(struct isp_csiphy > *phy, reg &= ~(OMAP3630_CONTROL_CAMERA_PHY_CTRL_CAMMODE_MASK << shift); reg > |= mode << shift; > > - isp_reg_writel(phy->isp, reg, > - OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, 0); > + regmap_write(phy->isp->syscon, phy->isp->syscon_offset, reg); > } > > static void csiphy_routing_cfg_3430(struct isp_csiphy *phy, u32 iface, bool > on, @@ -78,16 +79,14 @@ static void csiphy_routing_cfg_3430(struct > isp_csiphy *phy, u32 iface, bool on, return; > > if (!on) { > - isp_reg_writel(phy->isp, 0, > - OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, 0); > + regmap_write(phy->isp->syscon, phy->isp->syscon_offset, 0); > return; > } > > if (ccp2_strobe) > csirxfe |= OMAP343X_CONTROL_CSIRXFE_SELFORM; > > - isp_reg_writel(phy->isp, csirxfe, > - OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, 0); > + regmap_write(phy->isp->syscon, phy->isp->syscon_offset, csirxfe); > } > > /* > @@ -106,10 +105,9 @@ static void csiphy_routing_cfg(struct isp_csiphy *phy, > enum isp_interface_type iface, bool on, > bool ccp2_strobe) > { > - if (phy->isp->mmio_base[OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL] > - && on) > + if (phy->isp->phy_type == ISP_PHY_TYPE_3630 && on) > return csiphy_routing_cfg_3630(phy, iface, ccp2_strobe); > - if (phy->isp->mmio_base[OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE]) > + if (phy->isp->phy_type == ISP_PHY_TYPE_3430) > return csiphy_routing_cfg_3430(phy, iface, on, ccp2_strobe); > }
On Mon, Mar 16, 2015 at 02:19:04AM +0200, Laurent Pinchart wrote: > Hi Sakari, > > On Saturday 07 March 2015 23:41:07 Sakari Ailus wrote: > > The syscon register isn't part of the ISP, use it through the syscom driver > > regmap instead. The syscom block is considered to be from 343x on ISP > > revision 2.0 whereas 15.0 is assumed to have 3630 syscon. > > > > Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> > > --- > > arch/arm/boot/dts/omap3.dtsi | 2 +- > > arch/arm/mach-omap2/devices.c | 10 ---------- > > drivers/media/platform/omap3isp/isp.c | 19 +++++++++++++++---- > > drivers/media/platform/omap3isp/isp.h | 19 +++++++++++++++++-- > > drivers/media/platform/omap3isp/ispcsiphy.c | 20 +++++++++----------- > > I've noticed another issue, you need a "select MFD_SYSCON" in Kconfig. Thanks, fixed!
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 01b7111..fe0b293 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -183,7 +183,7 @@ omap3_scm_general: tisyscon@48002270 { compatible = "syscon"; - reg = <0x48002270 0x2f0>; + reg = <0x48002270 0x2f4>; }; pbias_regulator: pbias_regulator { diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 1afb50d..e945957 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -143,16 +143,6 @@ static struct resource omap3isp_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE, - .end = OMAP343X_CTRL_BASE + OMAP343X_CONTROL_CSIRXFE + 3, - .flags = IORESOURCE_MEM, - }, - { - .start = OMAP343X_CTRL_BASE + OMAP3630_CONTROL_CAMERA_PHY_CTRL, - .end = OMAP343X_CTRL_BASE + OMAP3630_CONTROL_CAMERA_PHY_CTRL + 3, - .flags = IORESOURCE_MEM, - }, - { .start = 24 + OMAP_INTC_START, .flags = IORESOURCE_IRQ, } diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index 68d7edfc..4ff4bbd 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -51,6 +51,7 @@ #include <linux/dma-mapping.h> #include <linux/i2c.h> #include <linux/interrupt.h> +#include <linux/mfd/syscon.h> #include <linux/module.h> #include <linux/omap-iommu.h> #include <linux/platform_device.h> @@ -94,8 +95,9 @@ static const struct isp_res_mapping isp_res_maps[] = { 1 << OMAP3_ISP_IOMEM_RESZ | 1 << OMAP3_ISP_IOMEM_SBL | 1 << OMAP3_ISP_IOMEM_CSI2A_REGS1 | - 1 << OMAP3_ISP_IOMEM_CSIPHY2 | - 1 << OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, + 1 << OMAP3_ISP_IOMEM_CSIPHY2, + .syscon_offset = 0xdc, + .phy_type = ISP_PHY_TYPE_3430, }, { .isp_rev = ISP_REVISION_15_0, @@ -112,8 +114,9 @@ static const struct isp_res_mapping isp_res_maps[] = { 1 << OMAP3_ISP_IOMEM_CSI2A_REGS2 | 1 << OMAP3_ISP_IOMEM_CSI2C_REGS1 | 1 << OMAP3_ISP_IOMEM_CSIPHY1 | - 1 << OMAP3_ISP_IOMEM_CSI2C_REGS2 | - 1 << OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, + 1 << OMAP3_ISP_IOMEM_CSI2C_REGS2, + .syscon_offset = 0x2f0, + .phy_type = ISP_PHY_TYPE_3630, }, }; @@ -2352,6 +2355,14 @@ static int isp_probe(struct platform_device *pdev) } } + isp->syscon = syscon_regmap_lookup_by_pdevname("syscon.0"); + isp->syscon_offset = isp_res_maps[m].syscon_offset; + isp->phy_type = isp_res_maps[m].phy_type; + if (IS_ERR(isp->syscon)) { + ret = PTR_ERR(isp->syscon); + goto error_isp; + } + /* IOMMU */ ret = isp_attach_iommu(isp); if (ret < 0) { diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h index 9535524..03d2129 100644 --- a/drivers/media/platform/omap3isp/isp.h +++ b/drivers/media/platform/omap3isp/isp.h @@ -59,8 +59,6 @@ enum isp_mem_resources { OMAP3_ISP_IOMEM_CSI2C_REGS1, OMAP3_ISP_IOMEM_CSIPHY1, OMAP3_ISP_IOMEM_CSI2C_REGS2, - OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, - OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, OMAP3_ISP_IOMEM_LAST }; @@ -93,14 +91,25 @@ enum isp_subclk_resource { /* ISP2P: OMAP 36xx */ #define ISP_REVISION_15_0 0xF0 +#define ISP_PHY_TYPE_3430 0 +#define ISP_PHY_TYPE_3630 1 + +struct regmap; + /* * struct isp_res_mapping - Map ISP io resources to ISP revision. * @isp_rev: ISP_REVISION_x_x * @map: bitmap for enum isp_mem_resources + * @syscon_offset: offset of the syscon register for 343x / 3630 + * (CONTROL_CSIRXFE / CONTROL_CAMERA_PHY_CTRL, respectively) + * from the syscon base address + * @phy_type: ISP_PHY_TYPE_{3430,3630} */ struct isp_res_mapping { u32 isp_rev; u32 map; + u32 syscon_offset; + u32 phy_type; }; /* @@ -140,6 +149,9 @@ struct isp_xclk { * regions. * @mmio_hist_base_phys: Physical L4 bus address for ISP hist block register * region. + * @syscon: Regmap for the syscon register space + * @syscon_offset: Offset of the CSIPHY control register in syscon + * @phy_type: ISP_PHY_TYPE_{3430,3630} * @mapping: IOMMU mapping * @stat_lock: Spinlock for handling statistics * @isp_mutex: Mutex for serializing requests to ISP. @@ -176,6 +188,9 @@ struct isp_device { void __iomem *mmio_base[OMAP3_ISP_IOMEM_LAST]; unsigned long mmio_hist_base_phys; + struct regmap *syscon; + u32 syscon_offset; + u32 phy_type; struct dma_iommu_mapping *mapping; diff --git a/drivers/media/platform/omap3isp/ispcsiphy.c b/drivers/media/platform/omap3isp/ispcsiphy.c index 4486e9f..d91dde1 100644 --- a/drivers/media/platform/omap3isp/ispcsiphy.c +++ b/drivers/media/platform/omap3isp/ispcsiphy.c @@ -16,6 +16,7 @@ #include <linux/delay.h> #include <linux/device.h> +#include <linux/regmap.h> #include <linux/regulator/consumer.h> #include "isp.h" @@ -26,10 +27,11 @@ static void csiphy_routing_cfg_3630(struct isp_csiphy *phy, enum isp_interface_type iface, bool ccp2_strobe) { - u32 reg = isp_reg_readl( - phy->isp, OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, 0); + u32 reg; u32 shift, mode; + regmap_read(phy->isp->syscon, phy->isp->syscon_offset, ®); + switch (iface) { default: /* Should not happen in practice, but let's keep the compiler happy. */ @@ -63,8 +65,7 @@ static void csiphy_routing_cfg_3630(struct isp_csiphy *phy, reg &= ~(OMAP3630_CONTROL_CAMERA_PHY_CTRL_CAMMODE_MASK << shift); reg |= mode << shift; - isp_reg_writel(phy->isp, reg, - OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL, 0); + regmap_write(phy->isp->syscon, phy->isp->syscon_offset, reg); } static void csiphy_routing_cfg_3430(struct isp_csiphy *phy, u32 iface, bool on, @@ -78,16 +79,14 @@ static void csiphy_routing_cfg_3430(struct isp_csiphy *phy, u32 iface, bool on, return; if (!on) { - isp_reg_writel(phy->isp, 0, - OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, 0); + regmap_write(phy->isp->syscon, phy->isp->syscon_offset, 0); return; } if (ccp2_strobe) csirxfe |= OMAP343X_CONTROL_CSIRXFE_SELFORM; - isp_reg_writel(phy->isp, csirxfe, - OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE, 0); + regmap_write(phy->isp->syscon, phy->isp->syscon_offset, csirxfe); } /* @@ -106,10 +105,9 @@ static void csiphy_routing_cfg(struct isp_csiphy *phy, enum isp_interface_type iface, bool on, bool ccp2_strobe) { - if (phy->isp->mmio_base[OMAP3_ISP_IOMEM_3630_CONTROL_CAMERA_PHY_CTRL] - && on) + if (phy->isp->phy_type == ISP_PHY_TYPE_3630 && on) return csiphy_routing_cfg_3630(phy, iface, ccp2_strobe); - if (phy->isp->mmio_base[OMAP3_ISP_IOMEM_343X_CONTROL_CSIRXFE]) + if (phy->isp->phy_type == ISP_PHY_TYPE_3430) return csiphy_routing_cfg_3430(phy, iface, on, ccp2_strobe); }
The syscon register isn't part of the ISP, use it through the syscom driver regmap instead. The syscom block is considered to be from 343x on ISP revision 2.0 whereas 15.0 is assumed to have 3630 syscon. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> --- arch/arm/boot/dts/omap3.dtsi | 2 +- arch/arm/mach-omap2/devices.c | 10 ---------- drivers/media/platform/omap3isp/isp.c | 19 +++++++++++++++---- drivers/media/platform/omap3isp/isp.h | 19 +++++++++++++++++-- drivers/media/platform/omap3isp/ispcsiphy.c | 20 +++++++++----------- 5 files changed, 42 insertions(+), 28 deletions(-)