* [PATCH V2 0/4] ARM: dts: omap5: Cleanup and updates for DT files
@ 2013-06-06 17:48 Sricharan R
2013-06-06 17:48 ` [PATCH V2 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm Sricharan R
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Sricharan R @ 2013-06-06 17:48 UTC (permalink / raw)
To: linux-omap, linux-arm-kernel
Cc: devicetree-discuss, r.sricharan, tony, rnayak, b-cousson
uevm is the official board supported for OMAP5 soc in the mainline.
This series renames the board dts file for OMAP5 accordingly and cleans
up the same. Also a few additional device DT entry updates are done.
This is on top of the below branch
git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git
for_3.11/dts
Boot tested on omap5-uevm after pulling in the data from below place
git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux.git
HWMOD DATA: for_3.11/omap5_data_files
CLOCK DATA: out_of_tree/omap5_clk_data
Dan Murphy (1):
ARM: dts: omap5-uevm: Add LED support for uEVM blue LED
Roger Quadros (1):
ARM: dts: omap5-uevm: Add USB Host support
Sourav Poddar (1):
ARM: dts: omap5-uevm: Add uart pinctrl data
Sricharan R (1):
ARM: dts: omap5: Rename omap5-evm to omap5-uevm
arch/arm/boot/dts/Makefile | 2 +-
arch/arm/boot/dts/omap5-evm.dts | 261 --------------------------------
arch/arm/boot/dts/omap5-uevm.dts | 311 ++++++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/omap5.dtsi | 30 ++++
4 files changed, 342 insertions(+), 262 deletions(-)
delete mode 100644 arch/arm/boot/dts/omap5-evm.dts
create mode 100644 arch/arm/boot/dts/omap5-uevm.dts
--
1.7.9.5
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH V2 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm
2013-06-06 17:48 [PATCH V2 0/4] ARM: dts: omap5: Cleanup and updates for DT files Sricharan R
@ 2013-06-06 17:48 ` Sricharan R
2013-06-07 12:03 ` Benoit Cousson
2013-06-06 17:48 ` [PATCH V2 2/4] ARM: dts: omap5-uevm: Add USB Host support Sricharan R
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Sricharan R @ 2013-06-06 17:48 UTC (permalink / raw)
To: linux-omap, linux-arm-kernel
Cc: devicetree-discuss, r.sricharan, tony, rnayak, b-cousson
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%)
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 {
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH V2 2/4] ARM: dts: omap5-uevm: Add USB Host support
2013-06-06 17:48 [PATCH V2 0/4] ARM: dts: omap5: Cleanup and updates for DT files Sricharan R
2013-06-06 17:48 ` [PATCH V2 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm Sricharan R
@ 2013-06-06 17:48 ` Sricharan R
2013-06-06 17:48 ` [PATCH V2 3/4] ARM: dts: omap5-uevm: Add LED support for uEVM blue LED Sricharan R
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Sricharan R @ 2013-06-06 17:48 UTC (permalink / raw)
To: linux-omap, linux-arm-kernel
Cc: devicetree-discuss, r.sricharan, tony, rnayak, b-cousson,
Roger Quadros
From: Roger Quadros <rogerq@ti.com>
Provide the RESET regulators for the USB PHYs, the USB Host
port modes and the PHY devices.
Also provide pin multiplexer information for the USB host
pins.
Cc: Roger Quadros <rogerq@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
[Sricharan R <r.sricharan@ti.com>: Replaced constants with preprocessor macros]
Signed-off-by: Sricharan R <r.sricharan@ti.com>
---
[v2] Removed the clk_alias node and removed the redundant comments
arch/arm/boot/dts/omap5-uevm.dts | 70 ++++++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/omap5.dtsi | 30 ++++++++++++++++
2 files changed, 100 insertions(+)
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index 843a001..a31e42f 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -25,6 +25,40 @@
regulator-max-microvolt = <3000000>;
};
+ /* HS USB Port 2 RESET */
+ hsusb2_reset: hsusb2_reset_reg {
+ compatible = "regulator-fixed";
+ regulator-name = "hsusb2_reset";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ gpio = <&gpio3 16 GPIO_ACTIVE_HIGH>; /* gpio3_80 HUB_NRESET */
+ startup-delay-us = <70000>;
+ enable-active-high;
+ };
+
+ /* HS USB Host PHY on PORT 2 */
+ hsusb2_phy: hsusb2_phy {
+ compatible = "usb-nop-xceiv";
+ reset-supply = <&hsusb2_reset>;
+ };
+
+ /* HS USB Port 3 RESET */
+ hsusb3_reset: hsusb3_reset_reg {
+ compatible = "regulator-fixed";
+ regulator-name = "hsusb3_reset";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ gpio = <&gpio3 15 GPIO_ACTIVE_HIGH>; /* gpio3_79 ETH_NRESET */
+ startup-delay-us = <70000>;
+ enable-active-high;
+ };
+
+ /* HS USB Host PHY on PORT 3 */
+ hsusb3_phy: hsusb3_phy {
+ compatible = "usb-nop-xceiv";
+ reset-supply = <&hsusb3_reset>;
+ };
+
};
&omap5_pmx_core {
@@ -35,6 +69,7 @@
&dmic_pins
&mcbsp1_pins
&mcbsp2_pins
+ &usbhost_pins
>;
twl6040_pins: pinmux_twl6040_pins {
@@ -120,6 +155,32 @@
0x16c (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */
>;
};
+
+ usbhost_pins: pinmux_usbhost_pins {
+ pinctrl-single,pins = <
+ 0x84 (PIN_INPUT | MUX_MODE0) /* usbb2_hsic_strobe */
+ 0x86 (PIN_INPUT | MUX_MODE0) /* usbb2_hsic_data */
+
+ 0x19e (PIN_INPUT | MUX_MODE0) /* usbb3_hsic_strobe */
+ 0x1a0 (PIN_INPUT | MUX_MODE0) /* usbb3_hsic_data */
+
+ 0x70 (PIN_OUTPUT | MUX_MODE6) /* gpio3_80 HUB_NRESET */
+ 0x6e (PIN_OUTPUT | MUX_MODE6) /* gpio3_79 ETH_NRESET */
+ >;
+ };
+};
+
+&omap5_pmx_wkup {
+ pinctrl-names = "default";
+ pinctrl-0 = <
+ &usbhost_wkup_pins
+ >;
+
+ usbhost_wkup_pins: pinmux_usbhost_wkup_pins {
+ pinctrl-single,pins = <
+ 0x1A (PIN_OUTPUT | MUX_MODE0) /* fref_clk1_out, USB hub clk */
+ >;
+ };
};
&mmc1 {
@@ -164,6 +225,15 @@
status = "disabled";
};
+&usbhshost {
+ port2-mode = "ehci-hsic";
+ port3-mode = "ehci-hsic";
+};
+
+&usbhsehci {
+ phys = <0 &hsusb2_phy &hsusb3_phy>;
+};
+
&mcspi1 {
};
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 1e84db8..accab62 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -666,5 +666,35 @@
ctrl-module = <&omap_control_usb>;
};
};
+
+ usbhstll: usbhstll@4a062000 {
+ compatible = "ti,usbhs-tll";
+ reg = <0x4a062000 0x1000>;
+ interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
+ ti,hwmods = "usb_tll_hs";
+ };
+
+ usbhshost: usbhshost@4a064000 {
+ compatible = "ti,usbhs-host";
+ reg = <0x4a064000 0x800>;
+ ti,hwmods = "usb_host_hs";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+
+ usbhsohci: ohci@4a064800 {
+ compatible = "ti,ohci-omap3", "usb-ohci";
+ reg = <0x4a064800 0x400>;
+ interrupt-parent = <&gic>;
+ interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ usbhsehci: ehci@4a064c00 {
+ compatible = "ti,ehci-omap", "usb-ehci";
+ reg = <0x4a064c00 0x400>;
+ interrupt-parent = <&gic>;
+ interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
+ };
+ };
};
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH V2 3/4] ARM: dts: omap5-uevm: Add LED support for uEVM blue LED
2013-06-06 17:48 [PATCH V2 0/4] ARM: dts: omap5: Cleanup and updates for DT files Sricharan R
2013-06-06 17:48 ` [PATCH V2 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm Sricharan R
2013-06-06 17:48 ` [PATCH V2 2/4] ARM: dts: omap5-uevm: Add USB Host support Sricharan R
@ 2013-06-06 17:48 ` Sricharan R
2013-06-06 17:48 ` [PATCH V2 4/4] ARM: dts: omap5-uevm: Add uart pinctrl data Sricharan R
2013-06-07 12:06 ` [PATCH V2 0/4] ARM: dts: omap5: Cleanup and updates for DT files Benoit Cousson
4 siblings, 0 replies; 9+ messages in thread
From: Sricharan R @ 2013-06-06 17:48 UTC (permalink / raw)
To: linux-omap, linux-arm-kernel
Cc: devicetree-discuss, r.sricharan, tony, rnayak, b-cousson,
Dan Murphy
From: Dan Murphy <dmurphy@ti.com>
Add support for blue LED 1 off of GPIO 153.
Make the LED a heartbeat LED
Configure the MUX for GPIO output.
Cc: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
[Sricharan R <r.sricharan@ti.com>: Replaced constants with preprocessor macros]
Signed-off-by: Sricharan R <r.sricharan@ti.com>
---
[V2] Removed the redundant comments
arch/arm/boot/dts/omap5-uevm.dts | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index a31e42f..6e8bb86 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -59,6 +59,15 @@
reset-supply = <&hsusb3_reset>;
};
+ leds {
+ compatible = "gpio-leds";
+ led@1 {
+ label = "omap5:blue:usr1";
+ gpios = <&gpio5 25 GPIO_ACTIVE_HIGH>; /* gpio5_153 D1 LED */
+ linux,default-trigger = "heartbeat";
+ default-state = "off";
+ };
+ };
};
&omap5_pmx_core {
@@ -70,6 +79,7 @@
&mcbsp1_pins
&mcbsp2_pins
&usbhost_pins
+ &led_gpio_pins
>;
twl6040_pins: pinmux_twl6040_pins {
@@ -168,6 +178,12 @@
0x6e (PIN_OUTPUT | MUX_MODE6) /* gpio3_79 ETH_NRESET */
>;
};
+
+ led_gpio_pins: pinmux_led_gpio_pins {
+ pinctrl-single,pins = <
+ 0x196 (PIN_OUTPUT | MUX_MODE6) /* uart3_cts_rctx.gpio5_153 */
+ >;
+ };
};
&omap5_pmx_wkup {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH V2 4/4] ARM: dts: omap5-uevm: Add uart pinctrl data
2013-06-06 17:48 [PATCH V2 0/4] ARM: dts: omap5: Cleanup and updates for DT files Sricharan R
` (2 preceding siblings ...)
2013-06-06 17:48 ` [PATCH V2 3/4] ARM: dts: omap5-uevm: Add LED support for uEVM blue LED Sricharan R
@ 2013-06-06 17:48 ` Sricharan R
2013-06-07 12:06 ` [PATCH V2 0/4] ARM: dts: omap5: Cleanup and updates for DT files Benoit Cousson
4 siblings, 0 replies; 9+ messages in thread
From: Sricharan R @ 2013-06-06 17:48 UTC (permalink / raw)
To: linux-omap, linux-arm-kernel
Cc: devicetree-discuss, r.sricharan, tony, rnayak, b-cousson,
Sourav Poddar
From: Sourav Poddar <sourav.poddar@ti.com>
Booting omap5 uevm results in the following error
"did not get pins for uart error: -19"
This happens because omap5 uevm dts file is not adapted to use uart through pinctrl
framework. Populating uart pinctrl data to get rid of the error.
Cc: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
[Sricharan R <r.sricharan@ti.com>: Replaced constants with preprocessor macros]
Signed-off-by: Sricharan R <r.sricharan@ti.com>
---
[V2] Removed the redundant comments
arch/arm/boot/dts/omap5-uevm.dts | 41 ++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index 6e8bb86..927db1e 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -184,6 +184,32 @@
0x196 (PIN_OUTPUT | MUX_MODE6) /* uart3_cts_rctx.gpio5_153 */
>;
};
+
+ uart1_pins: pinmux_uart1_pins {
+ pinctrl-single,pins = <
+ 0x60 (PIN_OUTPUT | MUX_MODE0) /* uart1_tx.uart1_cts */
+ 0x62 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart1_tx.uart1_cts */
+ 0x64 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart1_rx.uart1_rts */
+ 0x66 (PIN_OUTPUT | MUX_MODE0) /* uart1_rx.uart1_rts */
+ >;
+ };
+
+ uart3_pins: pinmux_uart3_pins {
+ pinctrl-single,pins = <
+ 0x19a (PIN_OUTPUT | MUX_MODE0) /* uart3_rts_irsd.uart3_tx_irtx */
+ 0x19c (PIN_INPUT_PULLUP | MUX_MODE0) /* uart3_rx_irrx.uart3_usbb3_hsic */
+ >;
+ };
+
+ uart5_pins: pinmux_uart5_pins {
+ pinctrl-single,pins = <
+ 0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart5_rx.uart5_rx */
+ 0x172 (PIN_OUTPUT | MUX_MODE0) /* uart5_tx.uart5_tx */
+ 0x174 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart5_cts.uart5_rts */
+ 0x176 (PIN_OUTPUT | MUX_MODE0) /* uart5_cts.uart5_rts */
+ >;
+ };
+
};
&omap5_pmx_wkup {
@@ -268,3 +294,18 @@
pinctrl-names = "default";
pinctrl-0 = <&mcspi4_pins>;
};
+
+&uart1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart1_pins>;
+};
+
+&uart3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart3_pins>;
+};
+
+&uart5 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart5_pins>;
+};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH V2 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm
2013-06-06 17:48 ` [PATCH V2 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm Sricharan R
@ 2013-06-07 12:03 ` Benoit Cousson
2013-06-07 13:27 ` Sricharan R
0 siblings, 1 reply; 9+ messages in thread
From: Benoit Cousson @ 2013-06-07 12:03 UTC (permalink / raw)
To: Sricharan R
Cc: linux-omap, linux-arm-kernel, devicetree-discuss, tony, rnayak
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 {
>
> };
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH V2 0/4] ARM: dts: omap5: Cleanup and updates for DT files
2013-06-06 17:48 [PATCH V2 0/4] ARM: dts: omap5: Cleanup and updates for DT files Sricharan R
` (3 preceding siblings ...)
2013-06-06 17:48 ` [PATCH V2 4/4] ARM: dts: omap5-uevm: Add uart pinctrl data Sricharan R
@ 2013-06-07 12:06 ` Benoit Cousson
2013-06-07 13:27 ` Sricharan R
4 siblings, 1 reply; 9+ messages in thread
From: Benoit Cousson @ 2013-06-07 12:06 UTC (permalink / raw)
To: Sricharan R
Cc: linux-omap, linux-arm-kernel, devicetree-discuss, tony, rnayak
On 06/06/2013 07:48 PM, Sricharan R wrote:
> uevm is the official board supported for OMAP5 soc in the mainline.
> This series renames the board dts file for OMAP5 accordingly and cleans
> up the same. Also a few additional device DT entry updates are done.
>
> This is on top of the below branch
> git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git
> for_3.11/dts
Could you update your branch before reposting, I pulled a Makefile fix
for AM5xx that prevents your patches to be applied properly.
Thanks,
Benoit
>
> Boot tested on omap5-uevm after pulling in the data from below place
> git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux.git
> HWMOD DATA: for_3.11/omap5_data_files
> CLOCK DATA: out_of_tree/omap5_clk_data
>
> Dan Murphy (1):
> ARM: dts: omap5-uevm: Add LED support for uEVM blue LED
>
> Roger Quadros (1):
> ARM: dts: omap5-uevm: Add USB Host support
>
> Sourav Poddar (1):
> ARM: dts: omap5-uevm: Add uart pinctrl data
>
> Sricharan R (1):
> ARM: dts: omap5: Rename omap5-evm to omap5-uevm
>
> arch/arm/boot/dts/Makefile | 2 +-
> arch/arm/boot/dts/omap5-evm.dts | 261 --------------------------------
> arch/arm/boot/dts/omap5-uevm.dts | 311 ++++++++++++++++++++++++++++++++++++++
> arch/arm/boot/dts/omap5.dtsi | 30 ++++
> 4 files changed, 342 insertions(+), 262 deletions(-)
> delete mode 100644 arch/arm/boot/dts/omap5-evm.dts
> create mode 100644 arch/arm/boot/dts/omap5-uevm.dts
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH V2 0/4] ARM: dts: omap5: Cleanup and updates for DT files
2013-06-07 12:06 ` [PATCH V2 0/4] ARM: dts: omap5: Cleanup and updates for DT files Benoit Cousson
@ 2013-06-07 13:27 ` Sricharan R
0 siblings, 0 replies; 9+ messages in thread
From: Sricharan R @ 2013-06-07 13:27 UTC (permalink / raw)
To: Benoit Cousson
Cc: linux-omap, linux-arm-kernel, devicetree-discuss, tony, rnayak
On Friday 07 June 2013 05:36 PM, Benoit Cousson wrote:
> On 06/06/2013 07:48 PM, Sricharan R wrote:
>> uevm is the official board supported for OMAP5 soc in the mainline.
>> This series renames the board dts file for OMAP5 accordingly and cleans
>> up the same. Also a few additional device DT entry updates are done.
>>
>> This is on top of the below branch
>> git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git
>> for_3.11/dts
> Could you update your branch before reposting, I pulled a Makefile fix
> for AM5xx that prevents your patches to be applied properly.
Ok, rebased and posted V3.
Regards,
Sricharan
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH V2 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm
2013-06-07 12:03 ` Benoit Cousson
@ 2013-06-07 13:27 ` Sricharan R
0 siblings, 0 replies; 9+ messages in thread
From: Sricharan R @ 2013-06-07 13:27 UTC (permalink / raw)
To: Benoit Cousson
Cc: linux-omap, linux-arm-kernel, devicetree-discuss, tony, rnayak
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
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-06-07 13:27 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-06 17:48 [PATCH V2 0/4] ARM: dts: omap5: Cleanup and updates for DT files Sricharan R
2013-06-06 17:48 ` [PATCH V2 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm Sricharan R
2013-06-07 12:03 ` Benoit Cousson
2013-06-07 13:27 ` Sricharan R
2013-06-06 17:48 ` [PATCH V2 2/4] ARM: dts: omap5-uevm: Add USB Host support Sricharan R
2013-06-06 17:48 ` [PATCH V2 3/4] ARM: dts: omap5-uevm: Add LED support for uEVM blue LED Sricharan R
2013-06-06 17:48 ` [PATCH V2 4/4] ARM: dts: omap5-uevm: Add uart pinctrl data Sricharan R
2013-06-07 12:06 ` [PATCH V2 0/4] ARM: dts: omap5: Cleanup and updates for DT files Benoit Cousson
2013-06-07 13:27 ` Sricharan R
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).