summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorShengjiu Wang <shengjiu.wang@freescale.com>2016-10-19 17:24:26 +0800
committerJason Liu <jason.hui.liu@nxp.com>2019-02-12 10:25:08 +0800
commitc777bbfc6e99b41eb0ca309393ced4c962267dd9 (patch)
treec5c7334bde783908ad11bdfb327bba70e510bc2e /arch
parent0745d78f2a7408b2695bd542e878c1fe23909c2c (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-wm8958.dts2
-rw-r--r--arch/arm/boot/dts/imx6ul-9x9-evk.dts2
-rw-r--r--arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-cs42888.dts2
-rw-r--r--arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts2
-rw-r--r--arch/arm/boot/dts/imx6ull-14x14-evk.dts2
-rw-r--r--arch/arm/boot/dts/imx6ull-9x9-evk.dts2
6 files changed, 6 insertions, 6 deletions
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 3e53604bf691..bdc5b903602a 100644
--- 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 11089a007558..3d2c4ac41dde 100644
--- 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 b357282d1a16..cf14b6f3f92a 100644
--- 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 b7c3afe87343..498281b2c88b 100644
--- 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 b0bd39f5c5ca..92727e1c3779 100644
--- 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 590af08d8db3..47077b38b741 100644
--- 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