diff options
| author | Olof Johansson <olof@lixom.net> | 2018-12-09 10:26:36 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-12-09 10:26:36 -0800 |
| commit | 69dcddecaa78a8765705cdf3eefc1b56f383dedc (patch) | |
| tree | 0c9710e474e158ae2b9fc4ad8829d1b92d3d9528 /net/bridge/br_stp_timer.c | |
| parent | d9536e809801687600a02b9b3fc755e1b3bde1af (diff) | |
| parent | f15096f12a4e9340168df5fdd9201aa8ed60d59e (diff) | |
Merge tag 'imx-fixes-4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
i.MX fixes for 4.20, round 3:
- A couple of fixes on imx7d-pico and imx7d-nitrogen7 boards to correct
the description of the Wifi clock.
- Change SW2ISO count to get a safer ARM LDO ramp-up time, so that
different boards can be covered. This fixes the ARM LDO failure seen
on some customer boards.
* tag 'imx-fixes-4.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock
ARM: imx: update the cpu power up timing setting on i.mx6sx
ARM: dts: imx7d-pico: Describe the Wifi clock
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/bridge/br_stp_timer.c')
0 files changed, 0 insertions, 0 deletions