UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Samsung DTS non-critical fixes for v4.7: 

1. Fix s5p-mfc driver probe on Exynos542x Peach boards (need to provide MFC
    memory banks). On these boards this was broken for long time but
    apparently no one enabled this driver till now.
 2. Fix creation of debugfs entries for one regulator on Exynos4210
    Trats board.
 3. Fix probing of max8997 MFD driver (and its children) because
    of missing interrupt. Actually the current version of the driver probes
    (just without interrupts) but after switching to regmap and regmap-irq,
    the interrupt will be mandatory.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXLcwaAAoJEME3ZuaGi4PXWfYP/REe1dyznGhMCvXFuv7EDQ2/
 c2xhWBD00zFqjSp8yA/q7Z2zP2YUIL/y882BlvCCkmFda5LdME3Wh/afA+8/GAAR
 4pJfnuxYC87ilNaWls1v7bAZc4O+F+SSU2EFI4LKbvxLv+KuwMx/TLeIJS6nEihk
 IalnICEO/BQRYSvz8CWMYx0GeHiiKjWaKkgZJnlqGzkRhQQZNUoccn8Z7By8mBeO
 ZGpBJCmg07+X1jWoc9e4YrY2of75IZMYkS2gbdck0mqj5VJn45wMJL/dJCwEPdjh
 f2Zv+d3851Uj6NqJEyn/9wfXPi6dQGLT/3Hu+TB4QVX3KlwCiDUBwouSU2f5YTgI
 b45AdrXlxakAybmQQnSSgKWbYClnJ6HaVVqB3RgolZZSZkJUmygtoYM72hUC7Z21
 K6hbqzgMVw+crhmymDdOyNHpYfb3OLSf16pomDTq585wYGOenEGcKnnDlgoJmoFe
 x4Ae6hRE/Hk4wQuWsh34KIKHzPkFaBJRQgFBBAOQR7Zqv7AN5FflQ2xxo32qYMvS
 hr9ObkW4DYmB6wDtvpm6va2cBSrnXXK3uA0vH3O1IkmOqoI6NeVFYjA387OVyRLj
 0MzrAgQLAiQPR2r2Xo3yhJGd6qZjlWq9R310jUJQonR0ZpVnQ5s52lNrt2qGtdmg
 LJC3Q+ahxhMVGw+RVsgf
 =l5HK
 -----END PGP SIGNATURE-----

Merge tag 'samsung-fixes-non-critical-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/fixes-non-critical

Merge "Samsung DTS non-critical fixes for v4.7":

1. Fix s5p-mfc driver probe on Exynos542x Peach boards (need to provide MFC
   memory banks). On these boards this was broken for long time but
   apparently no one enabled this driver till now.
2. Fix creation of debugfs entries for one regulator on Exynos4210
   Trats board.
3. Fix probing of max8997 MFD driver (and its children) because
   of missing interrupt. Actually the current version of the driver probes
   (just without interrupts) but after switching to regmap and regmap-irq,
   the interrupt will be mandatory.

* tag 'samsung-fixes-non-critical-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Add interrupt line to MAX8997 PMIC on exynos4210-trats
  ARM: dts: exynos: Fix regulator name to avoid forbidden character on exynos4210-trats
  ARM: dts: exynos: Add MFC memory banks for Peach boards
  ARM: EXYNOS: Properly skip unitialized parent clock in power domain on
This commit is contained in:
Arnd Bergmann 2016-05-09 16:38:04 +02:00
parent bf16200689 330d12764e
commit ea46a1f8d3
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/exynos4210-trats.dts
View File

@ -298,6 +298,8 @@
compatible = "maxim,max8997-pmic";
reg = <0x66>;
interrupt-parent = <&gpx0>;
interrupts = <7 0>;
max8997,pmic-buck1-uses-gpio-dvs;
max8997,pmic-buck2-uses-gpio-dvs;
@ -359,7 +361,7 @@
};
vusbdac_reg: LDO8 {
regulator-name = "VUSB/VDAC_3.3V_C210";
regulator-name = "VUSB+VDAC_3.3V_C210";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};

5
arch/arm/boot/dts/exynos5420-peach-pit.dts
View File

@ -696,6 +696,11 @@
status = "okay";
};
&mfc {
samsung,mfc-r = <0x43000000 0x800000>;
samsung,mfc-l = <0x51000000 0x800000>;
};
&mmc_0 {
status = "okay";
num-slots = <1>;

5
arch/arm/boot/dts/exynos5800-peach-pi.dts
View File

@ -671,6 +671,11 @@
status = "okay";
};
&mfc {
samsung,mfc-r = <0x43000000 0x800000>;
samsung,mfc-l = <0x51000000 0x800000>;
};
&mmc_0 {
status = "okay";
num-slots = <1>;

2
arch/arm/mach-exynos/pm_domains.c
View File

@ -92,7 +92,7 @@ static int exynos_pd_power(struct generic_pm_domain *domain, bool power_on)
if (IS_ERR(pd->clk[i]))
break;
if (IS_ERR(pd->clk[i]))
if (IS_ERR(pd->pclk[i]))
continue; /* Skip on first power up */
if (clk_set_parent(pd->clk[i], pd->pclk[i]))
pr_err("%s: error setting parent to clock%d\n",