diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-22 07:39:51 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-22 07:41:42 -0800 |
| commit | dbd327779b41bda10c726cb697a4c22206d88b36 (patch) | |
| tree | 7d6483e6ab1a34b89ce801232d3b5ce40fbc468e /include | |
| parent | f3426844f9d20e5d423600fa214322eb418293e0 (diff) | |
| parent | ae005b5277ef21afc8876baa56671a38dfe0667e (diff) | |
| parent | 935b0d622f16538d071af823388c21c2e6f66134 (diff) | |
Merge branches 'late/drivers' and 'late/dt' into for-next
* late/drivers:
clk: bcm281xx: define U32_MAX conditionally for now
clk: bcm281xx: add initial clock framework support
clocksource: kona: Add basic use of external clock
* late/dt:
clk: bcm281xx: define kona clock binding
ARM: dts: add usb udc support to bcm281xx
ARM: dts: Specify clocks for timer on bcm11351
Documentation: dt: kona-timer: Add clocks property
ARM: dts: Specify clocks for SDHCIs on bcm11351
Documentation: dt: kona-sdhci: Add clocks property
ARM: dts: Specify clocks for UARTs on bcm11351
ARM: dts: bcm281xx: Add i2c busses
ARM: dts: Declare clocks as fixed on bcm11351
ARM: dts: bcm28155-ap: Enable all the i2c busses
Signed-off-by: Kevin Hilman <khilman@linaro.org>