dt-bindings: vendor: Escape single quote
Subsystems (2)
PATCH 1/5 dt-bindings: vendor: Escape single quote
Single quotes need to be escaped in YAML, make sure it's the case.
--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/vendor-prefixes.yaml +1 -1
@@ -672,7 +672,7 @@ patternProperties: "^plantower,.*": description: Plantower Co., Ltd "^plathome,.*": - description: Plat'Home Co., Ltd. + description: Plat\'Home Co., Ltd. "^plda,.*": description: PLDA "^plx,.*":
Signature · 1 line
2.21.0
PATCH 2/5 dt-bindings: vendor: Fix simtek vendor compatible
In the text file, simtek didn't have any description and apparently this confused the conversion script. Fix the simtek entry and add a proper description.
--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/vendor-prefixes.yaml +2 -2
@@ -787,8 +787,8 @@ patternProperties: description: Silergy Corp. "^siliconmitus,.*": description: Silicon Mitus, Inc. - "^simte,.*": - description: k + "^simtek,.*": + description: Cypress Semiconductor Corporation (Simtek Corporation) "^sirf,.*": description: SiRF Technology, Inc. "^sis,.*":
Signature · 1 line
2.21.0
Re: [PATCH 2/5] dt-bindings: vendor: Fix simtek vendor compatible
Quoted 9 lines · Maxime Ripard
In the text file, simtek didn't have any description and apparently this confused the conversion script. Fix the simtek entry and add a proper description.
Signed-off-by Maxime Ripard <[email protected]>--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Applied, thanks.
Rob
PATCH 3/5 dt-bindings: vendor: Add a bunch of vendors
In reply to Maxime RipardAdd all the missing vendors used in Allwinner DTS.
--- .../devicetree/bindings/vendor-prefixes.yaml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+)
Documentation/devicetree/bindings/vendor-prefixes.yaml +58 -0
@@ -175,6 +175,8 @@ patternProperties: description: Common Hardware Reference Platform "^chunghwa,.*": description: Chunghwa Picture Tubes Ltd. + "^chuwi,.*": + description: Chuwi Innovation Ltd. "^ciaa,.*": description: Computadora Industrial Abierta Argentina "^cirrus,.*":
@@ -185,8 +187,12 @@ patternProperties: description: Chips&Media, Inc. "^cnxt,.*": description: Conexant Systems, Inc. + "^colorfly,.*": + description: Colorful GRP, Shenzhen Xueyushi Technology Ltd. "^compulab,.*": description: CompuLab Ltd. + "^corpro,.*": + description: Chengdu Corpro Technology Co., Ltd. "^cortina,.*": description: Cortina Systems, Inc. "^cosmic,.*":
@@ -199,6 +205,8 @@ patternProperties: description: Crystalfontz America, Inc. "^csky,.*": description: Hangzhou C-SKY Microsystems Co., Ltd + "^csq,.*": + description: Shenzen Chuangsiqi Technology Co.,Ltd. "^cubietech,.*": description: Cubietech, Ltd. "^cypress,.*":
@@ -219,6 +227,8 @@ patternProperties: description: Devantech, Ltd. "^dh,.*": description: DH electronics GmbH + "^difrnce,.*": + description: Shenzhen Yagu Electronic Technology Co., Ltd. "^digi,.*": description: Digi International Inc. "^digilent,.*":
@@ -241,6 +251,8 @@ patternProperties: description: DPTechnics "^dragino,.*": description: Dragino Technology Co., Limited + "^dserve,.*": + description: dServe Technology B.V. "^ea,.*": description: Embedded Artists AB "^ebs-systart,.*":
@@ -263,6 +275,8 @@ patternProperties: description: Emlid, Ltd. "^emmicro,.*": description: EM Microelectronic + "^empire-electronix,.*": + description: Empire Electronix "^emtrion,.*": description: emtrion GmbH "^endless,.*":
@@ -331,6 +345,8 @@ patternProperties: description: GE Fanuc Intelligent Platforms Embedded Systems, Inc. "^GEFanuc,.*": description: GE Fanuc Intelligent Platforms Embedded Systems, Inc. + "^gemei,.*": + description: Gemei Digital Technology Co., Ltd. "^geniatech,.*": description: Geniatech, Inc. "^giantec,.*":
@@ -379,10 +395,14 @@ patternProperties: description: Jiangsu HopeRun Software Co., Ltd. "^hp,.*": description: Hewlett Packard + "^hsg,.*": + description: HannStar Display Co. "^holtek,.*": description: Holtek Semiconductor, Inc. "^hwacom,.*": description: HwaCom Systems Inc. + "^hyundai,.*": + description: Hyundai Technology "^i2se,.*": description: I2SE GmbH "^ibm,.*":
@@ -397,6 +417,10 @@ patternProperties: description: ILI Technology Corporation (ILITEK) "^img,.*": description: Imagination Technologies Ltd. + "^incircuit,.*": + description: In-Circuit GmbH + "^inet-tek,.*": + description: Shenzhen iNet Mobile Internet Technology Co., Ltd "^infineon,.*": description: Infineon Technologies "^inforce,.*":
@@ -431,6 +455,8 @@ patternProperties: description: Japan Display Inc. "^jedec,.*": description: JEDEC Solid State Technology Association + "^jesurun,.*": + description: Shenzhen Jesurun Electronics Business Dept. "^jianda,.*": description: Jiandangjing Technology Co., Ltd. "^karo,.*":
@@ -463,6 +489,8 @@ patternProperties: description: LaCie "^laird,.*": description: Laird PLC + "^lamobo,.*": + description: Ketai Huajie Technology Co., Ltd. "^lantiq,.*": description: Lantiq Semiconductor "^lattice,.*":
@@ -481,6 +509,8 @@ patternProperties: description: Lichee Pi "^linaro,.*": description: Linaro Limited + "^linksprite,.*": + description: LinkSprite Technologies, Inc. "^linksys,.*": description: Belkin International, Inc. (Linksys) "^linux,.*":
@@ -497,6 +527,8 @@ patternProperties: description: Liebherr-Werk Nenzing GmbH "^macnica,.*": description: Macnica Americas + "^mapleboard,.*": + description: Mapleboard.org "^marvell,.*": description: Marvell Technology Group Ltd. "^maxbotix,.*":
@@ -537,6 +569,8 @@ patternProperties: description: Micron Technology Inc. "^mikroe,.*": description: MikroElektronika d.o.o. + "^miniand,.*": + description: Miniand Tech "^minix,.*": description: MINIX Technology Ltd. "^miramems,.*":
@@ -667,6 +701,8 @@ patternProperties: description: Picochip Ltd "^pine64,.*": description: Pine64 + "^pineriver,.*": + description: Shenzhen PineRiver Designs Co., Ltd. "^pixcir,.*": description: PIXCIR MICROELECTRONICS Co., Ltd "^plantower,.*":
@@ -679,12 +715,18 @@ patternProperties: description: Broadcom Corporation (formerly PLX Technology) "^pni,.*": description: PNI Sensor Corporation + "^polaroid,.*": + description: Polaroid Corporation "^portwell,.*": description: Portwell Inc. "^poslab,.*": description: Poslab Technology Co., Ltd. + "^pov,.*": + description: Point of View International B.V. "^powervr,.*": description: PowerVR (deprecated, use img) + "^primux,.*": + description: Primux Trading, S.L. "^probox2,.*": description: PROBOX2 (by W2COMP Co., Ltd.) "^pulsedlight,.*":
@@ -697,6 +739,8 @@ patternProperties: description: QEMU, a generic and open source machine emulator and virtualizer "^qi,.*": description: Qi Hardware + "^qihua,.*": + description: Chengdu Kaixuan Information Technology Co., Ltd. "^qiaodian,.*": description: QiaoDian XianShi Corporation "^qnap,.*":
@@ -719,6 +763,8 @@ patternProperties: description: Realtek Semiconductor Corp. "^renesas,.*": description: Renesas Electronics Corporation + "^rervision,.*": + description: Shenzhen Rervision Technology Co., Ltd. "^richtek,.*": description: Richtek Technology Corporation "^ricoh,.*":
@@ -789,6 +835,10 @@ patternProperties: description: Silicon Mitus, Inc. "^simtek,.*": description: Cypress Semiconductor Corporation (Simtek Corporation) + "^sinlinx,.*": + description: Sinlinx Electronics Technology Co., LTD + "^sinovoip,.*": + description: SinoVoip Co., Ltd "^sirf,.*": description: SiRF Technology, Inc. "^sis,.*":
@@ -909,6 +959,8 @@ patternProperties: description: United Radiant Technology Corporation "^usi,.*": description: Universal Scientific Industrial Co., Ltd. + "^utoo,.*": + description: Aigo Digital Technology Co., Ltd. "^v3,.*": description: V3 Semiconductor "^vamrs,.*":
@@ -947,10 +999,14 @@ patternProperties: description: Winbond Electronics corp. "^winstar,.*": description: Winstar Display Corp. + "^wits,.*": + description: Shenzhen Merrii Technology Co., Ltd. (WITS) "^wlf,.*": description: Wolfson Microelectronics "^wm,.*": description: Wondermedia Technologies, Inc. + "^wobo,.*": + description: Wobo "^x-powers,.*": description: X-Powers "^xes,.*":
@@ -961,6 +1017,8 @@ patternProperties: description: Xilinx "^xunlong,.*": description: Shenzhen Xunlong Software CO.,Limited + "^yones-toptech,.*": + description: Yones Toptech Co., Ltd. "^ysoft,.*": description: Y Soft Corporation a.s. "^zarlink,.*":
Signature · 1 line
2.21.0
Re: [PATCH 3/5] dt-bindings: vendor: Add a bunch of vendors
Quoted 7 lines · Maxime Ripard
Add all the missing vendors used in Allwinner DTS.
Signed-off-by Maxime Ripard <[email protected]>--- .../devicetree/bindings/vendor-prefixes.yaml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+)
Applied, thanks.
Rob
Re: [PATCH 3/5] dt-bindings: vendor: Add a bunch of vendors
Hi Rob,
Quoted 10 lines · Rob Herring
Quoted 7 lines · Maxime Ripard
Add all the missing vendors used in Allwinner DTS.
Signed-off-by Maxime Ripard <[email protected]>--- .../devicetree/bindings/vendor-prefixes.yaml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+)Applied, thanks.
While the other patches are in your tree now, this one looks missing.
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Rob Herring
maintainerRe: [PATCH 3/5] dt-bindings: vendor: Add a bunch of vendors
Quoted 13 lines · Maxime Ripard
Hi Rob,
Quoted 9 lines · Rob Herring
Quoted 7 lines · Maxime Ripard
Add all the missing vendors used in Allwinner DTS.
Signed-off-by Maxime Ripard <[email protected]>--- .../devicetree/bindings/vendor-prefixes.yaml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+)
Quoted 3 lines
Quoted 1 line
Applied, thanks.
While the other patches are in your tree now, this one looks missing.
That's what I get for one foot out the door for vacation. Now fixed.
Rob
PATCH 4/5 ARM: dts: sun7i: icnova-swac: Fix the model vendor
In reply to Maxime RipardEven though the SWAC is just a baseboard to the icnova SoM, the vendor of the baseboard somehow ended up with the board name instead of the vendor name. Fix that.
--- Documentation/devicetree/bindings/arm/sunxi.yaml | 2 +- arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/arm/sunxi.yaml +1 -1
@@ -263,7 +263,7 @@ properties: - description: ICNova A20 SWAC items: - - const: swac,icnova-a20-swac + - const: incircuit,icnova-a20-swac - const: incircuit,icnova-a20 - const: allwinner,sun7i-a20
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts +2 -1
@@ -49,7 +49,8 @@ / { model = "ICnova-A20 SWAC"; - compatible = "swac,icnova-a20-swac", "incircuit,icnova-a20", "allwinner,sun7i-a20"; + compatible = "incircuit,icnova-a20-swac", "incircuit,icnova-a20", + "allwinner,sun7i-a20"; aliases { serial0 = &uart0;
Signature · 1 line
2.21.0
Maxime Ripard
AppliedRe: [PATCH 4/5] ARM: dts: sun7i: icnova-swac: Fix the model vendor
Quoted 5 lines · Maxime Ripard
Even though the SWAC is just a baseboard to the icnova SoM, the vendor of the baseboard somehow ended up with the board name instead of the vendor name. Fix that.
Signed-off-by Maxime Ripard <[email protected]>
Applied.
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 5/5 ARM: dts: gr8-evb: Fix RTC vendor
In reply to Maxime RipardFor some reason, the RTC vendor is reported to be phg, while the part is actually made by the much more known NXP. Fix that.
--- arch/arm/boot/dts/sun5i-gr8-evb.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/sun5i-gr8-evb.dts +1 -1
@@ -150,7 +150,7 @@ }; pcf8563: rtc@51 { - compatible = "phg,pcf8563"; + compatible = "nxp,pcf8563"; reg = <0x51>; }; };
Signature · 1 line
2.21.0
Maxime Ripard
AppliedRe: [PATCH 5/5] ARM: dts: gr8-evb: Fix RTC vendor
Quoted 4 lines · Maxime Ripard
For some reason, the RTC vendor is reported to be phg, while the part is actually made by the much more known NXP. Fix that.
Signed-off-by Maxime Ripard <[email protected]>
Applied.
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 7 lines · Maxime Ripard
Single quotes need to be escaped in YAML, make sure it's the case.
Signed-off-by Maxime Ripard <[email protected]>--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks.
Rob
Quoted 13 lines · Maxime Ripard
Single quotes need to be escaped in YAML, make sure it's the case.
Signed-off-by Maxime Ripard <[email protected]>--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Documentation/devicetree/bindings/vendor-prefixes.yaml +0
-0
Documentation/devicetree/bindings/vendor-prefixes.yaml patternProperties: · line 675
Quoted 5 lines
Documentation/devicetree/bindings/vendor-prefixes.yaml +1
-1@@ -672,7 +672,7 @@ patternProperties: "^plantower,.*": description: Plantower Co., Ltd "^plathome,.*": - description: Plat'Home Co., Ltd. + description: Plat\'Home Co., Ltd.
Actually, I think this isn't necessary. Where was this causing a problem? Only in single quoted strings do you have to escape a single quote and it is done with 2 single quotes rather than a backslash. However, to maintain a json compatible subset of yaml, maybe we do need it.
Rob
Hi,
Quoted 9 lines · Rob Herring
Quoted 8 lines · Maxime Ripard
Single quotes need to be escaped in YAML, make sure it's the case.
Signed-off-by Maxime Ripard <[email protected]>--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 14 lines
Documentation/devicetree/bindings/vendor-prefixes.yaml patternProperties: · line 675
Quoted 10 lines
Documentation/devicetree/bindings/vendor-prefixes.yaml +1
-1@@ -672,7 +672,7 @@ patternProperties: "^plantower,.*": description: Plantower Co., Ltd "^plathome,.*": - description: Plat'Home Co., Ltd. + description: Plat\'Home Co., Ltd.Actually, I think this isn't necessary. Where was this causing a problem? Only in single quoted strings do you have to escape a single quote and it is done with 2 single quotes rather than a backslash.
I guess I misread the YAML spec though... Sorry.
Quoted 2 lines
However, to maintain a json compatible subset of yaml, maybe we do need it.
If you don't want it anymore, I guess we can drop or revert it.
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel