diff options
| author | Andy Green <andy.green@linaro.org> | 2015-01-21 12:21:33 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2015-01-22 00:46:33 +0800 |
| commit | 78f71dc38bc0ac6aa7a872b2922cf6b789d2ede9 (patch) | |
| tree | c62d26dd8e47f734f7e3363f146677fa899c73a6 /arch | |
| parent | 29fe2e31fdea7b7af8465da5fb440f978edac493 (diff) | |
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/msm8916.dtsi | 61 | ||||
| -rw-r--r-- | arch/arm/configs/msm8916-qrd_defconfig | 4 |
2 files changed, 29 insertions, 36 deletions
diff --git a/arch/arm/boot/dts/msm8916.dtsi b/arch/arm/boot/dts/msm8916.dtsi index 39c50b06dde1..2da31fe709e4 100644 --- a/arch/arm/boot/dts/msm8916.dtsi +++ b/arch/arm/boot/dts/msm8916.dtsi @@ -899,45 +899,34 @@ qcom,ipi-ping; }; - usb_otg: usb@78d9000 { - compatible = "qcom,usb-otg-snps"; - - reg = <0x78d9000 0x400>; - interrupts = <0 134 0>,<0 140 0>; - interrupt-names = "core_irq", "async_irq"; - - vddcx-supply = <&pm8916_s1_corner>; - v1p8-supply = <&pm8916_l7>; - v3p3-supply = <&pm8916_l13>; - qcom,vdd-levels = <1 5 7>; - - qcom,phy-init-sequence = + usb_otg:usb@78 { + compatible = "qcom,usb-otg-snps"; + reg = <0x78d9000 0x400>; + interrupts = <0 140 0>; + dr_mode = "peripheral"; + clocks = <&clock_gcc clk_gcc_usb_hs_ahb_clk>, + <&clock_gcc clk_gcc_usb_hs_system_clk>, + <&clock_gcc clk_gcc_usb2a_phy_sleep_clk>; + + clock-names = "iface", "core", "phy"; + + vddcx-supply = <&pm8916_s1_corner>; + v1p8-supply = <&pm8916_l7>; + v3p3-supply = <&pm8916_l13>; + qcom,vdd-levels = <1 5 7>; + + qcom,phy-init-sequence = <0x44 0x80 0x6B 0x81 0x24 0x82 0x13 0x83 0xffffffff>; - qcom,otg-phy-type = <2>; - qcom,otg-mode = <1>; - qcom,otg-control = <2>; - qcom,dp-manual-pullup; - - qcom,msm-bus,name = "usb2"; - qcom,msm-bus,num-cases = <3>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = - <87 512 0 0>, - <87 512 80000 0>, - <87 512 6000 6000>; - clocks = <&clock_gcc clk_gcc_usb_hs_ahb_clk>, - <&clock_gcc clk_gcc_usb_hs_system_clk>, - <&clock_gcc clk_gcc_usb2a_phy_sleep_clk>, - <&clock_rpm clk_bimc_usb_a_clk>, - <&clock_rpm clk_snoc_usb_a_clk>, - <&clock_rpm clk_pcnoc_usb_a_clk>, - <&clock_rpm clk_xo_otg_clk>; - clock-names = "iface", "core", "phy", - "bimc_clk", "snoc_clk", "pcnoc_clk", - "xo"; - qcom,bus-clk-rate = <400000000 200000000 100000000>; + qcom,otg-control = <2>; /* controlled by phy */ }; + gadget0: gadget@78 { + compatible = "qcom,ci-hdrc"; + reg = <0x78d9000 0x400>; + dr_mode = "peripheral"; + interrupts = <0 134 0>; + usb-phy = <&usb_otg>; + }; }; diff --git a/arch/arm/configs/msm8916-qrd_defconfig b/arch/arm/configs/msm8916-qrd_defconfig index 77885672956a..b4d679dc3c0e 100644 --- a/arch/arm/configs/msm8916-qrd_defconfig +++ b/arch/arm/configs/msm8916-qrd_defconfig @@ -144,7 +144,11 @@ CONFIG_USB=y CONFIG_USB_OTG=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_MSM=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_DEBUG=y CONFIG_USB_MSM_OTG=y +CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_USB_ETH=y CONFIG_MMC=y |