ARM: dts: rockchip: dalang-carrier: Move i2c nodes into SOM

I2C nodes and associated slave devices defined in Carrier board
are specific to rk3399pro vmrac SOM.

So, move them into SOM dtsi.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Link: https://lore.kernel.org/r/20200715083418.112003-2-jagan@amarulasolutions.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi
index df3712a..176b53b 100644 (file)
--- a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi
+++ b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi
@@ -17,29 +17,6 @@
        status = "okay";
 };
 
-&i2c1 {
-       status = "okay";
-       i2c-scl-rising-time-ns = <140>;
-       i2c-scl-falling-time-ns = <30>;
-};
-
-&i2c2 {
-       status = "okay";
-       clock-frequency = <400000>;
-
-       hym8563: hym8563@51 {
-               compatible = "haoyu,hym8563";
-               reg = <0x51>;
-               #clock-cells = <0>;
-               clock-frequency = <32768>;
-               clock-output-names = "hym8563";
-               pinctrl-names = "default";
-               pinctrl-0 = <&hym8563_int>;
-               interrupt-parent = <&gpio4>;
-               interrupts = <30 IRQ_TYPE_LEVEL_LOW>;
-       };
-};
-
 &pwm0 {
        status = "okay";
 };
@@ -70,12 +47,3 @@
 &uart2 {
        status = "okay";
 };
-
-&pinctrl {
-       hym8563 {
-               hym8563_int: hym8563-int {
-                       rockchip,pins =
-                               <4 RK_PD6 0 &pcfg_pull_up>;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
index 0a51633..e115381 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
@@ -297,6 +297,29 @@
        };
 };
 
+&i2c1 {
+       i2c-scl-falling-time-ns = <30>;
+       i2c-scl-rising-time-ns = <140>;
+       status = "okay";
+};
+
+&i2c2 {
+       clock-frequency = <400000>;
+       status = "okay";
+
+       hym8563: hym8563@51 {
+               compatible = "haoyu,hym8563";
+               reg = <0x51>;
+               #clock-cells = <0>;
+               clock-frequency = <32768>;
+               clock-output-names = "hym8563";
+               pinctrl-names = "default";
+               pinctrl-0 = <&hym8563_int>;
+               interrupt-parent = <&gpio4>;
+               interrupts = <RK_PD6 IRQ_TYPE_LEVEL_LOW>;
+       };
+};
+
 &io_domains {
        status = "okay";
        bt656-supply = <&vcca_1v8>;
@@ -324,6 +347,12 @@
 };
 
 &pinctrl {
+       hym8563 {
+               hym8563_int: hym8563-int {
+                       rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>;
+               };
+       };
+
        pmic {
                pmic_int_l: pmic-int-l {
                        rockchip,pins =