| Message ID | 87fb5ab9674efaf5dbf5fed779926eccf248306b.1577953408.git.baruch@tkos.co.il (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 5c04ad85627f64d278826fe41aae76896b406e37 |
| Headers | show |
| Series | [1/3] ARM: armada-38x-solidrun-microsom: move i2c0 to SOM DT | expand |
Hi Baruch, > Move the i2c0 controller properties to the SOM .dtsi. This is > preparation for adding an i2c device at the SOM level. > > Cc: Dennis Gilmore <dennis@ausil.us> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> Applied on mvebu/dt Thanks, Gregory > --- > arch/arm/boot/dts/armada-388-clearfog.dtsi | 5 ----- > arch/arm/boot/dts/armada-388-helios4.dts | 5 ----- > arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 7 +++++++ > 3 files changed, 7 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi > index 0d81600ca247..a6edea6f50d1 100644 > --- a/arch/arm/boot/dts/armada-388-clearfog.dtsi > +++ b/arch/arm/boot/dts/armada-388-clearfog.dtsi > @@ -111,11 +111,6 @@ ð2 { > }; > > &i2c0 { > - clock-frequency = <400000>; > - pinctrl-0 = <&i2c0_pins>; > - pinctrl-names = "default"; > - status = "okay"; > - > /* > * PCA9655 GPIO expander, up to 1MHz clock. > * 0-CON3 CLKREQ# > diff --git a/arch/arm/boot/dts/armada-388-helios4.dts b/arch/arm/boot/dts/armada-388-helios4.dts > index 705adfa8c680..fb49df2a3bce 100644 > --- a/arch/arm/boot/dts/armada-388-helios4.dts > +++ b/arch/arm/boot/dts/armada-388-helios4.dts > @@ -140,11 +140,6 @@ usb3_phy: usb3-phy { > soc { > internal-regs { > i2c@11000 { > - clock-frequency = <400000>; > - pinctrl-0 = <&i2c0_pins>; > - pinctrl-names = "default"; > - status = "okay"; > - > /* > * PCA9655 GPIO expander, up to 1MHz clock. > * 0-Board Revision bit 0 # > diff --git a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi > index 3a7f9c1ac346..cd39312fb50d 100644 > --- a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi > +++ b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi > @@ -71,6 +71,13 @@ phy_dedicated: ethernet-phy@0 { > }; > }; > > +&i2c0 { > + clock-frequency = <400000>; > + pinctrl-0 = <&i2c0_pins>; > + pinctrl-names = "default"; > + status = "okay"; > +}; > + > &pinctrl { > microsom_phy_clk_pins: microsom-phy-clk-pins { > marvell,pins = "mpp45"; > -- > 2.24.1 >
diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi index 0d81600ca247..a6edea6f50d1 100644 --- a/arch/arm/boot/dts/armada-388-clearfog.dtsi +++ b/arch/arm/boot/dts/armada-388-clearfog.dtsi @@ -111,11 +111,6 @@ ð2 { }; &i2c0 { - clock-frequency = <400000>; - pinctrl-0 = <&i2c0_pins>; - pinctrl-names = "default"; - status = "okay"; - /* * PCA9655 GPIO expander, up to 1MHz clock. * 0-CON3 CLKREQ# diff --git a/arch/arm/boot/dts/armada-388-helios4.dts b/arch/arm/boot/dts/armada-388-helios4.dts index 705adfa8c680..fb49df2a3bce 100644 --- a/arch/arm/boot/dts/armada-388-helios4.dts +++ b/arch/arm/boot/dts/armada-388-helios4.dts @@ -140,11 +140,6 @@ usb3_phy: usb3-phy { soc { internal-regs { i2c@11000 { - clock-frequency = <400000>; - pinctrl-0 = <&i2c0_pins>; - pinctrl-names = "default"; - status = "okay"; - /* * PCA9655 GPIO expander, up to 1MHz clock. * 0-Board Revision bit 0 # diff --git a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi index 3a7f9c1ac346..cd39312fb50d 100644 --- a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi +++ b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi @@ -71,6 +71,13 @@ phy_dedicated: ethernet-phy@0 { }; }; +&i2c0 { + clock-frequency = <400000>; + pinctrl-0 = <&i2c0_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + &pinctrl { microsom_phy_clk_pins: microsom-phy-clk-pins { marvell,pins = "mpp45";
Move the i2c0 controller properties to the SOM .dtsi. This is preparation for adding an i2c device at the SOM level. Cc: Dennis Gilmore <dennis@ausil.us> Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- arch/arm/boot/dts/armada-388-clearfog.dtsi | 5 ----- arch/arm/boot/dts/armada-388-helios4.dts | 5 ----- arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 7 +++++++ 3 files changed, 7 insertions(+), 10 deletions(-)