MLK-13369-2: ARM: dts: Add more parameters for gpr property of sound

The new parameter description is:
gpr = <gpr-node, register-offset, mask, value>;

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>

diff --git a/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-wm8958.dts b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-wm8958.dts
index 3e53604..bdc5b90 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-wm8958.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-wm8958.dts
@@ -47,7 +47,7 @@
                cpu-dai = <&sai2>;
                audio-codec = <&codec>;
                codec-master;
-               gpr = <&gpr>;
+               gpr = <&gpr 4 0x100000 0x100000>;
                hp-det-gpios = <&gpio5 0 1>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6ul-9x9-evk.dts b/arch/arm/boot/dts/imx6ul-9x9-evk.dts
index bf3f727..8fefe99 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-9x9-evk.dts
+++ b/arch/arm/boot/dts/imx6ul-9x9-evk.dts
@@ -93,7 +93,7 @@
                audio-codec = <&codec>;
                asrc-controller = <&asrc>;
                codec-master;
-               gpr = <&gpr>;
+               gpr = <&gpr 4 0x100000 0x100000>;
                /*
                  * hp-det = <hp-det-pin hp-det-polarity>;
                 * hp-det-pin: JD1 JD2  or JD3

diff --git a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-cs42888.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-cs42888.dts
index 9f46161..0b498b2 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-cs42888.dts
+++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-cs42888.dts
@@ -72,7 +72,7 @@
                cpu-dai = <&sai2>;
                audio-codec = <&codec_b>;
                codec-master;
-               gpr = <&gpr>;
+               gpr = <&gpr 4 0x100000 0x100000>;
                hp-det-gpios = <&gpio5 0 1>;
        };
 };

diff --git a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts
index b7c3afe..498281b 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts
+++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts
@@ -56,7 +56,7 @@
                cpu-dai = <&sai2>;
                audio-codec = <&codec_b>;
                codec-master;
-               gpr = <&gpr>;
+               gpr = <&gpr 4 0x100000 0x100000>;
                hp-det-gpios = <&gpio5 0 1>;
        };
 

diff --git a/arch/arm/boot/dts/imx6ull-14x14-evk.dts b/arch/arm/boot/dts/imx6ull-14x14-evk.dts
index e44fa9d..b0fb913 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-14x14-evk.dts
+++ b/arch/arm/boot/dts/imx6ull-14x14-evk.dts
@@ -93,7 +93,7 @@
                audio-codec = <&codec>;
                asrc-controller = <&asrc>;
                codec-master;
-               gpr = <&gpr>;
+               gpr = <&gpr 4 0x100000 0x100000>;
                /*
                  * hp-det = <hp-det-pin hp-det-polarity>;
                 * hp-det-pin: JD1 JD2  or JD3

diff --git a/arch/arm/boot/dts/imx6ull-9x9-evk.dts b/arch/arm/boot/dts/imx6ull-9x9-evk.dts
index 9ca45fa..8990293 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-9x9-evk.dts
+++ b/arch/arm/boot/dts/imx6ull-9x9-evk.dts
@@ -93,7 +93,7 @@
                audio-codec = <&codec>;
                asrc-controller = <&asrc>;
                codec-master;
-               gpr = <&gpr>;
+               gpr = <&gpr 4 0x100000 0x100000>;
                /*
                  * hp-det = <hp-det-pin hp-det-polarity>;
                 * hp-det-pin: JD1 JD2  or JD3