Skip to content

Commit

Permalink
arm64: dts: split out a shared imx8mq-librem5-r3.dtsi description
Browse files Browse the repository at this point in the history
The Librem 5 r3 ("Dogwood") and r4 ("Evergreen") revisions are quite
similar. Add a shared imx8mq-librem5-r3.dtsi description to be included
in r3 and later dts files in order to avoid duplication.

This is no change in the descriptions but only refactoring.

Signed-off-by: Martin Kepplinger <[email protected]>
Signed-off-by: Shawn Guo <[email protected]>
  • Loading branch information
merge authored and Shawn Guo committed Nov 22, 2021
1 parent e3f7750 commit b43e6c0
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 37 deletions.
25 changes: 2 additions & 23 deletions arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dts
Original file line number Diff line number Diff line change
@@ -1,37 +1,16 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2020 Purism SPC <[email protected]>
// Copyright (C) 2021 Purism SPC <[email protected]>

/dts-v1/;

#include "imx8mq-librem5.dtsi"

/ {
model = "Purism Librem 5r3";
compatible = "purism,librem5r3", "purism,librem5", "fsl,imx8mq";
};
#include "imx8mq-librem5-r3.dtsi"

&a53_opp_table {
opp-1000000000 {
opp-microvolt = <1000000>;
};
};

&accel_gyro {
mount-matrix = "1", "0", "0",
"0", "1", "0",
"0", "0", "-1";
};

&bq25895 {
ti,battery-regulation-voltage = <4200000>; /* uV */
ti,charge-current = <1500000>; /* uA */
ti,termination-current = <144000>; /* uA */
};

&buck3_reg {
regulator-always-on;
};

&proximity {
proximity-near-level = <25>;
};
32 changes: 32 additions & 0 deletions arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2021 Purism SPC <[email protected]>

/dts-v1/;

/*
* This file describes hardware that is shared among r3 ("Dogwood") and
* later revisions of the Librem 5 so it has to be included in dts there.
*/

#include "imx8mq-librem5.dtsi"

/ {
model = "Purism Librem 5r3";
compatible = "purism,librem5r3", "purism,librem5", "fsl,imx8mq";
};

&accel_gyro {
mount-matrix = "1", "0", "0",
"0", "1", "0",
"0", "0", "-1";
};

&bq25895 {
ti,battery-regulation-voltage = <4200000>; /* uV */
ti,charge-current = <1500000>; /* uA */
ti,termination-current = <144000>; /* uA */
};

&proximity {
proximity-near-level = <25>;
};
16 changes: 2 additions & 14 deletions arch/arm64/boot/dts/freescale/imx8mq-librem5-r4.dts
Original file line number Diff line number Diff line change
@@ -1,31 +1,19 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
// Copyright (C) 2020 Purism SPC <[email protected]>
// Copyright (C) 2021 Purism SPC <[email protected]>

/dts-v1/;

#include "imx8mq-librem5.dtsi"
#include "imx8mq-librem5-r3.dtsi"

/ {
model = "Purism Librem 5r4";
compatible = "purism,librem5r4", "purism,librem5", "fsl,imx8mq";
};

&accel_gyro {
mount-matrix = "1", "0", "0",
"0", "1", "0",
"0", "0", "-1";
};

&bat {
maxim,rsns-microohm = <1667>;
};

&bq25895 {
ti,battery-regulation-voltage = <4200000>; /* uV */
ti,charge-current = <1500000>; /* uA */
ti,termination-current = <144000>; /* uA */
};

&led_backlight {
led-max-microamp = <25000>;
};
Expand Down

0 comments on commit b43e6c0

Please sign in to comment.