History

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

Olof Johansson committed 11 years ago

Commit 4550bdb2 parents b1dae3d 370a9b55 files · +21 −12Browse files

Unified · Split

5 files
  1. arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts +16 −0
  2. arch/arm/boot/dts/sun4i-a10.dtsi +1 −2
  3. arch/arm/boot/dts/sun5i-a13.dtsi +1 −2
  4. arch/arm/boot/dts/sun7i-a20.dtsi +1 −2
  5. arch/arm/mach-sunxi/Kconfig +2 −6
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts+16−0
@@ -56,6 +56,22 @@ · 55 unmodified lines
56 model = "Olimex A10-OLinuXino-LIME";56 model = "Olimex A10-OLinuXino-LIME";
57 compatible = "olimex,a10-olinuxino-lime", "allwinner,sun4i-a10";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 soc@01c00000 {75 soc@01c00000 {
60 emac: ethernet@01c0b000 {76 emac: ethernet@01c0b000 {
61 pinctrl-names = "default";77 pinctrl-names = "default";
arch/arm/boot/dts/sun4i-a10.dtsi+1−2
@@ -75,7 +75,6 @@ · 74 unmodified lines
75 clock-latency = <244144>; /* 8 32k periods */75 clock-latency = <244144>; /* 8 32k periods */
76 operating-points = <76 operating-points = <
77 /* kHz uV */77 /* kHz uV */
78 1056000 1500000
79 1008000 140000078 1008000 1400000
80 912000 135000079 912000 1350000
81 864000 130000080 864000 1300000
@@ -83,7 +82,7 @@ · 1 unmodified line
83 >;82 >;
84 #cooling-cells = <2>;83 #cooling-cells = <2>;
85 cooling-min-level = <0>;84 cooling-min-level = <0>;
86 cooling-max-level = <4>;85 cooling-max-level = <3>;
87 };86 };
88 };87 };
89 88
arch/arm/boot/dts/sun5i-a13.dtsi+1−2
@@ -47,7 +47,6 @@ · 46 unmodified lines
47 clock-latency = <244144>; /* 8 32k periods */47 clock-latency = <244144>; /* 8 32k periods */
48 operating-points = <48 operating-points = <
49 /* kHz uV */49 /* kHz uV */
50 1104000 1500000
51 1008000 140000050 1008000 1400000
52 912000 135000051 912000 1350000
53 864000 130000052 864000 1300000
@@ -57,7 +56,7 @@ · 3 unmodified lines
57 >;56 >;
58 #cooling-cells = <2>;57 #cooling-cells = <2>;
59 cooling-min-level = <0>;58 cooling-min-level = <0>;
60 cooling-max-level = <6>;59 cooling-max-level = <5>;
61 };60 };
62 };61 };
63 62
arch/arm/boot/dts/sun7i-a20.dtsi+1−2
@@ -105,7 +105,6 @@ · 104 unmodified lines
105 clock-latency = <244144>; /* 8 32k periods */105 clock-latency = <244144>; /* 8 32k periods */
106 operating-points = <106 operating-points = <
107 /* kHz uV */107 /* kHz uV */
108 1008000 1450000
109 960000 1400000108 960000 1400000
110 912000 1400000109 912000 1400000
111 864000 1300000110 864000 1300000
@@ -116,7 +115,7 @@ · 4 unmodified lines
116 >;115 >;
117 #cooling-cells = <2>;116 #cooling-cells = <2>;
118 cooling-min-level = <0>;117 cooling-min-level = <0>;
119 cooling-max-level = <7>;118 cooling-max-level = <6>;
120 };119 };
121 120
122 cpu@1 {121 cpu@1 {
arch/arm/mach-sunxi/Kconfig+2−6
@@ -1,10 +1,12 @@
1menuconfig ARCH_SUNXI1menuconfig ARCH_SUNXI
2 bool "Allwinner SoCs" if ARCH_MULTI_V72 bool "Allwinner SoCs" if ARCH_MULTI_V7
3 select ARCH_REQUIRE_GPIOLIB3 select ARCH_REQUIRE_GPIOLIB
4 select ARCH_HAS_RESET_CONTROLLER
4 select CLKSRC_MMIO5 select CLKSRC_MMIO
5 select GENERIC_IRQ_CHIP6 select GENERIC_IRQ_CHIP
6 select PINCTRL7 select PINCTRL
7 select SUN4I_TIMER8 select SUN4I_TIMER
9 select RESET_CONTROLLER
8 10
9if ARCH_SUNXI11if ARCH_SUNXI
10 12
@@ -20,10 +22,8 @@ config MACH_SUN5I · 9 unmodified lines
20config MACH_SUN6I22config MACH_SUN6I
21 bool "Allwinner A31 (sun6i) SoCs support"23 bool "Allwinner A31 (sun6i) SoCs support"
22 default ARCH_SUNXI24 default ARCH_SUNXI
23 select ARCH_HAS_RESET_CONTROLLER
24 select ARM_GIC25 select ARM_GIC
25 select MFD_SUN6I_PRCM26 select MFD_SUN6I_PRCM
26 select RESET_CONTROLLER
27 select SUN5I_HSTIMER27 select SUN5I_HSTIMER
28 28
29config MACH_SUN7I29config MACH_SUN7I
@@ -37,16 +37,12 @@ config MACH_SUN7I · 7 unmodified lines
37config MACH_SUN8I37config MACH_SUN8I
38 bool "Allwinner A23 (sun8i) SoCs support"38 bool "Allwinner A23 (sun8i) SoCs support"
39 default ARCH_SUNXI39 default ARCH_SUNXI
40 select ARCH_HAS_RESET_CONTROLLER
41 select ARM_GIC40 select ARM_GIC
42 select MFD_SUN6I_PRCM41 select MFD_SUN6I_PRCM
43 select RESET_CONTROLLER
44 42
45config MACH_SUN9I43config MACH_SUN9I
46 bool "Allwinner (sun9i) SoCs support"44 bool "Allwinner (sun9i) SoCs support"
47 default ARCH_SUNXI45 default ARCH_SUNXI
48 select ARCH_HAS_RESET_CONTROLLER
49 select ARM_GIC46 select ARM_GIC
50 select RESET_CONTROLLER
51 47
52endif48endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t