Merge tag 'mvebu-fixes-4.0-2' of git://git.infradead.org/linux-mvebu into next/dt (49faf809) · Commits · 戴 / test

arch/arm/boot/dts/armada-370-db.dts

+10 −1

Original line number	Diff line number	Diff line
		@@ -45,6 +45,15 @@
		* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
		* OTHER DEALINGS IN THE SOFTWARE.
		*
		* Note: this Device Tree assumes that the bootloader has remapped the
		* internal registers to 0xf1000000 (instead of the default
		* 0xd0000000). The 0xf1000000 is the default used by the recent,
		* DT-capable, U-Boot bootloaders provided by Marvell. Some earlier
		* boards were delivered with an older version of the bootloader that
		* left internal registers mapped at 0xd0000000. If you are in this
		* situation, you should either update your bootloader (preferred
		* solution) or the below Device Tree should be adjusted.
		*/

		/dts-v1/;
		@@ -64,7 +73,7 @@
		};

		soc {
		ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
		ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
		MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;

		internal-regs {

+15 −1

Original line number	Diff line number	Diff line
		@@ -415,6 +415,9 @@ static __init int armada_38x_cpuidle_init(void)
		void __iomem *mpsoc_base;
		u32 reg;

		pr_warn("CPU idle is currently broken on Armada 38x: disabling");
		return 0;

		np = of_find_compatible_node(NULL, NULL,
		"marvell,armada-380-coherency-fabric");
		if (!np)
		@@ -476,6 +479,16 @@ static int __init mvebu_v7_cpu_pm_init(void)
		return 0;
		of_node_put(np);

		/*
		* Currently the CPU idle support for Armada 38x is broken, as
		* the CPU hotplug uses some of the CPU idle functions it is
		* broken too, so let's disable it
		*/
		if (of_machine_is_compatible("marvell,armada380")) {
		cpu_hotplug_disable();
		pr_warn("CPU hotplug support is currently broken on Armada 38x: disabling");
		}

		if (of_machine_is_compatible("marvell,armadaxp"))
		ret = armada_xp_cpuidle_init();
		else if (of_machine_is_compatible("marvell,armada370"))
		@@ -489,6 +502,7 @@ static int __init mvebu_v7_cpu_pm_init(void)
		return ret;

		mvebu_v7_pmsu_enable_l2_powerdown_onidle();
		if (mvebu_v7_cpuidle_device.name)
		platform_device_register(&mvebu_v7_cpuidle_device);
		cpu_pm_register_notifier(&mvebu_v7_cpu_pm_notifier);