mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
This is the pxa changes for v4.7 cycle.
This is a minor cycle with : - cleanup fix from Stephen on clocks (CLK_ROOT deprecated) - pin control activation for device-tree platforms -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJXJG+0AAoJEAP2et0duMsSZXAQAKlNDWaYPrrqqq0wkk1FeSi6 vqyCL3Guc9ITSAXAPGqpF2X5zSWHRHlNgRo3f22tJScNbtsQ3iH3D8LADVUD6Cnh yWsliJ+2WtSK6oaL6AFw4kBoudFqrY17755GYCXBiZd6EWdeI46EAsR69abgTeXB K6n7ApThWkB2KQxUjL38DEIHDVmBJ1YkprgOBV+PMWYjXZ7+BJR5wx0Pg8Efs78C g+ObVggdwqCZmPFXC7YHIyYtHV95f1Cb1VDyJ8faqjw55v3i2iJNHQ54NtpEKL/G PmKi0KO+x8cXxPF6i+4yZCpYGcDccI4AiAjuJIB/E9XYAZD6EJnVx91DXYMki2op zSx8DY8a1C7Xh8aidspZ7uuRaGjomSJF8BLxofUUND2pdnX3pvQmWKRSIGqjDJLa Yl++2fEp/XU2IOgAKxLHZzJ/qDERJn99hmJMAQEdEtOMricBZt3XYyx7U7WMR2TK vWsLS72TYbxZryF+TfwV+UwVf2IKJDJfu3B8SV6My2MiPvNQPPQxoqhxZ+Xj4jna +WX16Dotl6Bnm6ufPE6O/ZIEe9ROmFY03asiLDfYrGgxgjw97kvpLIj7XMEKQvVP y1rA/qvCxcciECMGUCnBv62Tl+yv7f8h6D9hOV5gfdQFll/npx5C5FQC8REIVCOV K3aBzOtG+57C10xGP+wl =C0/K -----END PGP SIGNATURE----- Merge tag 'pxa-for-4.7' of https://github.com/rjarzmik/linux into fixes Merge "pxa changes for v4.7 cycle" from Robert Jarzmik: This is a minor cycle with : - cleanup fix from Stephen on clocks (CLK_ROOT deprecated) - pin control activation for device-tree platforms * tag 'pxa-for-4.7' of https://github.com/rjarzmik/linux: ARM: pxa: Remove CLK_IS_ROOT ARM: pxa: activate pinctrl for device-tree machines These should have been part of the original pull request but got accidentally dropped. Both changes in this branch can be considered bugfixes, so I'm putting them in the fixes branch now.
This commit is contained in:
commit
4c1d76a1e1
2 changed files with 3 additions and 1 deletions
|
@ -6,6 +6,7 @@ comment "Intel/Marvell Dev Platforms (sorted by hardware release time)"
|
|||
|
||||
config MACH_PXA27X_DT
|
||||
bool "Support PXA27x platforms from device tree"
|
||||
select PINCTRL
|
||||
select POWER_SUPPLY
|
||||
select PXA27x
|
||||
select USE_OF
|
||||
|
@ -17,6 +18,7 @@ config MACH_PXA27X_DT
|
|||
config MACH_PXA3XX_DT
|
||||
bool "Support PXA3xx platforms from device tree"
|
||||
select CPU_PXA300
|
||||
select PINCTRL
|
||||
select POWER_SUPPLY
|
||||
select PXA3xx
|
||||
select USE_OF
|
||||
|
|
|
@ -128,7 +128,7 @@ struct resource eseries_tmio_resources[] = {
|
|||
/* Some e-series hardware cannot control the 32K clock */
|
||||
static void __init __maybe_unused eseries_register_clks(void)
|
||||
{
|
||||
clk_register_fixed_rate(NULL, "CLK_CK32K", NULL, CLK_IS_ROOT, 32768);
|
||||
clk_register_fixed_rate(NULL, "CLK_CK32K", NULL, 0, 32768);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_MACH_E330
|
||||
|
|
Loading…
Reference in a new issue