Hi!
Here's a series that is of the "documentation" kind. It fixes things
that don't really need fixing, but the fixes are correct none-the-less
and should prevent possible confusion.
Cheers,
Peter
Peter Rosin (3):
ARM: dts: at91: nattis: use up-to-date mtd partitions
ARM: dts: at91: nattis: add lvds-encoder
ARM: dts: at91: tse850: make the sound dai cell count explicit
arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 56 ++++++++++++++++++++++-------
arch/arm/boot/dts/at91-tse850-3.dts | 1 +
2 files changed, 44 insertions(+), 13 deletions(-)
--
2.11.0
The lvds encoder chip was omitted by oversight. Add it.
Fixes: 0e4323899973 ("ARM: dts: at91: add devicetree for the Axentia Nattis with Natte power")
Signed-off-by: Peter Rosin <[email protected]>
---
arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 31 ++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
index 4882bd6d38c1..3f08cc2aeae8 100644
--- a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
+++ b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
@@ -109,7 +109,32 @@
port {
panel_input: endpoint {
- remote-endpoint = <&hlcdc_panel_output>;
+ remote-endpoint = <&lvds_encoder_output>;
+ };
+ };
+ };
+
+ lvds-encoder {
+ compatible = "lvds-encoder";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+
+ lvds_encoder_input: endpoint {
+ remote-endpoint = <&hlcdc_output>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+
+ lvds_encoder_output: endpoint {
+ remote-endpoint = <&panel_input>;
+ };
};
};
};
@@ -176,8 +201,8 @@
&pinctrl_lcd_hipow0>;
port@0 {
- hlcdc_panel_output: endpoint {
- remote-endpoint = <&panel_input>;
+ hlcdc_output: endpoint {
+ remote-endpoint = <&lvds_encoder_input>;
};
};
};
--
2.11.0
The node is referred to as a DAI from the sound node and should
therefore have a #sound-dai-cells property.
Fixes: 21dd0ece34c2 ("ARM: dts: at91: add devicetree for the Axentia TSE-850")
Signed-off-by: Peter Rosin <[email protected]>
---
arch/arm/boot/dts/at91-tse850-3.dts | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/at91-tse850-3.dts b/arch/arm/boot/dts/at91-tse850-3.dts
index 9b82cc8843e1..16e6e60aa67a 100644
--- a/arch/arm/boot/dts/at91-tse850-3.dts
+++ b/arch/arm/boot/dts/at91-tse850-3.dts
@@ -234,6 +234,7 @@
compatible = "ti,pcm5142";
reg = <0x4c>;
+ #sound-dai-cells = <0>;
AVDD-supply = <®_3v3>;
DVDD-supply = <®_3v3>;
--
2.11.0
The nattis currently relies on the cmdline to correctly configure the
MTD partition table, and the one given in the device tree is simply
ignored. Which is fortunate, since the device tree partition table is
bonkers and does not match reality.
So, in order to avoid confusion, fix the device tree partition table
to match what is expected (i.e. what is normally provided on the cmdline).
In particular, the rootfs partition should be mtd6.
Fixes: 0e4323899973 ("ARM: dts: at91: add devicetree for the Axentia Nattis with Natte power")
Signed-off-by: Peter Rosin <[email protected]>
---
arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
index 3ea1d26e1c68..4882bd6d38c1 100644
--- a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
+++ b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
@@ -216,24 +216,29 @@
reg = <0x0 0x40000>;
};
- bootloader@40000 {
- label = "bootloader";
- reg = <0x40000 0x80000>;
+ barebox@40000 {
+ label = "barebox";
+ reg = <0x40000 0x60000>;
};
- bootloaderenv@c0000 {
- label = "bootloader env";
- reg = <0xc0000 0xc0000>;
+ bareboxenv@c0000 {
+ label = "bareboxenv";
+ reg = <0xc0000 0x40000>;
};
- dtb@180000 {
- label = "device tree";
- reg = <0x180000 0x80000>;
+ bareboxenv2@100000 {
+ label = "bareboxenv2";
+ reg = <0x100000 0x40000>;
+ };
+
+ oftree@180000 {
+ label = "oftree";
+ reg = <0x180000 0x20000>;
};
kernel@200000 {
label = "kernel";
- reg = <0x200000 0x600000>;
+ reg = <0x200000 0x500000>;
};
rootfs@800000 {
--
2.11.0
Hi,
On 16/01/2018 at 17:08:33 +0100, Peter Rosin wrote:
> The nattis currently relies on the cmdline to correctly configure the
> MTD partition table, and the one given in the device tree is simply
> ignored. Which is fortunate, since the device tree partition table is
> bonkers and does not match reality.
>
Shouldn't it be simply removed then?
> So, in order to avoid confusion, fix the device tree partition table
> to match what is expected (i.e. what is normally provided on the cmdline).
> In particular, the rootfs partition should be mtd6.
>
> Fixes: 0e4323899973 ("ARM: dts: at91: add devicetree for the Axentia Nattis with Natte power")
> Signed-off-by: Peter Rosin <[email protected]>
> ---
> arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 25 +++++++++++++++----------
> 1 file changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
> index 3ea1d26e1c68..4882bd6d38c1 100644
> --- a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
> +++ b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
> @@ -216,24 +216,29 @@
> reg = <0x0 0x40000>;
> };
>
> - bootloader@40000 {
> - label = "bootloader";
> - reg = <0x40000 0x80000>;
> + barebox@40000 {
> + label = "barebox";
> + reg = <0x40000 0x60000>;
> };
>
> - bootloaderenv@c0000 {
> - label = "bootloader env";
> - reg = <0xc0000 0xc0000>;
> + bareboxenv@c0000 {
> + label = "bareboxenv";
> + reg = <0xc0000 0x40000>;
> };
>
> - dtb@180000 {
> - label = "device tree";
> - reg = <0x180000 0x80000>;
> + bareboxenv2@100000 {
> + label = "bareboxenv2";
> + reg = <0x100000 0x40000>;
> + };
> +
> + oftree@180000 {
> + label = "oftree";
> + reg = <0x180000 0x20000>;
> };
>
> kernel@200000 {
> label = "kernel";
> - reg = <0x200000 0x600000>;
> + reg = <0x200000 0x500000>;
> };
>
> rootfs@800000 {
> --
> 2.11.0
>
--
Alexandre Belloni, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
On 2018-01-16 17:30, Alexandre Belloni wrote:
> Hi,
>
> On 16/01/2018 at 17:08:33 +0100, Peter Rosin wrote:
>> The nattis currently relies on the cmdline to correctly configure the
>> MTD partition table, and the one given in the device tree is simply
>> ignored. Which is fortunate, since the device tree partition table is
>> bonkers and does not match reality.
>>
>
> Shouldn't it be simply removed then?
Hmm, that's a thought! Less is more, and all that. However, I think I
rather have it in the device tree anyway. Then I have the option to
drop a lot of tedious cmdline args in the future.
Cheers,
Peter