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

Commit 0690f4f2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-fixes-2' of... 

Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

Merge "Samsung 2nd fixes for v4.3" from Kukjin Kim:

- fix SOC detection of exynos thermal on exynos5260
- fix audio card detection on Peach boards
- fix double of_node_put() when parsing child power domains

* tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  thermal: exynos: Fix register read in TMU
  ARM: dts: Fix audio card detection on Peach boards
  ARM: EXYNOS: Fix double of_node_put() when parsing child power domains
parents 6701ef03 b28fec13

arch/arm/boot/dts/exynos5420-peach-pit.dts

+5 −0
Original line number Diff line number Diff line
@@ -915,6 +915,11 @@ 
	};

};



&pmu_system_controller {

	assigned-clocks = <&pmu_system_controller 0>;

	assigned-clock-parents = <&clock CLK_FIN_PLL>;

};



&rtc {

	status = "okay";

	clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>;

arch/arm/boot/dts/exynos5800-peach-pi.dts

+5 −0
Original line number Diff line number Diff line
@@ -878,6 +878,11 @@ 
	};

};



&pmu_system_controller {

	assigned-clocks = <&pmu_system_controller 0>;

	assigned-clock-parents = <&clock CLK_FIN_PLL>;

};



&rtc {

	status = "okay";

	clocks = <&clock CLK_RTC>, <&max77802 MAX77802_CLK_32K_AP>;

arch/arm/mach-exynos/pm_domains.c

+3 −5
Original line number Diff line number Diff line
@@ -200,15 +200,15 @@ static __init int exynos4_pm_init_power_domain(void) 
		args.args_count = 0;

		child_domain = of_genpd_get_from_provider(&args);

		if (IS_ERR(child_domain))

			goto next_pd;

			continue;



		if (of_parse_phandle_with_args(np, "power-domains",

					 "#power-domain-cells", 0, &args) != 0)

			goto next_pd;

			continue;



		parent_domain = of_genpd_get_from_provider(&args);

		if (IS_ERR(parent_domain))

			goto next_pd;

			continue;



		if (pm_genpd_add_subdomain(parent_domain, child_domain))

			pr_warn("%s failed to add subdomain: %s\n",
@@ -216,8 +216,6 @@ static __init int exynos4_pm_init_power_domain(void) 
		else

			pr_info("%s has as child subdomain: %s.\n",

				parent_domain->name, child_domain->name);

next_pd:

		of_node_put(np);

	}



	return 0;

drivers/thermal/samsung/exynos_tmu.c

+1 −1
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ static void exynos4412_tmu_set_emulation(struct exynos_tmu_data *data, 


	if (data->soc == SOC_ARCH_EXYNOS5260)

		emul_con = EXYNOS5260_EMUL_CON;

	if (data->soc == SOC_ARCH_EXYNOS5433)

	else if (data->soc == SOC_ARCH_EXYNOS5433)

		emul_con = EXYNOS5433_TMU_EMUL_CON;

	else if (data->soc == SOC_ARCH_EXYNOS7)

		emul_con = EXYNOS7_TMU_REG_EMUL_CON;