[PATCH 0/4] Fix vendor strings on Rockchip boards

[PATCH 0/4] Fix vendor strings on Rockchip boards

[Tim Lunn]

A couple of rockchip boards incorrectly list their vendor as Rockchip
when they are in fact not manufactured by Rockchip.

Fix the vendor strings to correctly list the manufacturer


Tim Lunn (4):
  dt-bindings: arm: rockchip: Correct vendor for Orange Pi RK3399 board
  dt-bindings: arm: rockchip: Correct vendor for Banana Pi R2 Pro
  arm64: dts: rockchip: adjust vendor on Banana Pi R2 Pro board
  arm64: dts: rockchip: adjust vendor on orangepi rk3399 board

 Documentation/devicetree/bindings/arm/rockchip.yaml | 8 ++++----
 arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts    | 2 +-
 arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

-- 
2.40.1

[PATCH 1/4] dt-bindings: arm: rockchip: Correct vendor for Orange Pi RK3399 board

[Tim Lunn]

The vendor for this board was incorrectly listed as Rockchip. Fix this
now while they are not used anywhere, in the future they may be used by
bootloader to select dts.

Update the vendor to Xunlong.

Signed-off-by: Tim Lunn <tim@feathertop.org>
---

 Documentation/devicetree/bindings/arm/rockchip.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index 5cf5cbef2cf5..29f922f3ca4e 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -626,9 +626,9 @@ properties:
           - const: openailab,eaidk-610
           - const: rockchip,rk3399
 
-      - description: Orange Pi RK3399 board
+      - description: Xunlong Orange Pi RK3399 board
         items:
-          - const: rockchip,rk3399-orangepi
+          - const: xunlong,rk3399-orangepi
           - const: rockchip,rk3399
 
       - description: Phytec phyCORE-RK3288 Rapid Development Kit
-- 
2.40.1

Re: [PATCH 1/4] dt-bindings: arm: rockchip: Correct vendor for Orange Pi RK3399 board

[Tim Lunn]

On 2/14/24 15:07, Tim Lunn wrote:
> The vendor for this board was incorrectly listed as Rockchip. Fix this
> now while they are not used anywhere, in the future they may be used by
> bootloader to select dts.
>
> Update the vendor to Xunlong.
>
> Signed-off-by: Tim Lunn <tim@feathertop.org>
Fixes: 08b64bd2c681 ("arm64: dts: rockchip: Add support for the Orange 
Pi RK3399 board")
> ---
>
>   Documentation/devicetree/bindings/arm/rockchip.yaml | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
> index 5cf5cbef2cf5..29f922f3ca4e 100644
> --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> @@ -626,9 +626,9 @@ properties:
>             - const: openailab,eaidk-610
>             - const: rockchip,rk3399
>   
> -      - description: Orange Pi RK3399 board
> +      - description: Xunlong Orange Pi RK3399 board
>           items:
> -          - const: rockchip,rk3399-orangepi
> +          - const: xunlong,rk3399-orangepi
>             - const: rockchip,rk3399
>   
>         - description: Phytec phyCORE-RK3288 Rapid Development Kit

Re: [PATCH 1/4] dt-bindings: arm: rockchip: Correct vendor for Orange Pi RK3399 board

[Rob Herring]

On Wed, 14 Feb 2024 15:07:28 +1100, Tim Lunn wrote:
> The vendor for this board was incorrectly listed as Rockchip. Fix this
> now while they are not used anywhere, in the future they may be used by
> bootloader to select dts.
> 
> Update the vendor to Xunlong.
> 
> Signed-off-by: Tim Lunn <tim@feathertop.org>
> ---
> 
>  Documentation/devicetree/bindings/arm/rockchip.yaml | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>

[PATCH 2/4] dt-bindings: arm: rockchip: Correct vendor for Banana Pi R2 Pro

[Tim Lunn]

The vendor for this board was incorrectly listed as Rockchip. Fix this
now while they are not used anywhere, in the future they may be used by
bootloader to select dts.

Update the vendor to Sinovoip.

Signed-off-by: Tim Lunn <tim@feathertop.org>
---

 Documentation/devicetree/bindings/arm/rockchip.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
index 29f922f3ca4e..89261b9601ce 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
@@ -940,9 +940,9 @@ properties:
           - const: rockchip,rk3568-evb1-v10
           - const: rockchip,rk3568
 
-      - description: Rockchip RK3568 Banana Pi R2 Pro
+      - description: Sinovoip RK3568 Banana Pi R2 Pro
         items:
-          - const: rockchip,rk3568-bpi-r2pro
+          - const: sinovoip,rk3568-bpi-r2pro
           - const: rockchip,rk3568
 
       - description: Sonoff iHost Smart Home Hub
-- 
2.40.1

Re: [PATCH 2/4] dt-bindings: arm: rockchip: Correct vendor for Banana Pi R2 Pro

[Tim Lunn]

On 2/14/24 15:07, Tim Lunn wrote:
> The vendor for this board was incorrectly listed as Rockchip. Fix this
> now while they are not used anywhere, in the future they may be used by
> bootloader to select dts.
>
> Update the vendor to Sinovoip.
>
> Signed-off-by: Tim Lunn <tim@feathertop.org>
Fixes: 8ad885126daa ("dt-bindings: rockchip: Add BananaPi R2 Pro Board")
> ---
>
>   Documentation/devicetree/bindings/arm/rockchip.yaml | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
> index 29f922f3ca4e..89261b9601ce 100644
> --- a/Documentation/devicetree/bindings/arm/rockchip.yaml
> +++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
> @@ -940,9 +940,9 @@ properties:
>             - const: rockchip,rk3568-evb1-v10
>             - const: rockchip,rk3568
>   
> -      - description: Rockchip RK3568 Banana Pi R2 Pro
> +      - description: Sinovoip RK3568 Banana Pi R2 Pro
>           items:
> -          - const: rockchip,rk3568-bpi-r2pro
> +          - const: sinovoip,rk3568-bpi-r2pro
>             - const: rockchip,rk3568
>   
>         - description: Sonoff iHost Smart Home Hub

Re: [PATCH 2/4] dt-bindings: arm: rockchip: Correct vendor for Banana Pi R2 Pro

[Rob Herring]

On Wed, 14 Feb 2024 15:07:29 +1100, Tim Lunn wrote:
> The vendor for this board was incorrectly listed as Rockchip. Fix this
> now while they are not used anywhere, in the future they may be used by
> bootloader to select dts.
> 
> Update the vendor to Sinovoip.
> 
> Signed-off-by: Tim Lunn <tim@feathertop.org>
> ---
> 
>  Documentation/devicetree/bindings/arm/rockchip.yaml | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>

[PATCH 3/4] arm64: dts: rockchip: adjust vendor on Banana Pi R2 Pro board

[Tim Lunn]

Adjust compatible string to match the board vendor of Sinovoip

Signed-off-by: Tim Lunn <tim@feathertop.org>
---

 arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
index f9127ddfbb7d..7b5f3904ef61 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
@@ -13,7 +13,7 @@
 
 / {
 	model = "Bananapi-R2 Pro (RK3568) DDR4 Board";
-	compatible = "rockchip,rk3568-bpi-r2pro", "rockchip,rk3568";
+	compatible = "sinovoip,rk3568-bpi-r2pro", "rockchip,rk3568";
 
 	aliases {
 		ethernet0 = &gmac0;
-- 
2.40.1

[PATCH 4/4] arm64: dts: rockchip: adjust vendor on orangepi rk3399 board

[Tim Lunn]

Adjust compatible string to match the board vendor of Xunlong

Signed-off-by: Tim Lunn <tim@feathertop.org>
---

 arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
index e7551449e718..e26e2d86279c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
@@ -14,7 +14,7 @@
 
 / {
 	model = "Orange Pi RK3399 Board";
-	compatible = "rockchip,rk3399-orangepi", "rockchip,rk3399";
+	compatible = "xunlong,rk3399-orangepi", "rockchip,rk3399";
 
 	aliases {
 		ethernet0 = &gmac;
-- 
2.40.1

Re: [PATCH 0/4] Fix vendor strings on Rockchip boards

[Dragan Simic]

Hello Tim,

On 2024-02-14 05:07, Tim Lunn wrote:
> A couple of rockchip boards incorrectly list their vendor as Rockchip
> when they are in fact not manufactured by Rockchip.
> 
> Fix the vendor strings to correctly list the manufacturer

Just checking, have you verified that the old, incorrect "compatible"
strings from the board dts files aren't used anywhere in the kernel 
code,
such as in some drivers?

Otherwise, for the entire series:

Reviewed-by: Dragan Simic <dsimic@manjaro.org>

> Tim Lunn (4):
>   dt-bindings: arm: rockchip: Correct vendor for Orange Pi RK3399 board
>   dt-bindings: arm: rockchip: Correct vendor for Banana Pi R2 Pro
>   arm64: dts: rockchip: adjust vendor on Banana Pi R2 Pro board
>   arm64: dts: rockchip: adjust vendor on orangepi rk3399 board
> 
>  Documentation/devicetree/bindings/arm/rockchip.yaml | 8 ++++----
>  arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts    | 2 +-
>  arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts  | 2 +-
>  3 files changed, 6 insertions(+), 6 deletions(-)

Re: [PATCH 0/4] Fix vendor strings on Rockchip boards

[Tim Lunn]

Hi Dragan,

On 2/14/24 15:14, Dragan Simic wrote:
> Hello Tim,
>
> On 2024-02-14 05:07, Tim Lunn wrote:
>> A couple of rockchip boards incorrectly list their vendor as Rockchip
>> when they are in fact not manufactured by Rockchip.
>>
>> Fix the vendor strings to correctly list the manufacturer
>
> Just checking, have you verified that the old, incorrect "compatible"
> strings from the board dts files aren't used anywhere in the kernel code,
> such as in some drivers?
>
Yes I checked that, there are no remaining references to the 
old/incorrect compatible strings in kernel code

Regards
    Tim
> Otherwise, for the entire series:
>
> Reviewed-by: Dragan Simic <dsimic@manjaro.org>
>
>> Tim Lunn (4):
>>   dt-bindings: arm: rockchip: Correct vendor for Orange Pi RK3399 board
>>   dt-bindings: arm: rockchip: Correct vendor for Banana Pi R2 Pro
>>   arm64: dts: rockchip: adjust vendor on Banana Pi R2 Pro board
>>   arm64: dts: rockchip: adjust vendor on orangepi rk3399 board
>>
>>  Documentation/devicetree/bindings/arm/rockchip.yaml | 8 ++++----
>>  arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts    | 2 +-
>>  arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts  | 2 +-
>>  3 files changed, 6 insertions(+), 6 deletions(-)

Re: [PATCH 0/4] Fix vendor strings on Rockchip boards

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 938 bytes --]

On Wed, Feb 14, 2024 at 03:27:08PM +1100, Tim Lunn wrote:
> Hi Dragan,
> 
> On 2/14/24 15:14, Dragan Simic wrote:
> > Hello Tim,
> > 
> > On 2024-02-14 05:07, Tim Lunn wrote:
> > > A couple of rockchip boards incorrectly list their vendor as Rockchip
> > > when they are in fact not manufactured by Rockchip.
> > > 
> > > Fix the vendor strings to correctly list the manufacturer
> > 
> > Just checking, have you verified that the old, incorrect "compatible"
> > strings from the board dts files aren't used anywhere in the kernel code,
> > such as in some drivers?
> > 
> Yes I checked that, there are no remaining references to the old/incorrect
> compatible strings in kernel code

What about other code? Like a BSD or a bootloader? If nothing is using
them
Acked-by: Conor Dooley <conor.dooley@microchip.com>

Fixes tags I think wouldn't go amiss, but I'm not expecting a resend
with them.

Cheers,
Conor.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH 0/4] Fix vendor strings on Rockchip boards

[Dragan Simic]

Hello Conor,

On 2024-02-14 19:12, Conor Dooley wrote:
> On Wed, Feb 14, 2024 at 03:27:08PM +1100, Tim Lunn wrote:
>> On 2/14/24 15:14, Dragan Simic wrote:
>> > On 2024-02-14 05:07, Tim Lunn wrote:
>> > > A couple of rockchip boards incorrectly list their vendor as Rockchip
>> > > when they are in fact not manufactured by Rockchip.
>> > >
>> > > Fix the vendor strings to correctly list the manufacturer
>> >
>> > Just checking, have you verified that the old, incorrect "compatible"
>> > strings from the board dts files aren't used anywhere in the kernel code,
>> > such as in some drivers?
>> >
>> Yes I checked that, there are no remaining references to the 
>> old/incorrect
>> compatible strings in kernel code
> 
> What about other code? Like a BSD or a bootloader? If nothing is using
> them
> Acked-by: Conor Dooley <conor.dooley@microchip.com>

I just quickly checked U-Boot and it's fine.

> Fixes tags I think wouldn't go amiss, but I'm not expecting a resend
> with them.

Re: [PATCH 0/4] Fix vendor strings on Rockchip boards

[Tim Lunn]

Hi Conor,

On 2/15/24 05:12, Conor Dooley wrote:
> On Wed, Feb 14, 2024 at 03:27:08PM +1100, Tim Lunn wrote:
>> Hi Dragan,
>>
>> On 2/14/24 15:14, Dragan Simic wrote:
>>> Hello Tim,
>>>
>>> On 2024-02-14 05:07, Tim Lunn wrote:
>>>> A couple of rockchip boards incorrectly list their vendor as Rockchip
>>>> when they are in fact not manufactured by Rockchip.
>>>>
>>>> Fix the vendor strings to correctly list the manufacturer
>>> Just checking, have you verified that the old, incorrect "compatible"
>>> strings from the board dts files aren't used anywhere in the kernel code,
>>> such as in some drivers?
>>>
>> Yes I checked that, there are no remaining references to the old/incorrect
>> compatible strings in kernel code
> What about other code? Like a BSD or a bootloader? If nothing is using
> them
> Acked-by: Conor Dooley <conor.dooley@microchip.com>
>
> Fixes tags I think wouldn't go amiss, but I'm not expecting a resend
> with them.
I've added the fixes tags to the email thread.

Regards
   Tim
>
> Cheers,
> Conor.

Re: [PATCH 0/4] Fix vendor strings on Rockchip boards

[Heiko Stuebner]

On Wed, 14 Feb 2024 15:07:27 +1100, Tim Lunn wrote:
> A couple of rockchip boards incorrectly list their vendor as Rockchip
> when they are in fact not manufactured by Rockchip.
> 
> Fix the vendor strings to correctly list the manufacturer
> 
> 
> Tim Lunn (4):
>   dt-bindings: arm: rockchip: Correct vendor for Orange Pi RK3399 board
>   dt-bindings: arm: rockchip: Correct vendor for Banana Pi R2 Pro
>   arm64: dts: rockchip: adjust vendor on Banana Pi R2 Pro board
>   arm64: dts: rockchip: adjust vendor on orangepi rk3399 board
> 
> [...]

Applied, thanks!

[1/4] dt-bindings: arm: rockchip: Correct vendor for Orange Pi RK3399 board
      commit: db51e128df1010653aab71c07e06280e37fecaeb
[2/4] dt-bindings: arm: rockchip: Correct vendor for Banana Pi R2 Pro
      commit: a03fd4b3bebc9775c921a965c4c22b1a0d3a2503
[3/4] arm64: dts: rockchip: adjust vendor on Banana Pi R2 Pro board
      commit: 437644753208092f642b7669c69da606aa07dfb4
[4/4] arm64: dts: rockchip: adjust vendor on orangepi rk3399 board
      commit: 7ec958ed6a32daad36918d200b594f33cb4e0dd7

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>