ARM: dts: omap5: Cleanup and updates for DT files
v3 cover ARM: dts: omap5: Cleanup and updates for DT files
uevm is the only official board supported for OMAP5 soc in the mainline. This series deprecates the support for existent sevm which will no more be supported in mainline and renames the board dts file accordingly. 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/dtsBoot 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: Make uevm as the official board and deprecate sevm
support
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
Signature · 1 line
1.7.9.5
PATCH v3 1/4 ARM: dts: omap5: Make uevm as the official board and deprecate sevm support
The uevm is the only official board supported for the OMAP5 soc in mainline. The existent sevm platform will no more be supported. Hence cleaning up the board dts file to have only the data required for uevm.
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.
* OMAP5432 and DDR3 memory is used in the uevm. Temperature polling is not supported with DDR3 memories. Because of DDR3 phy limitation the voltage change across DVFS and all shadow registers for DVFS on DDR3 is not supported. Hence the emif kernel driver is not required, so removing the DDR3 device file and emif nodes for uevm.
* Keypad is not supported on uevm. So remove the device node.
---
[V3] Rebased on top of Benoit's latest tip and improved the subject, changelog
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%)arch/arm/boot/dts/Makefile +1 -1
@@ -150,7 +150,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap4-var-som.dtb \ omap4-sdp.dtb \ omap4-sdp-es23plus.dtb \ - omap5-evm.dtb \ + omap5-uevm.dtb \ am335x-evm.dtb \ am335x-evmsk.dtb \ am335x-bone.dtb \
arch/arm/boot/dts/omap5-uevm.dts renamed from arch/arm/boot/dts/omap5-evm.dts +3 -80
117 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v3 2/4 ARM: dts: omap5-uevm: Add USB Host support
In reply to Sricharan RFrom: Roger Quadros <[email protected]>
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.
--- arch/arm/boot/dts/omap5-uevm.dts | 70 ++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/omap5.dtsi | 30 ++++++++++++++++ 2 files changed, 100 insertions(+)
arch/arm/boot/dts/omap5-uevm.dts +70 -0
@@ -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 { };
arch/arm/boot/dts/omap5.dtsi +30 -0
@@ -666,5 +666,35 @@ ctrl-module = <&omap_control_usb>; }; }; + + usbhstll: usbhstll at 4a062000 { + compatible = "ti,usbhs-tll"; + reg = <0x4a062000 0x1000>; + interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>; + ti,hwmods = "usb_tll_hs"; + }; + + usbhshost: usbhshost at 4a064000 { + compatible = "ti,usbhs-host"; + reg = <0x4a064000 0x800>; + ti,hwmods = "usb_host_hs"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + usbhsohci: ohci at 4a064800 { + compatible = "ti,ohci-omap3", "usb-ohci"; + reg = <0x4a064800 0x400>; + interrupt-parent = <&gic>; + interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; + }; + + usbhsehci: ehci at 4a064c00 { + compatible = "ti,ehci-omap", "usb-ehci"; + reg = <0x4a064c00 0x400>; + interrupt-parent = <&gic>; + interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>; + }; + }; }; };
Signature · 1 line
1.7.9.5
PATCH v3 3/4 ARM: dts: omap5-uevm: Add LED support for uEVM blue LED
In reply to Sricharan RFrom: Dan Murphy <[email protected]>
Add support for blue LED 1 off of GPIO 153.
Make the LED a heartbeat LED
Configure the MUX for GPIO output.
--- arch/arm/boot/dts/omap5-uevm.dts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/arm/boot/dts/omap5-uevm.dts +16 -0
@@ -59,6 +59,15 @@ reset-supply = <&hsusb3_reset>; }; + leds { + compatible = "gpio-leds"; + led at 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 {
Signature · 1 line
1.7.9.5
PATCH v3 4/4 ARM: dts: omap5-uevm: Add uart pinctrl data
In reply to Sricharan RFrom: Sourav Poddar <[email protected]>
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.
--- arch/arm/boot/dts/omap5-uevm.dts | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
arch/arm/boot/dts/omap5-uevm.dts +41 -0
@@ -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>; +};
Signature · 1 line
1.7.9.5
v3 cover ARM: dts: omap5: Cleanup and updates for DT files
In reply to Sricharan RThanks for the quick update.
I've just applied the series in my for_3.11/dts branch.
Regards,
Benoit
Quoted 35 lines · Sricharan R
uevm is the only official board supported for OMAP5 soc in the mainline. This series deprecates the support for existent sevm which will no more be supported in mainline and renames the board dts file accordingly. 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/dtsBoot 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_dataDan Murphy (1):
ARM: dts: omap5-uevm: Add LED support for uEVM blue LEDRoger Quadros (1):
ARM: dts: omap5-uevm: Add USB Host supportSourav Poddar (1):
ARM: dts: omap5-uevm: Add uart pinctrl dataSricharan R (1):
ARM: dts: omap5: Make uevm as the official board and deprecate sevm
supportarch/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
v3 cover ARM: dts: omap5: Cleanup and updates for DT files
Quoted 3 lines · Benoit Cousson
Thanks for the quick update.
I've just applied the series in my for_3.11/dts branch.
Thanks..
Regards,
Sricharan
Quoted 40 lines
Regards,
BenoitQuoted 35 lines · Sricharan R
uevm is the only official board supported for OMAP5 soc in the mainline. This series deprecates the support for existent sevm which will no more be supported in mainline and renames the board dts file accordingly. 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/dtsBoot 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_dataDan Murphy (1):
ARM: dts: omap5-uevm: Add LED support for uEVM blue LEDRoger Quadros (1):
ARM: dts: omap5-uevm: Add USB Host supportSourav Poddar (1):
ARM: dts: omap5-uevm: Add uart pinctrl dataSricharan R (1):
ARM: dts: omap5: Make uevm as the official board and deprecate sevm
supportarch/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