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

Commit de4cf2fe authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'v3.14-next/fixes-samsung-2' into v3.14-next/dt-exynos-2

parents e0b51c2e ca7c11fc

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-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

+2 −5
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>;
@@ -159,7 +156,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-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>;

	};

};