Merge tag 'v5.3-rockchip-soc32-1' of... (4ab3a3e7) · Commits · 戴 / test

arch/arm/mach-rockchip/platsmp.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -269,19 +269,25 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus)
		sram_base_addr = of_iomap(node, 0);
		if (!sram_base_addr) {
		pr_err("%s: could not map sram registers\n", __func__);
		of_node_put(node);
		return;
		}

		if (has_pmu && rockchip_smp_prepare_pmu())
		if (has_pmu && rockchip_smp_prepare_pmu()) {
		of_node_put(node);
		return;
		}

		if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) {
		if (rockchip_smp_prepare_sram(node))
		if (rockchip_smp_prepare_sram(node)) {
		of_node_put(node);
		return;
		}

		/* enable the SCU power domain */
		pmu_set_power_domain(PMU_PWRDN_SCU, true);

		of_node_put(node);
		node = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");
		if (!node) {
		pr_err("%s: missing scu\n", __func__);
		@@ -291,6 +297,7 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus)
		scu_base_addr = of_iomap(node, 0);
		if (!scu_base_addr) {
		pr_err("%s: could not map scu registers\n", __func__);
		of_node_put(node);
		return;
		}

		@@ -309,6 +316,7 @@ static void __init rockchip_smp_prepare_cpus(unsigned int max_cpus)
		asm ("mrc p15, 1, %0, c9, c0, 2\n" : "=r" (l2ctlr));
		ncores = ((l2ctlr >> 24) & 0x3) + 1;
		}
		of_node_put(node);

		/* Make sure that all cores except the first are really off */
		for (i = 1; i < ncores; i++)

+2 −0

Original line number	Diff line number	Diff line
		@@ -257,12 +257,14 @@ static int __init rk3288_suspend_init(struct device_node *np)
		rk3288_bootram_base = of_iomap(sram_np, 0);
		if (!rk3288_bootram_base) {
		pr_err("%s: could not map bootram base\n", __func__);
		of_node_put(sram_np);
		return -ENOMEM;
		}

		ret = of_address_to_resource(sram_np, 0, &res);
		if (ret) {
		pr_err("%s: could not get bootram phy addr\n", __func__);
		of_node_put(sram_np);
		return ret;
		}
		rk3288_bootram_phy = res.start;