| Message ID | 1394197751-28984-8-git-send-email-rogerq@ti.com |
|---|---|
| State | New |
| Headers | show |
Hi Roger, On Friday 07 March 2014 06:39 PM, Roger Quadros wrote: > Add nodes for the Super Speed USB controllers, omap-control-usb, > USB2 PHY and USB3 PHY devices. > > Remove ocp2scp1 address space from hwmod data as it is > now provided via device tree. > > Signed-off-by: Roger Quadros <rogerq@ti.com> > --- > arch/arm/boot/dts/dra7.dtsi | 110 ++++++++++++++++++++++++++++++ > arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 10 --- > 2 files changed, 110 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi > index 597979b..1e73900 100644 > --- a/arch/arm/boot/dts/dra7.dtsi > +++ b/arch/arm/boot/dts/dra7.dtsi > @@ -811,6 +811,116 @@ > clocks = <&sata_ref_clk>; > ti,hwmods = "sata"; > }; > + > + omap_control_usb2phy1: control-phy@4a002300 { > + compatible = "ti,control-phy-usb2"; > + reg = <0x4a002300 0x4>; > + reg-names = "power"; > + }; > + > + omap_control_usb3phy1: control-phy@4a002370 { > + compatible = "ti,control-phy-pipe3"; > + reg = <0x4a002370 0x4>; > + reg-names = "power"; > + }; > + > + omap_control_usb2phy2: control-phy@0x4a002e74 { > + compatible = "ti,control-phy-usb2-dra7"; > + reg = <0x4a002e74 0x4>; > + reg-names = "power"; > + }; > + > + /* OCP2SCP1 */ > + ocp2scp@4a080000 { > + compatible = "ti,omap-ocp2scp"; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + reg = <0x4a080000 0x20>; > + ti,hwmods = "ocp2scp1"; > + > + usb2_phy1: phy@4a084000 { > + compatible = "ti,omap-usb2"; > + reg = <0x4a084000 0x400>; > + ctrl-module = <&omap_control_usb2phy1>; > + clocks = <&usb_phy1_always_on_clk32k>, > + <&usb_otg_ss1_refclk960m>; > + clock-names = "wkupclk", > + "refclk"; > + #phy-cells = <0>; > + }; > + > + usb2_phy2: phy@4a085000 { > + compatible = "ti,omap-usb2"; > + reg = <0x4a085000 0x400>; > + ctrl-module = <&omap_control_usb2phy2>; > + clocks = <&usb_phy2_always_on_clk32k>, > + <&usb_otg_ss2_refclk960m>; > + clock-names = "wkupclk", > + "refclk"; > + #phy-cells = <0>; > + }; > + > + usb3_phy1: phy@4a084400 { > + compatible = "ti,omap-usb3"; > + reg = <0x4a084400 0x80>, > + <0x4a084800 0x64>, > + <0x4a084c00 0x40>; > + reg-names = "phy_rx", "phy_tx", "pll_ctrl"; > + ctrl-module = <&omap_control_usb3phy1>; > + clocks = <&usb_phy3_always_on_clk32k>, > + <&sys_clkin1>, > + <&usb_otg_ss1_refclk960m>, > + <&dpll_core_h13x2_ck>; > + clock-names = "wkupclk", > + "sysclk", > + "refclk", > + "optclk"; Do we use this 'optclk' in driver? -Kishon -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On 03/14/2014 12:38 PM, Kishon Vijay Abraham I wrote: > Hi Roger, > > On Friday 07 March 2014 06:39 PM, Roger Quadros wrote: >> Add nodes for the Super Speed USB controllers, omap-control-usb, >> USB2 PHY and USB3 PHY devices. >> >> Remove ocp2scp1 address space from hwmod data as it is >> now provided via device tree. >> >> Signed-off-by: Roger Quadros <rogerq@ti.com> >> --- >> arch/arm/boot/dts/dra7.dtsi | 110 ++++++++++++++++++++++++++++++ >> arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 10 --- >> 2 files changed, 110 insertions(+), 10 deletions(-) >> >> diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi >> index 597979b..1e73900 100644 >> --- a/arch/arm/boot/dts/dra7.dtsi >> +++ b/arch/arm/boot/dts/dra7.dtsi >> @@ -811,6 +811,116 @@ >> clocks = <&sata_ref_clk>; >> ti,hwmods = "sata"; >> }; >> + >> + omap_control_usb2phy1: control-phy@4a002300 { >> + compatible = "ti,control-phy-usb2"; >> + reg = <0x4a002300 0x4>; >> + reg-names = "power"; >> + }; >> + >> + omap_control_usb3phy1: control-phy@4a002370 { >> + compatible = "ti,control-phy-pipe3"; >> + reg = <0x4a002370 0x4>; >> + reg-names = "power"; >> + }; >> + >> + omap_control_usb2phy2: control-phy@0x4a002e74 { >> + compatible = "ti,control-phy-usb2-dra7"; >> + reg = <0x4a002e74 0x4>; >> + reg-names = "power"; >> + }; >> + >> + /* OCP2SCP1 */ >> + ocp2scp@4a080000 { >> + compatible = "ti,omap-ocp2scp"; >> + #address-cells = <1>; >> + #size-cells = <1>; >> + ranges; >> + reg = <0x4a080000 0x20>; >> + ti,hwmods = "ocp2scp1"; >> + >> + usb2_phy1: phy@4a084000 { >> + compatible = "ti,omap-usb2"; >> + reg = <0x4a084000 0x400>; >> + ctrl-module = <&omap_control_usb2phy1>; >> + clocks = <&usb_phy1_always_on_clk32k>, >> + <&usb_otg_ss1_refclk960m>; >> + clock-names = "wkupclk", >> + "refclk"; >> + #phy-cells = <0>; >> + }; >> + >> + usb2_phy2: phy@4a085000 { >> + compatible = "ti,omap-usb2"; >> + reg = <0x4a085000 0x400>; >> + ctrl-module = <&omap_control_usb2phy2>; >> + clocks = <&usb_phy2_always_on_clk32k>, >> + <&usb_otg_ss2_refclk960m>; >> + clock-names = "wkupclk", >> + "refclk"; >> + #phy-cells = <0>; >> + }; >> + >> + usb3_phy1: phy@4a084400 { >> + compatible = "ti,omap-usb3"; >> + reg = <0x4a084400 0x80>, >> + <0x4a084800 0x64>, >> + <0x4a084c00 0x40>; >> + reg-names = "phy_rx", "phy_tx", "pll_ctrl"; >> + ctrl-module = <&omap_control_usb3phy1>; >> + clocks = <&usb_phy3_always_on_clk32k>, >> + <&sys_clkin1>, >> + <&usb_otg_ss1_refclk960m>, >> + <&dpll_core_h13x2_ck>; >> + clock-names = "wkupclk", >> + "sysclk", >> + "refclk", >> + "optclk"; > > Do we use this 'optclk' in driver? No we don't. Still the device seems to work without it. This is supposed to be USB_LFPS_TX_GFCLK or USB3PHY_REF_CLK. Any idea why it works without that on OMAP5 as well? cheers, -roger -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Mar 14, 2014 at 05:34:29PM +0200, Roger Quadros wrote: > On 03/14/2014 04:54 PM, Kishon Vijay Abraham I wrote: > > > > > > On Friday 14 March 2014 05:41 PM, Roger Quadros wrote: > >> On 03/14/2014 12:38 PM, Kishon Vijay Abraham I wrote: > >>> Hi Roger, > >>> > >>> On Friday 07 March 2014 06:39 PM, Roger Quadros wrote: > >>>> Add nodes for the Super Speed USB controllers, omap-control-usb, > >>>> USB2 PHY and USB3 PHY devices. > >>>> > >>>> Remove ocp2scp1 address space from hwmod data as it is > >>>> now provided via device tree. > >>>> > >>>> Signed-off-by: Roger Quadros <rogerq@ti.com> > >>>> --- > >>>> arch/arm/boot/dts/dra7.dtsi | 110 ++++++++++++++++++++++++++++++ > >>>> arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 10 --- > >>>> 2 files changed, 110 insertions(+), 10 deletions(-) > >>>> > >>>> diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi > >>>> index 597979b..1e73900 100644 > >>>> --- a/arch/arm/boot/dts/dra7.dtsi > >>>> +++ b/arch/arm/boot/dts/dra7.dtsi > >>>> @@ -811,6 +811,116 @@ > >>>> clocks = <&sata_ref_clk>; > >>>> ti,hwmods = "sata"; > >>>> }; > >>>> + > >>>> + omap_control_usb2phy1: control-phy@4a002300 { > >>>> + compatible = "ti,control-phy-usb2"; > >>>> + reg = <0x4a002300 0x4>; > >>>> + reg-names = "power"; > >>>> + }; > >>>> + > >>>> + omap_control_usb3phy1: control-phy@4a002370 { > >>>> + compatible = "ti,control-phy-pipe3"; > >>>> + reg = <0x4a002370 0x4>; > >>>> + reg-names = "power"; > >>>> + }; > >>>> + > >>>> + omap_control_usb2phy2: control-phy@0x4a002e74 { > >>>> + compatible = "ti,control-phy-usb2-dra7"; > >>>> + reg = <0x4a002e74 0x4>; > >>>> + reg-names = "power"; > >>>> + }; > >>>> + > >>>> + /* OCP2SCP1 */ > >>>> + ocp2scp@4a080000 { > >>>> + compatible = "ti,omap-ocp2scp"; > >>>> + #address-cells = <1>; > >>>> + #size-cells = <1>; > >>>> + ranges; > >>>> + reg = <0x4a080000 0x20>; > >>>> + ti,hwmods = "ocp2scp1"; > >>>> + > >>>> + usb2_phy1: phy@4a084000 { > >>>> + compatible = "ti,omap-usb2"; > >>>> + reg = <0x4a084000 0x400>; > >>>> + ctrl-module = <&omap_control_usb2phy1>; > >>>> + clocks = <&usb_phy1_always_on_clk32k>, > >>>> + <&usb_otg_ss1_refclk960m>; > >>>> + clock-names = "wkupclk", > >>>> + "refclk"; > >>>> + #phy-cells = <0>; > >>>> + }; > >>>> + > >>>> + usb2_phy2: phy@4a085000 { > >>>> + compatible = "ti,omap-usb2"; > >>>> + reg = <0x4a085000 0x400>; > >>>> + ctrl-module = <&omap_control_usb2phy2>; > >>>> + clocks = <&usb_phy2_always_on_clk32k>, > >>>> + <&usb_otg_ss2_refclk960m>; > >>>> + clock-names = "wkupclk", > >>>> + "refclk"; > >>>> + #phy-cells = <0>; > >>>> + }; > >>>> + > >>>> + usb3_phy1: phy@4a084400 { > >>>> + compatible = "ti,omap-usb3"; > >>>> + reg = <0x4a084400 0x80>, > >>>> + <0x4a084800 0x64>, > >>>> + <0x4a084c00 0x40>; > >>>> + reg-names = "phy_rx", "phy_tx", "pll_ctrl"; > >>>> + ctrl-module = <&omap_control_usb3phy1>; > >>>> + clocks = <&usb_phy3_always_on_clk32k>, > >>>> + <&sys_clkin1>, > >>>> + <&usb_otg_ss1_refclk960m>, > >>>> + <&dpll_core_h13x2_ck>; > >>>> + clock-names = "wkupclk", > >>>> + "sysclk", > >>>> + "refclk", > >>>> + "optclk"; > >>> > >>> Do we use this 'optclk' in driver? > >> > >> No we don't. Still the device seems to work without it. > >> This is supposed to be USB_LFPS_TX_GFCLK or USB3PHY_REF_CLK. > > > > I think it should be enabled. Did you check the status of this clock > > in CM_L3INIT_CLKSTCTRL? Moreover USB_LFPS_TX_GFCLK is an interface > > clock, so IIUC setting the module mode will enable it. > > > > Btw how did you tell dpll_core_h13x2_ck enables USB_LFPS_TX_GFCLK? > > > > From the clock tree tool. It looks like the clock is gated > automatically with the module mode as you suggested. I'll get rid of > this clock reference then. note that we can change the input clock of some parts of dwc3, maybe that's why it works without, we're probably using another clock as input.
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 597979b..1e73900 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -811,6 +811,116 @@ clocks = <&sata_ref_clk>; ti,hwmods = "sata"; }; + + omap_control_usb2phy1: control-phy@4a002300 { + compatible = "ti,control-phy-usb2"; + reg = <0x4a002300 0x4>; + reg-names = "power"; + }; + + omap_control_usb3phy1: control-phy@4a002370 { + compatible = "ti,control-phy-pipe3"; + reg = <0x4a002370 0x4>; + reg-names = "power"; + }; + + omap_control_usb2phy2: control-phy@0x4a002e74 { + compatible = "ti,control-phy-usb2-dra7"; + reg = <0x4a002e74 0x4>; + reg-names = "power"; + }; + + /* OCP2SCP1 */ + ocp2scp@4a080000 { + compatible = "ti,omap-ocp2scp"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + reg = <0x4a080000 0x20>; + ti,hwmods = "ocp2scp1"; + + usb2_phy1: phy@4a084000 { + compatible = "ti,omap-usb2"; + reg = <0x4a084000 0x400>; + ctrl-module = <&omap_control_usb2phy1>; + clocks = <&usb_phy1_always_on_clk32k>, + <&usb_otg_ss1_refclk960m>; + clock-names = "wkupclk", + "refclk"; + #phy-cells = <0>; + }; + + usb2_phy2: phy@4a085000 { + compatible = "ti,omap-usb2"; + reg = <0x4a085000 0x400>; + ctrl-module = <&omap_control_usb2phy2>; + clocks = <&usb_phy2_always_on_clk32k>, + <&usb_otg_ss2_refclk960m>; + clock-names = "wkupclk", + "refclk"; + #phy-cells = <0>; + }; + + usb3_phy1: phy@4a084400 { + compatible = "ti,omap-usb3"; + reg = <0x4a084400 0x80>, + <0x4a084800 0x64>, + <0x4a084c00 0x40>; + reg-names = "phy_rx", "phy_tx", "pll_ctrl"; + ctrl-module = <&omap_control_usb3phy1>; + clocks = <&usb_phy3_always_on_clk32k>, + <&sys_clkin1>, + <&usb_otg_ss1_refclk960m>, + <&dpll_core_h13x2_ck>; + clock-names = "wkupclk", + "sysclk", + "refclk", + "optclk"; + #phy-cells = <0>; + }; + }; + + omap_dwc3_1@48880000 { + compatible = "ti,dwc3"; + ti,hwmods = "usb_otg_ss1"; + reg = <0x48880000 0x10000>; + interrupts = <0 77 4>; + #address-cells = <1>; + #size-cells = <1>; + utmi-mode = <2>; + ranges; + usb1: usb@48890000 { + compatible = "snps,dwc3"; + reg = <0x48890000 0x17000>; + interrupts = <0 76 4>; + phys = <&usb2_phy1>, <&usb3_phy1>; + phy-names = "usb2-phy", "usb3-phy"; + tx-fifo-resize; + maximum-speed = "super-speed"; + dr_mode = "otg"; + }; + }; + + omap_dwc3_2@488c0000 { + compatible = "ti,dwc3"; + ti,hwmods = "usb_otg_ss2"; + reg = <0x488c0000 0x10000>; + interrupts = <0 92 4>; + #address-cells = <1>; + #size-cells = <1>; + utmi-mode = <2>; + ranges; + usb2: usb@488d0000 { + compatible = "snps,dwc3"; + reg = <0x488d0000 0x17000>; + interrupts = <0 78 4>; + phys = <&usb2_phy2>; + phy-names = "usb2-phy"; + tx-fifo-resize; + maximum-speed = "high-speed"; + dr_mode = "otg"; + }; + }; }; }; diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c index cca24ad..403ba02 100644 --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c @@ -2351,21 +2351,11 @@ static struct omap_hwmod_ocp_if dra7xx_l4_cfg__mpu = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -static struct omap_hwmod_addr_space dra7xx_ocp2scp1_addrs[] = { - { - .pa_start = 0x4a080000, - .pa_end = 0x4a08001f, - .flags = ADDR_TYPE_RT - }, - { } -}; - /* l4_cfg -> ocp2scp1 */ static struct omap_hwmod_ocp_if dra7xx_l4_cfg__ocp2scp1 = { .master = &dra7xx_l4_cfg_hwmod, .slave = &dra7xx_ocp2scp1_hwmod, .clk = "l4_root_clk_div", - .addr = dra7xx_ocp2scp1_addrs, .user = OCP_USER_MPU | OCP_USER_SDMA, };
Add nodes for the Super Speed USB controllers, omap-control-usb, USB2 PHY and USB3 PHY devices. Remove ocp2scp1 address space from hwmod data as it is now provided via device tree. Signed-off-by: Roger Quadros <rogerq@ti.com> --- arch/arm/boot/dts/dra7.dtsi | 110 ++++++++++++++++++++++++++++++ arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 10 --- 2 files changed, 110 insertions(+), 10 deletions(-)