mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-21 18:11:39 +00:00
Code Issues Releases Wiki Activity

Samsung non-critical fixes for v3.14

Browse source 
- Switch FIFO mode for arch_enable_uart_fifo()
 - Add missing op_mode for PMIC on exynos5250-arndale
 - Add missing clock-frequency for CPU on exynos5250
 - Fix typo samaung to samsung for exynos5420-pinctrl
 - Fix display clock-frequency for exynos4210/exynos4412-origen
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJSrgY0AAoJEA0Cl+kVi2xqNw8P+wUQdgTwRIUlXVh18WDrhHE2
 V0DlHeG0vsejIm5l/IC72kXDJWs6kvjqAEeEmo8W5V2JH+aEKCuqIZNrsszXo7v8
 /PCjgukGTmmJWgmwzT8rSH18xH90IcpVe0S6mOAoRnqu2RWsnZF/YQ0iUsITzd4k
 xfRnkedhxXmT9QL7nXM57acFhMg04vZpaBJtjEoV1suYhUOgf031AhnKsQuZpSev
 ldvcKrZrGLr1plXdOk5Gd+mRtwjTaF4HadvvNIy3Kch1s2w4hu9Mvr8UqGk5cbha
 GVlJ/10ESYV/p2HLtwjJvUGeRkVvywC+dtQrn0KWZ7ZHSn+Yq+hwmzuyeTw7yCb3
 dYp8o+ry0BDgAGs7nLHe/COTJz4XroYwNFvMGqLePMdyDv2VHvnS0yGaOA5VN11U
 2BUuqgkOuhCrvLeN2bYRjGKHRQg87sOh3v5vDnU9DSNo9gTzU2K5W8A1mkvNKMgG
 MwQwUodsHVLCzHylt9JDaE2r5/HBj+LYU+4bGbrWhwKGz7SUYvFYwNKzW2TAE3sq
 PZ+FckZd95wIA9Imo/JYSF306q/83m7Thmy6/zhjlWmSLZEhe/FAUCc6Ys3tZSit
 TmduB8Uvu3l2ToOI5R2QHCJRN7BMP1zOvnWVDSHSN6P4g3MoT71dZZ1GAhG3y6kX
 HoSLzj1AiFjtBs713fVo
 =9LEO
 -----END PGP SIGNATURE-----

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

From Kukjin Kim:
Samsung non-critical fixes for v3.14
- Switch FIFO mode for arch_enable_uart_fifo()
- Add missing op_mode for PMIC on exynos5250-arndale
- Add missing clock-frequency for CPU on exynos5250
- Fix typo samaung to samsung for exynos5420-pinctrl
- Fix display clock-frequency for exynos4210/exynos4412-origen

* tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: Update display clock frequency for Origen-4412
  ARM: dts: Update display clock frequency for Origen-4210
  ARM: dts: Fix a typo in exynos5420-pinctrl.dtsi
  ARM: dts: Add missing frequency property to exynos5250
  ARM: dts: Add missing op_mode property to PMIC on Arndale
  ARM: SAMSUNG: Fix switching FIFO in arch_enable_uart_fifo function

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2013-12-22 13:59:14 -08:00
commit 40d0c522a9
6 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/exynos4210-origen.dts
View file

@ -313,7 +313,7 @@ fimd@11c00000 {
display-timings {
native-mode = <&timing0>;
timing0: timing {
clock-frequency = <50000>;
clock-frequency = <47500000>;
hactive = <1024>;
vactive = <600>;
hfront-porch = <64>;

2
arch/arm/boot/dts/exynos4412-origen.dts
View file

@ -159,7 +159,7 @@ fimd@11c00000 {
display-timings {
native-mode = <&timing0>;
timing0: timing {
clock-frequency = <50000>;
clock-frequency = <47500000>;
hactive = <1024>;
vactive = <600>;
hfront-porch = <64>;

2
arch/arm/boot/dts/exynos5250-arndale.dts
View file

@ -302,11 +302,13 @@ buck5_reg: BUCK5 {
buck7_reg: BUCK7 {
regulator-name = "PVDD_BUCK7";
regulator-always-on;
op_mode = <1>;
};
buck8_reg: BUCK8 {
regulator-name = "PVDD_BUCK8";
regulator-always-on;
op_mode = <1>;
};
buck9_reg: BUCK9 {

2
arch/arm/boot/dts/exynos5250.dtsi
View file

@ -60,11 +60,13 @@ cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a15";
reg = <0>;
clock-frequency = <1700000000>;
};
cpu@1 {
device_type = "cpu";
compatible = "arm,cortex-a15";
reg = <1>;
clock-frequency = <1700000000>;
};
};

2
arch/arm/boot/dts/exynos5420-pinctrl.dtsi
View file

@ -64,7 +64,7 @@ dp_hpd: dp_hpd {
samsung,pins = "gpx0-7";
samsung,pin-function = <3>;
samsung,pin-pud = <0>;
samaung,pin-drv = <0>;
samsung,pin-drv = <0>;
};
};

2
arch/arm/plat-samsung/include/plat/uncompress.h
View file

@ -145,6 +145,8 @@ static inline void arch_enable_uart_fifo(void)
if (!(fifocon & S3C2410_UFCON_RESETBOTH))
break;
}
uart_wr(S3C2410_UFCON, S3C2410_UFCON_FIFOMODE);
}
}
#else