From dd6038d954ad9d7da21611a43a7ce66762fe1622 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Sat, 4 Apr 2020 11:23:20 -0500 Subject: [PATCH] boards: dts: Configure lpc flexcomm nodes as i2c at the board level Don't assume in the soc level device trees that flexcomm nodes will always be configured as i2c. Instead, configure flexcomm nodes at the board level for lpcxpresso55s69 and lpcxpresso54114 boards. Signed-off-by: Maureen Helm --- boards/arm/lpcxpresso54114/lpcxpresso54114.dtsi | 7 ++++++- boards/arm/lpcxpresso54114/lpcxpresso54114_m4.dts | 2 +- boards/arm/lpcxpresso55s69/lpcxpresso55s69.dtsi | 7 ++++++- boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0.dts | 2 +- dts/arm/nxp/nxp_lpc54xxx.dtsi | 9 +++------ dts/arm/nxp/nxp_lpc55S6x.dtsi | 9 +++------ 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/boards/arm/lpcxpresso54114/lpcxpresso54114.dtsi b/boards/arm/lpcxpresso54114/lpcxpresso54114.dtsi index b4a85d41fca..df4e6ce8239 100644 --- a/boards/arm/lpcxpresso54114/lpcxpresso54114.dtsi +++ b/boards/arm/lpcxpresso54114/lpcxpresso54114.dtsi @@ -31,6 +31,11 @@ }; }; -arduino_i2c: &i2c4 {}; +arduino_i2c: &flexcomm4 { + compatible = "nxp,lpc-i2c"; + clock-frequency = ; + #address-cells = <1>; + #size-cells = <0>; +}; arduino_spi: &spi5 {}; diff --git a/boards/arm/lpcxpresso54114/lpcxpresso54114_m4.dts b/boards/arm/lpcxpresso54114/lpcxpresso54114_m4.dts index a40f9e6d9b7..e3c874e6d5f 100644 --- a/boards/arm/lpcxpresso54114/lpcxpresso54114_m4.dts +++ b/boards/arm/lpcxpresso54114/lpcxpresso54114_m4.dts @@ -68,7 +68,7 @@ status = "okay"; }; -&i2c4 { +&flexcomm4 { status = "okay"; }; diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69.dtsi b/boards/arm/lpcxpresso55s69/lpcxpresso55s69.dtsi index 91bd8241e0c..1685c31c647 100644 --- a/boards/arm/lpcxpresso55s69/lpcxpresso55s69.dtsi +++ b/boards/arm/lpcxpresso55s69/lpcxpresso55s69.dtsi @@ -31,7 +31,12 @@ }; }; -arduino_i2c: &i2c4 { +arduino_i2c: &flexcomm4 { + compatible = "nxp,lpc-i2c"; + clock-frequency = ; + #address-cells = <1>; + #size-cells = <0>; + mma8652fc@1d { compatible = "nxp,fxos8700","nxp,mma8652fc"; reg = <0x1d>; diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0.dts b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0.dts index daf019f92ed..884f3010d26 100644 --- a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0.dts +++ b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_cpu0.dts @@ -69,7 +69,7 @@ status = "okay"; }; -&i2c4 { +&flexcomm4 { status = "okay"; }; diff --git a/dts/arm/nxp/nxp_lpc54xxx.dtsi b/dts/arm/nxp/nxp_lpc54xxx.dtsi index 466a7feac0e..d323d5ea547 100644 --- a/dts/arm/nxp/nxp_lpc54xxx.dtsi +++ b/dts/arm/nxp/nxp_lpc54xxx.dtsi @@ -92,15 +92,12 @@ status = "disabled"; }; - i2c4: i2c@4008a000 { - compatible = "nxp,lpc-i2c"; - clock-frequency = ; + flexcomm4: flexcomm@4008a000 { + compatible = "nxp,lpc-flexcomm"; reg = <0x4008a000 0x1000>; interrupts = <18 0>; - label = "I2C_4"; + label = "FLEXCOMM_4"; status = "disabled"; - #address-cells = <1>; - #size-cells = <0>; }; spi5: spi@40096000 { diff --git a/dts/arm/nxp/nxp_lpc55S6x.dtsi b/dts/arm/nxp/nxp_lpc55S6x.dtsi index 949e34dc7ef..8720ca0631a 100644 --- a/dts/arm/nxp/nxp_lpc55S6x.dtsi +++ b/dts/arm/nxp/nxp_lpc55S6x.dtsi @@ -144,15 +144,12 @@ #gpio-cells = <2>; }; - i2c4: i2c@5008a000 { - compatible = "nxp,lpc-i2c"; - clock-frequency = ; + flexcomm4: flexcomm@5008a000 { + compatible = "nxp,lpc-flexcomm"; reg = <0x5008a000 0x1000>; interrupts = <18 0>; - label = "I2C_4"; + label = "FLEXCOMM_4"; status = "disabled"; - #address-cells = <1>; - #size-cells = <0>; }; spi8: spi@5009f000 {