diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-19 22:46:00 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-19 22:46:00 -0700 |
| commit | 5669aab8d778d9887a19eb66e31198df402888c5 (patch) | |
| tree | 7443f0a7beb4de7a1fec5f9ab78564812f677adb /arch/arm/boot/dts/r8a7740.dtsi | |
| parent | 4831ddfd2bbe304961fede26ffaed8c64eda88bc (diff) | |
| parent | a93f9c88b7701d1c4c3b22d39d64a408f000a6ef (diff) | |
Merge tag 'at91-dt2' of git://github.com/at91linux/linux-at91 into next/dt
Merge "at91: DT for 3.16 #2" from Nicolas Ferre:
3.16: second DT series:
- at91sam9rl and at91sam9261 fixes about PLL ranges
- at91sam9261 more comprehensive support for SSC
- sama5d3 Xplained: addition of pull-ups, PWM and PMIC (regulator)
* tag 'at91-dt2' of git://github.com/at91linux/linux-at91:
ARM: at91/dt: at91-sama5d3_xplained: add the regulator device node
ARM: at91: add 2 PWM outputs to SAMA5D3 Xplained
ARM: at91: add PWM pinctrl to SAMA5D3
ARM: at91: add pull-up to i2c[02] on SAMA5D3 Xplained
ARM: at91/dt: sam9rl: Fix PLL output range and mck divisors
ARM: at91/dt: sam9261: Add ssc2, SSC clocks and pcks
ARM: at91/dt: sam9261: Fix PLL output ranges and other clocks divisors
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/r8a7740.dtsi')
0 files changed, 0 insertions, 0 deletions