bus: imx-weim: support CS GPR config for imx6q-weim
PATCH v2 1/1 bus: imx-weim: support CS GPR config for imx6q-weim
For imx6q-weim type of device, there might a WEIM CS space configuration register in General Purpose Register controller, e.g. IOMUXC_GPR1 on i.MX6Q.
Depending on which configuration of the following 4 is chosen for given system, IOMUXC_GPR1[11:0] should be set up as 05, 033, 0113 or 01111 correspondingly.
CS0(128M) CS1(0M) CS2(0M) CS3(0M) CS0(64M) CS1(64M) CS2(0M) CS3(0M) CS0(64M) CS1(32M) CS2(32M) CS3(0M) CS0(32M) CS1(32M) CS2(32M) CS3(32M)
The patch creates a function for imx6q-weim type of device, which scans 'ranges' property of WEIM node and build the GPR value incrementally. Thus the WEIM CS GPR can be set up automatically at boot time.
---
Changes since v1:
- Drop device tree property fsl,weim-cs-gpr
- Use octal value for IOMUXC_GPR1[11:0] bit field
- Use of_property_for_each_u32() to build gprval incrementally
drivers/bus/imx-weim.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+)
drivers/bus/imx-weim.c +59 -0
@@ -11,6 +11,9 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/of_device.h> +#include <linux/mfd/syscon.h> +#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> +#include <linux/regmap.h> struct imx_weim_devtype {unsigned int cs_count;
@@ -56,6 +59,59 @@ static const struct of_device_id weim_id_table[] = { };MODULE_DEVICE_TABLE (of, weim_id_table); +static int __init imx6q_weim_gpr_setup (struct platform_device *pdev) +{ +struct device_node *np = pdev->dev.of_node; +struct property *prop; +const __be32 *p; +struct regmap *gpr; +u32 gprvals[4 ] = { +05 ,/* CS0(128M) CS1(0M) CS2(0M) CS3(0M) */ +033 ,/* CS0(64M) CS1(64M) CS2(0M) CS3(0M) */ +0113 ,/* CS0(64M) CS1(32M) CS2(32M) CS3(0M) */ +0111 ,/* CS0(64M) CS1(32M) CS2(32M) CS3(0M) */ + }; +u32 gprval =0 ; +u32 val; +int len; +int cs =0 ; +int i =0 ; + + gpr =syscon_regmap_lookup_by_compatible ("fsl,imx6q-iomuxc-gpr" ); +if (IS_ERR (gpr)) { +dev_err (&pdev->dev,"failed to find fsl,imx6q-iomuxc-gpr\n" ); +return -ENOENT ; + } + + prop =of_find_property (np,"ranges" , &len); +if (prop ==NULL ) +return -ENOENT ; +if (len % (sizeof (u32) *4 )) +return -EINVAL ; + +of_property_for_each_u32 (np,"ranges" , prop, p, val) { +if (i %4 ==0 ) { + cs = val; + }else if (i %4 ==3 && val) { + val /=SZ_64M ; + val = (val <<1 ) |1 ; + gprval |= val << cs *3 ; + } + i++; + } + +for (i =0 ; i <ARRAY_SIZE (gprvals); i++) { +if (gprval == gprvals[i]) { +/* Found it. Set up IOMUXC_GPR1[11:0] with it. */ +regmap_update_bits (gpr,IOMUXC_GPR1 ,0xfff , gprval); +return 0 ; + } + } + +dev_err (&pdev->dev,"Invalid 'ranges' configuration\n" ); +return -EINVAL ; +} +/* Parse and set the timing for this device. */ static int __init weim_timing_setup (struct device_node *np,void __iomem *base,const struct imx_weim_devtype *devtype)
@@ -92,6 +148,9 @@ static int __init weim_parse_dt(struct platform_device *pdev,struct device_node *child;int ret; +if (of_device_is_compatible (pdev->dev.of_node,"fsl,imx6q-weim" )) +imx6q_weim_gpr_setup (pdev); +for_each_child_of_node (pdev->dev.of_node, child) {if (!child->name)continue ;
Signature · 1 line
1.7.9.5
PATCH v2 1/1 bus: imx-weim: support CS GPR config for imx6q-weim
Hi Shawn,
Quoted 8 lines · Shawn Guo
For imx6q-weim type of device, there might a WEIM CS space configuration register in General Purpose Register controller, e.g.
IOMUXC_GPR1on i.MX6Q.Depending on which configuration of the following 4 is chosen for given system, IOMUXC_GPR1[11:0] should be set up as 05, 033, 0113 or 01111 correspondingly.
Quoted 8 lines
CS0(128M) CS1(0M) CS2(0M) CS3(0M) CS0(64M) CS1(64M) CS2(0M) CS3(0M) CS0(64M) CS1(32M) CS2(32M) CS3(0M) CS0(32M) CS1(32M) CS2(32M) CS3(32M)The patch creates a function for imx6q-weim type of device, which scans 'ranges' property of WEIM node and build the GPR value incrementally. Thus the WEIM CS GPR can be set up automatically at boot time.
Please add that text to Documentation/devicetree/bindings/bus/imx-weim.txt.
Quoted 30 lines
Signed-off-by Shawn Guo <[email protected]>---
Changes since v1:
- Drop device tree property fsl,weim-cs-gpr
- Use octal value for IOMUXC_GPR1[11:0] bit field
- Useof_property_for_each_u32()to build gprval incrementallydrivers/bus/imx-weim.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+)drivers/bus/imx-weim.c +4
-0@@ -11,6 +11,9 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/of_device.h> +#include <linux/mfd/syscon.h> +#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> +#include <linux/regmap.h> struct imx_weim_devtype {unsigned int cs_count;@@ -56,6 +59,59 @@ static const struct of_device_id weim_id_table[] = { };MODULE_DEVICE_TABLE (of, weim_id_table); +static int __init imx6q_weim_gpr_setup (struct platform_device *pdev)
drivers/bus/imx-weim.c static const struct of_device_id weim_id_table[] = { · line 72
Quoted 10 lines
drivers/bus/imx-weim.c +10
-0+{ +struct device_node *np = pdev->dev.of_node; +struct property *prop; +const __be32 *p; +struct regmap *gpr; +u32 gprvals[4 ] = { +05 ,/* CS0(128M) CS1(0M) CS2(0M) CS3(0M) */ +033 ,/* CS0(64M) CS1(64M) CS2(0M) CS3(0M) */ +0113 ,/* CS0(64M) CS1(32M) CS2(32M) CS3(0M) */ +0111 ,/* CS0(64M) CS1(32M) CS2(32M) CS3(0M) */
01111, /* CS0(32M) CS1(32M) CS2(32M) CS3(32M) */
Quoted 15 lines
drivers/bus/imx-weim.c +15
-0+ }; +u32 gprval =0 ; +u32 val; +int len; +int cs =0 ; +int i =0 ; + + gpr =syscon_regmap_lookup_by_compatible ("fsl,imx6q-iomuxc-gpr" ); +if (IS_ERR (gpr)) { +dev_err (&pdev->dev,"failed to find fsl,imx6q-iomuxc-gpr\n" ); +return -ENOENT ; + } + + prop =of_find_property (np,"ranges" , &len); +if (prop ==NULL )
drivers/bus/imx-weim.c static const struct of_device_id weim_id_table[] = { · line 97
Quoted 10 lines
drivers/bus/imx-weim.c +10
-0+return -ENOENT ; +if (len % (sizeof (u32) *4 )) +return -EINVAL ; + +of_property_for_each_u32 (np,"ranges" , prop, p, val) { +if (i %4 ==0 ) { + cs = val; + }else if (i %4 ==3 && val) { + val /=SZ_64M ; + val = (val <<1 ) |1 ;
or
val = (val / SZ_32M) | 1;
drivers/bus/imx-weim.c static const struct of_device_id weim_id_table[] = { · line 101
Quoted 4 lines
drivers/bus/imx-weim.c +4
-0+ gprval |= val << cs *3 ; + } + i++; + }
You may replace the tests above (from "prop = of_find_property" to "EINVAL;") by :
if (i == 0 || (i % 4)) goto err;
drivers/bus/imx-weim.c static const struct of_device_id weim_id_table[] = { · line 110
Quoted 9 lines
drivers/bus/imx-weim.c +9
-0+ +for (i =0 ; i <ARRAY_SIZE (gprvals); i++) { +if (gprval == gprvals[i]) { +/* Found it. Set up IOMUXC_GPR1[11:0] with it. */ +regmap_update_bits (gpr,IOMUXC_GPR1 ,0xfff , gprval); +return 0 ; + } + } +
err:
Quoted 20 lines
drivers/bus/imx-weim.c +7
-0+dev_err (&pdev->dev,"Invalid 'ranges' configuration\n" ); +return -EINVAL ; +} +/* Parse and set the timing for this device. */ static int __init weim_timing_setup (struct device_node *np,void __iomem *base,const struct imx_weim_devtype *devtype)@@ -92,6 +148,9 @@ static int __init weim_parse_dt(struct platform_device *pdev,struct device_node *child;int ret; +if (of_device_is_compatible (pdev->dev.of_node,"fsl,imx6q-weim" )) +imx6q_weim_gpr_setup (pdev); +for_each_child_of_node (pdev->dev.of_node, child) {if (!child->name)continue ;Signature · 1 line
1.7.9.5
I have tested this v2 patch, and, except for the typo (0111 instead of 01111), it works perfectly.
Thanks
Philippe
Signature · 1 line
Philippe De Muyter +32 2 6101532 Macq SA rue de l'Aeronef 2 B-1140 Bruxelles
PATCH v2 1/1 bus: imx-weim: support CS GPR config for imx6q-weim
Quoted 16 lines · Philippe De Muyter
Hi Shawn,
Quoted 13 lines · Shawn Guo
For imx6q-weim type of device, there might a WEIM CS space configuration register in General Purpose Register controller, e.g.
IOMUXC_GPR1on i.MX6Q.Depending on which configuration of the following 4 is chosen for given system, IOMUXC_GPR1[11:0] should be set up as 05, 033, 0113 or 01111 correspondingly.
CS0(128M) CS1(0M) CS2(0M) CS3(0M) CS0(64M) CS1(64M) CS2(0M) CS3(0M) CS0(64M) CS1(32M) CS2(32M) CS3(0M) CS0(32M) CS1(32M) CS2(32M) CS3(32M)
Quoted 5 lines
Quoted 3 lines
The patch creates a function for imx6q-weim type of device, which scans 'ranges' property of WEIM node and build the GPR value incrementally. Thus the WEIM CS GPR can be set up automatically at boot time.
Please add that text to
Documentation/devicetree/bindings/bus/imx-weim.txt.
Since the patch does not add any new device tree properties, I do not think we need to necessarily update bindings doc in this patch. I prefer to improve the doc with another separate patch.
Quoted 30 lines
Quoted 30 lines
Signed-off-by Shawn Guo <[email protected]>---
Changes since v1:
- Drop device tree property fsl,weim-cs-gpr
- Use octal value for IOMUXC_GPR1[11:0] bit field
- Useof_property_for_each_u32()to build gprval incrementallydrivers/bus/imx-weim.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+)drivers/bus/imx-weim.c +3
-0@@ -11,6 +11,9 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/of_device.h> +#include <linux/mfd/syscon.h> +#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> +#include <linux/regmap.h> struct imx_weim_devtype {unsigned int cs_count;@@ -56,6 +59,59 @@ static const struct of_device_id weim_id_table[] = { };MODULE_DEVICE_TABLE (of, weim_id_table);
Quoted 13 lines
drivers/bus/imx-weim.c static const struct of_device_id weim_id_table[] = { · line 72
Quoted 11 lines
drivers/bus/imx-weim.c +11
-0+static int __init imx6q_weim_gpr_setup (struct platform_device *pdev) +{ +struct device_node *np = pdev->dev.of_node; +struct property *prop; +const __be32 *p; +struct regmap *gpr; +u32 gprvals[4 ] = { +05 ,/* CS0(128M) CS1(0M) CS2(0M) CS3(0M) */ +033 ,/* CS0(64M) CS1(64M) CS2(0M) CS3(0M) */ +0113 ,/* CS0(64M) CS1(32M) CS2(32M) CS3(0M) */ +0111 ,/* CS0(64M) CS1(32M) CS2(32M) CS3(0M) */ 01111, /* CS0(32M) CS1(32M) CS2(32M) CS3(32M) */
Oops, thanks.
Quoted 28 lines
Quoted 16 lines
drivers/bus/imx-weim.c +15
-0+ }; +u32 gprval =0 ; +u32 val; +int len; +int cs =0 ; +int i =0 ; + + gpr =syscon_regmap_lookup_by_compatible ("fsl,imx6q-iomuxc-gpr" ); +if (IS_ERR (gpr)) { +dev_err (&pdev->dev,"failed to find fsl,imx6q-iomuxc-gpr\n" ); +return -ENOENT ; + } + + prop =of_find_property (np,"ranges" , &len); +if (prop ==NULL )drivers/bus/imx-weim.c static const struct of_device_id weim_id_table[] = { · line 97
Quoted 10 lines
drivers/bus/imx-weim.c +10
-0+return -ENOENT ; +if (len % (sizeof (u32) *4 )) +return -EINVAL ; + +of_property_for_each_u32 (np,"ranges" , prop, p, val) { +if (i %4 ==0 ) { + cs = val; + }else if (i %4 ==3 && val) { + val /=SZ_64M ; + val = (val <<1 ) |1 ;or
Quoted 1 line
val = (val / SZ_32M) | 1;
Okay.
Quoted 10 lines
drivers/bus/imx-weim.c static const struct of_device_id weim_id_table[] = { · line 101
Quoted 5 lines
drivers/bus/imx-weim.c +4
-0+ gprval |= val << cs *3 ; + } + i++; + }You may replace the tests above (from "prop =
of_find_property" to "EINVAL;") by :if (i == 0 || (i % 4)) goto err;
Yeah, it's better.
I will roll these changes into v3.
Quoted 23 lines
drivers/bus/imx-weim.c static const struct of_device_id weim_id_table[] = { · line 110
Quoted 9 lines
drivers/bus/imx-weim.c +9
-0+ +for (i =0 ; i <ARRAY_SIZE (gprvals); i++) { +if (gprval == gprvals[i]) { +/* Found it. Set up IOMUXC_GPR1[11:0] with it. */ +regmap_update_bits (gpr,IOMUXC_GPR1 ,0xfff , gprval); +return 0 ; + } + } +err:
Quoted 11 lines
drivers/bus/imx-weim.c +4
-0+dev_err (&pdev->dev,"Invalid 'ranges' configuration\n" ); +return -EINVAL ; +} +/* Parse and set the timing for this device. */ static int __init weim_timing_setup (struct device_node *np,void __iomem *base,const struct imx_weim_devtype *devtype)@@ -92,6 +148,9 @@ static int __init weim_parse_dt(struct platform_device *pdev,struct device_node *child;int ret;
Quoted 12 lines
Quoted 9 lines
drivers/bus/imx-weim.c +3
-0+if (of_device_is_compatible (pdev->dev.of_node,"fsl,imx6q-weim" )) +imx6q_weim_gpr_setup (pdev); +for_each_child_of_node (pdev->dev.of_node, child) {if (!child->name)continue ;Signature · 1 line
1.7.9.5I have tested this v2 patch, and, except for the typo (0111 instead of 01111), it works perfectly.
Thanks for testing.
Shawn