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

Commit 40d0c522 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-fixes' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 319e2e3f 236940d2

arch/arm/boot/dts/exynos4210-origen.dts

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ 
	display-timings {

		native-mode = <&timing0>;

		timing0: timing {

			clock-frequency = <50000>;

			clock-frequency = <47500000>;

			hactive = <1024>;

			vactive = <600>;

			hfront-porch = <64>;

arch/arm/boot/dts/exynos4412-origen.dts

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ 
	display-timings {

		native-mode = <&timing0>;

		timing0: timing {

			clock-frequency = <50000>;

			clock-frequency = <47500000>;

			hactive = <1024>;

			vactive = <600>;

			hfront-porch = <64>;

arch/arm/boot/dts/exynos5250-arndale.dts

+2 −0
Original line number Diff line number Diff line
@@ -302,11 +302,13 @@ 
				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 {

arch/arm/boot/dts/exynos5250.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -60,11 +60,13 @@ 
			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>;

		};

	};

arch/arm/boot/dts/exynos5420-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
			samsung,pins = "gpx0-7";

			samsung,pin-function = <3>;

			samsung,pin-pud = <0>;

			samaung,pin-drv = <0>;

			samsung,pin-drv = <0>;

		};

	};