diff for duplicates of <1364878200-26343-7-git-send-email-linux@prisktech.co.nz> diff --git a/a/1.txt b/N1/1.txt index 11bf579..e5417ce 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -56,8 +56,8 @@ index c870b64..2871e21 100644 Example: -- fb@d800e400 { -+ fb@d8050800 { +- fb at d800e400 { ++ fb at d8050800 { compatible = "via,vt8500-fb"; reg = <0xd800e400 0x400>; interrupts = <12>; @@ -87,9 +87,9 @@ index c870b64..2871e21 100644 + bits-per-pixel = <16>; -Example: -- display: display@0 { +- display: display at 0 { - modes { -- mode0: mode@0 { +- mode0: mode at 0 { + display-timings { + native-mode = <&timing0>; + timing0: 800x480 { @@ -131,8 +131,8 @@ index 3d325e1..0bcadb2 100644 Example: -- fb@d8050800 { -+ fb@d8051700 { +- fb at d8050800 { ++ fb at d8051700 { compatible = "wm,wm8505-fb"; - reg = <0xd8050800 0x200>; - display = <&display>; @@ -170,9 +170,9 @@ index 567cf4e..877b33a 100644 - * Added a bpp property to calculate the size of the framebuffer - * until the binding is formalized. - */ -- display: display@0 { +- display: display at 0 { - modes { -- mode0: mode@0 { +- mode0: mode at 0 { - hactive = <800>; - vactive = <480>; - hback-porch = <88>; @@ -209,8 +209,8 @@ index cf31ced..68c8dc6 100644 interrupts = <43>; }; -- fb@d800e400 { -+ fb: fb@d8050800 { +- fb at d800e400 { ++ fb: fb at d8050800 { compatible = "via,vt8500-fb"; reg = <0xd800e400 0x400>; interrupts = <12>; @@ -218,7 +218,7 @@ index cf31ced..68c8dc6 100644 - default-mode = <&mode0>; }; - ge_rops@d8050400 { + ge_rops at d8050400 { diff --git a/arch/arm/boot/dts/wm8505-ref.dts b/arch/arm/boot/dts/wm8505-ref.dts index fd4e248..edd2cec 100644 --- a/arch/arm/boot/dts/wm8505-ref.dts @@ -234,9 +234,9 @@ index fd4e248..edd2cec 100644 - * Added a bpp property to calculate the size of the framebuffer - * until the binding is formalized. - */ -- display: display@0 { +- display: display at 0 { - modes { -- mode0: mode@0 { +- mode0: mode at 0 { - hactive = <800>; - vactive = <480>; - hback-porch = <88>; @@ -273,15 +273,15 @@ index e74a1c0..bcf668d 100644 interrupts = <0>; }; -- fb@d8050800 { -+ fb: fb@d8050800 { +- fb at d8050800 { ++ fb: fb at d8050800 { compatible = "wm,wm8505-fb"; reg = <0xd8050800 0x200>; - display = <&display>; - default-mode = <&mode0>; }; - ge_rops@d8050400 { + ge_rops at d8050400 { diff --git a/arch/arm/boot/dts/wm8650-mid.dts b/arch/arm/boot/dts/wm8650-mid.dts index cefd938..61671a0 100644 --- a/arch/arm/boot/dts/wm8650-mid.dts @@ -300,9 +300,9 @@ index cefd938..61671a0 100644 - * Added a bpp property to calculate the size of the framebuffer - * until the binding is formalized. - */ -- display: display@0 { +- display: display at 0 { - modes { -- mode0: mode@0 { +- mode0: mode at 0 { - hactive = <800>; - vactive = <480>; - hback-porch = <88>; @@ -338,15 +338,15 @@ index db3c0a1..9313407 100644 interrupts = <43>; }; -- fb@d8050800 { -+ fb: fb@d8050800 { +- fb at d8050800 { ++ fb: fb at d8050800 { compatible = "wm,wm8505-fb"; reg = <0xd8050800 0x200>; - display = <&display>; - default-mode = <&mode0>; }; - ge_rops@d8050400 { + ge_rops at d8050400 { diff --git a/arch/arm/boot/dts/wm8850-w70v2.dts b/arch/arm/boot/dts/wm8850-w70v2.dts index fcc660c..32d2253 100644 --- a/arch/arm/boot/dts/wm8850-w70v2.dts @@ -360,9 +360,9 @@ index fcc660c..32d2253 100644 - * Added a bpp property to calculate the size of the framebuffer - * until the binding is formalized. - */ -- display: display@0 { +- display: display at 0 { - modes { -- mode0: mode@0 { +- mode0: mode at 0 { - hactive = <800>; - vactive = <480>; - hback-porch = <88>; @@ -410,15 +410,15 @@ index e8cbfdc..7149cd1 100644 }; }; -- fb@d8051700 { -+ fb: fb@d8051700 { +- fb at d8051700 { ++ fb: fb at d8051700 { compatible = "wm,wm8505-fb"; reg = <0xd8051700 0x200>; - display = <&display>; - default-mode = <&mode0>; }; - ge_rops@d8050400 { + ge_rops at d8050400 { diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index ad762ed..d0c932a 100644 --- a/drivers/video/Kconfig @@ -589,7 +589,7 @@ index 5057457..d571723 100644 dma_addr_t fb_mem_phys; unsigned long fb_mem_len; @@ -321,33 +322,19 @@ static int wm8505fb_probe(struct platform_device *pdev) - if (fbi->regbase = NULL) + if (fbi->regbase == NULL) return -EBUSY; - np = of_parse_phandle(pdev->dev.of_node, "default-mode", 0); diff --git a/a/content_digest b/N1/content_digest index 6f7afad..6f0c01b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01364878200-26343-1-git-send-email-linux@prisktech.co.nz\0" - "From\0Tony Prisk <linux@prisktech.co.nz>\0" + "From\0linux@prisktech.co.nz (Tony Prisk)\0" "Subject\0[PATCHv2 6/6] video: fb: vt8500: Convert framebuffer drivers to standardized binding\0" - "Date\0Tue, 02 Apr 2013 04:50:00 +0000\0" + "Date\0Tue, 2 Apr 2013 17:50:00 +1300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -63,8 +63,8 @@ " \n" " Example:\n" " \n" - "-\tfb@d800e400 {\n" - "+\tfb@d8050800 {\n" + "-\tfb at d800e400 {\n" + "+\tfb at d8050800 {\n" " \t\tcompatible = \"via,vt8500-fb\";\n" " \t\treg = <0xd800e400 0x400>;\n" " \t\tinterrupts = <12>;\n" @@ -94,9 +94,9 @@ "+\t\tbits-per-pixel = <16>;\n" " \n" "-Example:\n" - "-\tdisplay: display@0 {\n" + "-\tdisplay: display at 0 {\n" "-\t\tmodes {\n" - "-\t\t\tmode0: mode@0 {\n" + "-\t\t\tmode0: mode at 0 {\n" "+\t\tdisplay-timings {\n" "+\t\t\tnative-mode = <&timing0>;\n" "+\t\t\ttiming0: 800x480 {\n" @@ -138,8 +138,8 @@ " \n" " Example:\n" " \n" - "-\tfb@d8050800 {\n" - "+\tfb@d8051700 {\n" + "-\tfb at d8050800 {\n" + "+\tfb at d8051700 {\n" " \t\tcompatible = \"wm,wm8505-fb\";\n" "-\t\treg = <0xd8050800 0x200>;\n" "-\t\tdisplay = <&display>;\n" @@ -177,9 +177,9 @@ "-\t * Added a bpp property to calculate the size of the framebuffer\n" "-\t * until the binding is formalized.\n" "-\t */\n" - "-\tdisplay: display@0 {\n" + "-\tdisplay: display at 0 {\n" "-\t\tmodes {\n" - "-\t\t\tmode0: mode@0 {\n" + "-\t\t\tmode0: mode at 0 {\n" "-\t\t\t\thactive = <800>;\n" "-\t\t\t\tvactive = <480>;\n" "-\t\t\t\thback-porch = <88>;\n" @@ -216,8 +216,8 @@ " \t\t\tinterrupts = <43>;\n" " \t\t};\n" " \n" - "-\t\tfb@d800e400 {\n" - "+\t\tfb: fb@d8050800 {\n" + "-\t\tfb at d800e400 {\n" + "+\t\tfb: fb at d8050800 {\n" " \t\t\tcompatible = \"via,vt8500-fb\";\n" " \t\t\treg = <0xd800e400 0x400>;\n" " \t\t\tinterrupts = <12>;\n" @@ -225,7 +225,7 @@ "-\t\t\tdefault-mode = <&mode0>;\n" " \t\t};\n" " \n" - " \t\tge_rops@d8050400 {\n" + " \t\tge_rops at d8050400 {\n" "diff --git a/arch/arm/boot/dts/wm8505-ref.dts b/arch/arm/boot/dts/wm8505-ref.dts\n" "index fd4e248..edd2cec 100644\n" "--- a/arch/arm/boot/dts/wm8505-ref.dts\n" @@ -241,9 +241,9 @@ "-\t * Added a bpp property to calculate the size of the framebuffer\n" "-\t * until the binding is formalized.\n" "-\t */\n" - "-\tdisplay: display@0 {\n" + "-\tdisplay: display at 0 {\n" "-\t\tmodes {\n" - "-\t\t\tmode0: mode@0 {\n" + "-\t\t\tmode0: mode at 0 {\n" "-\t\t\t\thactive = <800>;\n" "-\t\t\t\tvactive = <480>;\n" "-\t\t\t\thback-porch = <88>;\n" @@ -280,15 +280,15 @@ " \t\t\tinterrupts = <0>;\n" " \t\t};\n" " \n" - "-\t\tfb@d8050800 {\n" - "+\t\tfb: fb@d8050800 {\n" + "-\t\tfb at d8050800 {\n" + "+\t\tfb: fb at d8050800 {\n" " \t\t\tcompatible = \"wm,wm8505-fb\";\n" " \t\t\treg = <0xd8050800 0x200>;\n" "-\t\t\tdisplay = <&display>;\n" "-\t\t\tdefault-mode = <&mode0>;\n" " \t\t};\n" " \n" - " \t\tge_rops@d8050400 {\n" + " \t\tge_rops at d8050400 {\n" "diff --git a/arch/arm/boot/dts/wm8650-mid.dts b/arch/arm/boot/dts/wm8650-mid.dts\n" "index cefd938..61671a0 100644\n" "--- a/arch/arm/boot/dts/wm8650-mid.dts\n" @@ -307,9 +307,9 @@ "-\t * Added a bpp property to calculate the size of the framebuffer\n" "-\t * until the binding is formalized.\n" "-\t */\n" - "-\tdisplay: display@0 {\n" + "-\tdisplay: display at 0 {\n" "-\t\tmodes {\n" - "-\t\t\tmode0: mode@0 {\n" + "-\t\t\tmode0: mode at 0 {\n" "-\t\t\t\thactive = <800>;\n" "-\t\t\t\tvactive = <480>;\n" "-\t\t\t\thback-porch = <88>;\n" @@ -345,15 +345,15 @@ " \t\t\tinterrupts = <43>;\n" " \t\t};\n" " \n" - "-\t\tfb@d8050800 {\n" - "+\t\tfb: fb@d8050800 {\n" + "-\t\tfb at d8050800 {\n" + "+\t\tfb: fb at d8050800 {\n" " \t\t\tcompatible = \"wm,wm8505-fb\";\n" " \t\t\treg = <0xd8050800 0x200>;\n" "-\t\t\tdisplay = <&display>;\n" "-\t\t\tdefault-mode = <&mode0>;\n" " \t\t};\n" " \n" - " \t\tge_rops@d8050400 {\n" + " \t\tge_rops at d8050400 {\n" "diff --git a/arch/arm/boot/dts/wm8850-w70v2.dts b/arch/arm/boot/dts/wm8850-w70v2.dts\n" "index fcc660c..32d2253 100644\n" "--- a/arch/arm/boot/dts/wm8850-w70v2.dts\n" @@ -367,9 +367,9 @@ "-\t * Added a bpp property to calculate the size of the framebuffer\n" "-\t * until the binding is formalized.\n" "-\t */\n" - "-\tdisplay: display@0 {\n" + "-\tdisplay: display at 0 {\n" "-\t\tmodes {\n" - "-\t\t\tmode0: mode@0 {\n" + "-\t\t\tmode0: mode at 0 {\n" "-\t\t\t\thactive = <800>;\n" "-\t\t\t\tvactive = <480>;\n" "-\t\t\t\thback-porch = <88>;\n" @@ -417,15 +417,15 @@ " \t\t\t};\n" " \t\t};\n" " \n" - "-\t\tfb@d8051700 {\n" - "+\t\tfb: fb@d8051700 {\n" + "-\t\tfb at d8051700 {\n" + "+\t\tfb: fb at d8051700 {\n" " \t\t\tcompatible = \"wm,wm8505-fb\";\n" " \t\t\treg = <0xd8051700 0x200>;\n" "-\t\t\tdisplay = <&display>;\n" "-\t\t\tdefault-mode = <&mode0>;\n" " \t\t};\n" " \n" - " \t\tge_rops@d8050400 {\n" + " \t\tge_rops at d8050400 {\n" "diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig\n" "index ad762ed..d0c932a 100644\n" "--- a/drivers/video/Kconfig\n" @@ -596,7 +596,7 @@ " \tdma_addr_t fb_mem_phys;\n" " \tunsigned long fb_mem_len;\n" "@@ -321,33 +322,19 @@ static int wm8505fb_probe(struct platform_device *pdev)\n" - " \tif (fbi->regbase = NULL)\n" + " \tif (fbi->regbase == NULL)\n" " \t\treturn -EBUSY;\n" " \n" "-\tnp = of_parse_phandle(pdev->dev.of_node, \"default-mode\", 0);\n" @@ -662,4 +662,4 @@ "-- \n" 1.7.9.5 -1396e6e58915cfcc972f5cb4fcc9ff1fd0bcb8749e23e0e2c6d0cf90453d0d9c +9ea7358d6b338a91abe3789c4f760a694e570cfbd6b6568c6b5ee19f82b29947
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.