* [PATCH 0/4] ARM: dts: omap5: Cleanup and updates for DT files
@ 2013-06-05 6:46 Sricharan R
2013-06-05 6:46 ` [PATCH 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm Sricharan R
` (3 more replies)
0 siblings, 4 replies; 17+ messages in thread
From: Sricharan R @ 2013-06-05 6:46 UTC (permalink / raw)
To: linux-arm-kernel
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 | 319 ++++++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/omap5.dtsi | 30 ++++
4 files changed, 350 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] 17+ messages in thread* [PATCH 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm 2013-06-05 6:46 [PATCH 0/4] ARM: dts: omap5: Cleanup and updates for DT files Sricharan R @ 2013-06-05 6:46 ` Sricharan R 2013-06-05 6:50 ` Sricharan R 2013-06-05 6:46 ` [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support Sricharan R ` (2 subsequent siblings) 3 siblings, 1 reply; 17+ messages in thread From: Sricharan R @ 2013-06-05 6:46 UTC (permalink / raw) To: linux-arm-kernel 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 +- arch/arm/boot/dts/omap5-evm.dts | 261 -------------------------------------- arch/arm/boot/dts/omap5-uevm.dts | 184 +++++++++++++++++++++++++++ 3 files changed, 185 insertions(+), 262 deletions(-) delete mode 100644 arch/arm/boot/dts/omap5-evm.dts create mode 100644 arch/arm/boot/dts/omap5-uevm.dts 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-evm.dts deleted file mode 100644 index 22e9ee8..0000000 --- a/arch/arm/boot/dts/omap5-evm.dts +++ /dev/null @@ -1,261 +0,0 @@ -/* - * Copyright (C) 2012 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 - * published by the Free Software Foundation. - */ -/dts-v1/; - -#include "omap5.dtsi" -#include "samsung_k3pe0e000b.dtsi" - -/ { - model = "TI OMAP5 EVM board"; - compatible = "ti,omap5-evm", "ti,omap5"; - - memory { - device_type = "memory"; - reg = <0x80000000 0x7F000000>; /* 2032 MB */ - }; - - vmmcsd_fixed: fixedregulator-mmcsd { - compatible = "regulator-fixed"; - regulator-name = "vmmcsd_fixed"; - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - }; - -}; - -&omap5_pmx_core { - pinctrl-names = "default"; - pinctrl-0 = < - &twl6040_pins - &mcpdm_pins - &dmic_pins - &mcbsp1_pins - &mcbsp2_pins - >; - - twl6040_pins: pinmux_twl6040_pins { - pinctrl-single,pins = < - 0x18a (PIN_OUTPUT | MUX_MODE6) /* perslimbus2_clock.gpio5_145 */ - >; - }; - - mcpdm_pins: pinmux_mcpdm_pins { - pinctrl-single,pins = < - 0x142 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_clks.abe_clks */ - 0x15c (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_ul_data.abemcpdm_ul_data */ - 0x15e (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_dl_data.abemcpdm_dl_data */ - 0x160 (PIN_INPUT_PULLUP | MUX_MODE0) /* abemcpdm_frame.abemcpdm_frame */ - 0x162 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_lb_clk.abemcpdm_lb_clk */ - >; - }; - - dmic_pins: pinmux_dmic_pins { - pinctrl-single,pins = < - 0x144 (PIN_INPUT | MUX_MODE0) /* abedmic_din1.abedmic_din1 */ - 0x146 (PIN_INPUT | MUX_MODE0) /* abedmic_din2.abedmic_din2 */ - 0x148 (PIN_INPUT | MUX_MODE0) /* abedmic_din3.abedmic_din3 */ - 0x14a (PIN_OUTPUT | MUX_MODE0) /* abedmic_clk1.abedmic_clk1 */ - >; - }; - - mcbsp1_pins: pinmux_mcbsp1_pins { - pinctrl-single,pins = < - 0x14c (PIN_INPUT | MUX_MODE1) /* abedmic_clk2.abemcbsp1_fsx */ - 0x14e (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* abedmic_clk3.abemcbsp1_dx */ - 0x150 (PIN_INPUT | MUX_MODE1) /* abeslimbus1_clock.abemcbsp1_clkx */ - 0x152 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* abeslimbus1_data.abemcbsp1_dr */ - >; - }; - - mcbsp2_pins: pinmux_mcbsp2_pins { - pinctrl-single,pins = < - 0x154 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcbsp2_dr.abemcbsp2_dr */ - 0x156 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* abemcbsp2_dx.abemcbsp2_dx */ - 0x158 (PIN_INPUT | MUX_MODE0) /* abemcbsp2_fsx.abemcbsp2_fsx */ - 0x15a (PIN_INPUT | MUX_MODE0) /* abemcbsp2_clkx.abemcbsp2_clkx */ - >; - }; - - i2c1_pins: pinmux_i2c1_pins { - pinctrl-single,pins = < - 0x1b2 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */ - 0x1b4 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */ - >; - }; - - 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 */ - 0x186 (PIN_INPUT | MUX_MODE0) /* i2c5_sda */ - >; - }; - - mcspi2_pins: pinmux_mcspi2_pins { - pinctrl-single,pins = < - 0xbc (PIN_INPUT | MUX_MODE0) /* mcspi2_clk */ - 0xbe (PIN_INPUT | MUX_MODE0) /* mcspi2_simo */ - 0xc0 (PIN_INPUT_PULLUP | MUX_MODE0) /* mcspi2_somi */ - 0xc2 (PIN_OUTPUT | MUX_MODE0) /* mcspi2_cs */ - >; - }; - - mcspi3_pins: pinmux_mcspi3_pins { - pinctrl-single,pins = < - 0x78 (PIN_INPUT | MUX_MODE1) /* mcspi2_somi */ - 0x7a (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */ - 0x7c (PIN_INPUT | MUX_MODE1) /* mcspi2_simo */ - 0x7e (PIN_INPUT | MUX_MODE1) /* mcspi2_clk */ - >; - }; - - mcspi4_pins: pinmux_mcspi4_pins { - pinctrl-single,pins = < - 0x164 (PIN_INPUT | MUX_MODE1) /* mcspi2_clk */ - 0x168 (PIN_INPUT | MUX_MODE1) /* mcspi2_simo */ - 0x16a (PIN_INPUT | MUX_MODE1) /* mcspi2_somi */ - 0x16c (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */ - >; - }; -}; - -&mmc1 { - vmmc-supply = <&vmmcsd_fixed>; - bus-width = <4>; -}; - -&mmc2 { - vmmc-supply = <&vmmcsd_fixed>; - bus-width = <8>; - ti,non-removable; -}; - -&mmc3 { - bus-width = <4>; - ti,non-removable; -}; - -&mmc4 { - status = "disabled"; -}; - -&mmc5 { - status = "disabled"; -}; - -&i2c1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; - - clock-frequency = <400000>; -}; - -&i2c2 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins>; - - clock-frequency = <400000>; - - /* Pressure Sensor */ - bmp085 at 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 at 48{ - compatible = "ti,tmp102"; - reg = <0x48>; - }; -}; - -&i2c5 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c5_pins>; - - 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 { - -}; - -&mcspi2 { - pinctrl-names = "default"; - pinctrl-0 = <&mcspi2_pins>; -}; - -&mcspi3 { - pinctrl-names = "default"; - pinctrl-0 = <&mcspi3_pins>; -}; - -&mcspi4 { - pinctrl-names = "default"; - pinctrl-0 = <&mcspi4_pins>; -}; diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts new file mode 100644 index 0000000..843a001 --- /dev/null +++ b/arch/arm/boot/dts/omap5-uevm.dts @@ -0,0 +1,184 @@ +/* + * 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 + * published by the Free Software Foundation. + */ +/dts-v1/; + +#include "omap5.dtsi" + +/ { + model = "TI OMAP5 uEVM board"; + compatible = "ti,omap5-uevm", "ti,omap5"; + + memory { + device_type = "memory"; + reg = <0x80000000 0x7F000000>; /* 2032 MB */ + }; + + vmmcsd_fixed: fixedregulator-mmcsd { + compatible = "regulator-fixed"; + regulator-name = "vmmcsd_fixed"; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + }; + +}; + +&omap5_pmx_core { + pinctrl-names = "default"; + pinctrl-0 = < + &twl6040_pins + &mcpdm_pins + &dmic_pins + &mcbsp1_pins + &mcbsp2_pins + >; + + twl6040_pins: pinmux_twl6040_pins { + pinctrl-single,pins = < + 0x18a (PIN_OUTPUT | MUX_MODE6) /* perslimbus2_clock.gpio5_145 */ + >; + }; + + mcpdm_pins: pinmux_mcpdm_pins { + pinctrl-single,pins = < + 0x142 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_clks.abe_clks */ + 0x15c (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_ul_data.abemcpdm_ul_data */ + 0x15e (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_dl_data.abemcpdm_dl_data */ + 0x160 (PIN_INPUT_PULLUP | MUX_MODE0) /* abemcpdm_frame.abemcpdm_frame */ + 0x162 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_lb_clk.abemcpdm_lb_clk */ + >; + }; + + dmic_pins: pinmux_dmic_pins { + pinctrl-single,pins = < + 0x144 (PIN_INPUT | MUX_MODE0) /* abedmic_din1.abedmic_din1 */ + 0x146 (PIN_INPUT | MUX_MODE0) /* abedmic_din2.abedmic_din2 */ + 0x148 (PIN_INPUT | MUX_MODE0) /* abedmic_din3.abedmic_din3 */ + 0x14a (PIN_OUTPUT | MUX_MODE0) /* abedmic_clk1.abedmic_clk1 */ + >; + }; + + mcbsp1_pins: pinmux_mcbsp1_pins { + pinctrl-single,pins = < + 0x14c (PIN_INPUT | MUX_MODE1) /* abedmic_clk2.abemcbsp1_fsx */ + 0x14e (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* abedmic_clk3.abemcbsp1_dx */ + 0x150 (PIN_INPUT | MUX_MODE1) /* abeslimbus1_clock.abemcbsp1_clkx */ + 0x152 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* abeslimbus1_data.abemcbsp1_dr */ + >; + }; + + mcbsp2_pins: pinmux_mcbsp2_pins { + pinctrl-single,pins = < + 0x154 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcbsp2_dr.abemcbsp2_dr */ + 0x156 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* abemcbsp2_dx.abemcbsp2_dx */ + 0x158 (PIN_INPUT | MUX_MODE0) /* abemcbsp2_fsx.abemcbsp2_fsx */ + 0x15a (PIN_INPUT | MUX_MODE0) /* abemcbsp2_clkx.abemcbsp2_clkx */ + >; + }; + + i2c1_pins: pinmux_i2c1_pins { + pinctrl-single,pins = < + 0x1b2 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */ + 0x1b4 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */ + >; + }; + + i2c5_pins: pinmux_i2c5_pins { + pinctrl-single,pins = < + 0x184 (PIN_INPUT | MUX_MODE0) /* i2c5_scl */ + 0x186 (PIN_INPUT | MUX_MODE0) /* i2c5_sda */ + >; + }; + + mcspi2_pins: pinmux_mcspi2_pins { + pinctrl-single,pins = < + 0xbc (PIN_INPUT | MUX_MODE0) /* mcspi2_clk */ + 0xbe (PIN_INPUT | MUX_MODE0) /* mcspi2_simo */ + 0xc0 (PIN_INPUT_PULLUP | MUX_MODE0) /* mcspi2_somi */ + 0xc2 (PIN_OUTPUT | MUX_MODE0) /* mcspi2_cs */ + >; + }; + + mcspi3_pins: pinmux_mcspi3_pins { + pinctrl-single,pins = < + 0x78 (PIN_INPUT | MUX_MODE1) /* mcspi2_somi */ + 0x7a (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */ + 0x7c (PIN_INPUT | MUX_MODE1) /* mcspi2_simo */ + 0x7e (PIN_INPUT | MUX_MODE1) /* mcspi2_clk */ + >; + }; + + mcspi4_pins: pinmux_mcspi4_pins { + pinctrl-single,pins = < + 0x164 (PIN_INPUT | MUX_MODE1) /* mcspi2_clk */ + 0x168 (PIN_INPUT | MUX_MODE1) /* mcspi2_simo */ + 0x16a (PIN_INPUT | MUX_MODE1) /* mcspi2_somi */ + 0x16c (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */ + >; + }; +}; + +&mmc1 { + vmmc-supply = <&vmmcsd_fixed>; + bus-width = <4>; +}; + +&mmc2 { + vmmc-supply = <&vmmcsd_fixed>; + bus-width = <8>; + ti,non-removable; +}; + +&mmc3 { + bus-width = <4>; + ti,non-removable; +}; + +&mmc4 { + status = "disabled"; +}; + +&mmc5 { + status = "disabled"; +}; + +&i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; + + clock-frequency = <400000>; +}; + +&i2c5 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c5_pins>; + + clock-frequency = <400000>; +}; + +&mcbsp3 { + status = "disabled"; +}; + +&mcspi1 { + +}; + +&mcspi2 { + pinctrl-names = "default"; + pinctrl-0 = <&mcspi2_pins>; +}; + +&mcspi3 { + pinctrl-names = "default"; + pinctrl-0 = <&mcspi3_pins>; +}; + +&mcspi4 { + pinctrl-names = "default"; + pinctrl-0 = <&mcspi4_pins>; +}; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm 2013-06-05 6:46 ` [PATCH 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm Sricharan R @ 2013-06-05 6:50 ` Sricharan R 0 siblings, 0 replies; 17+ messages in thread From: Sricharan R @ 2013-06-05 6:50 UTC (permalink / raw) To: linux-arm-kernel On Wednesday 05 June 2013 12:16 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. > > * 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 +- > arch/arm/boot/dts/omap5-evm.dts | 261 -------------------------------------- > arch/arm/boot/dts/omap5-uevm.dts | 184 +++++++++++++++++++++++++++ > 3 files changed, 185 insertions(+), 262 deletions(-) > delete mode 100644 arch/arm/boot/dts/omap5-evm.dts > create mode 100644 arch/arm/boot/dts/omap5-uevm.dts > > 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-evm.dts > deleted file mode 100644 > index 22e9ee8..0000000 > --- a/arch/arm/boot/dts/omap5-evm.dts > +++ /dev/null > @@ -1,261 +0,0 @@ > -/* > - * Copyright (C) 2012 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 > - * published by the Free Software Foundation. > - */ > -/dts-v1/; > - > -#include "omap5.dtsi" > -#include "samsung_k3pe0e000b.dtsi" > - > -/ { > - model = "TI OMAP5 EVM board"; > - compatible = "ti,omap5-evm", "ti,omap5"; > - > - memory { > - device_type = "memory"; > - reg = <0x80000000 0x7F000000>; /* 2032 MB */ > - }; > - > - vmmcsd_fixed: fixedregulator-mmcsd { > - compatible = "regulator-fixed"; > - regulator-name = "vmmcsd_fixed"; > - regulator-min-microvolt = <3000000>; > - regulator-max-microvolt = <3000000>; > - }; > - > -}; > - > -&omap5_pmx_core { > - pinctrl-names = "default"; > - pinctrl-0 = < > - &twl6040_pins > - &mcpdm_pins > - &dmic_pins > - &mcbsp1_pins > - &mcbsp2_pins > - >; > - > - twl6040_pins: pinmux_twl6040_pins { > - pinctrl-single,pins = < > - 0x18a (PIN_OUTPUT | MUX_MODE6) /* perslimbus2_clock.gpio5_145 */ > - >; > - }; > - > - mcpdm_pins: pinmux_mcpdm_pins { > - pinctrl-single,pins = < > - 0x142 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_clks.abe_clks */ > - 0x15c (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_ul_data.abemcpdm_ul_data */ > - 0x15e (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_dl_data.abemcpdm_dl_data */ > - 0x160 (PIN_INPUT_PULLUP | MUX_MODE0) /* abemcpdm_frame.abemcpdm_frame */ > - 0x162 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_lb_clk.abemcpdm_lb_clk */ > - >; > - }; > - > - dmic_pins: pinmux_dmic_pins { > - pinctrl-single,pins = < > - 0x144 (PIN_INPUT | MUX_MODE0) /* abedmic_din1.abedmic_din1 */ > - 0x146 (PIN_INPUT | MUX_MODE0) /* abedmic_din2.abedmic_din2 */ > - 0x148 (PIN_INPUT | MUX_MODE0) /* abedmic_din3.abedmic_din3 */ > - 0x14a (PIN_OUTPUT | MUX_MODE0) /* abedmic_clk1.abedmic_clk1 */ > - >; > - }; > - > - mcbsp1_pins: pinmux_mcbsp1_pins { > - pinctrl-single,pins = < > - 0x14c (PIN_INPUT | MUX_MODE1) /* abedmic_clk2.abemcbsp1_fsx */ > - 0x14e (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* abedmic_clk3.abemcbsp1_dx */ > - 0x150 (PIN_INPUT | MUX_MODE1) /* abeslimbus1_clock.abemcbsp1_clkx */ > - 0x152 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* abeslimbus1_data.abemcbsp1_dr */ > - >; > - }; > - > - mcbsp2_pins: pinmux_mcbsp2_pins { > - pinctrl-single,pins = < > - 0x154 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcbsp2_dr.abemcbsp2_dr */ > - 0x156 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* abemcbsp2_dx.abemcbsp2_dx */ > - 0x158 (PIN_INPUT | MUX_MODE0) /* abemcbsp2_fsx.abemcbsp2_fsx */ > - 0x15a (PIN_INPUT | MUX_MODE0) /* abemcbsp2_clkx.abemcbsp2_clkx */ > - >; > - }; > - > - i2c1_pins: pinmux_i2c1_pins { > - pinctrl-single,pins = < > - 0x1b2 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */ > - 0x1b4 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */ > - >; > - }; > - > - 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 */ > - 0x186 (PIN_INPUT | MUX_MODE0) /* i2c5_sda */ > - >; > - }; > - > - mcspi2_pins: pinmux_mcspi2_pins { > - pinctrl-single,pins = < > - 0xbc (PIN_INPUT | MUX_MODE0) /* mcspi2_clk */ > - 0xbe (PIN_INPUT | MUX_MODE0) /* mcspi2_simo */ > - 0xc0 (PIN_INPUT_PULLUP | MUX_MODE0) /* mcspi2_somi */ > - 0xc2 (PIN_OUTPUT | MUX_MODE0) /* mcspi2_cs */ > - >; > - }; > - > - mcspi3_pins: pinmux_mcspi3_pins { > - pinctrl-single,pins = < > - 0x78 (PIN_INPUT | MUX_MODE1) /* mcspi2_somi */ > - 0x7a (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */ > - 0x7c (PIN_INPUT | MUX_MODE1) /* mcspi2_simo */ > - 0x7e (PIN_INPUT | MUX_MODE1) /* mcspi2_clk */ > - >; > - }; > - > - mcspi4_pins: pinmux_mcspi4_pins { > - pinctrl-single,pins = < > - 0x164 (PIN_INPUT | MUX_MODE1) /* mcspi2_clk */ > - 0x168 (PIN_INPUT | MUX_MODE1) /* mcspi2_simo */ > - 0x16a (PIN_INPUT | MUX_MODE1) /* mcspi2_somi */ > - 0x16c (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */ > - >; > - }; > -}; > - > -&mmc1 { > - vmmc-supply = <&vmmcsd_fixed>; > - bus-width = <4>; > -}; > - > -&mmc2 { > - vmmc-supply = <&vmmcsd_fixed>; > - bus-width = <8>; > - ti,non-removable; > -}; > - > -&mmc3 { > - bus-width = <4>; > - ti,non-removable; > -}; > - > -&mmc4 { > - status = "disabled"; > -}; > - > -&mmc5 { > - status = "disabled"; > -}; > - > -&i2c1 { > - pinctrl-names = "default"; > - pinctrl-0 = <&i2c1_pins>; > - > - clock-frequency = <400000>; > -}; > - > -&i2c2 { > - pinctrl-names = "default"; > - pinctrl-0 = <&i2c2_pins>; > - > - clock-frequency = <400000>; > - > - /* Pressure Sensor */ > - bmp085 at 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 at 48{ > - compatible = "ti,tmp102"; > - reg = <0x48>; > - }; > -}; > - > -&i2c5 { > - pinctrl-names = "default"; > - pinctrl-0 = <&i2c5_pins>; > - > - 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 { > - > -}; > - > -&mcspi2 { > - pinctrl-names = "default"; > - pinctrl-0 = <&mcspi2_pins>; > -}; > - > -&mcspi3 { > - pinctrl-names = "default"; > - pinctrl-0 = <&mcspi3_pins>; > -}; > - > -&mcspi4 { > - pinctrl-names = "default"; > - pinctrl-0 = <&mcspi4_pins>; > -}; > diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts > new file mode 100644 > index 0000000..843a001 > --- /dev/null > +++ b/arch/arm/boot/dts/omap5-uevm.dts > @@ -0,0 +1,184 @@ > +/* > + * 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 > + * published by the Free Software Foundation. > + */ > +/dts-v1/; > + > +#include "omap5.dtsi" > + > +/ { > + model = "TI OMAP5 uEVM board"; > + compatible = "ti,omap5-uevm", "ti,omap5"; > + > + memory { > + device_type = "memory"; > + reg = <0x80000000 0x7F000000>; /* 2032 MB */ > + }; > + > + vmmcsd_fixed: fixedregulator-mmcsd { > + compatible = "regulator-fixed"; > + regulator-name = "vmmcsd_fixed"; > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3000000>; > + }; > + > +}; > + > +&omap5_pmx_core { > + pinctrl-names = "default"; > + pinctrl-0 = < > + &twl6040_pins > + &mcpdm_pins > + &dmic_pins > + &mcbsp1_pins > + &mcbsp2_pins > + >; > + > + twl6040_pins: pinmux_twl6040_pins { > + pinctrl-single,pins = < > + 0x18a (PIN_OUTPUT | MUX_MODE6) /* perslimbus2_clock.gpio5_145 */ > + >; > + }; > + > + mcpdm_pins: pinmux_mcpdm_pins { > + pinctrl-single,pins = < > + 0x142 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abe_clks.abe_clks */ > + 0x15c (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_ul_data.abemcpdm_ul_data */ > + 0x15e (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_dl_data.abemcpdm_dl_data */ > + 0x160 (PIN_INPUT_PULLUP | MUX_MODE0) /* abemcpdm_frame.abemcpdm_frame */ > + 0x162 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcpdm_lb_clk.abemcpdm_lb_clk */ > + >; > + }; > + > + dmic_pins: pinmux_dmic_pins { > + pinctrl-single,pins = < > + 0x144 (PIN_INPUT | MUX_MODE0) /* abedmic_din1.abedmic_din1 */ > + 0x146 (PIN_INPUT | MUX_MODE0) /* abedmic_din2.abedmic_din2 */ > + 0x148 (PIN_INPUT | MUX_MODE0) /* abedmic_din3.abedmic_din3 */ > + 0x14a (PIN_OUTPUT | MUX_MODE0) /* abedmic_clk1.abedmic_clk1 */ > + >; > + }; > + > + mcbsp1_pins: pinmux_mcbsp1_pins { > + pinctrl-single,pins = < > + 0x14c (PIN_INPUT | MUX_MODE1) /* abedmic_clk2.abemcbsp1_fsx */ > + 0x14e (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* abedmic_clk3.abemcbsp1_dx */ > + 0x150 (PIN_INPUT | MUX_MODE1) /* abeslimbus1_clock.abemcbsp1_clkx */ > + 0x152 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* abeslimbus1_data.abemcbsp1_dr */ > + >; > + }; > + > + mcbsp2_pins: pinmux_mcbsp2_pins { > + pinctrl-single,pins = < > + 0x154 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* abemcbsp2_dr.abemcbsp2_dr */ > + 0x156 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* abemcbsp2_dx.abemcbsp2_dx */ > + 0x158 (PIN_INPUT | MUX_MODE0) /* abemcbsp2_fsx.abemcbsp2_fsx */ > + 0x15a (PIN_INPUT | MUX_MODE0) /* abemcbsp2_clkx.abemcbsp2_clkx */ > + >; > + }; > + > + i2c1_pins: pinmux_i2c1_pins { > + pinctrl-single,pins = < > + 0x1b2 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */ > + 0x1b4 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_sda */ > + >; > + }; > + > + i2c5_pins: pinmux_i2c5_pins { > + pinctrl-single,pins = < > + 0x184 (PIN_INPUT | MUX_MODE0) /* i2c5_scl */ > + 0x186 (PIN_INPUT | MUX_MODE0) /* i2c5_sda */ > + >; > + }; > + > + mcspi2_pins: pinmux_mcspi2_pins { > + pinctrl-single,pins = < > + 0xbc (PIN_INPUT | MUX_MODE0) /* mcspi2_clk */ > + 0xbe (PIN_INPUT | MUX_MODE0) /* mcspi2_simo */ > + 0xc0 (PIN_INPUT_PULLUP | MUX_MODE0) /* mcspi2_somi */ > + 0xc2 (PIN_OUTPUT | MUX_MODE0) /* mcspi2_cs */ > + >; > + }; > + > + mcspi3_pins: pinmux_mcspi3_pins { > + pinctrl-single,pins = < > + 0x78 (PIN_INPUT | MUX_MODE1) /* mcspi2_somi */ > + 0x7a (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */ > + 0x7c (PIN_INPUT | MUX_MODE1) /* mcspi2_simo */ > + 0x7e (PIN_INPUT | MUX_MODE1) /* mcspi2_clk */ > + >; > + }; > + > + mcspi4_pins: pinmux_mcspi4_pins { > + pinctrl-single,pins = < > + 0x164 (PIN_INPUT | MUX_MODE1) /* mcspi2_clk */ > + 0x168 (PIN_INPUT | MUX_MODE1) /* mcspi2_simo */ > + 0x16a (PIN_INPUT | MUX_MODE1) /* mcspi2_somi */ > + 0x16c (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */ > + >; > + }; > +}; > + > +&mmc1 { > + vmmc-supply = <&vmmcsd_fixed>; > + bus-width = <4>; > +}; > + > +&mmc2 { > + vmmc-supply = <&vmmcsd_fixed>; > + bus-width = <8>; > + ti,non-removable; > +}; > + > +&mmc3 { > + bus-width = <4>; > + ti,non-removable; > +}; > + > +&mmc4 { > + status = "disabled"; > +}; > + > +&mmc5 { > + status = "disabled"; > +}; > + > +&i2c1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c1_pins>; > + > + clock-frequency = <400000>; > +}; > + > +&i2c5 { > + pinctrl-names = "default"; > + pinctrl-0 = <&i2c5_pins>; > + > + clock-frequency = <400000>; > +}; > + > +&mcbsp3 { > + status = "disabled"; > +}; > + > +&mcspi1 { > + > +}; > + > +&mcspi2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mcspi2_pins>; > +}; > + > +&mcspi3 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mcspi3_pins>; > +}; > + > +&mcspi4 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mcspi4_pins>; > +}; Sorry missed -C option in formatting. Will resend for that Regards, Sricharan ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support 2013-06-05 6:46 [PATCH 0/4] ARM: dts: omap5: Cleanup and updates for DT files Sricharan R 2013-06-05 6:46 ` [PATCH 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm Sricharan R @ 2013-06-05 6:46 ` Sricharan R 2013-06-05 7:59 ` Florian Vaussard ` (2 more replies) 2013-06-05 6:46 ` [PATCH 3/4] ARM: dts: omap5-uevm: Add LED support for uEVM blue LED Sricharan R 2013-06-05 6:46 ` [PATCH 4/4] ARM: dts: omap5-uevm: Add uart pinctrl data Sricharan R 3 siblings, 3 replies; 17+ messages in thread From: Sricharan R @ 2013-06-05 6:46 UTC (permalink / raw) To: linux-arm-kernel 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> --- arch/arm/boot/dts/omap5-uevm.dts | 77 ++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/omap5.dtsi | 30 +++++++++++++++ 2 files changed, 107 insertions(+) diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts index 843a001..cf862df 100644 --- a/arch/arm/boot/dts/omap5-uevm.dts +++ b/arch/arm/boot/dts/omap5-uevm.dts @@ -25,6 +25,47 @@ 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>; + }; + + /* hsusb2_phy is clocked by FREF_CLK1 i.e. auxclk1 */ + clock_alias { + clock-name = "auxclk1_ck"; + clock-alias = "main_clk"; + device = <&hsusb2_phy>; + clock-frequency = <19200000>; /* 19.2 MHz */ + }; }; &omap5_pmx_core { @@ -35,6 +76,7 @@ &dmic_pins &mcbsp1_pins &mcbsp2_pins + &usbhost_pins >; twl6040_pins: pinmux_twl6040_pins { @@ -120,6 +162,32 @@ 0x16c (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */ >; }; + + usbhost_pins: pinmux_usbhost_pins { + pinctrl-single,pins = < + 0x84 (PIN_INPUT | MUX_MODE0) /* usbb2_hsic_strobe INPUT | MODE 0 */ + 0x86 (PIN_INPUT | MUX_MODE0) /* usbb2_hsic_data INPUT | MODE 0 */ + + 0x19e (PIN_INPUT | MUX_MODE0) /* usbb3_hsic_strobe INPUT | MODE 0 */ + 0x1a0 (PIN_INPUT | MUX_MODE0) /* usbb3_hsic_data INPUT | MODE 0 */ + + 0x70 (PIN_OUTPUT | MUX_MODE6) /* gpio3_80 OUTPUT | MODE 6 HUB_NRESET */ + 0x6e (PIN_OUTPUT | MUX_MODE6) /* gpio3_79 OUTPUT | MODE 6 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 OUTPUT | MODE 7 for USB hub clk */ + >; + }; }; &mmc1 { @@ -164,6 +232,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..67d6e1f 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 at 4a062000 { + compatible = "ti,usbhs-tll"; + reg = <0x4a062000 0x1000>; + interrupts = <0 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 = <0 76 IRQ_TYPE_LEVEL_HIGH>; + }; + + usbhsehci: ehci at 4a064c00 { + compatible = "ti,ehci-omap", "usb-ehci"; + reg = <0x4a064c00 0x400>; + interrupt-parent = <&gic>; + interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>; + }; + }; }; }; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support 2013-06-05 6:46 ` [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support Sricharan R @ 2013-06-05 7:59 ` Florian Vaussard 2013-06-05 9:12 ` Sricharan R 2013-06-05 10:32 ` Roger Quadros 2013-06-05 13:57 ` Nishanth Menon 2 siblings, 1 reply; 17+ messages in thread From: Florian Vaussard @ 2013-06-05 7:59 UTC (permalink / raw) To: linux-arm-kernel Hello, Some very minor comments. On 06/05/2013 08:46 AM, Sricharan R wrote: > 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> > --- > arch/arm/boot/dts/omap5-uevm.dts | 77 ++++++++++++++++++++++++++++++++++++++ > arch/arm/boot/dts/omap5.dtsi | 30 +++++++++++++++ > 2 files changed, 107 insertions(+) > > diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts > index 843a001..cf862df 100644 > --- a/arch/arm/boot/dts/omap5-uevm.dts > +++ b/arch/arm/boot/dts/omap5-uevm.dts > @@ -25,6 +25,47 @@ > 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>; > + }; > + > + /* hsusb2_phy is clocked by FREF_CLK1 i.e. auxclk1 */ > + clock_alias { > + clock-name = "auxclk1_ck"; > + clock-alias = "main_clk"; > + device = <&hsusb2_phy>; > + clock-frequency = <19200000>; /* 19.2 MHz */ > + }; > }; > > &omap5_pmx_core { > @@ -35,6 +76,7 @@ > &dmic_pins > &mcbsp1_pins > &mcbsp2_pins > + &usbhost_pins > >; > > twl6040_pins: pinmux_twl6040_pins { > @@ -120,6 +162,32 @@ > 0x16c (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */ > >; > }; > + > + usbhost_pins: pinmux_usbhost_pins { > + pinctrl-single,pins = < > + 0x84 (PIN_INPUT | MUX_MODE0) /* usbb2_hsic_strobe INPUT | MODE 0 */ > + 0x86 (PIN_INPUT | MUX_MODE0) /* usbb2_hsic_data INPUT | MODE 0 */ Comments are redundant with the constants, so maybe you can leave this part out. Same for a few others below. > + > + 0x19e (PIN_INPUT | MUX_MODE0) /* usbb3_hsic_strobe INPUT | MODE 0 */ > + 0x1a0 (PIN_INPUT | MUX_MODE0) /* usbb3_hsic_data INPUT | MODE 0 */ > + > + 0x70 (PIN_OUTPUT | MUX_MODE6) /* gpio3_80 OUTPUT | MODE 6 HUB_NRESET */ > + 0x6e (PIN_OUTPUT | MUX_MODE6) /* gpio3_79 OUTPUT | MODE 6 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 OUTPUT | MODE 7 for USB hub clk */ Mismatch between constants and comments, which mode should it be? > + >; > + }; > }; > > &mmc1 { > @@ -164,6 +232,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..67d6e1f 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 at 4a062000 { > + compatible = "ti,usbhs-tll"; > + reg = <0x4a062000 0x1000>; > + interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; I guess that here you can replace '0' with GIC_SPI. > + 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 = <0 76 IRQ_TYPE_LEVEL_HIGH>; Same here. > + }; > + > + usbhsehci: ehci at 4a064c00 { > + compatible = "ti,ehci-omap", "usb-ehci"; > + reg = <0x4a064c00 0x400>; > + interrupt-parent = <&gic>; > + interrupts = <0 77 IRQ_TYPE_LEVEL_HIGH>; And here. > + }; > + }; > }; > }; > Regards, Florian ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support 2013-06-05 7:59 ` Florian Vaussard @ 2013-06-05 9:12 ` Sricharan R 2013-06-05 12:15 ` Florian Vaussard 0 siblings, 1 reply; 17+ messages in thread From: Sricharan R @ 2013-06-05 9:12 UTC (permalink / raw) To: linux-arm-kernel Hi, On Wednesday 05 June 2013 01:29 PM, Florian Vaussard wrote: > Hello, > > Some very minor comments. > > On 06/05/2013 08:46 AM, Sricharan R wrote: >> 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> >> --- >> arch/arm/boot/dts/omap5-uevm.dts | 77 ++++++++++++++++++++++++++++++++++++++ >> arch/arm/boot/dts/omap5.dtsi | 30 +++++++++++++++ >> 2 files changed, 107 insertions(+) >> >> diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts >> index 843a001..cf862df 100644 >> --- a/arch/arm/boot/dts/omap5-uevm.dts >> +++ b/arch/arm/boot/dts/omap5-uevm.dts >> @@ -25,6 +25,47 @@ >> 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>; >> + }; >> + >> + /* hsusb2_phy is clocked by FREF_CLK1 i.e. auxclk1 */ >> + clock_alias { >> + clock-name = "auxclk1_ck"; >> + clock-alias = "main_clk"; >> + device = <&hsusb2_phy>; >> + clock-frequency = <19200000>; /* 19.2 MHz */ >> + }; >> }; >> >> &omap5_pmx_core { >> @@ -35,6 +76,7 @@ >> &dmic_pins >> &mcbsp1_pins >> &mcbsp2_pins >> + &usbhost_pins >> >; >> >> twl6040_pins: pinmux_twl6040_pins { >> @@ -120,6 +162,32 @@ >> 0x16c (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */ >> >; >> }; >> + >> + usbhost_pins: pinmux_usbhost_pins { >> + pinctrl-single,pins = < >> + 0x84 (PIN_INPUT | MUX_MODE0) /* usbb2_hsic_strobe INPUT | MODE 0 */ >> + 0x86 (PIN_INPUT | MUX_MODE0) /* usbb2_hsic_data INPUT | MODE 0 */ > > Comments are redundant with the constants, so maybe you can leave this part out. > Same for a few others below. > Ok, I agree here for attributes like pulls, i/o etc, comments are now not required. But comment is still good to describe just the mux mode functionality ? One module will use different pins, like data, clk, gpios, etc. Just MUX_MODEX does not complete it.. >> + >> + 0x19e (PIN_INPUT | MUX_MODE0) /* usbb3_hsic_strobe INPUT | MODE 0 */ >> + 0x1a0 (PIN_INPUT | MUX_MODE0) /* usbb3_hsic_data INPUT | MODE 0 */ >> + >> + 0x70 (PIN_OUTPUT | MUX_MODE6) /* gpio3_80 OUTPUT | MODE 6 HUB_NRESET */ >> + 0x6e (PIN_OUTPUT | MUX_MODE6) /* gpio3_79 OUTPUT | MODE 6 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 OUTPUT | MODE 7 for USB hub clk */ > > Mismatch between constants and comments, which mode should it be? > MODE 0. I see safe mode for 7. Comment should be corrected. >> + >; >> + }; >> }; >> >> &mmc1 { >> @@ -164,6 +232,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..67d6e1f 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 at 4a062000 { >> + compatible = "ti,usbhs-tll"; >> + reg = <0x4a062000 0x1000>; >> + interrupts = <0 78 IRQ_TYPE_LEVEL_HIGH>; > > I guess that here you can replace '0' with GIC_SPI. > Thanks. Will replace here and below. Regards, Sricharan ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support 2013-06-05 9:12 ` Sricharan R @ 2013-06-05 12:15 ` Florian Vaussard 0 siblings, 0 replies; 17+ messages in thread From: Florian Vaussard @ 2013-06-05 12:15 UTC (permalink / raw) To: linux-arm-kernel On 06/05/2013 11:12 AM, Sricharan R wrote: > Hi, > On Wednesday 05 June 2013 01:29 PM, Florian Vaussard wrote: >> Hello, >> >> Some very minor comments. >> >> On 06/05/2013 08:46 AM, Sricharan R wrote: >>> 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> >>> --- >>> arch/arm/boot/dts/omap5-uevm.dts | 77 ++++++++++++++++++++++++++++++++++++++ >>> arch/arm/boot/dts/omap5.dtsi | 30 +++++++++++++++ >>> 2 files changed, 107 insertions(+) >>> >>> diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts >>> index 843a001..cf862df 100644 >>> --- a/arch/arm/boot/dts/omap5-uevm.dts >>> +++ b/arch/arm/boot/dts/omap5-uevm.dts >>> @@ -25,6 +25,47 @@ >>> 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>; >>> + }; >>> + >>> + /* hsusb2_phy is clocked by FREF_CLK1 i.e. auxclk1 */ >>> + clock_alias { >>> + clock-name = "auxclk1_ck"; >>> + clock-alias = "main_clk"; >>> + device = <&hsusb2_phy>; >>> + clock-frequency = <19200000>; /* 19.2 MHz */ >>> + }; >>> }; >>> >>> &omap5_pmx_core { >>> @@ -35,6 +76,7 @@ >>> &dmic_pins >>> &mcbsp1_pins >>> &mcbsp2_pins >>> + &usbhost_pins >>> >; >>> >>> twl6040_pins: pinmux_twl6040_pins { >>> @@ -120,6 +162,32 @@ >>> 0x16c (PIN_INPUT | MUX_MODE1) /* mcspi2_cs */ >>> >; >>> }; >>> + >>> + usbhost_pins: pinmux_usbhost_pins { >>> + pinctrl-single,pins = < >>> + 0x84 (PIN_INPUT | MUX_MODE0) /* usbb2_hsic_strobe INPUT | MODE 0 */ >>> + 0x86 (PIN_INPUT | MUX_MODE0) /* usbb2_hsic_data INPUT | MODE 0 */ >> >> Comments are redundant with the constants, so maybe you can leave this part out. >> Same for a few others below. >> > Ok, I agree here for attributes like pulls, i/o etc, comments are now not required. > But comment is still good to describe just the mux mode functionality ? > One module will use different pins, like data, clk, gpios, etc. Just MUX_MODEX does not > complete it.. Yes, the 'usbb2_hsic_strobe' part must stay, only 'INPUT | MODE 0' should be removed from comments. >>> + >>> + 0x19e (PIN_INPUT | MUX_MODE0) /* usbb3_hsic_strobe INPUT | MODE 0 */ >>> + 0x1a0 (PIN_INPUT | MUX_MODE0) /* usbb3_hsic_data INPUT | MODE 0 */ >>> + >>> + 0x70 (PIN_OUTPUT | MUX_MODE6) /* gpio3_80 OUTPUT | MODE 6 HUB_NRESET */ >>> + 0x6e (PIN_OUTPUT | MUX_MODE6) /* gpio3_79 OUTPUT | MODE 6 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 OUTPUT | MODE 7 for USB hub clk */ >> >> Mismatch between constants and comments, which mode should it be? >> > MODE 0. I see safe mode for 7. Comment should be corrected. s/corrected/removed/. This will avoid this kind of inconsistency. Regards, Florian ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support 2013-06-05 6:46 ` [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support Sricharan R 2013-06-05 7:59 ` Florian Vaussard @ 2013-06-05 10:32 ` Roger Quadros 2013-06-05 11:50 ` Sricharan R 2013-06-05 13:57 ` Nishanth Menon 2 siblings, 1 reply; 17+ messages in thread From: Roger Quadros @ 2013-06-05 10:32 UTC (permalink / raw) To: linux-arm-kernel Hi Sricharan, Thanks for sending this, but some parts are outdated. See below. On 06/05/2013 09:46 AM, Sricharan R wrote: > 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> > --- > arch/arm/boot/dts/omap5-uevm.dts | 77 ++++++++++++++++++++++++++++++++++++++ > arch/arm/boot/dts/omap5.dtsi | 30 +++++++++++++++ > 2 files changed, 107 insertions(+) > > diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts > index 843a001..cf862df 100644 > --- a/arch/arm/boot/dts/omap5-uevm.dts > +++ b/arch/arm/boot/dts/omap5-uevm.dts > @@ -25,6 +25,47 @@ > 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>; > + }; > + > + /* hsusb2_phy is clocked by FREF_CLK1 i.e. auxclk1 */ > + clock_alias { > + clock-name = "auxclk1_ck"; > + clock-alias = "main_clk"; > + device = <&hsusb2_phy>; > + clock-frequency = <19200000>; /* 19.2 MHz */ > + }; clock_alias node is not required. Instead we need to rely on proper clock binding and provide reference to the clock phandle in the PHY node. as an example please see here https://lkml.org/lkml/2013/4/19/124 However this clock binding technique is still under discussion/transition. https://patchwork.kernel.org/patch/2541331/ So, I suggest you leave the auxclk1 part out for now and we can get it in later once the clock binding stuff is sorted out. The side effect of this is that PORT 2 (i.e. USB Hub) will not work. USB Ethernet should still work IMO. cheers, -roger ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support 2013-06-05 10:32 ` Roger Quadros @ 2013-06-05 11:50 ` Sricharan R 0 siblings, 0 replies; 17+ messages in thread From: Sricharan R @ 2013-06-05 11:50 UTC (permalink / raw) To: linux-arm-kernel Hi Roger, On Wednesday 05 June 2013 04:02 PM, Roger Quadros wrote: > Hi Sricharan, > > Thanks for sending this, but some parts are outdated. See below. > > On 06/05/2013 09:46 AM, Sricharan R wrote: >> 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> >> --- >> arch/arm/boot/dts/omap5-uevm.dts | 77 ++++++++++++++++++++++++++++++++++++++ >> arch/arm/boot/dts/omap5.dtsi | 30 +++++++++++++++ >> 2 files changed, 107 insertions(+) >> >> diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts >> index 843a001..cf862df 100644 >> --- a/arch/arm/boot/dts/omap5-uevm.dts >> +++ b/arch/arm/boot/dts/omap5-uevm.dts >> @@ -25,6 +25,47 @@ >> 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>; >> + }; >> + >> + /* hsusb2_phy is clocked by FREF_CLK1 i.e. auxclk1 */ >> + clock_alias { >> + clock-name = "auxclk1_ck"; >> + clock-alias = "main_clk"; >> + device = <&hsusb2_phy>; >> + clock-frequency = <19200000>; /* 19.2 MHz */ >> + }; > clock_alias node is not required. Instead we need to rely on proper clock binding > and provide reference to the clock phandle in the PHY node. > > as an example please see here > https://lkml.org/lkml/2013/4/19/124 > > However this clock binding technique is still under discussion/transition. > https://patchwork.kernel.org/patch/2541331/ > > So, I suggest you leave the auxclk1 part out for now and we can get it in later once > the clock binding stuff is sorted out. The side effect of this is that PORT 2 (i.e. USB Hub) > will not work. USB Ethernet should still work IMO. Ok will drop that part then. Thanks, Sricharan ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support 2013-06-05 6:46 ` [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support Sricharan R 2013-06-05 7:59 ` Florian Vaussard 2013-06-05 10:32 ` Roger Quadros @ 2013-06-05 13:57 ` Nishanth Menon 2013-06-06 17:51 ` Sricharan R 2 siblings, 1 reply; 17+ messages in thread From: Nishanth Menon @ 2013-06-05 13:57 UTC (permalink / raw) To: linux-arm-kernel On 12:16-20130605, Sricharan R wrote: > From: Roger Quadros <rogerq@ti.com> [...] > diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts > index 843a001..cf862df 100644 > --- a/arch/arm/boot/dts/omap5-uevm.dts > +++ b/arch/arm/boot/dts/omap5-uevm.dts <snip> > + /* hsusb2_phy is clocked by FREF_CLK1 i.e. auxclk1 */ > + clock_alias { > + clock-name = "auxclk1_ck"; > + clock-alias = "main_clk"; is'nt this better to use with clock node? > + device = <&hsusb2_phy>; > + clock-frequency = <19200000>; /* 19.2 MHz */ > + }; > }; <snip> -- Regards, Nishanth Menon ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support 2013-06-05 13:57 ` Nishanth Menon @ 2013-06-06 17:51 ` Sricharan R 2013-06-06 18:46 ` Nishanth Menon 0 siblings, 1 reply; 17+ messages in thread From: Sricharan R @ 2013-06-06 17:51 UTC (permalink / raw) To: linux-arm-kernel Hi, On Wednesday 05 June 2013 07:27 PM, Nishanth Menon wrote: > On 12:16-20130605, Sricharan R wrote: >> From: Roger Quadros <rogerq@ti.com> > [...] >> diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts >> index 843a001..cf862df 100644 >> --- a/arch/arm/boot/dts/omap5-uevm.dts >> +++ b/arch/arm/boot/dts/omap5-uevm.dts > <snip> >> + /* hsusb2_phy is clocked by FREF_CLK1 i.e. auxclk1 */ >> + clock_alias { >> + clock-name = "auxclk1_ck"; >> + clock-alias = "main_clk"; > is'nt this better to use with clock node? Roger was suggesting to remove this for now. Posted V2 following that. Are you suggesting to go with your clock-binding patch ? Regards, Sricharan ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support 2013-06-06 17:51 ` Sricharan R @ 2013-06-06 18:46 ` Nishanth Menon 2013-06-07 6:08 ` Sricharan R 0 siblings, 1 reply; 17+ messages in thread From: Nishanth Menon @ 2013-06-06 18:46 UTC (permalink / raw) To: linux-arm-kernel On 23:21-20130606, Sricharan R wrote: > Hi, > On Wednesday 05 June 2013 07:27 PM, Nishanth Menon wrote: > > On 12:16-20130605, Sricharan R wrote: > >> From: Roger Quadros <rogerq@ti.com> > > [...] > >> diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts > >> index 843a001..cf862df 100644 > >> --- a/arch/arm/boot/dts/omap5-uevm.dts > >> +++ b/arch/arm/boot/dts/omap5-uevm.dts > > <snip> > >> + /* hsusb2_phy is clocked by FREF_CLK1 i.e. auxclk1 */ > >> + clock_alias { > >> + clock-name = "auxclk1_ck"; > >> + clock-alias = "main_clk"; > > is'nt this better to use with clock node? > Roger was suggesting to remove this for now. Posted > V2 following that. > Are you suggesting to go with your clock-binding patch ? you cannot. Mike has already rejected that approach and I have dropped that series and wont be following up. See discussion https://patchwork.kernel.org/patch/2541331/ instead the new approach being discussed https://patchwork.kernel.org/patch/2657351/ and related discussions is the way to go. That said, it practically blocks introduction of all code that depend on dts nodes :(, no matter how I dont like being blocked and my many series delayed, I believe Mike, Tero, Rajendra are doing the right architecture and we should wait for it's upstream introduction. That is just my 2 cents. -- Regards, Nishanth Menon ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support 2013-06-06 18:46 ` Nishanth Menon @ 2013-06-07 6:08 ` Sricharan R 0 siblings, 0 replies; 17+ messages in thread From: Sricharan R @ 2013-06-07 6:08 UTC (permalink / raw) To: linux-arm-kernel On Friday 07 June 2013 12:16 AM, Nishanth Menon wrote: > On 23:21-20130606, Sricharan R wrote: >> Hi, >> On Wednesday 05 June 2013 07:27 PM, Nishanth Menon wrote: >>> On 12:16-20130605, Sricharan R wrote: >>>> From: Roger Quadros <rogerq@ti.com> >>> [...] >>>> diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts >>>> index 843a001..cf862df 100644 >>>> --- a/arch/arm/boot/dts/omap5-uevm.dts >>>> +++ b/arch/arm/boot/dts/omap5-uevm.dts >>> <snip> >>>> + /* hsusb2_phy is clocked by FREF_CLK1 i.e. auxclk1 */ >>>> + clock_alias { >>>> + clock-name = "auxclk1_ck"; >>>> + clock-alias = "main_clk"; >>> is'nt this better to use with clock node? >> Roger was suggesting to remove this for now. Postedhen >> V2 following that. >> Are you suggesting to go with your clock-binding patch ? > you cannot. Mike has already rejected that approach and I have dropped > that series and wont be following up. > See discussion https://patchwork.kernel.org/patch/2541331/ > > instead the new approach being discussed > https://patchwork.kernel.org/patch/2657351/ and related discussions is > the way to go. > > That said, it practically blocks introduction of all code that depend on > dts nodes :(, no matter how I dont like being blocked and my many series > delayed, I believe Mike, Tero, Rajendra are doing the right architecture > and we should wait for it's upstream introduction. > > That is just my 2 cents. > Thanks for the details. So dropping the alias for now, should be fine. Regards, Sricharan ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 3/4] ARM: dts: omap5-uevm: Add LED support for uEVM blue LED 2013-06-05 6:46 [PATCH 0/4] ARM: dts: omap5: Cleanup and updates for DT files Sricharan R 2013-06-05 6:46 ` [PATCH 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm Sricharan R 2013-06-05 6:46 ` [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support Sricharan R @ 2013-06-05 6:46 ` Sricharan R 2013-06-05 17:04 ` Dan Murphy 2013-06-05 6:46 ` [PATCH 4/4] ARM: dts: omap5-uevm: Add uart pinctrl data Sricharan R 3 siblings, 1 reply; 17+ messages in thread From: Sricharan R @ 2013-06-05 6:46 UTC (permalink / raw) To: linux-arm-kernel 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> --- arch/arm/boot/dts/omap5-uevm.dts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts index cf862df..a2aed5b 100644 --- a/arch/arm/boot/dts/omap5-uevm.dts +++ b/arch/arm/boot/dts/omap5-uevm.dts @@ -66,6 +66,16 @@ device = <&hsusb2_phy>; clock-frequency = <19200000>; /* 19.2 MHz */ }; + + 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 { @@ -77,6 +87,7 @@ &mcbsp1_pins &mcbsp2_pins &usbhost_pins + &led_gpio_pins >; twl6040_pins: pinmux_twl6040_pins { @@ -175,6 +186,12 @@ 0x6e (PIN_OUTPUT | MUX_MODE6) /* gpio3_79 OUTPUT | MODE 6 ETH_NRESET */ >; }; + + led_gpio_pins: pinmux_led_gpio_pins { + pinctrl-single,pins = < + 0x196 (PIN_OUTPUT | MUX_MODE6) /* uart3_cts_rctx.gpio5_153 OUTPUT | MODE6 */ + >; + }; }; &omap5_pmx_wkup { -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH 3/4] ARM: dts: omap5-uevm: Add LED support for uEVM blue LED 2013-06-05 6:46 ` [PATCH 3/4] ARM: dts: omap5-uevm: Add LED support for uEVM blue LED Sricharan R @ 2013-06-05 17:04 ` Dan Murphy 2013-06-06 17:52 ` Sricharan R 0 siblings, 1 reply; 17+ messages in thread From: Dan Murphy @ 2013-06-05 17:04 UTC (permalink / raw) To: linux-arm-kernel Sricharan Thanks for sending this up in the series. On 06/05/2013 01:46 AM, Sricharan R wrote: > 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> > --- > arch/arm/boot/dts/omap5-uevm.dts | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts > index cf862df..a2aed5b 100644 > --- a/arch/arm/boot/dts/omap5-uevm.dts > +++ b/arch/arm/boot/dts/omap5-uevm.dts > @@ -66,6 +66,16 @@ > device = <&hsusb2_phy>; > clock-frequency = <19200000>; /* 19.2 MHz */ > }; > + > + 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 { > @@ -77,6 +87,7 @@ > &mcbsp1_pins > &mcbsp2_pins > &usbhost_pins > + &led_gpio_pins > >; > > twl6040_pins: pinmux_twl6040_pins { > @@ -175,6 +186,12 @@ > 0x6e (PIN_OUTPUT | MUX_MODE6) /* gpio3_79 OUTPUT | MODE 6 ETH_NRESET */ > >; > }; > + > + led_gpio_pins: pinmux_led_gpio_pins { > + pinctrl-single,pins = < > + 0x196 (PIN_OUTPUT | MUX_MODE6) /* uart3_cts_rctx.gpio5_153 OUTPUT | MODE6 */ Same comment from Florian. We can drop the OUTPUT | MODE6 in the comment. > + >; > + }; > }; > > &omap5_pmx_wkup { -- ------------------ Dan Murphy ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 3/4] ARM: dts: omap5-uevm: Add LED support for uEVM blue LED 2013-06-05 17:04 ` Dan Murphy @ 2013-06-06 17:52 ` Sricharan R 0 siblings, 0 replies; 17+ messages in thread From: Sricharan R @ 2013-06-06 17:52 UTC (permalink / raw) To: linux-arm-kernel Hi, On Wednesday 05 June 2013 10:34 PM, Dan Murphy wrote: > Sricharan > > Thanks for sending this up in the series. > > On 06/05/2013 01:46 AM, Sricharan R wrote: >> 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> >> --- >> arch/arm/boot/dts/omap5-uevm.dts | 17 +++++++++++++++++ >> 1 file changed, 17 insertions(+) >> >> diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts >> index cf862df..a2aed5b 100644 >> --- a/arch/arm/boot/dts/omap5-uevm.dts >> +++ b/arch/arm/boot/dts/omap5-uevm.dts >> @@ -66,6 +66,16 @@ >> device = <&hsusb2_phy>; >> clock-frequency = <19200000>; /* 19.2 MHz */ >> }; >> + >> + 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 { >> @@ -77,6 +87,7 @@ >> &mcbsp1_pins >> &mcbsp2_pins >> &usbhost_pins >> + &led_gpio_pins >> >; >> >> twl6040_pins: pinmux_twl6040_pins { >> @@ -175,6 +186,12 @@ >> 0x6e (PIN_OUTPUT | MUX_MODE6) /* gpio3_79 OUTPUT | MODE 6 ETH_NRESET */ >> >; >> }; >> + >> + led_gpio_pins: pinmux_led_gpio_pins { >> + pinctrl-single,pins = < >> + 0x196 (PIN_OUTPUT | MUX_MODE6) /* uart3_cts_rctx.gpio5_153 OUTPUT | MODE6 */ > Same comment from Florian. We can drop the OUTPUT | MODE6 in the comment. Ok thanks, Corrected in V2. Regards, Sricharan ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 4/4] ARM: dts: omap5-uevm: Add uart pinctrl data 2013-06-05 6:46 [PATCH 0/4] ARM: dts: omap5: Cleanup and updates for DT files Sricharan R ` (2 preceding siblings ...) 2013-06-05 6:46 ` [PATCH 3/4] ARM: dts: omap5-uevm: Add LED support for uEVM blue LED Sricharan R @ 2013-06-05 6:46 ` Sricharan R 3 siblings, 0 replies; 17+ messages in thread From: Sricharan R @ 2013-06-05 6:46 UTC (permalink / raw) To: linux-arm-kernel 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> --- 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 a2aed5b..e545e64 100644 --- a/arch/arm/boot/dts/omap5-uevm.dts +++ b/arch/arm/boot/dts/omap5-uevm.dts @@ -192,6 +192,32 @@ 0x196 (PIN_OUTPUT | MUX_MODE6) /* uart3_cts_rctx.gpio5_153 OUTPUT | MODE6 */ >; }; + + uart1_pins: pinmux_uart1_pins { + pinctrl-single,pins = < + 0x60 (PIN_OUTPUT | MUX_MODE0) /* uart1_tx.uart1_cts MODE0 */ + 0x62 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart1_tx.uart1_cts INPUT | PULLUP | MODE0 */ + 0x64 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart1_rx.uart1_rts INPUT | PULLUP | MODE0 */ + 0x66 (PIN_OUTPUT | MUX_MODE0) /* uart1_rx.uart1_rts MODE0 */ + >; + }; + + uart3_pins: pinmux_uart3_pins { + pinctrl-single,pins = < + 0x19a (PIN_OUTPUT | MUX_MODE0) /* uart3_rts_irsd.uart3_tx_irtx MODE0 */ + 0x19c (PIN_INPUT_PULLUP | MUX_MODE0) /* uart3_rx_irrx.uart3_usbb3_hsic INPUT | PULLUP | MODE0 */ + >; + }; + + uart5_pins: pinmux_uart5_pins { + pinctrl-single,pins = < + 0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart5_rx.uart5_rx INPUT | PULLUP | MODE0 */ + 0x172 (PIN_OUTPUT | MUX_MODE0) /* uart5_tx.uart5_tx MODE0 */ + 0x174 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart5_cts.uart5_rts INPUT | PULLUP | MODE0 */ + 0x176 (PIN_OUTPUT | MUX_MODE0) /* uart5_cts.uart5_rts MODE0 */ + >; + }; + }; &omap5_pmx_wkup { @@ -276,3 +302,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] 17+ messages in thread
end of thread, other threads:[~2013-06-07 6:08 UTC | newest] Thread overview: 17+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-06-05 6:46 [PATCH 0/4] ARM: dts: omap5: Cleanup and updates for DT files Sricharan R 2013-06-05 6:46 ` [PATCH 1/4] ARM: dts: omap5: Rename omap5-evm to omap5-uevm Sricharan R 2013-06-05 6:50 ` Sricharan R 2013-06-05 6:46 ` [PATCH 2/4] ARM: dts: omap5-uevm: Add USB Host support Sricharan R 2013-06-05 7:59 ` Florian Vaussard 2013-06-05 9:12 ` Sricharan R 2013-06-05 12:15 ` Florian Vaussard 2013-06-05 10:32 ` Roger Quadros 2013-06-05 11:50 ` Sricharan R 2013-06-05 13:57 ` Nishanth Menon 2013-06-06 17:51 ` Sricharan R 2013-06-06 18:46 ` Nishanth Menon 2013-06-07 6:08 ` Sricharan R 2013-06-05 6:46 ` [PATCH 3/4] ARM: dts: omap5-uevm: Add LED support for uEVM blue LED Sricharan R 2013-06-05 17:04 ` Dan Murphy 2013-06-06 17:52 ` Sricharan R 2013-06-05 6:46 ` [PATCH 4/4] ARM: dts: omap5-uevm: Add uart pinctrl data 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).