diff mbox

[3/3] ARM: davinci: da850: add EHRPWM & ECAP DT node

Message ID 1363257453-24747-4-git-send-email-avinashphilip@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

avinash philip March 14, 2013, 10:37 a.m. UTC
Add da850 EHRPWM & ECAP DT node.
Also adds OF_DEV_AUXDATA for EHRPWM & ECAP driver to use EHRPWM & ECAP
clock.

Signed-off-by: Philip Avinash <avinashphilip@ti.com>
---
:100644 100644 3ec1bda... 9b5b613... M	arch/arm/boot/dts/da850.dtsi
:100644 100644 72466ab... e32484c... M	arch/arm/mach-davinci/da8xx-dt.c
 arch/arm/boot/dts/da850.dtsi     |   30 ++++++++++++++++++++++++++++++
 arch/arm/mach-davinci/da8xx-dt.c |    5 +++++
 2 files changed, 35 insertions(+)

Comments

Peter Korsgaard March 14, 2013, 3:49 p.m. UTC | #1
>>>>> "P" == Philip Avinash <avinashphilip@ti.com> writes:

 P> Add da850 EHRPWM & ECAP DT node.
 P> Also adds OF_DEV_AUXDATA for EHRPWM & ECAP driver to use EHRPWM & ECAP
 P> clock.

 P> Signed-off-by: Philip Avinash <avinashphilip@ti.com>
 P> ---
 P> :100644 100644 3ec1bda... 9b5b613... M	arch/arm/boot/dts/da850.dtsi
 P> :100644 100644 72466ab... e32484c... M	arch/arm/mach-davinci/da8xx-dt.c
 P>  arch/arm/boot/dts/da850.dtsi     |   30 ++++++++++++++++++++++++++++++
 P>  arch/arm/mach-davinci/da8xx-dt.c |    5 +++++
 P>  2 files changed, 35 insertions(+)

 P> diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
 P> index 3ec1bda..9b5b613 100644
 P> --- a/arch/arm/boot/dts/da850.dtsi
 P> +++ b/arch/arm/boot/dts/da850.dtsi
 P> @@ -107,6 +107,36 @@
 P>  			reg = <0x21000 0x1000>;
 P>  			status = "disabled";
 P>  		};
 P> +		ehrpwm0: ehrpwm@01f00000 {
 P> +			compatible = "ti,da850-ehrpwm";

This should be:

compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm";

 P> +		ecap0: ecap@01f06000 {
 P> +			compatible = "ti,da850-ecap";

And:

compatible = "ti,da850-ecap", "ti,am33xx-ecap";
diff mbox

Patch

diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index 3ec1bda..9b5b613 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -107,6 +107,36 @@ 
 			reg = <0x21000 0x1000>;
 			status = "disabled";
 		};
+		ehrpwm0: ehrpwm@01f00000 {
+			compatible = "ti,da850-ehrpwm";
+			#pwm-cells = <3>;
+			reg = <0x300000 0x2000>;
+			status = "disabled";
+		};
+		ehrpwm1: ehrpwm@01f02000 {
+			compatible = "ti,da850-ehrpwm";
+			#pwm-cells = <3>;
+			reg = <0x302000 0x2000>;
+			status = "disabled";
+		};
+		ecap0: ecap@01f06000 {
+			compatible = "ti,da850-ecap";
+			#pwm-cells = <3>;
+			reg = <0x306000 0x80>;
+			status = "disabled";
+		};
+		ecap1: ecap@01f07000 {
+			compatible = "ti,da850-ecap";
+			#pwm-cells = <3>;
+			reg = <0x307000 0x80>;
+			status = "disabled";
+		};
+		ecap2: ecap@01f08000 {
+			compatible = "ti,da850-ecap";
+			#pwm-cells = <3>;
+			reg = <0x308000 0x80>;
+			status = "disabled";
+		};
 	};
 	nand_cs3@62000000 {
 		compatible = "ti,davinci-nand";
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index 72466ab..e32484c 100644
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -41,6 +41,11 @@  static void __init da8xx_init_irq(void)
 struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL),
 	OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "watchdog", NULL),
+	OF_DEV_AUXDATA("ti,da850-ehrpwm", 0x01f00000, "ehrpwm", NULL),
+	OF_DEV_AUXDATA("ti,da850-ehrpwm", 0x01f02000, "ehrpwm", NULL),
+	OF_DEV_AUXDATA("ti,da850-ecap", 0x01f06000, "ecap", NULL),
+	OF_DEV_AUXDATA("ti,da850-ecap", 0x01f07000, "ecap", NULL),
+	OF_DEV_AUXDATA("ti,da850-ecap", 0x01f08000, "ecap", NULL),
 	{}
 };