| From 8a924e7606e13f7ce4aa6d19bd75b171dc4f3a77 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Mon, 31 Oct 2016 14:43:04 +0100 |
| Subject: [PATCH 209/299] ARM: shmobile: r8a7779/marzen: Add board part number |
| to DT bindings |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 9652623f8f019edc93a7a934a10b7d0b90421d5a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| Documentation/devicetree/bindings/arm/shmobile.txt |
| --- |
| Documentation/devicetree/bindings/arm/shmobile.txt | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/Documentation/devicetree/bindings/arm/shmobile.txt |
| +++ b/Documentation/devicetree/bindings/arm/shmobile.txt |
| @@ -65,7 +65,7 @@ Boards: |
| compatible = "renesas,lager", "renesas,r8a7790" |
| - M3ULCB (R-Car Starter Kit Pro, RTP0RC7796SKB00010S) |
| compatible = "renesas,m3ulcb", "renesas,r8a7796"; |
| - - Marzen |
| + - Marzen (R0P7779A00010S) |
| compatible = "renesas,marzen", "renesas,r8a7779" |
| - Porter (M2-LCDP) |
| compatible = "renesas,porter", "renesas,r8a7791" |
