From: Jonas Gorski Date: Sun, 29 Jul 2018 11:09:22 +0000 (+0200) Subject: brcm63xx: drop linux,part-probe usage where possible X-Git-Tag: v18.06.3~34 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4b633affff972bf19906f748fe56016f844d0022;p=oweals%2Fopenwrt.git brcm63xx: drop linux,part-probe usage where possible It was present as 4.4 compatibility, but since we now use 4.9 or later with the new upstream solution, we don't need it anymore. This also fixes a serious regression introduced by ac9bcefa3b04, which changed the precedence of linux,part-probe and the new-type partitions node compatible string, causing caldata partitions to be overwritten. Fixes: ac9bcefa3b04 ("kernel: use V10 of mtd patchset adding support for "compatible" string") Signed-off-by: Jonas Gorski (cherry picked from commit 7880a6f7fee89efe9e5e4c707b59ba45f02e21cf) --- diff --git a/target/linux/brcm63xx/dts/a226g.dts b/target/linux/brcm63xx/dts/a226g.dts index 0023c296bb..5269fab2bb 100644 --- a/target/linux/brcm63xx/dts/a226g.dts +++ b/target/linux/brcm63xx/dts/a226g.dts @@ -94,8 +94,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/a226m-fwb.dts b/target/linux/brcm63xx/dts/a226m-fwb.dts index 5ae97d76be..0695e839e5 100644 --- a/target/linux/brcm63xx/dts/a226m-fwb.dts +++ b/target/linux/brcm63xx/dts/a226m-fwb.dts @@ -94,8 +94,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/a226m.dts b/target/linux/brcm63xx/dts/a226m.dts index 26ea47c8a8..aea54c3d8b 100644 --- a/target/linux/brcm63xx/dts/a226m.dts +++ b/target/linux/brcm63xx/dts/a226m.dts @@ -94,8 +94,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/a4001n.dts b/target/linux/brcm63xx/dts/a4001n.dts index 8662c71c65..fcd921fa44 100644 --- a/target/linux/brcm63xx/dts/a4001n.dts +++ b/target/linux/brcm63xx/dts/a4001n.dts @@ -69,8 +69,6 @@ spi-rx-bus-width = <2>; reg = <0>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/a4001n1.dts b/target/linux/brcm63xx/dts/a4001n1.dts index dece3c1de9..3cb95e8f2e 100644 --- a/target/linux/brcm63xx/dts/a4001n1.dts +++ b/target/linux/brcm63xx/dts/a4001n1.dts @@ -100,8 +100,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/ad1018-nor.dts b/target/linux/brcm63xx/dts/ad1018-nor.dts index 93862c2fce..61fde75072 100644 --- a/target/linux/brcm63xx/dts/ad1018-nor.dts +++ b/target/linux/brcm63xx/dts/ad1018-nor.dts @@ -132,8 +132,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/agpf-s0.dts b/target/linux/brcm63xx/dts/agpf-s0.dts index 9678a7a47c..46aa399bdc 100644 --- a/target/linux/brcm63xx/dts/agpf-s0.dts +++ b/target/linux/brcm63xx/dts/agpf-s0.dts @@ -98,8 +98,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/ar-5315u.dts b/target/linux/brcm63xx/dts/ar-5315u.dts index 9457bb3194..5f38f3ed16 100644 --- a/target/linux/brcm63xx/dts/ar-5315u.dts +++ b/target/linux/brcm63xx/dts/ar-5315u.dts @@ -80,9 +80,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/ar-5381u.dts b/target/linux/brcm63xx/dts/ar-5381u.dts index 849c7b27d0..7a54778020 100644 --- a/target/linux/brcm63xx/dts/ar-5381u.dts +++ b/target/linux/brcm63xx/dts/ar-5381u.dts @@ -59,8 +59,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/ar-5387un.dts b/target/linux/brcm63xx/dts/ar-5387un.dts index 3f2f540117..3a83834bde 100644 --- a/target/linux/brcm63xx/dts/ar-5387un.dts +++ b/target/linux/brcm63xx/dts/ar-5387un.dts @@ -67,8 +67,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/ar1004g.dts b/target/linux/brcm63xx/dts/ar1004g.dts index 9357726af5..c7f8c50687 100644 --- a/target/linux/brcm63xx/dts/ar1004g.dts +++ b/target/linux/brcm63xx/dts/ar1004g.dts @@ -49,8 +49,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/av4202n.dts b/target/linux/brcm63xx/dts/av4202n.dts index 2b0a15376b..e61baf94a1 100644 --- a/target/linux/brcm63xx/dts/av4202n.dts +++ b/target/linux/brcm63xx/dts/av4202n.dts @@ -71,8 +71,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/bcm96318ref.dts b/target/linux/brcm63xx/dts/bcm96318ref.dts index 26dda1cba3..d0ca2fc204 100644 --- a/target/linux/brcm63xx/dts/bcm96318ref.dts +++ b/target/linux/brcm63xx/dts/bcm96318ref.dts @@ -66,8 +66,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts b/target/linux/brcm63xx/dts/bcm96318ref_p300.dts index a26b3b3db6..ef9b5c4aaf 100644 --- a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts +++ b/target/linux/brcm63xx/dts/bcm96318ref_p300.dts @@ -72,8 +72,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts b/target/linux/brcm63xx/dts/bcm963268bu_p300.dts index 19d713c03d..f7477a3a25 100644 --- a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts +++ b/target/linux/brcm63xx/dts/bcm963268bu_p300.dts @@ -47,8 +47,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm963269bhr.dts b/target/linux/brcm63xx/dts/bcm963269bhr.dts index 4caca94f7f..de7255b130 100644 --- a/target/linux/brcm63xx/dts/bcm963269bhr.dts +++ b/target/linux/brcm63xx/dts/bcm963269bhr.dts @@ -55,8 +55,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm963281TAN.dts b/target/linux/brcm63xx/dts/bcm963281TAN.dts index 48f4c2c71e..46a79979c6 100644 --- a/target/linux/brcm63xx/dts/bcm963281TAN.dts +++ b/target/linux/brcm63xx/dts/bcm963281TAN.dts @@ -57,8 +57,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm96328avng.dts b/target/linux/brcm63xx/dts/bcm96328avng.dts index e9bee34647..e271838521 100644 --- a/target/linux/brcm63xx/dts/bcm96328avng.dts +++ b/target/linux/brcm63xx/dts/bcm96328avng.dts @@ -57,8 +57,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm96338GW.dts b/target/linux/brcm63xx/dts/bcm96338GW.dts index 42e51f4d32..a31c4f564f 100644 --- a/target/linux/brcm63xx/dts/bcm96338GW.dts +++ b/target/linux/brcm63xx/dts/bcm96338GW.dts @@ -43,8 +43,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm96338W.dts b/target/linux/brcm63xx/dts/bcm96338W.dts index f5953e443c..d7ab476b63 100644 --- a/target/linux/brcm63xx/dts/bcm96338W.dts +++ b/target/linux/brcm63xx/dts/bcm96338W.dts @@ -43,8 +43,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm96345GW2.dts b/target/linux/brcm63xx/dts/bcm96345GW2.dts index a2a8203d17..5aea2ddc8d 100644 --- a/target/linux/brcm63xx/dts/bcm96345GW2.dts +++ b/target/linux/brcm63xx/dts/bcm96345GW2.dts @@ -17,8 +17,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm96348GW-10.dts b/target/linux/brcm63xx/dts/bcm96348GW-10.dts index c751fcff45..6f54664ff0 100644 --- a/target/linux/brcm63xx/dts/bcm96348GW-10.dts +++ b/target/linux/brcm63xx/dts/bcm96348GW-10.dts @@ -57,8 +57,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm96348GW-11.dts b/target/linux/brcm63xx/dts/bcm96348GW-11.dts index fca961251f..c1dfaf6b0b 100644 --- a/target/linux/brcm63xx/dts/bcm96348GW-11.dts +++ b/target/linux/brcm63xx/dts/bcm96348GW-11.dts @@ -57,8 +57,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm96348GW.dts b/target/linux/brcm63xx/dts/bcm96348GW.dts index e7662aa839..cc0ebd2629 100644 --- a/target/linux/brcm63xx/dts/bcm96348GW.dts +++ b/target/linux/brcm63xx/dts/bcm96348GW.dts @@ -57,8 +57,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm96348R.dts b/target/linux/brcm63xx/dts/bcm96348R.dts index 946fcf3402..2f0778467c 100644 --- a/target/linux/brcm63xx/dts/bcm96348R.dts +++ b/target/linux/brcm63xx/dts/bcm96348R.dts @@ -43,8 +43,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm96358VW.dts b/target/linux/brcm63xx/dts/bcm96358VW.dts index cc5d9f8e29..346e24dc15 100644 --- a/target/linux/brcm63xx/dts/bcm96358VW.dts +++ b/target/linux/brcm63xx/dts/bcm96358VW.dts @@ -43,8 +43,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm96358VW2.dts b/target/linux/brcm63xx/dts/bcm96358VW2.dts index 9e26aa7a30..02f1ea9edf 100644 --- a/target/linux/brcm63xx/dts/bcm96358VW2.dts +++ b/target/linux/brcm63xx/dts/bcm96358VW2.dts @@ -39,8 +39,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm96368MVNgr.dts b/target/linux/brcm63xx/dts/bcm96368MVNgr.dts index b18aa2c6e0..ac658b137e 100644 --- a/target/linux/brcm63xx/dts/bcm96368MVNgr.dts +++ b/target/linux/brcm63xx/dts/bcm96368MVNgr.dts @@ -43,8 +43,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/bcm96368MVWG.dts b/target/linux/brcm63xx/dts/bcm96368MVWG.dts index 29f7decbc9..fdc32d0c99 100644 --- a/target/linux/brcm63xx/dts/bcm96368MVWG.dts +++ b/target/linux/brcm63xx/dts/bcm96368MVWG.dts @@ -43,8 +43,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/cpva502plus.dts b/target/linux/brcm63xx/dts/cpva502plus.dts index 9a7bf67077..ee5472eefc 100644 --- a/target/linux/brcm63xx/dts/cpva502plus.dts +++ b/target/linux/brcm63xx/dts/cpva502plus.dts @@ -45,8 +45,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/cpva642.dts b/target/linux/brcm63xx/dts/cpva642.dts index ef66c38f5f..649aae2d7b 100644 --- a/target/linux/brcm63xx/dts/cpva642.dts +++ b/target/linux/brcm63xx/dts/cpva642.dts @@ -82,8 +82,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/ct-5365.dts b/target/linux/brcm63xx/dts/ct-5365.dts index 0bcff5f050..691479af75 100644 --- a/target/linux/brcm63xx/dts/ct-5365.dts +++ b/target/linux/brcm63xx/dts/ct-5365.dts @@ -59,8 +59,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/ct-6373.dts b/target/linux/brcm63xx/dts/ct-6373.dts index a1be08b171..9b450dc6bc 100644 --- a/target/linux/brcm63xx/dts/ct-6373.dts +++ b/target/linux/brcm63xx/dts/ct-6373.dts @@ -80,8 +80,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/ct536plus.dts b/target/linux/brcm63xx/dts/ct536plus.dts index 2c023f5d32..04d8033ec8 100644 --- a/target/linux/brcm63xx/dts/ct536plus.dts +++ b/target/linux/brcm63xx/dts/ct536plus.dts @@ -45,8 +45,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/cvg834g.dts b/target/linux/brcm63xx/dts/cvg834g.dts index ca635bb26b..9bdc8c2427 100644 --- a/target/linux/brcm63xx/dts/cvg834g.dts +++ b/target/linux/brcm63xx/dts/cvg834g.dts @@ -27,8 +27,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/dg834g_v4.dts b/target/linux/brcm63xx/dts/dg834g_v4.dts index 55f57dc562..77b7323cfb 100644 --- a/target/linux/brcm63xx/dts/dg834g_v4.dts +++ b/target/linux/brcm63xx/dts/dg834g_v4.dts @@ -53,8 +53,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/dg834gtpn.dts b/target/linux/brcm63xx/dts/dg834gtpn.dts index 3895324821..ff9c853817 100644 --- a/target/linux/brcm63xx/dts/dg834gtpn.dts +++ b/target/linux/brcm63xx/dts/dg834gtpn.dts @@ -57,8 +57,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/dgnd3700v1.dts b/target/linux/brcm63xx/dts/dgnd3700v1.dts index cafa098f60..e2884703ad 100644 --- a/target/linux/brcm63xx/dts/dgnd3700v1.dts +++ b/target/linux/brcm63xx/dts/dgnd3700v1.dts @@ -91,8 +91,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/dsl-2640b-b.dts b/target/linux/brcm63xx/dts/dsl-2640b-b.dts index 3c3ea07e89..1ce0d65d65 100644 --- a/target/linux/brcm63xx/dts/dsl-2640b-b.dts +++ b/target/linux/brcm63xx/dts/dsl-2640b-b.dts @@ -53,8 +53,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/dsl-2640u.dts b/target/linux/brcm63xx/dts/dsl-2640u.dts index dec25a7bca..170a722d4c 100644 --- a/target/linux/brcm63xx/dts/dsl-2640u.dts +++ b/target/linux/brcm63xx/dts/dsl-2640u.dts @@ -37,8 +37,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/dsl-2650u.dts b/target/linux/brcm63xx/dts/dsl-2650u.dts index f784f3364f..0ee0ff354d 100644 --- a/target/linux/brcm63xx/dts/dsl-2650u.dts +++ b/target/linux/brcm63xx/dts/dsl-2650u.dts @@ -39,8 +39,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/dsl-274xb-c.dts b/target/linux/brcm63xx/dts/dsl-274xb-c.dts index e8cebb3370..f6042cd977 100644 --- a/target/linux/brcm63xx/dts/dsl-274xb-c.dts +++ b/target/linux/brcm63xx/dts/dsl-274xb-c.dts @@ -57,8 +57,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/dsl-274xb-f.dts b/target/linux/brcm63xx/dts/dsl-274xb-f.dts index 8b9acaa778..052584b7e5 100644 --- a/target/linux/brcm63xx/dts/dsl-274xb-f.dts +++ b/target/linux/brcm63xx/dts/dsl-274xb-f.dts @@ -81,8 +81,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/dsl-275xb-d.dts b/target/linux/brcm63xx/dts/dsl-275xb-d.dts index a8022ddb26..ae773fe192 100644 --- a/target/linux/brcm63xx/dts/dsl-275xb-d.dts +++ b/target/linux/brcm63xx/dts/dsl-275xb-d.dts @@ -94,8 +94,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/dv-201amr.dts b/target/linux/brcm63xx/dts/dv-201amr.dts index ae68de479e..6cafc891aa 100644 --- a/target/linux/brcm63xx/dts/dv-201amr.dts +++ b/target/linux/brcm63xx/dts/dv-201amr.dts @@ -17,8 +17,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts index e9e042285a..bc8750577c 100644 --- a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts +++ b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts @@ -57,8 +57,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/evg2000.dts b/target/linux/brcm63xx/dts/evg2000.dts index 8468393a45..122fa50f3a 100644 --- a/target/linux/brcm63xx/dts/evg2000.dts +++ b/target/linux/brcm63xx/dts/evg2000.dts @@ -82,8 +82,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/f5d7633.dts b/target/linux/brcm63xx/dts/f5d7633.dts index 57ab97aa86..81f14ec3c0 100644 --- a/target/linux/brcm63xx/dts/f5d7633.dts +++ b/target/linux/brcm63xx/dts/f5d7633.dts @@ -57,8 +57,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/fast2404.dts b/target/linux/brcm63xx/dts/fast2404.dts index 9035b9d158..c9f75f389f 100644 --- a/target/linux/brcm63xx/dts/fast2404.dts +++ b/target/linux/brcm63xx/dts/fast2404.dts @@ -17,8 +17,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/fast2504n.dts b/target/linux/brcm63xx/dts/fast2504n.dts index 86ac4b7686..22349d9f9a 100644 --- a/target/linux/brcm63xx/dts/fast2504n.dts +++ b/target/linux/brcm63xx/dts/fast2504n.dts @@ -76,8 +76,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/fast2604.dts b/target/linux/brcm63xx/dts/fast2604.dts index 4ac9d30c3d..ad8093c6a4 100644 --- a/target/linux/brcm63xx/dts/fast2604.dts +++ b/target/linux/brcm63xx/dts/fast2604.dts @@ -53,8 +53,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/fast2704n.dts b/target/linux/brcm63xx/dts/fast2704n.dts index 1d75b6cf51..b29367913b 100644 --- a/target/linux/brcm63xx/dts/fast2704n.dts +++ b/target/linux/brcm63xx/dts/fast2704n.dts @@ -101,8 +101,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/fast2704v2.dts b/target/linux/brcm63xx/dts/fast2704v2.dts index dfab31f4a8..47a998f298 100644 --- a/target/linux/brcm63xx/dts/fast2704v2.dts +++ b/target/linux/brcm63xx/dts/fast2704v2.dts @@ -85,8 +85,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/gw6000.dts b/target/linux/brcm63xx/dts/gw6000.dts index ab7932e78b..063bc6b24b 100644 --- a/target/linux/brcm63xx/dts/gw6000.dts +++ b/target/linux/brcm63xx/dts/gw6000.dts @@ -31,8 +31,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/gw6200.dts b/target/linux/brcm63xx/dts/gw6200.dts index a7d5d476c5..51f2947264 100644 --- a/target/linux/brcm63xx/dts/gw6200.dts +++ b/target/linux/brcm63xx/dts/gw6200.dts @@ -52,8 +52,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/hg520v.dts b/target/linux/brcm63xx/dts/hg520v.dts index d79b73d4ce..0a809c163f 100644 --- a/target/linux/brcm63xx/dts/hg520v.dts +++ b/target/linux/brcm63xx/dts/hg520v.dts @@ -40,9 +40,7 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - - partitions { + partitions { compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; diff --git a/target/linux/brcm63xx/dts/hg553.dts b/target/linux/brcm63xx/dts/hg553.dts index 8d5c3db25c..36e6d8c332 100644 --- a/target/linux/brcm63xx/dts/hg553.dts +++ b/target/linux/brcm63xx/dts/hg553.dts @@ -79,8 +79,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/hg556a-a.dts b/target/linux/brcm63xx/dts/hg556a-a.dts index 3abfc4b574..71ae3deafa 100644 --- a/target/linux/brcm63xx/dts/hg556a-a.dts +++ b/target/linux/brcm63xx/dts/hg556a-a.dts @@ -105,8 +105,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/hg556a-b.dts b/target/linux/brcm63xx/dts/hg556a-b.dts index c88825f9e4..203ca995ac 100644 --- a/target/linux/brcm63xx/dts/hg556a-b.dts +++ b/target/linux/brcm63xx/dts/hg556a-b.dts @@ -105,8 +105,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/hg556a-c.dts b/target/linux/brcm63xx/dts/hg556a-c.dts index 896ddf1c80..90cc8a507c 100644 --- a/target/linux/brcm63xx/dts/hg556a-c.dts +++ b/target/linux/brcm63xx/dts/hg556a-c.dts @@ -100,8 +100,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/hg622.dts b/target/linux/brcm63xx/dts/hg622.dts index dc44dd36ca..f34009a28f 100644 --- a/target/linux/brcm63xx/dts/hg622.dts +++ b/target/linux/brcm63xx/dts/hg622.dts @@ -54,8 +54,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/hg655b.dts b/target/linux/brcm63xx/dts/hg655b.dts index 4307517315..6766b43eca 100644 --- a/target/linux/brcm63xx/dts/hg655b.dts +++ b/target/linux/brcm63xx/dts/hg655b.dts @@ -72,8 +72,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/homehub2a.dts b/target/linux/brcm63xx/dts/homehub2a.dts index a16441af0c..dfc3f1380b 100644 --- a/target/linux/brcm63xx/dts/homehub2a.dts +++ b/target/linux/brcm63xx/dts/homehub2a.dts @@ -139,8 +139,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/magic.dts b/target/linux/brcm63xx/dts/magic.dts index f9331d4539..2c187b7994 100644 --- a/target/linux/brcm63xx/dts/magic.dts +++ b/target/linux/brcm63xx/dts/magic.dts @@ -57,8 +57,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts index 4874bc1523..76c55b4fd0 100644 --- a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts +++ b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts @@ -102,8 +102,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/nb4-ser-r0.dts b/target/linux/brcm63xx/dts/nb4-ser-r0.dts index a6dc102c03..09b34cc9de 100644 --- a/target/linux/brcm63xx/dts/nb4-ser-r0.dts +++ b/target/linux/brcm63xx/dts/nb4-ser-r0.dts @@ -102,8 +102,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/nb6-ser-r0.dts b/target/linux/brcm63xx/dts/nb6-ser-r0.dts index 2866afd2d1..5ebfca6fb4 100644 --- a/target/linux/brcm63xx/dts/nb6-ser-r0.dts +++ b/target/linux/brcm63xx/dts/nb6-ser-r0.dts @@ -64,8 +64,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts index 02749ce6ef..20d820bd18 100644 --- a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts +++ b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts @@ -62,8 +62,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/r1000h.dts b/target/linux/brcm63xx/dts/r1000h.dts index 3b3ac5792f..9434060da1 100644 --- a/target/linux/brcm63xx/dts/r1000h.dts +++ b/target/linux/brcm63xx/dts/r1000h.dts @@ -77,8 +77,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/r5010unv2.dts b/target/linux/brcm63xx/dts/r5010unv2.dts index fd87bef708..c134d52ca8 100644 --- a/target/linux/brcm63xx/dts/r5010unv2.dts +++ b/target/linux/brcm63xx/dts/r5010unv2.dts @@ -81,12 +81,10 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; cfe@0 { reg = <0x000000 0x010000>; diff --git a/target/linux/brcm63xx/dts/rg100a.dts b/target/linux/brcm63xx/dts/rg100a.dts index 9ae128eb7f..7b0e4b2763 100644 --- a/target/linux/brcm63xx/dts/rg100a.dts +++ b/target/linux/brcm63xx/dts/rg100a.dts @@ -39,8 +39,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/rta1025w.dts b/target/linux/brcm63xx/dts/rta1025w.dts index f6f8a08927..122e049b3c 100644 --- a/target/linux/brcm63xx/dts/rta1025w.dts +++ b/target/linux/brcm63xx/dts/rta1025w.dts @@ -17,8 +17,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/rta1320.dts b/target/linux/brcm63xx/dts/rta1320.dts index 3783c8db0e..b249fbd081 100644 --- a/target/linux/brcm63xx/dts/rta1320.dts +++ b/target/linux/brcm63xx/dts/rta1320.dts @@ -39,8 +39,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/rta770bw.dts b/target/linux/brcm63xx/dts/rta770bw.dts index d40cfd28d3..89cf87248f 100644 --- a/target/linux/brcm63xx/dts/rta770bw.dts +++ b/target/linux/brcm63xx/dts/rta770bw.dts @@ -55,8 +55,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/rta770w.dts b/target/linux/brcm63xx/dts/rta770w.dts index 034faaf394..6a1dfd2f43 100644 --- a/target/linux/brcm63xx/dts/rta770w.dts +++ b/target/linux/brcm63xx/dts/rta770w.dts @@ -55,8 +55,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/spw303v.dts b/target/linux/brcm63xx/dts/spw303v.dts index 3df9820920..3317fc85eb 100644 --- a/target/linux/brcm63xx/dts/spw303v.dts +++ b/target/linux/brcm63xx/dts/spw303v.dts @@ -66,8 +66,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/spw500v.dts b/target/linux/brcm63xx/dts/spw500v.dts index ceaa569b99..c55fdf8402 100644 --- a/target/linux/brcm63xx/dts/spw500v.dts +++ b/target/linux/brcm63xx/dts/spw500v.dts @@ -57,8 +57,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/td-w8900gb.dts b/target/linux/brcm63xx/dts/td-w8900gb.dts index 6b7eecec33..513c40ac66 100644 --- a/target/linux/brcm63xx/dts/td-w8900gb.dts +++ b/target/linux/brcm63xx/dts/td-w8900gb.dts @@ -57,8 +57,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/usr9108.dts b/target/linux/brcm63xx/dts/usr9108.dts index 5c9309334d..987fc59427 100644 --- a/target/linux/brcm63xx/dts/usr9108.dts +++ b/target/linux/brcm63xx/dts/usr9108.dts @@ -30,8 +30,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/v2110.dts b/target/linux/brcm63xx/dts/v2110.dts index 3ae37453b8..a400d5ab9a 100644 --- a/target/linux/brcm63xx/dts/v2110.dts +++ b/target/linux/brcm63xx/dts/v2110.dts @@ -56,8 +56,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/v2500v-bb.dts b/target/linux/brcm63xx/dts/v2500v-bb.dts index 243cffa773..7d47683baf 100644 --- a/target/linux/brcm63xx/dts/v2500v-bb.dts +++ b/target/linux/brcm63xx/dts/v2500v-bb.dts @@ -56,8 +56,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/vg50.dts b/target/linux/brcm63xx/dts/vg50.dts index e7b5dbdbbb..7f11da2bd8 100644 --- a/target/linux/brcm63xx/dts/vg50.dts +++ b/target/linux/brcm63xx/dts/vg50.dts @@ -47,8 +47,6 @@ #address-cells = <1>; #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "brcm,bcm963xx-cfe-nor-partitions"; }; diff --git a/target/linux/brcm63xx/dts/vh4032n.dts b/target/linux/brcm63xx/dts/vh4032n.dts index 6dee875015..1296fbf14b 100644 --- a/target/linux/brcm63xx/dts/vh4032n.dts +++ b/target/linux/brcm63xx/dts/vh4032n.dts @@ -83,8 +83,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/vr-3025u.dts b/target/linux/brcm63xx/dts/vr-3025u.dts index 6201718d7e..126ca94fa7 100644 --- a/target/linux/brcm63xx/dts/vr-3025u.dts +++ b/target/linux/brcm63xx/dts/vr-3025u.dts @@ -57,8 +57,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/vr-3025un.dts b/target/linux/brcm63xx/dts/vr-3025un.dts index a3d12a707c..5e57036d02 100644 --- a/target/linux/brcm63xx/dts/vr-3025un.dts +++ b/target/linux/brcm63xx/dts/vr-3025un.dts @@ -57,8 +57,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/vr-3026e.dts b/target/linux/brcm63xx/dts/vr-3026e.dts index 0ffbb7d825..7439a2e62c 100644 --- a/target/linux/brcm63xx/dts/vr-3026e.dts +++ b/target/linux/brcm63xx/dts/vr-3026e.dts @@ -57,8 +57,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/target/linux/brcm63xx/dts/wap-5813n.dts b/target/linux/brcm63xx/dts/wap-5813n.dts index b50ff237ef..9a66895bd5 100644 --- a/target/linux/brcm63xx/dts/wap-5813n.dts +++ b/target/linux/brcm63xx/dts/wap-5813n.dts @@ -67,8 +67,6 @@ &pflash { status = "ok"; - linux,part-probe = "bcm63xxpart"; - partitions { compatible = "fixed-partitions"; #address-cells = <1>;