tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sunxi-fixes-for-4.0' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes
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
Signed-off-by: Olof Johansson <olof@lixom.net>
+21
-12
+16
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
+16
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
···
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";
+1
-2
arch/arm/boot/dts/sun4i-a10.dtsi
+1
-2
arch/arm/boot/dts/sun4i-a10.dtsi
···
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
···
82
83
>;
83
84
#cooling-cells = <2>;
84
85
cooling-min-level = <0>;
85
-
cooling-max-level = <4>;
86
+
cooling-max-level = <3>;
86
87
};
87
88
};
88
89
+1
-2
arch/arm/boot/dts/sun5i-a13.dtsi
+1
-2
arch/arm/boot/dts/sun5i-a13.dtsi
···
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
···
56
57
>;
57
58
#cooling-cells = <2>;
58
59
cooling-min-level = <0>;
59
-
cooling-max-level = <6>;
60
+
cooling-max-level = <5>;
60
61
};
61
62
};
62
63
+1
-2
arch/arm/boot/dts/sun7i-a20.dtsi
+1
-2
arch/arm/boot/dts/sun7i-a20.dtsi
···
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
···
115
116
>;
116
117
#cooling-cells = <2>;
117
118
cooling-min-level = <0>;
118
-
cooling-max-level = <7>;
119
+
cooling-max-level = <6>;
119
120
};
120
121
121
122
cpu@1 {
+2
-6
arch/arm/mach-sunxi/Kconfig
+2
-6
arch/arm/mach-sunxi/Kconfig
···
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
···
22
20
config MACH_SUN6I
23
21
bool "Allwinner A31 (sun6i) SoCs support"
24
22
default ARCH_SUNXI
25
-
select ARCH_HAS_RESET_CONTROLLER
26
23
select ARM_GIC
27
24
select MFD_SUN6I_PRCM
28
-
select RESET_CONTROLLER
29
25
select SUN5I_HSTIMER
30
26
31
27
config MACH_SUN7I
···
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