Commit 91d0d294 authored by Arnd Bergmann's avatar Arnd Bergmann

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
...@@ -22,7 +22,6 @@ / { ...@@ -22,7 +22,6 @@ / {
}; };
&mshc_2 { &mshc_2 {
num-slots = <1>;
cap-sd-highspeed; cap-sd-highspeed;
disable-wp; disable-wp;
vqmmc-supply = <&ldo3_reg>; vqmmc-supply = <&ldo3_reg>;
......
...@@ -304,7 +304,6 @@ buck5_reg: BUCK5 { ...@@ -304,7 +304,6 @@ buck5_reg: BUCK5 {
}; };
&mshc_0 { &mshc_0 {
num-slots = <1>;
non-removable; non-removable;
cap-mmc-highspeed; cap-mmc-highspeed;
card-detect-delay = <200>; card-detect-delay = <200>;
......
...@@ -426,7 +426,6 @@ &i2s2 { ...@@ -426,7 +426,6 @@ &i2s2 {
&mshc_0 { &mshc_0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
num-slots = <1>;
broken-cd; broken-cd;
non-removable; non-removable;
cap-mmc-highspeed; cap-mmc-highspeed;
......
...@@ -220,21 +220,6 @@ &dsi_0 { ...@@ -220,21 +220,6 @@ &dsi_0 {
samsung,pll-clock-frequency = <24000000>; samsung,pll-clock-frequency = <24000000>;
status = "okay"; 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 { panel@0 {
compatible = "samsung,s6e63j0x03"; compatible = "samsung,s6e63j0x03";
reg = <0>; reg = <0>;
...@@ -264,12 +249,6 @@ timing-0 { ...@@ -264,12 +249,6 @@ timing-0 {
vsync-len = <2>; vsync-len = <2>;
}; };
}; };
port {
dsi_in: endpoint {
remote-endpoint = <&dsi_out>;
};
};
}; };
}; };
...@@ -642,7 +621,6 @@ &jpeg { ...@@ -642,7 +621,6 @@ &jpeg {
&mshc_0 { &mshc_0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
num-slots = <1>;
broken-cd; broken-cd;
non-removable; non-removable;
cap-mmc-highspeed; cap-mmc-highspeed;
......
...@@ -202,21 +202,6 @@ &dsi_0 { ...@@ -202,21 +202,6 @@ &dsi_0 {
samsung,pll-clock-frequency = <24000000>; samsung,pll-clock-frequency = <24000000>;
status = "okay"; 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 { panel@0 {
reg = <0>; reg = <0>;
compatible = "samsung,s6e8aa0"; compatible = "samsung,s6e8aa0";
...@@ -244,12 +229,6 @@ timing-0 { ...@@ -244,12 +229,6 @@ timing-0 {
vsync-len = <2>; vsync-len = <2>;
}; };
}; };
port {
dsi_in: endpoint {
remote-endpoint = <&dsi_out>;
};
};
}; };
}; };
......
...@@ -466,7 +466,6 @@ &mshc_0 { ...@@ -466,7 +466,6 @@ &mshc_0 {
pinctrl-names = "default"; pinctrl-names = "default";
status = "okay"; status = "okay";
vmmc-supply = <&buck9_reg>; vmmc-supply = <&buck9_reg>;
num-slots = <1>;
broken-cd; broken-cd;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
......
...@@ -516,7 +516,6 @@ &mshc_0 { ...@@ -516,7 +516,6 @@ &mshc_0 {
mmc-pwrseq = <&emmc_pwrseq>; mmc-pwrseq = <&emmc_pwrseq>;
status = "okay"; status = "okay";
num-slots = <1>;
broken-cd; broken-cd;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
......
...@@ -488,7 +488,6 @@ &mshc_0 { ...@@ -488,7 +488,6 @@ &mshc_0 {
pinctrl-names = "default"; pinctrl-names = "default";
status = "okay"; status = "okay";
num-slots = <1>;
broken-cd; broken-cd;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
......
...@@ -390,21 +390,6 @@ &dsi_0 { ...@@ -390,21 +390,6 @@ &dsi_0 {
samsung,pll-clock-frequency = <24000000>; samsung,pll-clock-frequency = <24000000>;
status = "okay"; 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 { panel@0 {
compatible = "samsung,s6e8aa0"; compatible = "samsung,s6e8aa0";
reg = <0>; reg = <0>;
...@@ -432,12 +417,6 @@ timing-0 { ...@@ -432,12 +417,6 @@ timing-0 {
vsync-len = <2>; vsync-len = <2>;
}; };
}; };
port {
dsi_in: endpoint {
remote-endpoint = <&dsi_out>;
};
};
}; };
}; };
...@@ -901,7 +880,6 @@ &i2s0 { ...@@ -901,7 +880,6 @@ &i2s0 {
}; };
&mshc_0 { &mshc_0 {
num-slots = <1>;
broken-cd; broken-cd;
non-removable; non-removable;
card-detect-delay = <200>; card-detect-delay = <200>;
......
...@@ -518,7 +518,6 @@ &i2s0 { ...@@ -518,7 +518,6 @@ &i2s0 {
&mmc_0 { &mmc_0 {
status = "okay"; status = "okay";
num-slots = <1>;
broken-cd; broken-cd;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
...@@ -533,7 +532,6 @@ &mmc_0 { ...@@ -533,7 +532,6 @@ &mmc_0 {
&mmc_2 { &mmc_2 {
status = "okay"; status = "okay";
num-slots = <1>;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>; samsung,dw-mshc-sdr-timing = <2 3>;
......
...@@ -346,7 +346,6 @@ &i2s0 { ...@@ -346,7 +346,6 @@ &i2s0 {
&mmc_0 { &mmc_0 {
status = "okay"; status = "okay";
num-slots = <1>;
broken-cd; broken-cd;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
...@@ -360,7 +359,6 @@ &mmc_0 { ...@@ -360,7 +359,6 @@ &mmc_0 {
&mmc_2 { &mmc_2 {
status = "okay"; status = "okay";
num-slots = <1>;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>; samsung,dw-mshc-sdr-timing = <2 3>;
......
...@@ -530,7 +530,6 @@ &i2s0 { ...@@ -530,7 +530,6 @@ &i2s0 {
/* eMMC flash */ /* eMMC flash */
&mmc_0 { &mmc_0 {
status = "okay"; status = "okay";
num-slots = <1>;
non-removable; non-removable;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>; samsung,dw-mshc-sdr-timing = <2 3>;
...@@ -544,7 +543,6 @@ &mmc_0 { ...@@ -544,7 +543,6 @@ &mmc_0 {
/* uSD card */ /* uSD card */
&mmc_2 { &mmc_2 {
status = "okay"; status = "okay";
num-slots = <1>;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
samsung,dw-mshc-sdr-timing = <2 3>; samsung,dw-mshc-sdr-timing = <2 3>;
...@@ -564,7 +562,6 @@ &mmc_2 { ...@@ -564,7 +562,6 @@ &mmc_2 {
*/ */
&mmc_3 { &mmc_3 {
status = "okay"; status = "okay";
num-slots = <1>;
non-removable; non-removable;
cap-sdio-irq; cap-sdio-irq;
keep-power-in-suspend; keep-power-in-suspend;
......
...@@ -427,7 +427,6 @@ &i2s0 { ...@@ -427,7 +427,6 @@ &i2s0 {
&mmc_0 { &mmc_0 {
status = "okay"; status = "okay";
num-slots = <1>;
broken-cd; broken-cd;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
...@@ -445,7 +444,6 @@ &mmc_0 { ...@@ -445,7 +444,6 @@ &mmc_0 {
*/ */
&mmc_1 { &mmc_1 {
status = "okay"; status = "okay";
num-slots = <1>;
broken-cd; broken-cd;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
......
...@@ -67,7 +67,6 @@ &uart3 { ...@@ -67,7 +67,6 @@ &uart3 {
&mmc_0 { &mmc_0 {
status = "okay"; status = "okay";
num-slots = <1>;
broken-cd; broken-cd;
bypass-smu; bypass-smu;
cap-mmc-highspeed; cap-mmc-highspeed;
...@@ -83,7 +82,6 @@ &mmc_0 { ...@@ -83,7 +82,6 @@ &mmc_0 {
&mmc_2 { &mmc_2 {
status = "okay"; status = "okay";
num-slots = <1>;
cap-sd-highspeed; cap-sd-highspeed;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
......
...@@ -41,7 +41,6 @@ firmware@02037000 { ...@@ -41,7 +41,6 @@ firmware@02037000 {
&mmc_0 { &mmc_0 {
status = "okay"; status = "okay";
num-slots = <1>;
cap-mmc-highspeed; cap-mmc-highspeed;
broken-cd; broken-cd;
card-detect-delay = <200>; card-detect-delay = <200>;
...@@ -53,7 +52,6 @@ &mmc_0 { ...@@ -53,7 +52,6 @@ &mmc_0 {
&mmc_2 { &mmc_2 {
status = "okay"; status = "okay";
num-slots = <1>;
cap-sd-highspeed; cap-sd-highspeed;
card-detect-delay = <200>; card-detect-delay = <200>;
samsung,dw-mshc-ciu-div = <3>; samsung,dw-mshc-ciu-div = <3>;
......
...@@ -699,7 +699,6 @@ &i2s0 { ...@@ -699,7 +699,6 @@ &i2s0 {
/* eMMC flash */ /* eMMC flash */
&mmc_0 { &mmc_0 {
status = "okay"; status = "okay";
num-slots = <1>;
mmc-hs200-1_8v; mmc-hs200-1_8v;
cap-mmc-highspeed; cap-mmc-highspeed;
non-removable; non-removable;
...@@ -717,7 +716,6 @@ &mmc_0 { ...@@ -717,7 +716,6 @@ &mmc_0 {
/* WiFi SDIO module */ /* WiFi SDIO module */
&mmc_1 { &mmc_1 {
status = "okay"; status = "okay";
num-slots = <1>;
non-removable; non-removable;
cap-sdio-irq; cap-sdio-irq;
keep-power-in-suspend; keep-power-in-suspend;
...@@ -737,7 +735,6 @@ &mmc_1 { ...@@ -737,7 +735,6 @@ &mmc_1 {
/* uSD card */ /* uSD card */
&mmc_2 { &mmc_2 {
status = "okay"; status = "okay";
num-slots = <1>;
cap-sd-highspeed; cap-sd-highspeed;
card-detect-delay = <200>; card-detect-delay = <200>;
clock-frequency = <400000000>; clock-frequency = <400000000>;
......
...@@ -667,7 +667,6 @@ &i2s0 { ...@@ -667,7 +667,6 @@ &i2s0 {
/* eMMC flash */ /* eMMC flash */
&mmc_0 { &mmc_0 {
status = "okay"; status = "okay";
num-slots = <1>;
mmc-hs200-1_8v; mmc-hs200-1_8v;
mmc-hs400-1_8v; mmc-hs400-1_8v;
cap-mmc-highspeed; cap-mmc-highspeed;
...@@ -686,7 +685,6 @@ &mmc_0 { ...@@ -686,7 +685,6 @@ &mmc_0 {
/* WiFi SDIO module */ /* WiFi SDIO module */
&mmc_1 { &mmc_1 {
status = "okay"; status = "okay";
num-slots = <1>;
non-removable; non-removable;
cap-sdio-irq; cap-sdio-irq;
keep-power-in-suspend; keep-power-in-suspend;
...@@ -706,7 +704,6 @@ &mmc_1 { ...@@ -706,7 +704,6 @@ &mmc_1 {
/* uSD card */ /* uSD card */
&mmc_2 { &mmc_2 {
status = "okay"; status = "okay";
num-slots = <1>;
cap-sd-highspeed; cap-sd-highspeed;
card-detect-delay = <200>; card-detect-delay = <200>;
clock-frequency = <400000000>; 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