This patch cleans up duplicated main_i2c node from r5 file. Since this node needs bootph property, So add in common file.
Signed-off-by: Udit Kumar u-kumar1@ti.com --- .../k3-j7200-common-proc-board-u-boot.dtsi | 16 --------------- arch/arm/dts/k3-j7200-common-proc-board.dts | 2 ++ .../arm/dts/k3-j7200-r5-common-proc-board.dts | 20 ------------------- 3 files changed, 2 insertions(+), 36 deletions(-)
diff --git a/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi index 4c92223d2c..6ac68720ed 100644 --- a/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +++ b/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi @@ -110,22 +110,6 @@ bootph-pre-ram; };
-&wkup_i2c0 { - bootph-pre-ram; -}; - -&main_i2c0 { - bootph-pre-ram; -}; - -&main_i2c0_pins_default { - bootph-pre-ram; -}; - -&exp2 { - bootph-pre-ram; -}; - &mcu_cpsw { reg = <0x0 0x46000000 0x0 0x200000>, <0x0 0x40f00200 0x0 0x8>; diff --git a/arch/arm/dts/k3-j7200-common-proc-board.dts b/arch/arm/dts/k3-j7200-common-proc-board.dts index 4fd2bb5bd6..77f9922260 100644 --- a/arch/arm/dts/k3-j7200-common-proc-board.dts +++ b/arch/arm/dts/k3-j7200-common-proc-board.dts @@ -243,6 +243,7 @@
&main_i2c0 { status = "okay"; + bootph-pre-ram; pinctrl-names = "default"; pinctrl-0 = <&main_i2c0_pins_default>; clock-frequency = <400000>; @@ -255,6 +256,7 @@ };
exp2: gpio@22 { + bootph-pre-ram; compatible = "ti,tca6424"; reg = <0x22>; gpio-controller; diff --git a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts index 144c00efbe..c247ad1b2e 100644 --- a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts +++ b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts @@ -161,26 +161,6 @@ bootph-pre-ram; };
-&main_i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&main_i2c0_pins_default>; - clock-frequency = <400000>; - - exp1: gpio@20 { - compatible = "ti,tca6416"; - reg = <0x20>; - gpio-controller; - #gpio-cells = <2>; - }; - - exp2: gpio@22 { - compatible = "ti,tca6424"; - reg = <0x22>; - gpio-controller; - #gpio-cells = <2>; - }; -}; - &hbmc { status = "okay"; pinctrl-names = "default";