Commit 5759d6cd authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'bcm2835-clk-next-2016-03-17' of git://github.com/anholt/linux into clk-next

This pull request against clk/clk-next brings in fixes for fractional
clocks on 2835, add the PCM clock that used to be driven directly by
the bcm2835-i2s driver (that driver has been broken since this driver
was introduced), and adds many other new clocks.

* tag 'bcm2835-clk-next-2016-03-17' of git://github.com/anholt/linux:
  clk: bcm2835: add missing osc and per clocks
  clk: bcm2835: add missing PLL clock dividers
  clk: bcm2835: enable management of PCM clock
  clk: bcm2835: reorganize bcm2835_clock_array assignment
  clk: bcm2835: remove use of BCM2835_CLOCK_COUNT in driver
  clk: bcm2835: expose raw clock-registers via debugfs
  clk: bcm2835: clean up coding style issues
  clk: bcm2835: correctly enable fractional clock support
  clk: bcm2835: divider value has to be 1 or more
  clk: bcm2835: add locking to pll*_on/off methods
  clk: bcm2835: pll_off should only update CM_PLL_ANARST
parents 2aac7ddf d3d6f15f
Loading
Loading
Loading
Loading
+714 −489

File changed.

Preview size limit exceeded, changes collapsed.

+19 −1
Original line number Diff line number Diff line
@@ -44,5 +44,23 @@
#define BCM2835_CLOCK_EMMC		28
#define BCM2835_CLOCK_PERI_IMAGE	29
#define BCM2835_CLOCK_PWM		30
#define BCM2835_CLOCK_PCM		31

#define BCM2835_CLOCK_COUNT		31
#define BCM2835_PLLA_DSI0		32
#define BCM2835_PLLA_CCP2		33
#define BCM2835_PLLD_DSI0		34
#define BCM2835_PLLD_DSI1		35

#define BCM2835_CLOCK_AVEO		36
#define BCM2835_CLOCK_DFT		37
#define BCM2835_CLOCK_GP0		38
#define BCM2835_CLOCK_GP1		39
#define BCM2835_CLOCK_GP2		40
#define BCM2835_CLOCK_SLIM		41
#define BCM2835_CLOCK_SMI		42
#define BCM2835_CLOCK_TEC		43
#define BCM2835_CLOCK_DPI		44
#define BCM2835_CLOCK_CAM0		45
#define BCM2835_CLOCK_CAM1		46
#define BCM2835_CLOCK_DSI0E		47
#define BCM2835_CLOCK_DSI1E		48