Allwinner fixes for 4.0 There's a few fixes to merge for 4.0, one to add a select in the machine Kconfig option to fix a potential build failure, and two fixing cpufreq related issues. * tag 'sunxi-fixes-for-4.0' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: ARM: dts: sunxi: Remove overclocked/overvoltaged OPP ARM: dts: sun4i: a10-lime: Override and remove 1008MHz OPP setting ARM: sunxi: Have ARCH_SUNXI select RESET_CONTROLLER for clock driver usage
Unified · Split
| @@ -56,6 +56,22 @@ · 55 unmodified lines | ||
| 56 | 56 | model = "Olimex A10-OLinuXino-LIME"; |
| 57 | 57 | compatible = "olimex,a10-olinuxino-lime", "allwinner,sun4i-a10"; |
| 58 | 58 | |
| 59 | + cpus { | |
| 60 | + cpu0: cpu@0 { | |
| 61 | + /* | |
| 62 | + * The A10-Lime is known to be unstable | |
| 63 | + * when running at 1008 MHz | |
| 64 | + */ | |
| 65 | + operating-points = < | |
| 66 | + /* kHz uV */ | |
| 67 | + 912000 1350000 | |
| 68 | + 864000 1300000 | |
| 69 | + 624000 1250000 | |
| 70 | + >; | |
| 71 | + cooling-max-level = <2>; | |
| 72 | + }; | |
| 73 | + }; | |
| 74 | + | |
| 59 | 75 | soc@01c00000 { |
| 60 | 76 | emac: ethernet@01c0b000 { |
| 61 | 77 | pinctrl-names = "default"; |
| @@ -75,7 +75,6 @@ · 74 unmodified lines | ||
| 75 | 75 | clock-latency = <244144>; /* 8 32k periods */ |
| 76 | 76 | operating-points = < |
| 77 | 77 | /* kHz uV */ |
| 78 | − 1056000 1500000 | |
| 79 | 78 | 1008000 1400000 |
| 80 | 79 | 912000 1350000 |
| 81 | 80 | 864000 1300000 |
| @@ -83,7 +82,7 @@ · 1 unmodified line | ||
| 83 | 82 | >; |
| 84 | 83 | #cooling-cells = <2>; |
| 85 | 84 | cooling-min-level = <0>; |
| 86 | − cooling-max-level = <4>; | |
| 85 | + cooling-max-level = <3>; | |
| 87 | 86 | }; |
| 88 | 87 | }; |
| 89 | 88 | |
| @@ -47,7 +47,6 @@ · 46 unmodified lines | ||
| 47 | 47 | clock-latency = <244144>; /* 8 32k periods */ |
| 48 | 48 | operating-points = < |
| 49 | 49 | /* kHz uV */ |
| 50 | − 1104000 1500000 | |
| 51 | 50 | 1008000 1400000 |
| 52 | 51 | 912000 1350000 |
| 53 | 52 | 864000 1300000 |
| @@ -57,7 +56,7 @@ · 3 unmodified lines | ||
| 57 | 56 | >; |
| 58 | 57 | #cooling-cells = <2>; |
| 59 | 58 | cooling-min-level = <0>; |
| 60 | − cooling-max-level = <6>; | |
| 59 | + cooling-max-level = <5>; | |
| 61 | 60 | }; |
| 62 | 61 | }; |
| 63 | 62 | |
| @@ -105,7 +105,6 @@ · 104 unmodified lines | ||
| 105 | 105 | clock-latency = <244144>; /* 8 32k periods */ |
| 106 | 106 | operating-points = < |
| 107 | 107 | /* kHz uV */ |
| 108 | − 1008000 1450000 | |
| 109 | 108 | 960000 1400000 |
| 110 | 109 | 912000 1400000 |
| 111 | 110 | 864000 1300000 |
| @@ -116,7 +115,7 @@ · 4 unmodified lines | ||
| 116 | 115 | >; |
| 117 | 116 | #cooling-cells = <2>; |
| 118 | 117 | cooling-min-level = <0>; |
| 119 | − cooling-max-level = <7>; | |
| 118 | + cooling-max-level = <6>; | |
| 120 | 119 | }; |
| 121 | 120 | |
| 122 | 121 | cpu@1 { |
| @@ -1,10 +1,12 @@ | ||
| 1 | 1 | menuconfig ARCH_SUNXI |
| 2 | 2 | bool "Allwinner SoCs" if ARCH_MULTI_V7 |
| 3 | 3 | select ARCH_REQUIRE_GPIOLIB |
| 4 | + select ARCH_HAS_RESET_CONTROLLER | |
| 4 | 5 | select CLKSRC_MMIO |
| 5 | 6 | select GENERIC_IRQ_CHIP |
| 6 | 7 | select PINCTRL |
| 7 | 8 | select SUN4I_TIMER |
| 9 | + select RESET_CONTROLLER | |
| 8 | 10 | |
| 9 | 11 | if ARCH_SUNXI |
| 10 | 12 | |
| @@ -20,10 +22,8 @@ config MACH_SUN5I · 9 unmodified lines | ||
| 20 | 22 | config MACH_SUN6I |
| 21 | 23 | bool "Allwinner A31 (sun6i) SoCs support" |
| 22 | 24 | default ARCH_SUNXI |
| 23 | − select ARCH_HAS_RESET_CONTROLLER | |
| 24 | 25 | select ARM_GIC |
| 25 | 26 | select MFD_SUN6I_PRCM |
| 26 | − select RESET_CONTROLLER | |
| 27 | 27 | select SUN5I_HSTIMER |
| 28 | 28 | |
| 29 | 29 | config MACH_SUN7I |
| @@ -37,16 +37,12 @@ config MACH_SUN7I · 7 unmodified lines | ||
| 37 | 37 | config MACH_SUN8I |
| 38 | 38 | bool "Allwinner A23 (sun8i) SoCs support" |
| 39 | 39 | default ARCH_SUNXI |
| 40 | − select ARCH_HAS_RESET_CONTROLLER | |
| 41 | 40 | select ARM_GIC |
| 42 | 41 | select MFD_SUN6I_PRCM |
| 43 | − select RESET_CONTROLLER | |
| 44 | 42 | |
| 45 | 43 | config MACH_SUN9I |
| 46 | 44 | bool "Allwinner (sun9i) SoCs support" |
| 47 | 45 | default ARCH_SUNXI |
| 48 | − select ARCH_HAS_RESET_CONTROLLER | |
| 49 | 46 | select ARM_GIC |
| 50 | − select RESET_CONTROLLER | |
| 51 | 47 | |
| 52 | 48 | endif |