[2/2] arm64: dts: qcom: Rename SBC to DragonBoard 410c

Message ID 20171003091155.7138-2-linus.walleij@linaro.org
State New
Headers show
Series
  • [1/2] arm64: qcom: sbc: Name GPIO lines
Related show

Commit Message

Linus Walleij Oct. 3, 2017, 9:11 a.m.
Naming the DragonBoard 410c "SBC" (I guess "single board computer")
is not very helpful for users looking for their device tree in
the kernel. Also the db820c is named properly.

Rectify this, simply, do not change the compatible strings but name
the DTS files in a consistent manner.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

---
It's not like I don't understand that people will be nitpicky
about this.

I was looking for the DragonBoard 410c devicetree and could not
find it until I realized this hopeless idiomatic naming.

It cost me time and effort, and it is going to cost others time
and effort. Fixing it.

The other patch naming the GPIO lines can be applied without
this one.
---
 arch/arm64/boot/dts/qcom/Makefile                                    | 2 +-
 .../{apq8016-sbc-pmic-pins.dtsi => apq8016-db410c-pmic-pins.dtsi}    | 0
 .../qcom/{apq8016-sbc-soc-pins.dtsi => apq8016-db410c-soc-pins.dtsi} | 0
 arch/arm64/boot/dts/qcom/{apq8016-sbc.dts => apq8016-db410c.dts}     | 5 +++--
 arch/arm64/boot/dts/qcom/{apq8016-sbc.dtsi => apq8016-db410c.dtsi}   | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename arch/arm64/boot/dts/qcom/{apq8016-sbc-pmic-pins.dtsi => apq8016-db410c-pmic-pins.dtsi} (100%)
 rename arch/arm64/boot/dts/qcom/{apq8016-sbc-soc-pins.dtsi => apq8016-db410c-soc-pins.dtsi} (100%)
 rename arch/arm64/boot/dts/qcom/{apq8016-sbc.dts => apq8016-db410c.dts} (95%)
 rename arch/arm64/boot/dts/qcom/{apq8016-sbc.dtsi => apq8016-db410c.dtsi} (99%)

-- 
2.13.5

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Srinivas Kandagatla Oct. 3, 2017, 12:25 p.m. | #1
On 03/10/17 10:11, Linus Walleij wrote:
> Naming the DragonBoard 410c "SBC" (I guess "single board computer")

> is not very helpful for users looking for their device tree in

> the kernel. Also the db820c is named properly.

> 

> Rectify this, simply, do not change the compatible strings but name

> the DTS files in a consistent manner.

> 

> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

I did not like the sbc naming convention too, This was primarily done 
due to some legacy build tools + bootloaders which have used sbc 
compatible to identify boards from multiple dtb blobs. Now that we can 
append dtb to kernel with new LK, this should not be a issue anymore.

Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>


> ---

> It's not like I don't understand that people will be nitpicky

> about this.

> 

> I was looking for the DragonBoard 410c devicetree and could not

> find it until I realized this hopeless idiomatic naming.

> 

> It cost me time and effort, and it is going to cost others time

> and effort. Fixing it.

> 

> The other patch naming the GPIO lines can be applied without

> this one.

> ---

>   arch/arm64/boot/dts/qcom/Makefile                                    | 2 +-

>   .../{apq8016-sbc-pmic-pins.dtsi => apq8016-db410c-pmic-pins.dtsi}    | 0

>   .../qcom/{apq8016-sbc-soc-pins.dtsi => apq8016-db410c-soc-pins.dtsi} | 0

>   arch/arm64/boot/dts/qcom/{apq8016-sbc.dts => apq8016-db410c.dts}     | 5 +++--

>   arch/arm64/boot/dts/qcom/{apq8016-sbc.dtsi => apq8016-db410c.dtsi}   | 4 ++--

>   5 files changed, 6 insertions(+), 5 deletions(-)

>   rename arch/arm64/boot/dts/qcom/{apq8016-sbc-pmic-pins.dtsi => apq8016-db410c-pmic-pins.dtsi} (100%)

>   rename arch/arm64/boot/dts/qcom/{apq8016-sbc-soc-pins.dtsi => apq8016-db410c-soc-pins.dtsi} (100%)

>   rename arch/arm64/boot/dts/qcom/{apq8016-sbc.dts => apq8016-db410c.dts} (95%)

>   rename arch/arm64/boot/dts/qcom/{apq8016-sbc.dtsi => apq8016-db410c.dtsi} (99%)

> 

> diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile

> index ff81d7e5805e..fc46ab79acd9 100644

> --- a/arch/arm64/boot/dts/qcom/Makefile

> +++ b/arch/arm64/boot/dts/qcom/Makefile

> @@ -1,4 +1,4 @@

> -dtb-$(CONFIG_ARCH_QCOM)	+= apq8016-sbc.dtb

> +dtb-$(CONFIG_ARCH_QCOM)	+= apq8016-db410c.dtb

>   dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb

>   dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk01.dtb

>   dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-mtp.dtb

> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8016-db410c-pmic-pins.dtsi

> similarity index 100%

> rename from arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi

> rename to arch/arm64/boot/dts/qcom/apq8016-db410c-pmic-pins.dtsi

> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8016-db410c-soc-pins.dtsi

> similarity index 100%

> rename from arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi

> rename to arch/arm64/boot/dts/qcom/apq8016-db410c-soc-pins.dtsi

> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-db410c.dts

> similarity index 95%

> rename from arch/arm64/boot/dts/qcom/apq8016-sbc.dts

> rename to arch/arm64/boot/dts/qcom/apq8016-db410c.dts

> index 40b0d62861bb..86cfae4d2b9d 100644

> --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts

> +++ b/arch/arm64/boot/dts/qcom/apq8016-db410c.dts

> @@ -13,10 +13,11 @@

>   

>   /dts-v1/;

>   

> -#include "apq8016-sbc.dtsi"

> +#include "apq8016-db410c.dtsi"

>   

>   / {

> -	model = "Qualcomm Technologies, Inc. APQ 8016 SBC";

> +	model = "Qualcomm Technologies, Inc. APQ 8016 DragonBoard 410c";

> +	/* The "SBC" (Single Board Computer) is another name for this board */

>   	compatible = "qcom,apq8016-sbc", "qcom,apq8016", "qcom,sbc";

>   };

>   

> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi

> similarity index 99%

> rename from arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

> rename to arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi

> index 1d63e6b879de..1300c11e5f0e 100644

> --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

> +++ b/arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi

> @@ -13,8 +13,8 @@

>   

>   #include "msm8916.dtsi"

>   #include "pm8916.dtsi"

> -#include "apq8016-sbc-soc-pins.dtsi"

> -#include "apq8016-sbc-pmic-pins.dtsi"

> +#include "apq8016-db410c-soc-pins.dtsi"

> +#include "apq8016-db410c-pmic-pins.dtsi"

>   #include <dt-bindings/gpio/gpio.h>

>   #include <dt-bindings/input/input.h>

>   #include <dt-bindings/sound/apq8016-lpass.h>

> 

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rob Clark Oct. 3, 2017, 4:37 p.m. | #2
On Tue, Oct 3, 2017 at 8:25 AM, Srinivas Kandagatla
<srinivas.kandagatla@linaro.org> wrote:
>

>

> On 03/10/17 10:11, Linus Walleij wrote:

>>

>> Naming the DragonBoard 410c "SBC" (I guess "single board computer")

>> is not very helpful for users looking for their device tree in

>> the kernel. Also the db820c is named properly.

>>

>> Rectify this, simply, do not change the compatible strings but name

>> the DTS files in a consistent manner.

>>

>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

>

> I did not like the sbc naming convention too, This was primarily done due to

> some legacy build tools + bootloaders which have used sbc compatible to

> identify boards from multiple dtb blobs. Now that we can append dtb to

> kernel with new LK, this should not be a issue anymore.


maybe it would be an idea to update skales/dbttool first to look for
the new name, and then give people some time to upgrade, before
changing this in the kernel.  Otherwise I expect you'll cause some
confusion..

BR,
-R


> Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

>

>

>> ---

>> It's not like I don't understand that people will be nitpicky

>> about this.

>>

>> I was looking for the DragonBoard 410c devicetree and could not

>> find it until I realized this hopeless idiomatic naming.

>>

>> It cost me time and effort, and it is going to cost others time

>> and effort. Fixing it.

>>

>> The other patch naming the GPIO lines can be applied without

>> this one.

>> ---

>>   arch/arm64/boot/dts/qcom/Makefile                                    | 2

>> +-

>>   .../{apq8016-sbc-pmic-pins.dtsi => apq8016-db410c-pmic-pins.dtsi}    | 0

>>   .../qcom/{apq8016-sbc-soc-pins.dtsi => apq8016-db410c-soc-pins.dtsi} | 0

>>   arch/arm64/boot/dts/qcom/{apq8016-sbc.dts => apq8016-db410c.dts}     | 5

>> +++--

>>   arch/arm64/boot/dts/qcom/{apq8016-sbc.dtsi => apq8016-db410c.dtsi}   | 4

>> ++--

>>   5 files changed, 6 insertions(+), 5 deletions(-)

>>   rename arch/arm64/boot/dts/qcom/{apq8016-sbc-pmic-pins.dtsi =>

>> apq8016-db410c-pmic-pins.dtsi} (100%)

>>   rename arch/arm64/boot/dts/qcom/{apq8016-sbc-soc-pins.dtsi =>

>> apq8016-db410c-soc-pins.dtsi} (100%)

>>   rename arch/arm64/boot/dts/qcom/{apq8016-sbc.dts => apq8016-db410c.dts}

>> (95%)

>>   rename arch/arm64/boot/dts/qcom/{apq8016-sbc.dtsi =>

>> apq8016-db410c.dtsi} (99%)

>>

>> diff --git a/arch/arm64/boot/dts/qcom/Makefile

>> b/arch/arm64/boot/dts/qcom/Makefile

>> index ff81d7e5805e..fc46ab79acd9 100644

>> --- a/arch/arm64/boot/dts/qcom/Makefile

>> +++ b/arch/arm64/boot/dts/qcom/Makefile

>> @@ -1,4 +1,4 @@

>> -dtb-$(CONFIG_ARCH_QCOM)        += apq8016-sbc.dtb

>> +dtb-$(CONFIG_ARCH_QCOM)        += apq8016-db410c.dtb

>>   dtb-$(CONFIG_ARCH_QCOM)       += apq8096-db820c.dtb

>>   dtb-$(CONFIG_ARCH_QCOM)       += ipq8074-hk01.dtb

>>   dtb-$(CONFIG_ARCH_QCOM)       += msm8916-mtp.dtb

>> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi

>> b/arch/arm64/boot/dts/qcom/apq8016-db410c-pmic-pins.dtsi

>> similarity index 100%

>> rename from arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi

>> rename to arch/arm64/boot/dts/qcom/apq8016-db410c-pmic-pins.dtsi

>> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi

>> b/arch/arm64/boot/dts/qcom/apq8016-db410c-soc-pins.dtsi

>> similarity index 100%

>> rename from arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi

>> rename to arch/arm64/boot/dts/qcom/apq8016-db410c-soc-pins.dtsi

>> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts

>> b/arch/arm64/boot/dts/qcom/apq8016-db410c.dts

>> similarity index 95%

>> rename from arch/arm64/boot/dts/qcom/apq8016-sbc.dts

>> rename to arch/arm64/boot/dts/qcom/apq8016-db410c.dts

>> index 40b0d62861bb..86cfae4d2b9d 100644

>> --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts

>> +++ b/arch/arm64/boot/dts/qcom/apq8016-db410c.dts

>> @@ -13,10 +13,11 @@

>>     /dts-v1/;

>>   -#include "apq8016-sbc.dtsi"

>> +#include "apq8016-db410c.dtsi"

>>     / {

>> -       model = "Qualcomm Technologies, Inc. APQ 8016 SBC";

>> +       model = "Qualcomm Technologies, Inc. APQ 8016 DragonBoard 410c";

>> +       /* The "SBC" (Single Board Computer) is another name for this

>> board */

>>         compatible = "qcom,apq8016-sbc", "qcom,apq8016", "qcom,sbc";

>>   };

>>   diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

>> b/arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi

>> similarity index 99%

>> rename from arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

>> rename to arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi

>> index 1d63e6b879de..1300c11e5f0e 100644

>> --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

>> +++ b/arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi

>> @@ -13,8 +13,8 @@

>>     #include "msm8916.dtsi"

>>   #include "pm8916.dtsi"

>> -#include "apq8016-sbc-soc-pins.dtsi"

>> -#include "apq8016-sbc-pmic-pins.dtsi"

>> +#include "apq8016-db410c-soc-pins.dtsi"

>> +#include "apq8016-db410c-pmic-pins.dtsi"

>>   #include <dt-bindings/gpio/gpio.h>

>>   #include <dt-bindings/input/input.h>

>>   #include <dt-bindings/sound/apq8016-lpass.h>

>>

> --

> To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in

> the body of a message to majordomo@vger.kernel.org

> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Nicolas Dechesne Oct. 3, 2017, 5:49 p.m. | #3
On Tue, Oct 3, 2017 at 6:37 PM, Rob Clark <robdclark@gmail.com> wrote:
> On Tue, Oct 3, 2017 at 8:25 AM, Srinivas Kandagatla

> <srinivas.kandagatla@linaro.org> wrote:

>>

>>

>> On 03/10/17 10:11, Linus Walleij wrote:

>>>

>>> Naming the DragonBoard 410c "SBC" (I guess "single board computer")

>>> is not very helpful for users looking for their device tree in

>>> the kernel. Also the db820c is named properly.

>>>

>>> Rectify this, simply, do not change the compatible strings but name

>>> the DTS files in a consistent manner.

>>>

>>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

>>

>> I did not like the sbc naming convention too, This was primarily done due to

>> some legacy build tools + bootloaders which have used sbc compatible to

>> identify boards from multiple dtb blobs. Now that we can append dtb to

>> kernel with new LK, this should not be a issue anymore.

>

> maybe it would be an idea to update skales/dbttool first to look for

> the new name, and then give people some time to upgrade, before

> changing this in the kernel.  Otherwise I expect you'll cause some

> confusion..


iirc, skale is using the compatible name, not the filename.

>

> BR,

> -R

>

>

>> Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

>>

>>

>>> ---

>>> It's not like I don't understand that people will be nitpicky

>>> about this.

>>>

>>> I was looking for the DragonBoard 410c devicetree and could not

>>> find it until I realized this hopeless idiomatic naming.

>>>

>>> It cost me time and effort, and it is going to cost others time

>>> and effort. Fixing it.

>>>

>>> The other patch naming the GPIO lines can be applied without

>>> this one.

>>> ---

>>>   arch/arm64/boot/dts/qcom/Makefile                                    | 2

>>> +-

>>>   .../{apq8016-sbc-pmic-pins.dtsi => apq8016-db410c-pmic-pins.dtsi}    | 0

>>>   .../qcom/{apq8016-sbc-soc-pins.dtsi => apq8016-db410c-soc-pins.dtsi} | 0

>>>   arch/arm64/boot/dts/qcom/{apq8016-sbc.dts => apq8016-db410c.dts}     | 5

>>> +++--

>>>   arch/arm64/boot/dts/qcom/{apq8016-sbc.dtsi => apq8016-db410c.dtsi}   | 4

>>> ++--

>>>   5 files changed, 6 insertions(+), 5 deletions(-)

>>>   rename arch/arm64/boot/dts/qcom/{apq8016-sbc-pmic-pins.dtsi =>

>>> apq8016-db410c-pmic-pins.dtsi} (100%)

>>>   rename arch/arm64/boot/dts/qcom/{apq8016-sbc-soc-pins.dtsi =>

>>> apq8016-db410c-soc-pins.dtsi} (100%)

>>>   rename arch/arm64/boot/dts/qcom/{apq8016-sbc.dts => apq8016-db410c.dts}

>>> (95%)

>>>   rename arch/arm64/boot/dts/qcom/{apq8016-sbc.dtsi =>

>>> apq8016-db410c.dtsi} (99%)

>>>

>>> diff --git a/arch/arm64/boot/dts/qcom/Makefile

>>> b/arch/arm64/boot/dts/qcom/Makefile

>>> index ff81d7e5805e..fc46ab79acd9 100644

>>> --- a/arch/arm64/boot/dts/qcom/Makefile

>>> +++ b/arch/arm64/boot/dts/qcom/Makefile

>>> @@ -1,4 +1,4 @@

>>> -dtb-$(CONFIG_ARCH_QCOM)        += apq8016-sbc.dtb

>>> +dtb-$(CONFIG_ARCH_QCOM)        += apq8016-db410c.dtb

>>>   dtb-$(CONFIG_ARCH_QCOM)       += apq8096-db820c.dtb

>>>   dtb-$(CONFIG_ARCH_QCOM)       += ipq8074-hk01.dtb

>>>   dtb-$(CONFIG_ARCH_QCOM)       += msm8916-mtp.dtb

>>> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi

>>> b/arch/arm64/boot/dts/qcom/apq8016-db410c-pmic-pins.dtsi

>>> similarity index 100%

>>> rename from arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi

>>> rename to arch/arm64/boot/dts/qcom/apq8016-db410c-pmic-pins.dtsi

>>> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi

>>> b/arch/arm64/boot/dts/qcom/apq8016-db410c-soc-pins.dtsi

>>> similarity index 100%

>>> rename from arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi

>>> rename to arch/arm64/boot/dts/qcom/apq8016-db410c-soc-pins.dtsi

>>> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts

>>> b/arch/arm64/boot/dts/qcom/apq8016-db410c.dts

>>> similarity index 95%

>>> rename from arch/arm64/boot/dts/qcom/apq8016-sbc.dts

>>> rename to arch/arm64/boot/dts/qcom/apq8016-db410c.dts

>>> index 40b0d62861bb..86cfae4d2b9d 100644

>>> --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts

>>> +++ b/arch/arm64/boot/dts/qcom/apq8016-db410c.dts

>>> @@ -13,10 +13,11 @@

>>>     /dts-v1/;

>>>   -#include "apq8016-sbc.dtsi"

>>> +#include "apq8016-db410c.dtsi"

>>>     / {

>>> -       model = "Qualcomm Technologies, Inc. APQ 8016 SBC";

>>> +       model = "Qualcomm Technologies, Inc. APQ 8016 DragonBoard 410c";

>>> +       /* The "SBC" (Single Board Computer) is another name for this

>>> board */

>>>         compatible = "qcom,apq8016-sbc", "qcom,apq8016", "qcom,sbc";

>>>   };

>>>   diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

>>> b/arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi

>>> similarity index 99%

>>> rename from arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

>>> rename to arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi

>>> index 1d63e6b879de..1300c11e5f0e 100644

>>> --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

>>> +++ b/arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi

>>> @@ -13,8 +13,8 @@

>>>     #include "msm8916.dtsi"

>>>   #include "pm8916.dtsi"

>>> -#include "apq8016-sbc-soc-pins.dtsi"

>>> -#include "apq8016-sbc-pmic-pins.dtsi"

>>> +#include "apq8016-db410c-soc-pins.dtsi"

>>> +#include "apq8016-db410c-pmic-pins.dtsi"

>>>   #include <dt-bindings/gpio/gpio.h>

>>>   #include <dt-bindings/input/input.h>

>>>   #include <dt-bindings/sound/apq8016-lpass.h>

>>>

>> --

>> To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in

>> the body of a message to majordomo@vger.kernel.org

>> More majordomo info at  http://vger.kernel.org/majordomo-info.html

> --

> To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in

> the body of a message to majordomo@vger.kernel.org

> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rob Clark Oct. 3, 2017, 6:54 p.m. | #4
On Tue, Oct 3, 2017 at 1:49 PM, Nicolas Dechesne
<nicolas.dechesne@linaro.org> wrote:
> On Tue, Oct 3, 2017 at 6:37 PM, Rob Clark <robdclark@gmail.com> wrote:

>> On Tue, Oct 3, 2017 at 8:25 AM, Srinivas Kandagatla

>> <srinivas.kandagatla@linaro.org> wrote:

>>>

>>>

>>> On 03/10/17 10:11, Linus Walleij wrote:

>>>>

>>>> Naming the DragonBoard 410c "SBC" (I guess "single board computer")

>>>> is not very helpful for users looking for their device tree in

>>>> the kernel. Also the db820c is named properly.

>>>>

>>>> Rectify this, simply, do not change the compatible strings but name

>>>> the DTS files in a consistent manner.

>>>>

>>>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

>>>

>>> I did not like the sbc naming convention too, This was primarily done due to

>>> some legacy build tools + bootloaders which have used sbc compatible to

>>> identify boards from multiple dtb blobs. Now that we can append dtb to

>>> kernel with new LK, this should not be a issue anymore.

>>

>> maybe it would be an idea to update skales/dbttool first to look for

>> the new name, and then give people some time to upgrade, before

>> changing this in the kernel.  Otherwise I expect you'll cause some

>> confusion..

>

> iirc, skale is using the compatible name, not the filename.

>


ahh, yes, I think you are right.. u-boot is using a different filename.

So in this case, no issue to pick a saner name :-)

BR,
-R
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Bjorn Andersson Oct. 3, 2017, 8:58 p.m. | #5
On Tue 03 Oct 02:11 PDT 2017, Linus Walleij wrote:

> Naming the DragonBoard 410c "SBC" (I guess "single board computer")

> is not very helpful for users looking for their device tree in

> the kernel. Also the db820c is named properly.

> 

> Rectify this, simply, do not change the compatible strings but name

> the DTS files in a consistent manner.

> 

> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>


This annoys me every time I'm poking at the 410c.

Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>


Regards,
Bjorn

> ---

> It's not like I don't understand that people will be nitpicky

> about this.

> 

> I was looking for the DragonBoard 410c devicetree and could not

> find it until I realized this hopeless idiomatic naming.

> 

> It cost me time and effort, and it is going to cost others time

> and effort. Fixing it.

> 

> The other patch naming the GPIO lines can be applied without

> this one.

> ---

>  arch/arm64/boot/dts/qcom/Makefile                                    | 2 +-

>  .../{apq8016-sbc-pmic-pins.dtsi => apq8016-db410c-pmic-pins.dtsi}    | 0

>  .../qcom/{apq8016-sbc-soc-pins.dtsi => apq8016-db410c-soc-pins.dtsi} | 0

>  arch/arm64/boot/dts/qcom/{apq8016-sbc.dts => apq8016-db410c.dts}     | 5 +++--

>  arch/arm64/boot/dts/qcom/{apq8016-sbc.dtsi => apq8016-db410c.dtsi}   | 4 ++--

>  5 files changed, 6 insertions(+), 5 deletions(-)

>  rename arch/arm64/boot/dts/qcom/{apq8016-sbc-pmic-pins.dtsi => apq8016-db410c-pmic-pins.dtsi} (100%)

>  rename arch/arm64/boot/dts/qcom/{apq8016-sbc-soc-pins.dtsi => apq8016-db410c-soc-pins.dtsi} (100%)

>  rename arch/arm64/boot/dts/qcom/{apq8016-sbc.dts => apq8016-db410c.dts} (95%)

>  rename arch/arm64/boot/dts/qcom/{apq8016-sbc.dtsi => apq8016-db410c.dtsi} (99%)

> 

> diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile

> index ff81d7e5805e..fc46ab79acd9 100644

> --- a/arch/arm64/boot/dts/qcom/Makefile

> +++ b/arch/arm64/boot/dts/qcom/Makefile

> @@ -1,4 +1,4 @@

> -dtb-$(CONFIG_ARCH_QCOM)	+= apq8016-sbc.dtb

> +dtb-$(CONFIG_ARCH_QCOM)	+= apq8016-db410c.dtb

>  dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb

>  dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk01.dtb

>  dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-mtp.dtb

> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8016-db410c-pmic-pins.dtsi

> similarity index 100%

> rename from arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi

> rename to arch/arm64/boot/dts/qcom/apq8016-db410c-pmic-pins.dtsi

> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8016-db410c-soc-pins.dtsi

> similarity index 100%

> rename from arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi

> rename to arch/arm64/boot/dts/qcom/apq8016-db410c-soc-pins.dtsi

> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-db410c.dts

> similarity index 95%

> rename from arch/arm64/boot/dts/qcom/apq8016-sbc.dts

> rename to arch/arm64/boot/dts/qcom/apq8016-db410c.dts

> index 40b0d62861bb..86cfae4d2b9d 100644

> --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts

> +++ b/arch/arm64/boot/dts/qcom/apq8016-db410c.dts

> @@ -13,10 +13,11 @@

>  

>  /dts-v1/;

>  

> -#include "apq8016-sbc.dtsi"

> +#include "apq8016-db410c.dtsi"

>  

>  / {

> -	model = "Qualcomm Technologies, Inc. APQ 8016 SBC";

> +	model = "Qualcomm Technologies, Inc. APQ 8016 DragonBoard 410c";

> +	/* The "SBC" (Single Board Computer) is another name for this board */

>  	compatible = "qcom,apq8016-sbc", "qcom,apq8016", "qcom,sbc";

>  };

>  

> diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi

> similarity index 99%

> rename from arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

> rename to arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi

> index 1d63e6b879de..1300c11e5f0e 100644

> --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi

> +++ b/arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi

> @@ -13,8 +13,8 @@

>  

>  #include "msm8916.dtsi"

>  #include "pm8916.dtsi"

> -#include "apq8016-sbc-soc-pins.dtsi"

> -#include "apq8016-sbc-pmic-pins.dtsi"

> +#include "apq8016-db410c-soc-pins.dtsi"

> +#include "apq8016-db410c-pmic-pins.dtsi"

>  #include <dt-bindings/gpio/gpio.h>

>  #include <dt-bindings/input/input.h>

>  #include <dt-bindings/sound/apq8016-lpass.h>

> -- 

> 2.13.5

> 

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rob Clark Oct. 4, 2017, 9:23 p.m. | #6
On Tue, Oct 3, 2017 at 2:54 PM, Rob Clark <robdclark@gmail.com> wrote:
> On Tue, Oct 3, 2017 at 1:49 PM, Nicolas Dechesne

> <nicolas.dechesne@linaro.org> wrote:

>> On Tue, Oct 3, 2017 at 6:37 PM, Rob Clark <robdclark@gmail.com> wrote:

>>> On Tue, Oct 3, 2017 at 8:25 AM, Srinivas Kandagatla

>>> <srinivas.kandagatla@linaro.org> wrote:

>>>>

>>>>

>>>> On 03/10/17 10:11, Linus Walleij wrote:

>>>>>

>>>>> Naming the DragonBoard 410c "SBC" (I guess "single board computer")

>>>>> is not very helpful for users looking for their device tree in

>>>>> the kernel. Also the db820c is named properly.

>>>>>

>>>>> Rectify this, simply, do not change the compatible strings but name

>>>>> the DTS files in a consistent manner.

>>>>>

>>>>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

>>>>

>>>> I did not like the sbc naming convention too, This was primarily done due to

>>>> some legacy build tools + bootloaders which have used sbc compatible to

>>>> identify boards from multiple dtb blobs. Now that we can append dtb to

>>>> kernel with new LK, this should not be a issue anymore.

>>>

>>> maybe it would be an idea to update skales/dbttool first to look for

>>> the new name, and then give people some time to upgrade, before

>>> changing this in the kernel.  Otherwise I expect you'll cause some

>>> confusion..

>>

>> iirc, skale is using the compatible name, not the filename.

>>

>

> ahh, yes, I think you are right.. u-boot is using a different filename.

>

> So in this case, no issue to pick a saner name :-)

>


So, actually u-boot encodes the board's fdtname..  so as much as I'd
like to rename it to something more sane, unless the kernel can manage
to install a symlink for backwards compat, NAK

I was trying to think of hacks for u-boot to check for multiple fdt
names, but if we want to get to the point of being able to install
multiple distro's on a single disk, we actually need to pass fdtname
to grub (where distro specific grub.cfg is encoding the UUID of the
distro's /boot partition, so it knows where to load the dtb from)..
this gets nearly impossible when one name becomes multiple names.  So
hurray for the fdt name becoming accidental ABI!

If we managed to get this in before the 4.14 LTS I might feel
differently.  But afterwards, totally not. :-(

BR,
-R
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Stephen Boyd Oct. 4, 2017, 10:09 p.m. | #7
On 10/04, Rob Clark wrote:
> On Tue, Oct 3, 2017 at 2:54 PM, Rob Clark <robdclark@gmail.com> wrote:

> > On Tue, Oct 3, 2017 at 1:49 PM, Nicolas Dechesne

> > <nicolas.dechesne@linaro.org> wrote:

> >> On Tue, Oct 3, 2017 at 6:37 PM, Rob Clark <robdclark@gmail.com> wrote:

> >>> On Tue, Oct 3, 2017 at 8:25 AM, Srinivas Kandagatla

> >>> <srinivas.kandagatla@linaro.org> wrote:

> >>>>

> >>>>

> >>>> On 03/10/17 10:11, Linus Walleij wrote:

> >>>>>

> >>>>> Naming the DragonBoard 410c "SBC" (I guess "single board computer")

> >>>>> is not very helpful for users looking for their device tree in

> >>>>> the kernel. Also the db820c is named properly.

> >>>>>

> >>>>> Rectify this, simply, do not change the compatible strings but name

> >>>>> the DTS files in a consistent manner.

> >>>>>

> >>>>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

> >>>>

> >>>> I did not like the sbc naming convention too, This was primarily done due to

> >>>> some legacy build tools + bootloaders which have used sbc compatible to

> >>>> identify boards from multiple dtb blobs. Now that we can append dtb to

> >>>> kernel with new LK, this should not be a issue anymore.

> >>>

> >>> maybe it would be an idea to update skales/dbttool first to look for

> >>> the new name, and then give people some time to upgrade, before

> >>> changing this in the kernel.  Otherwise I expect you'll cause some

> >>> confusion..

> >>

> >> iirc, skale is using the compatible name, not the filename.

> >>

> >

> > ahh, yes, I think you are right.. u-boot is using a different filename.

> >

> > So in this case, no issue to pick a saner name :-)

> >

> 

> So, actually u-boot encodes the board's fdtname..  so as much as I'd

> like to rename it to something more sane, unless the kernel can manage

> to install a symlink for backwards compat, NAK

> 

> I was trying to think of hacks for u-boot to check for multiple fdt

> names, but if we want to get to the point of being able to install

> multiple distro's on a single disk, we actually need to pass fdtname

> to grub (where distro specific grub.cfg is encoding the UUID of the

> distro's /boot partition, so it knows where to load the dtb from)..

> this gets nearly impossible when one name becomes multiple names.  So

> hurray for the fdt name becoming accidental ABI!

> 

> If we managed to get this in before the 4.14 LTS I might feel

> differently.  But afterwards, totally not. :-(

> 


How do you install dtbs onto your device? Should be simple enough
to run 'mv' on the new filename to the old one?

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rob Clark Oct. 4, 2017, 10:12 p.m. | #8
On Wed, Oct 4, 2017 at 6:09 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> On 10/04, Rob Clark wrote:

>> On Tue, Oct 3, 2017 at 2:54 PM, Rob Clark <robdclark@gmail.com> wrote:

>> > On Tue, Oct 3, 2017 at 1:49 PM, Nicolas Dechesne

>> > <nicolas.dechesne@linaro.org> wrote:

>> >> On Tue, Oct 3, 2017 at 6:37 PM, Rob Clark <robdclark@gmail.com> wrote:

>> >>> On Tue, Oct 3, 2017 at 8:25 AM, Srinivas Kandagatla

>> >>> <srinivas.kandagatla@linaro.org> wrote:

>> >>>>

>> >>>>

>> >>>> On 03/10/17 10:11, Linus Walleij wrote:

>> >>>>>

>> >>>>> Naming the DragonBoard 410c "SBC" (I guess "single board computer")

>> >>>>> is not very helpful for users looking for their device tree in

>> >>>>> the kernel. Also the db820c is named properly.

>> >>>>>

>> >>>>> Rectify this, simply, do not change the compatible strings but name

>> >>>>> the DTS files in a consistent manner.

>> >>>>>

>> >>>>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

>> >>>>

>> >>>> I did not like the sbc naming convention too, This was primarily done due to

>> >>>> some legacy build tools + bootloaders which have used sbc compatible to

>> >>>> identify boards from multiple dtb blobs. Now that we can append dtb to

>> >>>> kernel with new LK, this should not be a issue anymore.

>> >>>

>> >>> maybe it would be an idea to update skales/dbttool first to look for

>> >>> the new name, and then give people some time to upgrade, before

>> >>> changing this in the kernel.  Otherwise I expect you'll cause some

>> >>> confusion..

>> >>

>> >> iirc, skale is using the compatible name, not the filename.

>> >>

>> >

>> > ahh, yes, I think you are right.. u-boot is using a different filename.

>> >

>> > So in this case, no issue to pick a saner name :-)

>> >

>>

>> So, actually u-boot encodes the board's fdtname..  so as much as I'd

>> like to rename it to something more sane, unless the kernel can manage

>> to install a symlink for backwards compat, NAK

>>

>> I was trying to think of hacks for u-boot to check for multiple fdt

>> names, but if we want to get to the point of being able to install

>> multiple distro's on a single disk, we actually need to pass fdtname

>> to grub (where distro specific grub.cfg is encoding the UUID of the

>> distro's /boot partition, so it knows where to load the dtb from)..

>> this gets nearly impossible when one name becomes multiple names.  So

>> hurray for the fdt name becoming accidental ABI!

>>

>> If we managed to get this in before the 4.14 LTS I might feel

>> differently.  But afterwards, totally not. :-(

>>

>

> How do you install dtbs onto your device? Should be simple enough

> to run 'mv' on the new filename to the old one?

>


it is part of the kernel package.. but fixing it in the distro means
fixing it in *every* distro..

if we are going for a workaround, then it should be the kernel
installing a symlink.  Not every distro having to fix things up in the
same way for one particular board.

BR,
-R
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Stephen Boyd Oct. 4, 2017, 11:21 p.m. | #9
On 10/04, Rob Clark wrote:
> On Wed, Oct 4, 2017 at 6:09 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:

> > On 10/04, Rob Clark wrote:

> >> If we managed to get this in before the 4.14 LTS I might feel

> >> differently.  But afterwards, totally not. :-(

> >>

> >

> > How do you install dtbs onto your device? Should be simple enough

> > to run 'mv' on the new filename to the old one?

> >

> 

> it is part of the kernel package


Are you copying the file out of the arch/arm64/boot/dts
directory? Or you're using dtbs_install rule?

> but fixing it in the distro means fixing it in *every* distro..


That assumes every distro has a bootloader that's looking for one
file name vs. the other. And that the distro hasn't updated the
bootloader to pick a different name.

> 

> if we are going for a workaround, then it should be the kernel

> installing a symlink.  Not every distro having to fix things up in the

> same way for one particular board.


There was a discussion about this years ago when the dtbs_install
rule was introduced to the kernel makefiles[1]. Maybe the
sentiment has changed, but it seems that people involved in that
thread didn't consider the filename an ABI. Also, take a look at
commit f4d4ffc03efc ("kbuild: dtbs_install: new make target")
where it says:

"Removed option to call external script. Copying the files should
be sufficient and a build system can post-process the install
directory.  Despite the fact an external script is used for
installing the kernel, I don't think that is a pattern that
should be encouraged. I would rather see buildroot type tools
post process the install directory to rename or move dtb files
after installing to a staging directory."

which makes it look like the distro installation scripts would
rename things if desired.

[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-November/210562.html

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rob Clark Oct. 4, 2017, 11:49 p.m. | #10
On Wed, Oct 4, 2017 at 7:21 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:
> On 10/04, Rob Clark wrote:

>> On Wed, Oct 4, 2017 at 6:09 PM, Stephen Boyd <sboyd@codeaurora.org> wrote:

>> > On 10/04, Rob Clark wrote:

>> >> If we managed to get this in before the 4.14 LTS I might feel

>> >> differently.  But afterwards, totally not. :-(

>> >>

>> >

>> > How do you install dtbs onto your device? Should be simple enough

>> > to run 'mv' on the new filename to the old one?

>> >

>>

>> it is part of the kernel package

>

> Are you copying the file out of the arch/arm64/boot/dts

> directory? Or you're using dtbs_install rule?


dtbs_install

>> but fixing it in the distro means fixing it in *every* distro..

>

> That assumes every distro has a bootloader that's looking for one

> file name vs. the other. And that the distro hasn't updated the

> bootloader to pick a different name.


well, the distro starts at grub.. u-boot (implementing the uefi
interface, and loading the dtb) is part of the board's "bios".. we
kinda want to avoid having to provide different versions of "bios" for
users to flash depending on kernel version

>>

>> if we are going for a workaround, then it should be the kernel

>> installing a symlink.  Not every distro having to fix things up in the

>> same way for one particular board.

>

> There was a discussion about this years ago when the dtbs_install

> rule was introduced to the kernel makefiles[1]. Maybe the

> sentiment has changed, but it seems that people involved in that

> thread didn't consider the filename an ABI. Also, take a look at

> commit f4d4ffc03efc ("kbuild: dtbs_install: new make target")

> where it says:

>

> "Removed option to call external script. Copying the files should

> be sufficient and a build system can post-process the install

> directory.  Despite the fact an external script is used for

> installing the kernel, I don't think that is a pattern that

> should be encouraged. I would rather see buildroot type tools

> post process the install directory to rename or move dtb files

> after installing to a staging directory."


So there is kernel-install (which regen's initrd and runs
/lib/kernel/install.d/* scripts).. but so far afaik it hasn't had to
do board specific fixups.. and since this is a change there would have
to propagate into every distro, I'd prefer either not needing to do
this in the first place, or doing it in dtbs_install..

Then again, for db410c, since prior to 4.14 we didn't have an iommu
driver (which display and gpu needed to work without hacks, and
therefore less interesting for distro users), if we manage to sneak
this change into 4.14, then I guess we could live with the short term
headache of telling distro users to flash a different "bios" depending
on kernel version.

After that, we *really* don't want the headache of handholding users
thru bios upgrade for 4.14-lts to newer kernel upgrade.

BR,
-R

> which makes it look like the distro installation scripts would

> rename things if desired.

>

> [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-November/210562.html

>

> --

> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,

> a Linux Foundation Collaborative Project

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Riku Voipio Oct. 5, 2017, 12:54 p.m. | #11
On 5 October 2017 at 00:23, Rob Clark <robdclark@gmail.com> wrote:
> On Tue, Oct 3, 2017 at 2:54 PM, Rob Clark <robdclark@gmail.com> wrote:

>> On Tue, Oct 3, 2017 at 1:49 PM, Nicolas Dechesne

>> <nicolas.dechesne@linaro.org> wrote:

>>> On Tue, Oct 3, 2017 at 6:37 PM, Rob Clark <robdclark@gmail.com> wrote:

>>>> On Tue, Oct 3, 2017 at 8:25 AM, Srinivas Kandagatla

>>>> <srinivas.kandagatla@linaro.org> wrote:

>>>>>

>>>>>

>>>>> On 03/10/17 10:11, Linus Walleij wrote:

>>>>>>

>>>>>> Naming the DragonBoard 410c "SBC" (I guess "single board computer")

>>>>>> is not very helpful for users looking for their device tree in

>>>>>> the kernel. Also the db820c is named properly.

>>>>>>

>>>>>> Rectify this, simply, do not change the compatible strings but name

>>>>>> the DTS files in a consistent manner.

>>>>>>

>>>>>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

>>>>>

>>>>> I did not like the sbc naming convention too, This was primarily done due to

>>>>> some legacy build tools + bootloaders which have used sbc compatible to

>>>>> identify boards from multiple dtb blobs. Now that we can append dtb to

>>>>> kernel with new LK, this should not be a issue anymore.

>>>>

>>>> maybe it would be an idea to update skales/dbttool first to look for

>>>> the new name, and then give people some time to upgrade, before

>>>> changing this in the kernel.  Otherwise I expect you'll cause some

>>>> confusion..

>>>

>>> iirc, skale is using the compatible name, not the filename.

>>>

>>

>> ahh, yes, I think you are right.. u-boot is using a different filename.

>>

>> So in this case, no issue to pick a saner name :-)

>>

>

> So, actually u-boot encodes the board's fdtname..  so as much as I'd

> like to rename it to something more sane, unless the kernel can manage

> to install a symlink for backwards compat, NAK


In some cases the partition where dtbs is FAT, which doesn't do
symlinks. There are various instructions around that refer to editing
apq8016-sbc.dts already[1]. The goal of the patch is to reduce
confusion, but requiring different firmware depending on kernel
version, and/or updated userspace, is actually going to increase the
confusion and frustration. So I have echo Rob here.

> I was trying to think of hacks for u-boot to check for multiple fdt

> names, but if we want to get to the point of being able to install

> multiple distro's on a single disk, we actually need to pass fdtname

> to grub (where distro specific grub.cfg is encoding the UUID of the

> distro's /boot partition, so it knows where to load the dtb from)..

> this gets nearly impossible when one name becomes multiple names.  So

> hurray for the fdt name becoming accidental ABI!


It's unfortunate yes.

But is renaming .dts really needed to make finding the right DTS easier?

Maybe just pick this part the patch:

-       model = "Qualcomm Technologies, Inc. APQ 8016 SBC";
+       model = "Qualcomm Technologies, Inc. APQ 8016 DragonBoard 410c";

then you can "git grep 410c " to find the file. This is how find the
Nexus, Pixel and Jetson TX dts for example.

[1] https://www.google.fi/search?q=instructions+apq8016-sbc

Riku
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexander Graf Oct. 5, 2017, 1:06 p.m. | #12
On 05.10.17 14:54, Riku Voipio wrote:
> On 5 October 2017 at 00:23, Rob Clark <robdclark@gmail.com> wrote:

>> On Tue, Oct 3, 2017 at 2:54 PM, Rob Clark <robdclark@gmail.com> wrote:

>>> On Tue, Oct 3, 2017 at 1:49 PM, Nicolas Dechesne

>>> <nicolas.dechesne@linaro.org> wrote:

>>>> On Tue, Oct 3, 2017 at 6:37 PM, Rob Clark <robdclark@gmail.com> wrote:

>>>>> On Tue, Oct 3, 2017 at 8:25 AM, Srinivas Kandagatla

>>>>> <srinivas.kandagatla@linaro.org> wrote:

>>>>>>

>>>>>>

>>>>>> On 03/10/17 10:11, Linus Walleij wrote:

>>>>>>>

>>>>>>> Naming the DragonBoard 410c "SBC" (I guess "single board computer")

>>>>>>> is not very helpful for users looking for their device tree in

>>>>>>> the kernel. Also the db820c is named properly.

>>>>>>>

>>>>>>> Rectify this, simply, do not change the compatible strings but name

>>>>>>> the DTS files in a consistent manner.

>>>>>>>

>>>>>>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

>>>>>>

>>>>>> I did not like the sbc naming convention too, This was primarily done due to

>>>>>> some legacy build tools + bootloaders which have used sbc compatible to

>>>>>> identify boards from multiple dtb blobs. Now that we can append dtb to

>>>>>> kernel with new LK, this should not be a issue anymore.

>>>>>

>>>>> maybe it would be an idea to update skales/dbttool first to look for

>>>>> the new name, and then give people some time to upgrade, before

>>>>> changing this in the kernel.  Otherwise I expect you'll cause some

>>>>> confusion..

>>>>

>>>> iirc, skale is using the compatible name, not the filename.

>>>>

>>>

>>> ahh, yes, I think you are right.. u-boot is using a different filename.

>>>

>>> So in this case, no issue to pick a saner name :-)

>>>

>>

>> So, actually u-boot encodes the board's fdtname..  so as much as I'd

>> like to rename it to something more sane, unless the kernel can manage

>> to install a symlink for backwards compat, NAK

> 

> In some cases the partition where dtbs is FAT, which doesn't do

> symlinks. There are various instructions around that refer to editing

> apq8016-sbc.dts already[1]. The goal of the patch is to reduce

> confusion, but requiring different firmware depending on kernel

> version, and/or updated userspace, is actually going to increase the

> confusion and frustration. So I have echo Rob here.

> 

>> I was trying to think of hacks for u-boot to check for multiple fdt

>> names, but if we want to get to the point of being able to install

>> multiple distro's on a single disk, we actually need to pass fdtname

>> to grub (where distro specific grub.cfg is encoding the UUID of the

>> distro's /boot partition, so it knows where to load the dtb from)..

>> this gets nearly impossible when one name becomes multiple names.  So

>> hurray for the fdt name becoming accidental ABI!

> 

> It's unfortunate yes.

> 

> But is renaming .dts really needed to make finding the right DTS easier?

> 

> Maybe just pick this part the patch:

> 

> -       model = "Qualcomm Technologies, Inc. APQ 8016 SBC";

> +       model = "Qualcomm Technologies, Inc. APQ 8016 DragonBoard 410c";

> 

> then you can "git grep 410c " to find the file. This is how find the

> Nexus, Pixel and Jetson TX dts for example.


You could also simply carry around both, with for example the 
dragonboard one including sbc and overriding the machine name.

But please don't remove any device tree file names that were there 
before. It only causes confusion for everyone.


Alex
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Andy Gross Oct. 6, 2017, 4:41 a.m. | #13
On Thu, Oct 05, 2017 at 03:06:34PM +0200, Alexander Graf wrote:

<snip>

> You could also simply carry around both, with for example the dragonboard

> one including sbc and overriding the machine name.

> 

> But please don't remove any device tree file names that were there before.

> It only causes confusion for everyone.


This seems to be a reasonable solution.


Regards,
Andy
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index ff81d7e5805e..fc46ab79acd9 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -1,4 +1,4 @@ 
-dtb-$(CONFIG_ARCH_QCOM)	+= apq8016-sbc.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= apq8016-db410c.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= apq8096-db820c.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= ipq8074-hk01.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= msm8916-mtp.dtb
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8016-db410c-pmic-pins.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi
rename to arch/arm64/boot/dts/qcom/apq8016-db410c-pmic-pins.dtsi
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi b/arch/arm64/boot/dts/qcom/apq8016-db410c-soc-pins.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi
rename to arch/arm64/boot/dts/qcom/apq8016-db410c-soc-pins.dtsi
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-db410c.dts
similarity index 95%
rename from arch/arm64/boot/dts/qcom/apq8016-sbc.dts
rename to arch/arm64/boot/dts/qcom/apq8016-db410c.dts
index 40b0d62861bb..86cfae4d2b9d 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-db410c.dts
@@ -13,10 +13,11 @@ 
 
 /dts-v1/;
 
-#include "apq8016-sbc.dtsi"
+#include "apq8016-db410c.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. APQ 8016 SBC";
+	model = "Qualcomm Technologies, Inc. APQ 8016 DragonBoard 410c";
+	/* The "SBC" (Single Board Computer) is another name for this board */
 	compatible = "qcom,apq8016-sbc", "qcom,apq8016", "qcom,sbc";
 };
 
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi
similarity index 99%
rename from arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
rename to arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi
index 1d63e6b879de..1300c11e5f0e 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8016-db410c.dtsi
@@ -13,8 +13,8 @@ 
 
 #include "msm8916.dtsi"
 #include "pm8916.dtsi"
-#include "apq8016-sbc-soc-pins.dtsi"
-#include "apq8016-sbc-pmic-pins.dtsi"
+#include "apq8016-db410c-soc-pins.dtsi"
+#include "apq8016-db410c-pmic-pins.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/sound/apq8016-lpass.h>