diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-06-08 10:29:06 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-06-08 10:29:35 -0700 |
| commit | eff019527fa7b27e872d9e2ec35e2487fd71a90a (patch) | |
| tree | 488106de8bbcd28a7ba301c23ded4659290bca55 /arch/arm/boot/dts | |
| parent | 388da55ea8ef2b8cf0d0abbbd5d5b6a2739629b9 (diff) | |
| download | olio-linux-3.10-eff019527fa7b27e872d9e2ec35e2487fd71a90a.tar.xz olio-linux-3.10-eff019527fa7b27e872d9e2ec35e2487fd71a90a.zip | |
Android sleep: USB configuration settings, kernel configuration update.
Change-Id: I9e86827b75affde28311aee144be5ad830dde029
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 12 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 27 |
2 files changed, 34 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index a6e8ef88219..78e97bea7af 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -503,13 +503,14 @@ ti,timer-secure; }; + /* usbhstll: usbhstll@48062000 { compatible = "ti,usbhs-tll"; reg = <0x48062000 0x1000>; interrupts = <78>; ti,hwmods = "usb_tll_hs"; }; - + usbhshost: usbhshost@48064000 { compatible = "ti,usbhs-host"; reg = <0x48064000 0x400>; @@ -517,14 +518,14 @@ #address-cells = <1>; #size-cells = <1>; ranges; - + usbhsohci: ohci@48064400 { compatible = "ti,ohci-omap3", "usb-ohci"; reg = <0x48064400 0x400>; interrupt-parent = <&intc>; interrupts = <76>; }; - + usbhsehci: ehci@48064800 { compatible = "ti,ehci-omap", "usb-ehci"; reg = <0x48064800 0x400>; @@ -532,6 +533,7 @@ interrupts = <77>; }; }; + */ gpmc: gpmc@6e000000 { compatible = "ti,omap3430-gpmc"; @@ -544,6 +546,8 @@ #size-cells = <1>; }; + + /* usb_otg_hs: usb_otg_hs@480ab000 { compatible = "ti,omap3-musb"; reg = <0x480ab000 0x1000>; @@ -553,7 +557,7 @@ multipoint = <1>; num-eps = <16>; ram-bits = <12>; - }; + };*/ glbl_prm: glbl_prm@48307250 { /* diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index ed685adb6cb..4c28fdf293b 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -24,7 +24,7 @@ 300000 975000 600000 1150000 800000 1275000 - 1000000 1337500 + /* 1000000 1337500 */ >; /* OPP tolerance in percentage */ voltage-tolerance = <0>; @@ -124,6 +124,31 @@ 0x5ba 0x004 /* ETK_D7, MODE4 | OUTPUT */ 0x1b0 0x100 /* SYS_NIRQ, MODE0 | INPUT */ 0x0dc 0x004 /* CAM_HS, MODE4 | OUTPUT */ + + /* USB */ + + 0x172 0x100 /* HSUSB0_CLK, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ + 0x174 0x000 /* HSUSB0_STP, (OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT) */ + 0x176 0x100 /* HSUSB0_DIR, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ + 0x178 0x100 /* HSUSB0_NXT, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ + 0x17a 0x100 /* HSUSB0_DATA0, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ + 0x17c 0x100 /* HSUSB0_DATA1, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT */ + 0x17e 0x100 /* HSUSB0_DATA2, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ + 0x180 0x100 /* HSUSB0_DATA3, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ + 0x182 0x100 /* HSUSB0_DATA4, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ + 0x184 0x100 /* HSUSB0_DATA5, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ + 0x186 0x100 /* HSUSB0_DATA6, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ + 0x188 0x100 /* HSUSB0_DATA7, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT) */ + + /* USB connected interrupt */ + 0x5ba 0x004 /* ETK_D7, (OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT)) */ + + 0x1b0 0x100 /* SYS_NIRQ, (OMAP_MUX_MODE0 | OMAP_PIN_INPUT)) */ + + /* Accelerometer interrupt */ + 0x9fc 0x4104 /* JTAG_EMU1, OMAP_MUX_MODE4 | OMAP_PIN_INPUT | + OMAP_PIN_OFF_WAKEUPENABLE) */ + >; }; |