[alsa-devel] [PATCH RESEND V2] ARM: dts: Correct the base address of pinctrl_3 on Exynos5250
This patch corrects the base address of pinctrl_3 on Exynos5250 platform.
Signed-off-by: Padmavathi Venna padma.v@samsung.com --- Changes since V1: - Added platform name in the subject line.
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 +- arch/arm/boot/dts/exynos5250.dtsi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi index d1650fb..ded558b 100644 --- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi @@ -763,7 +763,7 @@ }; };
- pinctrl@03680000 { + pinctrl@03860000 { gpz: gpz { gpio-controller; #gpio-cells = <2>; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 7154e3d..e9bfd13 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -169,9 +169,9 @@ interrupts = <0 50 0>; };
- pinctrl_3: pinctrl@03680000 { + pinctrl_3: pinctrl@03860000 { compatible = "samsung,exynos5250-pinctrl"; - reg = <0x0368000 0x1000>; + reg = <0x03860000 0x1000>; interrupts = <0 47 0>; };
This patch adds the required regulator supplies and properties for wm8994 codec on smdk5250 board.
Signed-off-by: Padmavathi Venna padma.v@samsung.com ---
Changes since V1: - Clubbed the same supply regulators as suggested by Mark.
arch/arm/boot/dts/exynos5250-smdk5250.dts | 37 +++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index f2a025e..dc2ec25 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -37,6 +37,30 @@ }; };
+ vdd:fixed-regulator@0 { + compatible = "regulator-fixed"; + regulator-name = "vdd-supply"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + dbvdd:fixed-regulator@1 { + compatible = "regulator-fixed"; + regulator-name = "dbvdd-supply"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + spkvdd:fixed-regulator@2 { + compatible = "regulator-fixed"; + regulator-name = "spkvdd-supply"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + i2c@12C70000 { samsung,i2c-sda-delay = <100>; samsung,i2c-max-bus-freq = <20000>; @@ -47,8 +71,17 @@ };
wm8994: wm8994@1a { - compatible = "wlf,wm8994"; - reg = <0x1a>; + compatible = "wlf,wm8994"; + reg = <0x1a>; + + gpio-controller; + #gpio-cells = <2>; + + AVDD2-supply = <&vdd>; + CPVDD-supply = <&vdd>; + DBVDD-supply = <&dbvdd>; + SPKVDD1-supply = <&spkvdd>; + SPKVDD2-supply = <&spkvdd>; }; };
Padmavathi Venna wrote:
This patch adds the required regulator supplies and properties for wm8994 codec on smdk5250 board.
Signed-off-by: Padmavathi Venna padma.v@samsung.com
Changes since V1:
- Clubbed the same supply regulators as suggested by Mark.
Applied, thanks.
- Kukjin
Padmavathi Venna wrote:
This patch corrects the base address of pinctrl_3 on Exynos5250 platform.
Signed-off-by: Padmavathi Venna padma.v@samsung.com
Changes since V1:
- Added platform name in the subject line.
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 +- arch/arm/boot/dts/exynos5250.dtsi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi index d1650fb..ded558b 100644 --- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi @@ -763,7 +763,7 @@ }; };
- pinctrl@03680000 {
- pinctrl@03860000 { gpz: gpz { gpio-controller; #gpio-cells = <2>;
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 7154e3d..e9bfd13 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -169,9 +169,9 @@ interrupts = <0 50 0>; };
- pinctrl_3: pinctrl@03680000 {
- pinctrl_3: pinctrl@03860000 { compatible = "samsung,exynos5250-pinctrl";
reg = <0x0368000 0x1000>;
interrupts = <0 47 0>; };reg = <0x03860000 0x1000>;
-- 1.7.4.4
Yes, right.
Thanks, applied.
- Kukjin
Padmavathi Venna wrote:
This patch corrects the base address of pinctrl_3 on Exynos5250 platform.
Signed-off-by: Padmavathi Venna padma.v@samsung.com
(+ Olof)
Olof, there is no other fixes in my tree for v3.10 yet, so would be helpful if you could take this into fixes in arm-soc for v3.10. Just note, the wrong address added during v3.10 merge window.
If you want, Acked-by: Kukjin Kim kgene.kim@samsung.com
If any problems, please kindly let me know.
Thanks, - Kukjin
Changes since V1:
- Added platform name in the subject line.
arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 +- arch/arm/boot/dts/exynos5250.dtsi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi index d1650fb..ded558b 100644 --- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi @@ -763,7 +763,7 @@ }; };
- pinctrl@03680000 {
- pinctrl@03860000 { gpz: gpz { gpio-controller; #gpio-cells = <2>;
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 7154e3d..e9bfd13 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -169,9 +169,9 @@ interrupts = <0 50 0>; };
- pinctrl_3: pinctrl@03680000 {
- pinctrl_3: pinctrl@03860000 { compatible = "samsung,exynos5250-pinctrl";
reg = <0x0368000 0x1000>;
interrupts = <0 47 0>; };reg = <0x03860000 0x1000>;
-- 1.7.4.4
On Mon, Jun 17, 2013 at 09:58:47PM +0900, Kukjin Kim wrote:
Padmavathi Venna wrote:
This patch corrects the base address of pinctrl_3 on Exynos5250 platform.
Signed-off-by: Padmavathi Venna padma.v@samsung.com
(+ Olof)
Olof, there is no other fixes in my tree for v3.10 yet, so would be helpful if you could take this into fixes in arm-soc for v3.10. Just note, the wrong address added during v3.10 merge window.
Huh. I guess we lucked out on snow since we're definitely using this and didn't hit any problems from it.
I'll apply to fixes.
-Olof
participants (3)
-
Kukjin Kim
-
Olof Johansson
-
Padmavathi Venna