A number of things, where we use paths have labels already in the upstream DT, so switch to that.
Signed-off-by: Ahmad Fatoum <[email protected]> --- arch/arm/dts/armada-370-mirabox-bb.dts | 2 +- arch/arm/dts/armada-370-rn104-bb.dts | 2 +- arch/arm/dts/armada-385-turris-omnia-bb.dts | 2 +- arch/arm/dts/armada-xp-db-bb.dts | 2 +- arch/arm/dts/armada-xp-gp-bb.dts | 2 +- arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts | 2 +- arch/arm/dts/armada-xp-rn2120-bb.dts | 2 +- arch/arm/dts/at91sam9263ek.dts | 2 +- arch/arm/dts/fsl-ls1046a-rdb.dts | 6 +++--- arch/arm/dts/imx50.dtsi | 2 +- arch/arm/dts/imx51-genesi-efika-sb.dts | 7 ++++--- arch/arm/dts/socfpga_arria10_achilles.dts | 8 ++++---- arch/arm/dts/socfpga_arria10_mercury_aa1.dts | 8 ++++---- 13 files changed, 24 insertions(+), 23 deletions(-) diff --git a/arch/arm/dts/armada-370-mirabox-bb.dts b/arch/arm/dts/armada-370-mirabox-bb.dts index 99263d485446..cdbce4af30fa 100644 --- a/arch/arm/dts/armada-370-mirabox-bb.dts +++ b/arch/arm/dts/armada-370-mirabox-bb.dts @@ -7,7 +7,7 @@ / { chosen { - stdout-path = "/soc/internal-regs/serial@12000"; + stdout-path = &uart0; }; }; diff --git a/arch/arm/dts/armada-370-rn104-bb.dts b/arch/arm/dts/armada-370-rn104-bb.dts index 32f961e5292e..d19b4c70ee70 100644 --- a/arch/arm/dts/armada-370-rn104-bb.dts +++ b/arch/arm/dts/armada-370-rn104-bb.dts @@ -6,6 +6,6 @@ / { chosen { - stdout-path = "/soc/internal-regs/serial@12000"; + stdout-path = &uart0; }; }; diff --git a/arch/arm/dts/armada-385-turris-omnia-bb.dts b/arch/arm/dts/armada-385-turris-omnia-bb.dts index 53bef01af758..5cfc57b3113b 100644 --- a/arch/arm/dts/armada-385-turris-omnia-bb.dts +++ b/arch/arm/dts/armada-385-turris-omnia-bb.dts @@ -2,6 +2,6 @@ / { chosen { - stdout-path = "/soc/internal-regs/serial@12000"; + stdout-path = &uart0; }; }; diff --git a/arch/arm/dts/armada-xp-db-bb.dts b/arch/arm/dts/armada-xp-db-bb.dts index 7201f4aaa12e..d1b9fd2b452a 100644 --- a/arch/arm/dts/armada-xp-db-bb.dts +++ b/arch/arm/dts/armada-xp-db-bb.dts @@ -7,6 +7,6 @@ / { chosen { - stdout-path = "/soc/internal-regs/serial@12000"; + stdout-path = &uart0; }; }; diff --git a/arch/arm/dts/armada-xp-gp-bb.dts b/arch/arm/dts/armada-xp-gp-bb.dts index 3836016425b9..9c115db78ee1 100644 --- a/arch/arm/dts/armada-xp-gp-bb.dts +++ b/arch/arm/dts/armada-xp-gp-bb.dts @@ -7,6 +7,6 @@ / { chosen { - stdout-path = "/soc/internal-regs/serial@12000"; + stdout-path = &uart0; }; }; diff --git a/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts b/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts index e57cd8f0ce4b..38a206e47a3f 100644 --- a/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts +++ b/arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts @@ -7,6 +7,6 @@ / { chosen { - stdout-path = "/soc/internal-regs/serial@12000"; + stdout-path = &uart0; }; }; diff --git a/arch/arm/dts/armada-xp-rn2120-bb.dts b/arch/arm/dts/armada-xp-rn2120-bb.dts index 969136b336fc..98458893ce57 100644 --- a/arch/arm/dts/armada-xp-rn2120-bb.dts +++ b/arch/arm/dts/armada-xp-rn2120-bb.dts @@ -6,6 +6,6 @@ / { chosen { - stdout-path = "/soc/internal-regs/serial@12000"; + stdout-path = &uart0; }; }; diff --git a/arch/arm/dts/at91sam9263ek.dts b/arch/arm/dts/at91sam9263ek.dts index 29a615f4823e..cce137e39422 100644 --- a/arch/arm/dts/at91sam9263ek.dts +++ b/arch/arm/dts/at91sam9263ek.dts @@ -41,7 +41,7 @@ }; }; -&{/ahb/apb/mmc@fff84000} { +&mmc1 { pinctrl-0 = < &pinctrl_board_mmc1 &pinctrl_mmc1_clk diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts index d842387fa0da..10f716a974c0 100644 --- a/arch/arm/dts/fsl-ls1046a-rdb.dts +++ b/arch/arm/dts/fsl-ls1046a-rdb.dts @@ -120,14 +120,14 @@ dr_mode = "host"; }; -&{/soc/pcie@3400000} { +&pcie1 { status = "okay"; }; -&{/soc/pcie@3500000} { +&pcie2 { status = "okay"; }; -&{/soc/pcie@3600000} { +&pcie3 { status = "okay"; }; diff --git a/arch/arm/dts/imx50.dtsi b/arch/arm/dts/imx50.dtsi index b5def2e4f67f..7ad8cea5a830 100644 --- a/arch/arm/dts/imx50.dtsi +++ b/arch/arm/dts/imx50.dtsi @@ -1,6 +1,6 @@ #include <arm/imx50.dtsi> -&{/soc/bus@50000000} { /* AIPS1 */ +&aips1 { usbphy1: usbphy@1 { compatible = "usb-nop-xceiv"; clocks = <&clks IMX5_CLK_USB_PHY2_GATE>; diff --git a/arch/arm/dts/imx51-genesi-efika-sb.dts b/arch/arm/dts/imx51-genesi-efika-sb.dts index 9afb670edffe..cf53da888043 100644 --- a/arch/arm/dts/imx51-genesi-efika-sb.dts +++ b/arch/arm/dts/imx51-genesi-efika-sb.dts @@ -394,9 +394,10 @@ &ipu_di1 { interface-pix-fmt = "rgb565"; - endpoint { - remote-endpoint = <&mtl017_in>; - }; +}; + +&ipu_di1_disp2 { + remote-endpoint = <&mtl017_in>; }; &esdhc1 { diff --git a/arch/arm/dts/socfpga_arria10_achilles.dts b/arch/arm/dts/socfpga_arria10_achilles.dts index 6071dbfb49ee..4eafa8176ea4 100644 --- a/arch/arm/dts/socfpga_arria10_achilles.dts +++ b/arch/arm/dts/socfpga_arria10_achilles.dts @@ -108,19 +108,19 @@ }; }; -&{/soc/clkmgr@ffd04000/clocks/osc1} { +&osc1 { clock-frequency = <25000000>; }; -&{/soc/clkmgr@ffd04000/clocks/cb_intosc_hs_div2_clk} { +&cb_intosc_hs_div2_clk { clock-frequency = <0>; }; -&{/soc/clkmgr@ffd04000/clocks/cb_intosc_ls_clk} { +&cb_intosc_ls_clk { clock-frequency = <60000000>; }; -&{/soc/clkmgr@ffd04000/clocks/f2s_free_clk} { +&f2s_free_clk { clock-frequency = <200000000>; }; diff --git a/arch/arm/dts/socfpga_arria10_mercury_aa1.dts b/arch/arm/dts/socfpga_arria10_mercury_aa1.dts index 53ca8fd82c4b..7c6385329270 100644 --- a/arch/arm/dts/socfpga_arria10_mercury_aa1.dts +++ b/arch/arm/dts/socfpga_arria10_mercury_aa1.dts @@ -20,20 +20,20 @@ }; // provide reset-names until fixed in the upstream dts. Binding prescribes this property. -&{/soc/mmc@ff808000} { +&mmc { reset-names = "reset"; }; // This clock is unused, but fixed-clocks need to have a clock-frequency set -&{/soc/clkmgr@ffd04000/clocks/cb_intosc_hs_div2_clk} { +&cb_intosc_hs_div2_clk { clock-frequency = <0>; }; -&{/soc/clkmgr@ffd04000/clocks/cb_intosc_ls_clk} { +&cb_intosc_ls_clk { clock-frequency = <60000000>; }; -&{/soc/clkmgr@ffd04000/clocks/f2s_free_clk} { +&f2s_free_clk { clock-frequency = <200000000>; }; -- 2.30.2
