| Message ID | 20210617090222.7516-1-paul.barker@sancloud.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Lokesh Vutla |
| Headers | show |
| Series | [1/4] arm: dts: am335x-boneblack: Extract common config | expand |
On Thu, Jun 17, 2021 at 10:03 AM Paul Barker <paul.barker@sancloud.com> wrote: > > Configuration which is shared between the BeagleBone Black and > derivative boards like the Sancloud BeagleBone Enhanced (BBE) is moved > to a common dtsi file to prevent duplication. Are these being sent upstream to the linux kernel? > Signed-off-by: Paul Barker <paul.barker@sancloud.com> > --- > ...black.dts => am335x-boneblack-common.dtsi} | 26 +++---- > arch/arm/dts/am335x-boneblack.dts | 75 +------------------ > 2 files changed, 10 insertions(+), 91 deletions(-) > copy arch/arm/dts/{am335x-boneblack.dts => am335x-boneblack-common.dtsi} (94%) > > diff --git a/arch/arm/dts/am335x-boneblack.dts b/arch/arm/dts/am335x-boneblack-common.dtsi > similarity index 94% > copy from arch/arm/dts/am335x-boneblack.dts > copy to arch/arm/dts/am335x-boneblack-common.dtsi > index 27ebe4a65d..9d31fda17b 100644 > --- a/arch/arm/dts/am335x-boneblack.dts > +++ b/arch/arm/dts/am335x-boneblack-common.dtsi > @@ -5,18 +5,21 @@ > * it under the terms of the GNU General Public License version 2 as > * published by the Free Software Foundation. > */ > -/dts-v1/; > - > -#include "am33xx.dtsi" > -#include "am335x-bone-common.dtsi" > > / { > - model = "TI AM335x BeagleBone Black"; > - compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; > chosen { > stdout-path = &uart0; > tick-timer = &timer2; > }; > + > + hdmi { > + compatible = "ti,tilcdc,slave"; > + i2c = <&i2c0>; > + pinctrl-names = "default", "off"; > + pinctrl-0 = <&nxp_hdmi_bonelt_pins>; > + pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; > + status = "okay"; > + }; > }; > > &ldo3_reg { > @@ -74,17 +77,6 @@ > status = "okay"; > }; > > -/ { > - hdmi { > - compatible = "ti,tilcdc,slave"; > - i2c = <&i2c0>; > - pinctrl-names = "default", "off"; > - pinctrl-0 = <&nxp_hdmi_bonelt_pins>; > - pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; > - status = "okay"; > - }; > -}; > - > &rtc { > system-power-controller; > }; > diff --git a/arch/arm/dts/am335x-boneblack.dts b/arch/arm/dts/am335x-boneblack.dts > index 27ebe4a65d..77273df1a0 100644 > --- a/arch/arm/dts/am335x-boneblack.dts > +++ b/arch/arm/dts/am335x-boneblack.dts > @@ -9,82 +9,9 @@ > > #include "am33xx.dtsi" > #include "am335x-bone-common.dtsi" > +#include "am335x-boneblack-common.dtsi" > > / { > model = "TI AM335x BeagleBone Black"; > compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; > - chosen { > - stdout-path = &uart0; > - tick-timer = &timer2; > - }; > -}; > - > -&ldo3_reg { > - regulator-min-microvolt = <1800000>; > - regulator-max-microvolt = <1800000>; > - regulator-always-on; > -}; > - > -&mmc1 { > - vmmc-supply = <&vmmcsd_fixed>; > -}; > - > -&mmc2 { > - vmmc-supply = <&vmmcsd_fixed>; > - pinctrl-names = "default"; > - pinctrl-0 = <&emmc_pins>; > - bus-width = <8>; > - status = "okay"; > -}; > - > -&am33xx_pinmux { > - nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins { > - pinctrl-single,pins = < > - 0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */ > - 0xa0 0x08 /* lcd_data0.lcd_data0, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xa4 0x08 /* lcd_data1.lcd_data1, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xa8 0x08 /* lcd_data2.lcd_data2, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xac 0x08 /* lcd_data3.lcd_data3, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xb0 0x08 /* lcd_data4.lcd_data4, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xb4 0x08 /* lcd_data5.lcd_data5, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xb8 0x08 /* lcd_data6.lcd_data6, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xbc 0x08 /* lcd_data7.lcd_data7, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xc0 0x08 /* lcd_data8.lcd_data8, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xc4 0x08 /* lcd_data9.lcd_data9, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xc8 0x08 /* lcd_data10.lcd_data10, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xcc 0x08 /* lcd_data11.lcd_data11, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xd0 0x08 /* lcd_data12.lcd_data12, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xd4 0x08 /* lcd_data13.lcd_data13, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xd8 0x08 /* lcd_data14.lcd_data14, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xdc 0x08 /* lcd_data15.lcd_data15, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ > - 0xe0 0x00 /* lcd_vsync.lcd_vsync, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ > - 0xe4 0x00 /* lcd_hsync.lcd_hsync, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ > - 0xe8 0x00 /* lcd_pclk.lcd_pclk, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ > - 0xec 0x00 /* lcd_ac_bias_en.lcd_ac_bias_en, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ > - >; > - }; > - nxp_hdmi_bonelt_off_pins: nxp_hdmi_bonelt_off_pins { > - pinctrl-single,pins = < > - 0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */ > - >; > - }; > -}; > - > -&lcdc { > - status = "okay"; > -}; > - > -/ { > - hdmi { > - compatible = "ti,tilcdc,slave"; > - i2c = <&i2c0>; > - pinctrl-names = "default", "off"; > - pinctrl-0 = <&nxp_hdmi_bonelt_pins>; > - pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; > - status = "okay"; > - }; > -}; > - > -&rtc { > - system-power-controller; > }; > -- > 2.26.2 >
On Thu, 17 Jun 2021 11:05:46 +0100 Peter Robinson <pbrobinson@gmail.com> wrote: > On Thu, Jun 17, 2021 at 10:03 AM Paul Barker > <paul.barker@sancloud.com> wrote: > > > > Configuration which is shared between the BeagleBone Black and > > derivative boards like the Sancloud BeagleBone Enhanced (BBE) is > > moved to a common dtsi file to prevent duplication. > > Are these being sent upstream to the linux kernel? The upstream kernel already has am335x-boneblack-common.dtsi and am335x-sancloud-bbe.dts files, since 2016 and 2018 respectively. As these files fell out of sync over 4 years ago I've assumed there is no need to keep them in sync. We could try to resync things but that would lead to an unnecessary risk of breakage, I don't have every BeagleBone Black derivative board on hand to fully test such a resync.
On Thu, Jun 17, 2021 at 11:32 AM Paul Barker <paul.barker@sancloud.com> wrote: > > On Thu, 17 Jun 2021 11:05:46 +0100 > Peter Robinson <pbrobinson@gmail.com> wrote: > > > On Thu, Jun 17, 2021 at 10:03 AM Paul Barker > > <paul.barker@sancloud.com> wrote: > > > > > > Configuration which is shared between the BeagleBone Black and > > > derivative boards like the Sancloud BeagleBone Enhanced (BBE) is > > > moved to a common dtsi file to prevent duplication. > > > > Are these being sent upstream to the linux kernel? > > The upstream kernel already has am335x-boneblack-common.dtsi and > am335x-sancloud-bbe.dts files, since 2016 and 2018 respectively. As > these files fell out of sync over 4 years ago I've assumed there is no > need to keep them in sync. We could try to resync things but that would > lead to an unnecessary risk of breakage, I don't have every BeagleBone > Black derivative board on hand to fully test such a resync. So are the changes above in the Linux kernel already? Or this diverge them even more?
On Thu, 17 Jun 2021 11:35:16 +0100 Peter Robinson <pbrobinson@gmail.com> wrote: > On Thu, Jun 17, 2021 at 11:32 AM Paul Barker > <paul.barker@sancloud.com> wrote: > > > > On Thu, 17 Jun 2021 11:05:46 +0100 > > Peter Robinson <pbrobinson@gmail.com> wrote: > > > > > On Thu, Jun 17, 2021 at 10:03 AM Paul Barker > > > <paul.barker@sancloud.com> wrote: > > > > > > > > Configuration which is shared between the BeagleBone Black and > > > > derivative boards like the Sancloud BeagleBone Enhanced (BBE) is > > > > moved to a common dtsi file to prevent duplication. > > > > > > Are these being sent upstream to the linux kernel? > > > > The upstream kernel already has am335x-boneblack-common.dtsi and > > am335x-sancloud-bbe.dts files, since 2016 and 2018 respectively. As > > these files fell out of sync over 4 years ago I've assumed there is > > no need to keep them in sync. We could try to resync things but > > that would lead to an unnecessary risk of breakage, I don't have > > every BeagleBone Black derivative board on hand to fully test such > > a resync. > > So are the changes above in the Linux kernel already? Or this diverge > them even more? These changes reduce the difference a little.
On Thu, Jun 17, 2021 at 11:31:56AM +0100, Paul Barker wrote: > On Thu, 17 Jun 2021 11:05:46 +0100 > Peter Robinson <pbrobinson@gmail.com> wrote: > > > On Thu, Jun 17, 2021 at 10:03 AM Paul Barker > > <paul.barker@sancloud.com> wrote: > > > > > > Configuration which is shared between the BeagleBone Black and > > > derivative boards like the Sancloud BeagleBone Enhanced (BBE) is > > > moved to a common dtsi file to prevent duplication. > > > > Are these being sent upstream to the linux kernel? > > The upstream kernel already has am335x-boneblack-common.dtsi and > am335x-sancloud-bbe.dts files, since 2016 and 2018 respectively. As > these files fell out of sync over 4 years ago I've assumed there is no > need to keep them in sync. We could try to resync things but that would > lead to an unnecessary risk of breakage, I don't have every BeagleBone > Black derivative board on hand to fully test such a resync. Adding in Lokesh. It would be really good to get as many of these files back in sync again as possible and then keep them in sync periodically. As I don't think there's been any breaking fixes in the dts files again, there shouldn't be any problems.
On Thu, 17 Jun 2021 12:27:55 +0000 Tom Rini <trini@konsulko.com> wrote: > On Thu, Jun 17, 2021 at 11:31:56AM +0100, Paul Barker wrote: > > On Thu, 17 Jun 2021 11:05:46 +0100 > > Peter Robinson <pbrobinson@gmail.com> wrote: > > > > > On Thu, Jun 17, 2021 at 10:03 AM Paul Barker > > > <paul.barker@sancloud.com> wrote: > > > > > > > > Configuration which is shared between the BeagleBone Black and > > > > derivative boards like the Sancloud BeagleBone Enhanced (BBE) is > > > > moved to a common dtsi file to prevent duplication. > > > > > > Are these being sent upstream to the linux kernel? > > > > The upstream kernel already has am335x-boneblack-common.dtsi and > > am335x-sancloud-bbe.dts files, since 2016 and 2018 respectively. As > > these files fell out of sync over 4 years ago I've assumed there is no > > need to keep them in sync. We could try to resync things but that would > > lead to an unnecessary risk of breakage, I don't have every BeagleBone > > Black derivative board on hand to fully test such a resync. > > Adding in Lokesh. It would be really good to get as many of these files > back in sync again as possible and then keep them in sync periodically. > As I don't think there's been any breaking fixes in the dts files again, > there shouldn't be any problems. > Hi Tom, As there's been no reply from Lokesh I'd like to move forward with these updates if we can. I'm happy to resync the SanCloud dts files plus what we include, I think that will also involve copying over at least one more dt-bindings header as well. I'll send an updated series shortly. Thanks,
On 12/07/21 9:53 pm, Paul Barker wrote: > On Thu, 17 Jun 2021 12:27:55 +0000 > Tom Rini <trini@konsulko.com> wrote: > >> On Thu, Jun 17, 2021 at 11:31:56AM +0100, Paul Barker wrote: >>> On Thu, 17 Jun 2021 11:05:46 +0100 >>> Peter Robinson <pbrobinson@gmail.com> wrote: >>> >>>> On Thu, Jun 17, 2021 at 10:03 AM Paul Barker >>>> <paul.barker@sancloud.com> wrote: >>>>> >>>>> Configuration which is shared between the BeagleBone Black and >>>>> derivative boards like the Sancloud BeagleBone Enhanced (BBE) is >>>>> moved to a common dtsi file to prevent duplication. >>>> >>>> Are these being sent upstream to the linux kernel? >>> >>> The upstream kernel already has am335x-boneblack-common.dtsi and >>> am335x-sancloud-bbe.dts files, since 2016 and 2018 respectively. As >>> these files fell out of sync over 4 years ago I've assumed there is no >>> need to keep them in sync. We could try to resync things but that would >>> lead to an unnecessary risk of breakage, I don't have every BeagleBone >>> Black derivative board on hand to fully test such a resync. >> >> Adding in Lokesh. It would be really good to get as many of these files >> back in sync again as possible and then keep them in sync periodically. >> As I don't think there's been any breaking fixes in the dts files again, >> there shouldn't be any problems. >> > > Hi Tom, > > As there's been no reply from Lokesh I'd like to move forward with > these updates if we can. I'm happy to resync the SanCloud dts files > plus what we include, I think that will also involve copying over at > least one more dt-bindings header as well. > > I'll send an updated series shortly. Sorry for the delayed response as I was out of office last week. yes, please sync the entire dts. Thanks and regards, Lokesh > > Thanks, >
diff --git a/arch/arm/dts/am335x-boneblack.dts b/arch/arm/dts/am335x-boneblack-common.dtsi similarity index 94% copy from arch/arm/dts/am335x-boneblack.dts copy to arch/arm/dts/am335x-boneblack-common.dtsi index 27ebe4a65d..9d31fda17b 100644 --- a/arch/arm/dts/am335x-boneblack.dts +++ b/arch/arm/dts/am335x-boneblack-common.dtsi @@ -5,18 +5,21 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ -/dts-v1/; - -#include "am33xx.dtsi" -#include "am335x-bone-common.dtsi" / { - model = "TI AM335x BeagleBone Black"; - compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; chosen { stdout-path = &uart0; tick-timer = &timer2; }; + + hdmi { + compatible = "ti,tilcdc,slave"; + i2c = <&i2c0>; + pinctrl-names = "default", "off"; + pinctrl-0 = <&nxp_hdmi_bonelt_pins>; + pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; + status = "okay"; + }; }; &ldo3_reg { @@ -74,17 +77,6 @@ status = "okay"; }; -/ { - hdmi { - compatible = "ti,tilcdc,slave"; - i2c = <&i2c0>; - pinctrl-names = "default", "off"; - pinctrl-0 = <&nxp_hdmi_bonelt_pins>; - pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; - status = "okay"; - }; -}; - &rtc { system-power-controller; }; diff --git a/arch/arm/dts/am335x-boneblack.dts b/arch/arm/dts/am335x-boneblack.dts index 27ebe4a65d..77273df1a0 100644 --- a/arch/arm/dts/am335x-boneblack.dts +++ b/arch/arm/dts/am335x-boneblack.dts @@ -9,82 +9,9 @@ #include "am33xx.dtsi" #include "am335x-bone-common.dtsi" +#include "am335x-boneblack-common.dtsi" / { model = "TI AM335x BeagleBone Black"; compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; - chosen { - stdout-path = &uart0; - tick-timer = &timer2; - }; -}; - -&ldo3_reg { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; -}; - -&mmc1 { - vmmc-supply = <&vmmcsd_fixed>; -}; - -&mmc2 { - vmmc-supply = <&vmmcsd_fixed>; - pinctrl-names = "default"; - pinctrl-0 = <&emmc_pins>; - bus-width = <8>; - status = "okay"; -}; - -&am33xx_pinmux { - nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins { - pinctrl-single,pins = < - 0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */ - 0xa0 0x08 /* lcd_data0.lcd_data0, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xa4 0x08 /* lcd_data1.lcd_data1, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xa8 0x08 /* lcd_data2.lcd_data2, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xac 0x08 /* lcd_data3.lcd_data3, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xb0 0x08 /* lcd_data4.lcd_data4, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xb4 0x08 /* lcd_data5.lcd_data5, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xb8 0x08 /* lcd_data6.lcd_data6, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xbc 0x08 /* lcd_data7.lcd_data7, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xc0 0x08 /* lcd_data8.lcd_data8, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xc4 0x08 /* lcd_data9.lcd_data9, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xc8 0x08 /* lcd_data10.lcd_data10, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xcc 0x08 /* lcd_data11.lcd_data11, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xd0 0x08 /* lcd_data12.lcd_data12, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xd4 0x08 /* lcd_data13.lcd_data13, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xd8 0x08 /* lcd_data14.lcd_data14, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xdc 0x08 /* lcd_data15.lcd_data15, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ - 0xe0 0x00 /* lcd_vsync.lcd_vsync, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ - 0xe4 0x00 /* lcd_hsync.lcd_hsync, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ - 0xe8 0x00 /* lcd_pclk.lcd_pclk, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ - 0xec 0x00 /* lcd_ac_bias_en.lcd_ac_bias_en, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ - >; - }; - nxp_hdmi_bonelt_off_pins: nxp_hdmi_bonelt_off_pins { - pinctrl-single,pins = < - 0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */ - >; - }; -}; - -&lcdc { - status = "okay"; -}; - -/ { - hdmi { - compatible = "ti,tilcdc,slave"; - i2c = <&i2c0>; - pinctrl-names = "default", "off"; - pinctrl-0 = <&nxp_hdmi_bonelt_pins>; - pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; - status = "okay"; - }; -}; - -&rtc { - system-power-controller; };
Configuration which is shared between the BeagleBone Black and derivative boards like the Sancloud BeagleBone Enhanced (BBE) is moved to a common dtsi file to prevent duplication. Signed-off-by: Paul Barker <paul.barker@sancloud.com> --- ...black.dts => am335x-boneblack-common.dtsi} | 26 +++---- arch/arm/dts/am335x-boneblack.dts | 75 +------------------ 2 files changed, 10 insertions(+), 91 deletions(-) copy arch/arm/dts/{am335x-boneblack.dts => am335x-boneblack-common.dtsi} (94%)