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

Commit f89bc02f authored by Olof Johansson's avatar Olof Johansson
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 next/fixes-non-critical

From Kukjin Kim:
Samsung non-critical 2nd fixes for v3.14
- Correct HSMMC1 card detection type for s3c6410-mini6410
- Fix different key mapping backslash and search key for exynos5250-snow
- Fix definitions of div_mmc_pre4 divider for CLK_SET_RATE_PARENT
- Fix clock provider for mshc on exynos4412
- Fix definitions of mshc dt nodes for exynos4x12
- use mshc controller for eMMC for exynos4412-trats2

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

:
  ARM: dts: Use MSHC controller for eMMC memory for exynos4412-trats2
  ARM: dts: Fix definition of MSHC device tree nodes for exynos4x12
  ARM: dts: add clock provider for mshc node for Exynos4412 SOC
  clk: samsung: exynos4: Fix definition of div_mmc_pre4 divider
  ARM: dts: Fix exynos5250-snow's search key to be L_META
  ARM: dts: Add the missing "\" key in non-US keyboards for exynos5250-snow
  ARM: S3C64XX: Correct card detect type for HSMMC1 for MINI6410

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 40d0c522 ca7c11fc

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

+1 −4
Original line number Diff line number Diff line
@@ -38,9 +38,7 @@ 
		};

	};



	mshc@12550000 {

		#address-cells = <1>;

		#size-cells = <0>;

	mmc@12550000 {

		pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;

		pinctrl-names = "default";

		vmmc-supply = <&ldo20_reg &buck8_reg>;
@@ -49,7 +47,6 @@ 
		num-slots = <1>;

		supports-highspeed;

		broken-cd;

		fifo-depth = <0x80>;

		card-detect-delay = <200>;

		samsung,dw-mshc-ciu-div = <3>;

		samsung,dw-mshc-sdr-timing = <2 3>;

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

+1 −4
Original line number Diff line number Diff line
@@ -122,9 +122,7 @@ 
		status = "okay";

	};



	mshc@12550000 {

		#address-cells = <1>;

		#size-cells = <0>;

	mmc@12550000 {

		pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;

		pinctrl-names = "default";

		status = "okay";
@@ -132,7 +130,6 @@ 
		num-slots = <1>;

		supports-highspeed;

		broken-cd;

		fifo-depth = <0x80>;

		card-detect-delay = <200>;

		samsung,dw-mshc-ciu-div = <3>;

		samsung,dw-mshc-sdr-timing = <2 3>;

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

+16 −4
Original line number Diff line number Diff line
@@ -442,13 +442,25 @@ 
		};

	};



	sdhci@12510000 {

		bus-width = <8>;

	mmc@12550000 {

		num-slots = <1>;

		supports-highspeed;

		broken-cd;

		non-removable;

		pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus8>;

		pinctrl-names = "default";

		card-detect-delay = <200>;

		vmmc-supply = <&vemmc_reg>;

		clock-frequency = <400000000>;

		samsung,dw-mshc-ciu-div = <0>;

		samsung,dw-mshc-sdr-timing = <2 3>;

		samsung,dw-mshc-ddr-timing = <1 2>;

		pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;

		pinctrl-names = "default";

		status = "okay";



		slot@0 {

			reg = <0>;

			bus-width = <8>;

		};

	};



	serial@13800000 {

arch/arm/boot/dts/exynos4412.dtsi

+0 −7
Original line number Diff line number Diff line
@@ -61,11 +61,4 @@ 
		};

	};



	mshc@12550000 {

		compatible = "samsung,exynos4412-dw-mshc";

		reg = <0x12550000 0x1000>;

		interrupts = <0 77 0>;

		#address-cells = <1>;

		#size-cells = <0>;

	};

};

arch/arm/boot/dts/exynos4x12.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
		pinctrl3 = &pinctrl_3;

		fimc-lite0 = &fimc_lite_0;

		fimc-lite1 = &fimc_lite_1;

		mshc0 = &mshc_0;

	};



	pd_isp: isp-power-domain@10023CA0 {
@@ -176,4 +177,16 @@ 
			};

		};

	};



	mshc_0: mmc@12550000 {

		compatible = "samsung,exynos4412-dw-mshc";

		reg = <0x12550000 0x1000>;

		interrupts = <0 77 0>;

		#address-cells = <1>;

		#size-cells = <0>;

		fifo-depth = <0x80>;

		clocks = <&clock 301>, <&clock 149>;

		clock-names = "biu", "ciu";

		status = "disabled";

	};

};