Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4550bdb0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-fixes-for-4.0' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents b1dae3d8 370a9b5f

arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts

+16 −0
Original line number Original line Diff line number Diff line
@@ -56,6 +56,22 @@ 
	model = "Olimex A10-OLinuXino-LIME";

	model = "Olimex A10-OLinuXino-LIME";

	compatible = "olimex,a10-olinuxino-lime", "allwinner,sun4i-a10";

	compatible = "olimex,a10-olinuxino-lime", "allwinner,sun4i-a10";





	cpus {

		cpu0: cpu@0 {

			/*

			 * The A10-Lime is known to be unstable

			 * when running at 1008 MHz

			 */

			operating-points = <

				/* kHz    uV */

				912000  1350000

				864000  1300000

				624000  1250000

				>;

			cooling-max-level = <2>;

		};

	};



	soc@01c00000 {

	soc@01c00000 {

		emac: ethernet@01c0b000 {

		emac: ethernet@01c0b000 {

			pinctrl-names = "default";

			pinctrl-names = "default";

arch/arm/boot/dts/sun4i-a10.dtsi

+1 −2
Original line number Original line Diff line number Diff line
@@ -75,7 +75,6 @@ 
			clock-latency = <244144>; /* 8 32k periods */

			clock-latency = <244144>; /* 8 32k periods */

			operating-points = <

			operating-points = <

				/* kHz    uV */

				/* kHz    uV */

				1056000 1500000

				1008000 1400000

				1008000 1400000

				912000  1350000

				912000  1350000

				864000  1300000

				864000  1300000
@@ -83,7 +82,7 @@ 
				>;

				>;

			#cooling-cells = <2>;

			#cooling-cells = <2>;

			cooling-min-level = <0>;

			cooling-min-level = <0>;

			cooling-max-level = <4>;

			cooling-max-level = <3>;

		};

		};

	};

	};

arch/arm/boot/dts/sun5i-a13.dtsi

+1 −2
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ 
			clock-latency = <244144>; /* 8 32k periods */

			clock-latency = <244144>; /* 8 32k periods */

			operating-points = <

			operating-points = <

				/* kHz    uV */

				/* kHz    uV */

				1104000	1500000

				1008000 1400000

				1008000 1400000

				912000  1350000

				912000  1350000

				864000  1300000

				864000  1300000
@@ -57,7 +56,7 @@ 
				>;

				>;

			#cooling-cells = <2>;

			#cooling-cells = <2>;

			cooling-min-level = <0>;

			cooling-min-level = <0>;

			cooling-max-level = <6>;

			cooling-max-level = <5>;

		};

		};

	};

	};

arch/arm/boot/dts/sun7i-a20.dtsi

+1 −2
Original line number Original line Diff line number Diff line
@@ -105,7 +105,6 @@ 
			clock-latency = <244144>; /* 8 32k periods */

			clock-latency = <244144>; /* 8 32k periods */

			operating-points = <

			operating-points = <

				/* kHz    uV */

				/* kHz    uV */

				1008000 1450000

				960000  1400000

				960000  1400000

				912000  1400000

				912000  1400000

				864000  1300000

				864000  1300000
@@ -116,7 +115,7 @@ 
				>;

				>;

			#cooling-cells = <2>;

			#cooling-cells = <2>;

			cooling-min-level = <0>;

			cooling-min-level = <0>;

			cooling-max-level = <7>;

			cooling-max-level = <6>;

		};

		};





		cpu@1 {

		cpu@1 {

arch/arm/mach-sunxi/Kconfig

+2 −6
Original line number Original line Diff line number Diff line 
menuconfig ARCH_SUNXI

menuconfig ARCH_SUNXI

	bool "Allwinner SoCs" if ARCH_MULTI_V7

	bool "Allwinner SoCs" if ARCH_MULTI_V7

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_RESET_CONTROLLER

	select CLKSRC_MMIO

	select CLKSRC_MMIO

	select GENERIC_IRQ_CHIP

	select GENERIC_IRQ_CHIP

	select PINCTRL

	select PINCTRL

	select SUN4I_TIMER

	select SUN4I_TIMER

	select RESET_CONTROLLER





if ARCH_SUNXI

if ARCH_SUNXI
@@ -20,10 +22,8 @@ config MACH_SUN5I 
config MACH_SUN6I

config MACH_SUN6I

	bool "Allwinner A31 (sun6i) SoCs support"

	bool "Allwinner A31 (sun6i) SoCs support"

	default ARCH_SUNXI

	default ARCH_SUNXI

	select ARCH_HAS_RESET_CONTROLLER

	select ARM_GIC

	select ARM_GIC

	select MFD_SUN6I_PRCM

	select MFD_SUN6I_PRCM

	select RESET_CONTROLLER

	select SUN5I_HSTIMER

	select SUN5I_HSTIMER





config MACH_SUN7I

config MACH_SUN7I
@@ -37,16 +37,12 @@ config MACH_SUN7I 
config MACH_SUN8I

config MACH_SUN8I

	bool "Allwinner A23 (sun8i) SoCs support"

	bool "Allwinner A23 (sun8i) SoCs support"

	default ARCH_SUNXI

	default ARCH_SUNXI

	select ARCH_HAS_RESET_CONTROLLER

	select ARM_GIC

	select ARM_GIC

	select MFD_SUN6I_PRCM

	select MFD_SUN6I_PRCM

	select RESET_CONTROLLER





config MACH_SUN9I

config MACH_SUN9I

	bool "Allwinner (sun9i) SoCs support"

	bool "Allwinner (sun9i) SoCs support"

	default ARCH_SUNXI

	default ARCH_SUNXI

	select ARCH_HAS_RESET_CONTROLLER

	select ARM_GIC

	select ARM_GIC

	select RESET_CONTROLLER





endif
 
endif