diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2020-04-03 15:09:55 -0700 | 
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2020-04-03 15:09:55 -0700 | 
| commit | 53a2cc5cc36fd97728e1b418dbfa8f70bf23391a (patch) | |
| tree | b6f8666dde9f2f2eac3859d056c8be0bd62b53e7 /net/lapb/lapb_iface.c | |
| parent | 2d11e9a1fd2abe784b334442b36f7d83ff914287 (diff) | |
| parent | 1aa0817e43c525c3ee035786a17a19077a0bb06a (diff) | |
| parent | edcc42945dee85e9dec3737f3dbf59d917ae5418 (diff) | |
| parent | a37a5a9d715f0dc30761bf469f85bc5e02240cf5 (diff) | |
| parent | 02ff48e4d7f7f253008f3aeadd41c8a2fc640587 (diff) | |
| parent | de17be999cb07effacf6a1129602f63396f5af27 (diff) | |
| parent | 7928f4f6a20c321ef5ec7f665b3a60dc17b18b69 (diff) | |
Merge branches 'clk-ti', 'clk-ingenic', 'clk-typo', 'clk-at91', 'clk-mmp2' and 'clk-arm-icst' into clk-next
 - EHRPWM's TimeBase clock(TBCLK) for TI AM654 SoCs
 - Support PMC clks on at91sam9n12, at91rm9200, sama5d3, and at91sam9g45 SoCs
 - Fixes and improvements for the Marvell MMP2/MMP3 SoC clk drivers
* clk-ti:
  clk: keystone: Add new driver to handle syscon based clocks
  dt-bindings: clock: Add binding documentation for TI EHRPWM TBCLK
* clk-ingenic:
  clk: ingenic/TCU: Fix round_rate returning error
  clk: ingenic/jz4770: Exit with error if CGU init failed
  clk: JZ4780: Add function for enable the second core.
  clk: Ingenic: Add support for TCU of X1000.
* clk-typo:
  clk: Fix trivia typo in comment exlusive => exclusive
* clk-at91:
  clk: at91: add at91rm9200 pmc driver
  clk: at91: add at91sam9n12 pmc driver
  clk: at91: add sama5d3 pmc driver
  clk: at91: add at91sam9g45 pmc driver
  clk: at91: usb: introduce num_parents in driver's structure
  clk: at91: usb: use proper usbs_mask
  clk: at91: sam9x60: fix usb clock parents
  clk: at91: usb: continue if clk_hw_round_rate() return zero
  clk: at91: sam9x60: Don't use audio PLL
* clk-mmp2:
  clk: mmp2: Fix bit masks for LCDC I/O and pixel clocks
  clk: mmp2: Add clock for fifth SD HCI on MMP3
  dt-bindings: marvell,mmp2: Add clock id for the fifth SD HCI on MMP3
  clk: mmp2: Add clocks for the thermal sensors
  dt-bindings: marvell,mmp2: Add clock ids for the thermal sensors
  clk: mmp2: add the GPU clocks
  dt-bindings: marvell,mmp2: Add clock ids for the GPU clocks
  clk: mmp2: Add PLLs that are available on MMP3
  dt-bindings: marvell,mmp2: Add clock ids for MMP3 PLLs
  clk: mmp2: Check for MMP3
  dt-bindings: clock: Add MMP3 compatible string
  clk: mmp2: Stop pretending PLL outputs are constant
  clk: mmp2: Add support for PLL clock sources
  dt-bindings: clock: Convert marvell,mmp2-clock to json-schema
  clk: mmp2: Constify some strings
  clk: mmp2: Remove a unused prototype
* clk-arm-icst:
  MAINTAINERS: dt: update reference for arm-integrator.txt
  clk: versatile: Add device tree probing for IM-PD1 clocks
  clk: versatile: Export icst_clk_setup()
  dt-bindings: clock: Create YAML schema for ICST clocks
