diff mbox

[V2,1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm

Message ID 1370540919-4339-2-git-send-email-r.sricharan@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

R Sricharan June 6, 2013, 5:48 p.m. UTC
The uevm is the official board supported for the OMAP5 soc
in mainline. The uevm has an OMAP5432 with a DDR3 memory.
Renaming the board dts file and adding the following cleanups.

 * There are no devices connected on I2C 2,3,4 buses. So remove
   the pinmux data for the same.

 * DDR3 memory is used in the uevm. Neither DVFS or temperature
   polling is supported with DDR3. So remove the DDR3 device and
   emif nodes.

 * Keypad is not supported on uevm. So remove the device node.

Signed-off-by: Sricharan R <r.sricharan@ti.com>
---
 arch/arm/boot/dts/Makefile                         |    2 +-
 .../arm/boot/dts/{omap5-evm.dts => omap5-uevm.dts} |   83 +-------------------
 2 files changed, 4 insertions(+), 81 deletions(-)
 rename arch/arm/boot/dts/{omap5-evm.dts => omap5-uevm.dts} (73%)

Comments

Benoit Cousson June 7, 2013, 12:03 p.m. UTC | #1
Hi Sricharan,

On 06/06/2013 07:48 PM, Sricharan R wrote:
> The uevm is the official board supported for the OMAP5 soc
> in mainline. The uevm has an OMAP5432 with a DDR3 memory.
> Renaming the board dts file and adding the following cleanups.

OK, so in fact you are not just renaming the board file, you are using
the previous board EVM DTS to describe a completely different board.
You are recycling the old non supported EVM.

You should update the subject and changelog to reflect that, because
that's rather confusing.

> 
>  * There are no devices connected on I2C 2,3,4 buses. So remove
>    the pinmux data for the same.
> 
>  * DDR3 memory is used in the uevm. Neither DVFS or temperature
>    polling is supported with DDR3. So remove the DDR3 device and
>    emif nodes.

You should explain why. I don't think this is obvious for people outside TI.

Regards,
Benoit

> 
>  * Keypad is not supported on uevm. So remove the device node.
> 
> Signed-off-by: Sricharan R <r.sricharan@ti.com>
> ---
>  arch/arm/boot/dts/Makefile                         |    2 +-
>  .../arm/boot/dts/{omap5-evm.dts => omap5-uevm.dts} |   83 +-------------------
>  2 files changed, 4 insertions(+), 81 deletions(-)
>  rename arch/arm/boot/dts/{omap5-evm.dts => omap5-uevm.dts} (73%)
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index f0895c5..13b86bf 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -149,7 +149,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
>  	omap4-panda-es.dtb \
>  	omap4-var-som.dtb \
>  	omap4-sdp.dtb \
> -	omap5-evm.dtb \
> +	omap5-uevm.dtb \
>  	am335x-evm.dtb \
>  	am335x-evmsk.dtb \
>  	am335x-bone.dtb
> diff --git a/arch/arm/boot/dts/omap5-evm.dts b/arch/arm/boot/dts/omap5-uevm.dts
> similarity index 73%
> rename from arch/arm/boot/dts/omap5-evm.dts
> rename to arch/arm/boot/dts/omap5-uevm.dts
> index 22e9ee8..843a001 100644
> --- a/arch/arm/boot/dts/omap5-evm.dts
> +++ b/arch/arm/boot/dts/omap5-uevm.dts
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
> + * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
>   *
>   * This program is free software; you can redistribute it and/or modify
>   * it under the terms of the GNU General Public License version 2 as
> @@ -8,11 +8,10 @@
>  /dts-v1/;
>  
>  #include "omap5.dtsi"
> -#include "samsung_k3pe0e000b.dtsi"
>  
>  / {
> -	model = "TI OMAP5 EVM board";
> -	compatible = "ti,omap5-evm", "ti,omap5";
> +	model = "TI OMAP5 uEVM board";
> +	compatible = "ti,omap5-uevm", "ti,omap5";
>  
>  	memory {
>  		device_type = "memory";
> @@ -88,27 +87,6 @@
>  		>;
>  	};
>  
> -	i2c2_pins: pinmux_i2c2_pins {
> -		pinctrl-single,pins = <
> -			0x178 (PIN_INPUT | MUX_MODE0)		/* i2c2_scl */
> -			0x17a (PIN_INPUT | MUX_MODE0)		/* i2c2_sda */
> -		>;
> -	};
> -
> -	i2c3_pins: pinmux_i2c3_pins {
> -		pinctrl-single,pins = <
> -			0x13a (PIN_INPUT | MUX_MODE0)		/* i2c3_scl */
> -			0x13c (PIN_INPUT | MUX_MODE0)		/* i2c3_sda */
> -		>;
> -	};
> -
> -	i2c4_pins: pinmux_i2c4_pins {
> -		pinctrl-single,pins = <
> -			0xb8 (PIN_INPUT | MUX_MODE0)		/* i2c4_scl */
> -			0xba (PIN_INPUT | MUX_MODE0)		/* i2c4_sda */
> -		>;
> -	};
> -
>  	i2c5_pins: pinmux_i2c5_pins {
>  		pinctrl-single,pins = <
>  			0x184 (PIN_INPUT | MUX_MODE0)		/* i2c5_scl */
> @@ -175,39 +153,6 @@
>  	clock-frequency = <400000>;
>  };
>  
> -&i2c2 {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&i2c2_pins>;
> -
> -	clock-frequency = <400000>;
> -
> -	/* Pressure Sensor */
> -	bmp085@77 {
> -		compatible = "bosch,bmp085";
> -		reg = <0x77>;
> -	};
> -};
> -
> -&i2c3 {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&i2c3_pins>;
> -
> -	clock-frequency = <400000>;
> -};
> -
> -&i2c4 {
> -	pinctrl-names = "default";
> -	pinctrl-0 = <&i2c4_pins>;
> -
> -	clock-frequency = <400000>;
> -
> -	/* Temperature Sensor */
> -	tmp102@48{
> -		compatible = "ti,tmp102";
> -		reg = <0x48>;
> -	};
> -};
> -
>  &i2c5 {
>  	pinctrl-names = "default";
>  	pinctrl-0 = <&i2c5_pins>;
> @@ -215,32 +160,10 @@
>  	clock-frequency = <400000>;
>  };
>  
> -&keypad {
> -	keypad,num-rows = <8>;
> -	keypad,num-columns = <8>;
> -	linux,keymap = <0x02020073	/* VOLUP */
> -			0x02030072	/* VOLDOWM */
> -			0x020400e7	/* SEND */
> -			0x02050066	/* HOME */
> -			0x0206006b	/* END */
> -			0x020700d9>;	/* SEARCH */
> -	linux,input-no-autorepeat;
> -};
> -
>  &mcbsp3 {
>  	status = "disabled";
>  };
>  
> -&emif1 {
> -	cs1-used;
> -	device-handle = <&samsung_K3PE0E000B>;
> -};
> -
> -&emif2 {
> -	cs1-used;
> -	device-handle = <&samsung_K3PE0E000B>;
> -};
> -
>  &mcspi1 {
>  
>  };
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
R Sricharan June 7, 2013, 1:27 p.m. UTC | #2
On Friday 07 June 2013 05:33 PM, Benoit Cousson wrote:
> Hi Sricharan,
>
> On 06/06/2013 07:48 PM, Sricharan R wrote:
>> The uevm is the official board supported for the OMAP5 soc
>> in mainline. The uevm has an OMAP5432 with a DDR3 memory.
>> Renaming the board dts file and adding the following cleanups.
> OK, so in fact you are not just renaming the board file, you are using
> the previous board EVM DTS to describe a completely different board.
> You are recycling the old non supported EVM.
>
> You should update the subject and changelog to reflect that, because
> that's rather confusing.
  Ok, reposted V3.
>
>>  * There are no devices connected on I2C 2,3,4 buses. So remove
>>    the pinmux data for the same.
>>
>>  * DDR3 memory is used in the uevm. Neither DVFS or temperature
>>    polling is supported with DDR3. So remove the DDR3 device and
>>    emif nodes.
> You should explain why. I don't think this is obvious for people outside TI.
  Ok, updated this in V3.

Regards,
 Sricharan
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index f0895c5..13b86bf 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -149,7 +149,7 @@  dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 	omap4-panda-es.dtb \
 	omap4-var-som.dtb \
 	omap4-sdp.dtb \
-	omap5-evm.dtb \
+	omap5-uevm.dtb \
 	am335x-evm.dtb \
 	am335x-evmsk.dtb \
 	am335x-bone.dtb
diff --git a/arch/arm/boot/dts/omap5-evm.dts b/arch/arm/boot/dts/omap5-uevm.dts
similarity index 73%
rename from arch/arm/boot/dts/omap5-evm.dts
rename to arch/arm/boot/dts/omap5-uevm.dts
index 22e9ee8..843a001 100644
--- a/arch/arm/boot/dts/omap5-evm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -1,5 +1,5 @@ 
 /*
- * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -8,11 +8,10 @@ 
 /dts-v1/;
 
 #include "omap5.dtsi"
-#include "samsung_k3pe0e000b.dtsi"
 
 / {
-	model = "TI OMAP5 EVM board";
-	compatible = "ti,omap5-evm", "ti,omap5";
+	model = "TI OMAP5 uEVM board";
+	compatible = "ti,omap5-uevm", "ti,omap5";
 
 	memory {
 		device_type = "memory";
@@ -88,27 +87,6 @@ 
 		>;
 	};
 
-	i2c2_pins: pinmux_i2c2_pins {
-		pinctrl-single,pins = <
-			0x178 (PIN_INPUT | MUX_MODE0)		/* i2c2_scl */
-			0x17a (PIN_INPUT | MUX_MODE0)		/* i2c2_sda */
-		>;
-	};
-
-	i2c3_pins: pinmux_i2c3_pins {
-		pinctrl-single,pins = <
-			0x13a (PIN_INPUT | MUX_MODE0)		/* i2c3_scl */
-			0x13c (PIN_INPUT | MUX_MODE0)		/* i2c3_sda */
-		>;
-	};
-
-	i2c4_pins: pinmux_i2c4_pins {
-		pinctrl-single,pins = <
-			0xb8 (PIN_INPUT | MUX_MODE0)		/* i2c4_scl */
-			0xba (PIN_INPUT | MUX_MODE0)		/* i2c4_sda */
-		>;
-	};
-
 	i2c5_pins: pinmux_i2c5_pins {
 		pinctrl-single,pins = <
 			0x184 (PIN_INPUT | MUX_MODE0)		/* i2c5_scl */
@@ -175,39 +153,6 @@ 
 	clock-frequency = <400000>;
 };
 
-&i2c2 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c2_pins>;
-
-	clock-frequency = <400000>;
-
-	/* Pressure Sensor */
-	bmp085@77 {
-		compatible = "bosch,bmp085";
-		reg = <0x77>;
-	};
-};
-
-&i2c3 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c3_pins>;
-
-	clock-frequency = <400000>;
-};
-
-&i2c4 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c4_pins>;
-
-	clock-frequency = <400000>;
-
-	/* Temperature Sensor */
-	tmp102@48{
-		compatible = "ti,tmp102";
-		reg = <0x48>;
-	};
-};
-
 &i2c5 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c5_pins>;
@@ -215,32 +160,10 @@ 
 	clock-frequency = <400000>;
 };
 
-&keypad {
-	keypad,num-rows = <8>;
-	keypad,num-columns = <8>;
-	linux,keymap = <0x02020073	/* VOLUP */
-			0x02030072	/* VOLDOWM */
-			0x020400e7	/* SEND */
-			0x02050066	/* HOME */
-			0x0206006b	/* END */
-			0x020700d9>;	/* SEARCH */
-	linux,input-no-autorepeat;
-};
-
 &mcbsp3 {
 	status = "disabled";
 };
 
-&emif1 {
-	cs1-used;
-	device-handle = <&samsung_K3PE0E000B>;
-};
-
-&emif2 {
-	cs1-used;
-	device-handle = <&samsung_K3PE0E000B>;
-};
-
 &mcspi1 {
 
 };