mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 22:14:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jagan Teki
2020-07-15 14:04:12 +05:30
committed by Heiko Stuebner
parent fb082df317
commit c2f343510d
2 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi
View File

@@ -17,29 +17,6 @@ &gmac {
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 @@ &uart0 {
&uart2 {
status = "okay";
};
&pinctrl {
hym8563 {
hym8563_int: hym8563-int {
rockchip,pins =
<4 RK_PD6 0 &pcfg_pull_up>;
};
};
};

29
arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
View File

@@ -297,6 +297,29 @@ regulator-state-mem {
};
};
&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 @@ &tsadc {
};
&pinctrl {
hym8563 {
hym8563_int: hym8563-int {
rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>;
};
};
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =