diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-11-18 14:07:13 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-11-23 19:21:52 +0300 |
| commit | a9f8cda32a3acc3150755fe973f7fa1867a7a5d6 (patch) | |
| tree | 6bb28e5628a0385c727d236aa26bae06dfd8f5ba /arch/arm/boot | |
| parent | 678e75d3e5526bee1b09f0e916096ec7f7d35c8e (diff) | |
| download | linux-a9f8cda32a3acc3150755fe973f7fa1867a7a5d6.tar.xz | |
ARM: dts: sunxi: Update simplefb nodes so that u-boot can find them
Review of the u-boot sunxi simplefb patches has led to the decision that
u-boot should not use a specific path to find the nodes as this goes contrary
to how devicetree usually works.
Instead a platform specific compatible + properties should be used for this.
The simplefb bindings have already been updated to reflect this, this patch
brings the sunxi devicetree files in line with the new binding, and the
actual u-boot implementation as it is going upstream.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/sun4i-a10.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun5i-a10s.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun7i-a20.dtsi | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 02d611862a99..e3ab942fd148 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -32,8 +32,9 @@ #size-cells = <1>; ranges; - framebuffer0-hdmi { - compatible = "simple-framebuffer"; + framebuffer@0 { + compatible = "allwinner,simple-framebuffer", "simple-framebuffer"; + allwinner,pipeline = "de_be0-lcd0-hdmi"; clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>, <&ahb_gates 44>; status = "disabled"; diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index 419b1b0937c8..81ad4b94e812 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi @@ -29,8 +29,9 @@ #size-cells = <1>; ranges; - framebuffer0-hdmi { - compatible = "simple-framebuffer"; + framebuffer@0 { + compatible = "allwinner,simple-framebuffer", "simple-framebuffer"; + allwinner,pipeline = "de_be0-lcd0-hdmi"; clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>, <&ahb_gates 44>; status = "disabled"; diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index 0631873c76bb..a400172a8a52 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -67,8 +67,9 @@ #size-cells = <1>; ranges; - framebuffer0-hdmi { - compatible = "simple-framebuffer"; + framebuffer@0 { + compatible = "allwinner,simple-framebuffer", "simple-framebuffer"; + allwinner,pipeline = "de_be0-lcd0-hdmi"; clocks = <&pll6 0>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 786aa656f3bb..82a524ce28ad 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -69,8 +69,9 @@ #size-cells = <1>; ranges; - framebuffer0-hdmi { - compatible = "simple-framebuffer"; + framebuffer@0 { + compatible = "allwinner,simple-framebuffer", "simple-framebuffer"; + allwinner,pipeline = "de_be0-lcd0-hdmi"; clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 43>, <&ahb_gates 44>; status = "disabled"; |