[PATCH 1/2] rockchip: dts: tinker: move i2c node to shared device tree

The I2C EEPROM is present on Tinker Board S as well. Move the i2c node to the shared, U-Boot specific rk3288-tinker-u-boot.dtsi device tree.
Cc: Jonas Karlman jonas@kwiboo.se Signed-off-by: Stefan Agner stefan@agner.ch --- arch/arm/dts/rk3288-tinker-u-boot.dtsi | 7 +++++++ arch/arm/dts/rk3288-tinker.dts | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi index 732aa4f91f..56d10c82ec 100644 --- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi @@ -17,6 +17,13 @@ rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>; };
+&i2c2 { + m24c08@50 { + compatible = "at,24c08", "i2c-eeprom"; + reg = <0x50>; + }; +}; + &pinctrl { u-boot,dm-pre-reloc; }; diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts index 4b8405fd82..338670123b 100644 --- a/arch/arm/dts/rk3288-tinker.dts +++ b/arch/arm/dts/rk3288-tinker.dts @@ -35,10 +35,3 @@ vbus-supply = <&vcc5v0_host>; status = "okay"; }; - -&i2c2 { - m24c08@50 { - compatible = "at,24c08", "i2c-eeprom"; - reg = <0x50>; - }; -};

The property reg-shift with the same value is present in the base device tree already. Remove unnecessary node from rk3288-tinker.dts.
Signed-off-by: Stefan Agner stefan@agner.ch --- arch/arm/dts/rk3288-tinker.dts | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts index 338670123b..8b1848c310 100644 --- a/arch/arm/dts/rk3288-tinker.dts +++ b/arch/arm/dts/rk3288-tinker.dts @@ -27,10 +27,6 @@ status = "okay"; };
-&uart2 { - reg-shift = <2>; -}; - &usb_host1 { vbus-supply = <&vcc5v0_host>; status = "okay";

On 2020/9/4 下午10:11, Stefan Agner wrote:
The property reg-shift with the same value is present in the base device tree already. Remove unnecessary node from rk3288-tinker.dts.
Signed-off-by: Stefan Agner stefan@agner.ch
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks,
- Kever
arch/arm/dts/rk3288-tinker.dts | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts index 338670123b..8b1848c310 100644 --- a/arch/arm/dts/rk3288-tinker.dts +++ b/arch/arm/dts/rk3288-tinker.dts @@ -27,10 +27,6 @@ status = "okay"; };
-&uart2 {
- reg-shift = <2>;
-};
- &usb_host1 { vbus-supply = <&vcc5v0_host>; status = "okay";

On 2020/9/4 下午10:11, Stefan Agner wrote:
The I2C EEPROM is present on Tinker Board S as well. Move the i2c node to the shared, U-Boot specific rk3288-tinker-u-boot.dtsi device tree.
Cc: Jonas Karlman jonas@kwiboo.se Signed-off-by: Stefan Agner stefan@agner.ch
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks,
- Kever
arch/arm/dts/rk3288-tinker-u-boot.dtsi | 7 +++++++ arch/arm/dts/rk3288-tinker.dts | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/dts/rk3288-tinker-u-boot.dtsi b/arch/arm/dts/rk3288-tinker-u-boot.dtsi index 732aa4f91f..56d10c82ec 100644 --- a/arch/arm/dts/rk3288-tinker-u-boot.dtsi +++ b/arch/arm/dts/rk3288-tinker-u-boot.dtsi @@ -17,6 +17,13 @@ rockchip,sdram-params = <0x20d266a4 0x5b6 2 533000000 6 9 0>; };
+&i2c2 {
- m24c08@50 {
compatible = "at,24c08", "i2c-eeprom";
reg = <0x50>;
- };
+};
- &pinctrl { u-boot,dm-pre-reloc; };
diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts index 4b8405fd82..338670123b 100644 --- a/arch/arm/dts/rk3288-tinker.dts +++ b/arch/arm/dts/rk3288-tinker.dts @@ -35,10 +35,3 @@ vbus-supply = <&vcc5v0_host>; status = "okay"; };
-&i2c2 {
- m24c08@50 {
compatible = "at,24c08", "i2c-eeprom";
reg = <0x50>;
- };
-};
participants (2)
-
Kever Yang
-
Stefan Agner