Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge commit '20a2742e5784295b9197250b50c40f6d38a55880' into omap-for-v4.16/dt-clk

+58
+36
Documentation/devicetree/bindings/bus/ti-sysc.txt
··· 26 26 or one of the following derivative types for hardware 27 27 needing special workarounds: 28 28 29 + "ti,sysc-omap2-timer" 30 + "ti,sysc-omap4-timer" 29 31 "ti,sysc-omap3430-sr" 30 32 "ti,sysc-omap3630-sr" 31 33 "ti,sysc-omap4-sr" ··· 51 49 52 50 Optional properties: 53 51 52 + - ti,sysc-mask shall contain mask of supported register bits for the 53 + SYSCONFIG register as documented in the Technical Reference 54 + Manual (TRM) for the interconnect target module 55 + 56 + - ti,sysc-midle list of master idle modes supported by the interconnect 57 + target module as documented in the TRM for SYSCONFIG 58 + register MIDLEMODE bits 59 + 60 + - ti,sysc-sidle list of slave idle modes supported by the interconnect 61 + target module as documented in the TRM for SYSCONFIG 62 + register SIDLEMODE bits 63 + 64 + - ti,sysc-delay-us delay needed after OCP softreset before accssing 65 + SYSCONFIG register again 66 + 67 + - ti,syss-mask optional mask of reset done status bits as described in the 68 + TRM for SYSSTATUS registers, typically 1 with some devices 69 + having separate reset done bits for children like OHCI and 70 + EHCI 71 + 54 72 - clocks clock specifier for each name in the clock-names as 55 73 specified in the binding documentation for ti-clkctrl, 56 74 typically available for all interconnect targets on TI SoCs ··· 83 61 - ti,hwmods optional TI interconnect module name to use legacy 84 62 hwmod platform data 85 63 64 + - ti,no-reset-on-init interconnect target module should not be reset at init 65 + 66 + - ti,no-idle-on-init interconnect target module should not be idled at init 86 67 87 68 Example: Single instance of MUSB controller on omap4 using interconnect ranges 88 69 using offsets from l4_cfg second segment (0x4a000000 + 0x80000 = 0x4a0ab000): ··· 99 74 reg-names = "rev", "sysc", "syss"; 100 75 clocks = <&l3_init_clkctrl OMAP4_USB_OTG_HS_CLKCTRL 0>; 101 76 clock-names = "fck"; 77 + ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP | 78 + SYSC_OMAP2_SOFTRESET | 79 + SYSC_OMAP2_AUTOIDLE)>; 80 + ti,sysc-midle = <SYSC_IDLE_FORCE>, 81 + <SYSC_IDLE_NO>, 82 + <SYSC_IDLE_SMART>; 83 + ti,sysc-sidle = <SYSC_IDLE_FORCE>, 84 + <SYSC_IDLE_NO>, 85 + <SYSC_IDLE_SMART>, 86 + <SYSC_IDLE_SMART_WKUP>; 87 + ti,syss-mask = <1>; 102 88 #address-cells = <1>; 103 89 #size-cells = <1>; 104 90 ranges = <0 0x2b000 0x1000>;
+22
include/dt-bindings/bus/ti-sysc.h
··· 1 + /* TI sysc interconnect target module defines */ 2 + 3 + /* Generic sysc found on omap2 and later, also known as type1 */ 4 + #define SYSC_OMAP2_CLOCKACTIVITY (3 << 8) 5 + #define SYSC_OMAP2_EMUFREE (1 << 5) 6 + #define SYSC_OMAP2_ENAWAKEUP (1 << 2) 7 + #define SYSC_OMAP2_SOFTRESET (1 << 1) 8 + #define SYSC_OMAP2_AUTOIDLE (1 << 0) 9 + 10 + /* Generic sysc found on omap4 and later, also known as type2 */ 11 + #define SYSC_OMAP4_DMADISABLE (1 << 16) 12 + #define SYSC_OMAP4_FREEEMU (1 << 1) /* Also known as EMUFREE */ 13 + #define SYSC_OMAP4_SOFTRESET (1 << 0) 14 + 15 + /* SmartReflex sysc found on 36xx and later */ 16 + #define SYSC_OMAP3_SR_ENAWAKEUP (1 << 26) 17 + 18 + /* SYSCONFIG STANDBYMODE/MIDLEMODE/SIDLEMODE supported by hardware */ 19 + #define SYSC_IDLE_FORCE 0 20 + #define SYSC_IDLE_NO 1 21 + #define SYSC_IDLE_SMART 2 22 + #define SYSC_IDLE_SMART_WKUP 3