Skip to content

L
linux
Commit 91d0d294 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'samsung-dt-4.14' of... 

Merge tag 'samsung-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Pull "Samsung DTS ARM changes for v4.13" from Krzysztof Kozłowski:

Remove deprecated and unneeded properties from Exynos boards.

* tag 'samsung-dt-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Remove num-slots from exynos platforms
  ARM: dts: exynos: Remove the OF graph from DSI node
parents aae4e7a8 9d2770b8
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 90 deletions
arch/arm/boot/dts/exynos3250-artik5-eval.dts
View file @ 91d0d294
......@@ -22,7 +22,6 @@ / {
};
&mshc_2 {
num-slots = <1>;
cap-sd-highspeed;
disable-wp;
vqmmc-supply = <&ldo3_reg>;
......
arch/arm/boot/dts/exynos3250-artik5.dtsi
View file @ 91d0d294
......@@ -304,7 +304,6 @@ buck5_reg: BUCK5 {
};
&mshc_0 {
num-slots = <1>;
non-removable;
cap-mmc-highspeed;
card-detect-delay = <200>;
......
arch/arm/boot/dts/exynos3250-monk.dts
View file @ 91d0d294
......@@ -426,7 +426,6 @@ &i2s2 {
&mshc_0 {
#address-cells = <1>;
#size-cells = <0>;
num-slots = <1>;
broken-cd;
non-removable;
cap-mmc-highspeed;
......
arch/arm/boot/dts/exynos3250-rinato.dts
View file @ 91d0d294
......@@ -220,21 +220,6 @@ &dsi_0 {
samsung,pll-clock-frequency = <24000000>;
status = "okay";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@1 {
reg = <1>;
dsi_out: endpoint {
remote-endpoint = <&dsi_in>;
samsung,burst-clock-frequency = <250000000>;
samsung,esc-clock-frequency = <20000000>;
};
};
};
panel@0 {
compatible = "samsung,s6e63j0x03";
reg = <0>;
......@@ -264,12 +249,6 @@ timing-0 {
vsync-len = <2>;
};
};
port {
dsi_in: endpoint {
remote-endpoint = <&dsi_out>;
};
};
};
};
......@@ -642,7 +621,6 @@ &jpeg {
&mshc_0 {
#address-cells = <1>;
#size-cells = <0>;
num-slots = <1>;
broken-cd;
non-removable;
cap-mmc-highspeed;
......
arch/arm/boot/dts/exynos4210-trats.dts
View file @ 91d0d294
......@@ -202,21 +202,6 @@ &dsi_0 {
samsung,pll-clock-frequency = <24000000>;
status = "okay";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@1 {
reg = <1>;
dsi_out: endpoint {
remote-endpoint = <&dsi_in>;
samsung,burst-clock-frequency = <500000000>;
samsung,esc-clock-frequency = <20000000>;
};
};
};
panel@0 {
reg = <0>;
compatible = "samsung,s6e8aa0";
......@@ -244,12 +229,6 @@ timing-0 {
vsync-len = <2>;
};
};
port {
dsi_in: endpoint {
remote-endpoint = <&dsi_out>;
};
};
};
};
......
arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
View file @ 91d0d294
......@@ -466,7 +466,6 @@ &mshc_0 {
pinctrl-names = "default";
status = "okay";
vmmc-supply = <&buck9_reg>;
num-slots = <1>;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
......
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
View file @ 91d0d294
......@@ -516,7 +516,6 @@ &mshc_0 {
mmc-pwrseq = <&emmc_pwrseq>;
status = "okay";
num-slots = <1>;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
......
arch/arm/boot/dts/exynos4412-origen.dts
View file @ 91d0d294
......@@ -488,7 +488,6 @@ &mshc_0 {
pinctrl-names = "default";
status = "okay";
num-slots = <1>;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
......
arch/arm/boot/dts/exynos4412-trats2.dts
View file @ 91d0d294
......@@ -390,21 +390,6 @@ &dsi_0 {
samsung,pll-clock-frequency = <24000000>;
status = "okay";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@1 {
reg = <1>;
dsi_out: endpoint {
remote-endpoint = <&dsi_in>;
samsung,burst-clock-frequency = <500000000>;
samsung,esc-clock-frequency = <20000000>;
};
};
};
panel@0 {
compatible = "samsung,s6e8aa0";
reg = <0>;
......@@ -432,12 +417,6 @@ timing-0 {
vsync-len = <2>;
};
};
port {
dsi_in: endpoint {
remote-endpoint = <&dsi_out>;
};
};
};
};
......@@ -901,7 +880,6 @@ &i2s0 {
};
&mshc_0 {
num-slots = <1>;
broken-cd;
non-removable;
card-detect-delay = <200>;
......
arch/arm/boot/dts/exynos5250-arndale.dts
View file @ 91d0d294
......@@ -518,7 +518,6 @@ &i2s0 {
&mmc_0 {
status = "okay";
num-slots = <1>;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
......@@ -533,7 +532,6 @@ &mmc_0 {
&mmc_2 {
status = "okay";
num-slots = <1>;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
......
arch/arm/boot/dts/exynos5250-smdk5250.dts
View file @ 91d0d294
......@@ -346,7 +346,6 @@ &i2s0 {
&mmc_0 {
status = "okay";
num-slots = <1>;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
......@@ -360,7 +359,6 @@ &mmc_0 {
&mmc_2 {
status = "okay";
num-slots = <1>;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
......
arch/arm/boot/dts/exynos5250-snow-common.dtsi
View file @ 91d0d294
......@@ -530,7 +530,6 @@ &i2s0 {
/* eMMC flash */
&mmc_0 {
status = "okay";
num-slots = <1>;
non-removable;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
......@@ -544,7 +543,6 @@ &mmc_0 {
/* uSD card */
&mmc_2 {
status = "okay";
num-slots = <1>;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>;
......@@ -564,7 +562,6 @@ &mmc_2 {
*/
&mmc_3 {
status = "okay";
num-slots = <1>;
non-removable;
cap-sdio-irq;
keep-power-in-suspend;
......
arch/arm/boot/dts/exynos5250-spring.dts
View file @ 91d0d294
......@@ -427,7 +427,6 @@ &i2s0 {
&mmc_0 {
status = "okay";
num-slots = <1>;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
......@@ -445,7 +444,6 @@ &mmc_0 {
*/
&mmc_1 {
status = "okay";
num-slots = <1>;
broken-cd;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
......
arch/arm/boot/dts/exynos5260-xyref5260.dts
View file @ 91d0d294
......@@ -67,7 +67,6 @@ &uart3 {
&mmc_0 {
status = "okay";
num-slots = <1>;
broken-cd;
bypass-smu;
cap-mmc-highspeed;
......@@ -83,7 +82,6 @@ &mmc_0 {
&mmc_2 {
status = "okay";
num-slots = <1>;
cap-sd-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
......
arch/arm/boot/dts/exynos5410-smdk5410.dts
View file @ 91d0d294
......@@ -41,7 +41,6 @@ firmware@02037000 {
&mmc_0 {
status = "okay";
num-slots = <1>;
cap-mmc-highspeed;
broken-cd;
card-detect-delay = <200>;
......@@ -53,7 +52,6 @@ &mmc_0 {
&mmc_2 {
status = "okay";
num-slots = <1>;
cap-sd-highspeed;
card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>;
......
arch/arm/boot/dts/exynos5420-peach-pit.dts
View file @ 91d0d294
......@@ -699,7 +699,6 @@ &i2s0 {
/* eMMC flash */
&mmc_0 {
status = "okay";
num-slots = <1>;
mmc-hs200-1_8v;
cap-mmc-highspeed;
non-removable;
......@@ -717,7 +716,6 @@ &mmc_0 {
/* WiFi SDIO module */
&mmc_1 {
status = "okay";
num-slots = <1>;
non-removable;
cap-sdio-irq;
keep-power-in-suspend;
......@@ -737,7 +735,6 @@ &mmc_1 {
/* uSD card */
&mmc_2 {
status = "okay";
num-slots = <1>;
cap-sd-highspeed;
card-detect-delay = <200>;
clock-frequency = <400000000>;
......
arch/arm/boot/dts/exynos5800-peach-pi.dts
View file @ 91d0d294
......@@ -667,7 +667,6 @@ &i2s0 {
/* eMMC flash */
&mmc_0 {
status = "okay";
num-slots = <1>;
mmc-hs200-1_8v;
mmc-hs400-1_8v;
cap-mmc-highspeed;
......@@ -686,7 +685,6 @@ &mmc_0 {
/* WiFi SDIO module */
&mmc_1 {
status = "okay";
num-slots = <1>;
non-removable;
cap-sdio-irq;
keep-power-in-suspend;
......@@ -706,7 +704,6 @@ &mmc_1 {
/* uSD card */
&mmc_2 {
status = "okay";
num-slots = <1>;
cap-sd-highspeed;
card-detect-delay = <200>;
clock-frequency = <400000000>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7