[U-Boot] [PATCH] fdt: update bcm283x device tree sources to Linux 4.14 state
Upstream Linux has received a few device tree updates to the RPi which we should propagate into the builtin U-Boot one as well to gain hardware support. This patch bumps the dts files to their 4.14 Linux counterparts. Signed-off-by: Alexander Graf --- arch/arm/dts/bcm2835-rpi-a-plus.dts| 74 +++- arch/arm/dts/bcm2835-rpi-a.dts | 76 +++- arch/arm/dts/bcm2835-rpi-b-plus.dts| 75 +++- arch/arm/dts/bcm2835-rpi-b-rev2.dts| 75 +++- arch/arm/dts/bcm2835-rpi-b.dts | 76 +++- arch/arm/dts/bcm2835-rpi.dtsi | 34 +++- arch/arm/dts/bcm2835.dtsi | 10 + arch/arm/dts/bcm2836-rpi-2-b.dts | 9 +- arch/arm/dts/bcm2836.dtsi | 11 ++ arch/arm/dts/bcm2837-rpi-3-b.dts | 35 +++- arch/arm/dts/bcm2837.dtsi | 13 +- arch/arm/dts/bcm283x-rpi-smsc9512.dtsi | 2 +- arch/arm/dts/bcm283x-rpi-smsc9514.dtsi | 2 +- arch/arm/dts/bcm283x-rpi-usb-host.dtsi | 3 + arch/arm/dts/bcm283x.dtsi | 325 - include/dt-bindings/clock/bcm2835.h| 2 + include/dt-bindings/pinctrl/bcm2835.h | 5 + 17 files changed, 801 insertions(+), 26 deletions(-) create mode 100644 arch/arm/dts/bcm283x-rpi-usb-host.dtsi diff --git a/arch/arm/dts/bcm2835-rpi-a-plus.dts b/arch/arm/dts/bcm2835-rpi-a-plus.dts index 35ff4e7a4a..9f866491ef 100644 --- a/arch/arm/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/dts/bcm2835-rpi-a-plus.dts @@ -1,6 +1,7 @@ /dts-v1/; #include "bcm2835.dtsi" #include "bcm2835-rpi.dtsi" +#include "bcm283x-rpi-usb-host.dtsi" / { compatible = "raspberrypi,model-a-plus", "brcm,bcm2835"; @@ -21,7 +22,72 @@ }; &gpio { - pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>; + /* +* This is based on the unreleased schematic for the Model A+. +* +* Legend: +* "NC" = not connected (no rail from the SoC) +* "FOO" = GPIO line named "FOO" on the schematic +* "FOO_N" = GPIO line named "FOO" on schematic, active low +*/ + gpio-line-names = "SDA0", + "SCL0", + "SDA1", + "SCL1", + "GPIO_GCLK", + "GPIO5", + "GPIO6", + "SPI_CE1_N", + "SPI_CE0_N", + "SPI_MISO", + "SPI_MOSI", + "SPI_SCLK", + "GPIO12", + "GPIO13", + /* Serial port */ + "TXD0", + "RXD0", + "GPIO16", + "GPIO17", + "GPIO18", + "GPIO19", + "GPIO20", + "GPIO21", + "GPIO22", + "GPIO23", + "GPIO24", + "GPIO25", + "GPIO26", + "GPIO27", + "SDA0", + "SCL0", + "NC", /* GPIO30 */ + "NC", /* GPIO31 */ + "CAM_GPIO1", /* GPIO32 */ + "NC", /* GPIO33 */ + "NC", /* GPIO34 */ + "PWR_LOW_N", /* GPIO35 */ + "NC", /* GPIO36 */ + "NC", /* GPIO37 */ + "USB_LIMIT", /* GPIO38 */ + "NC", /* GPIO39 */ + "PWM0_OUT", /* GPIO40 */ + "CAM_GPIO0", /* GPIO41 */ + "NC", /* GPIO42 */ + "NC", /* GPIO43 */ + "NC", /* GPIO44 */ + "PWM1_OUT", /* GPIO45 */ + "HDMI_HPD_N", + "STATUS_LED", + /* Used by SD Card */ + "SD_CLK_R", + "SD_CMD_R", + "SD_DATA0_R", + "SD_DATA1_R", + "SD_DATA2_R", + "SD_DATA3_R"; + + pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; /* I2S interface */ i2s_alt0: i2s_alt0 { @@ -33,3 +99,9 @@ &hdmi { hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; }; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_gpio14>; + status = "okay"; +}; diff --git a/arch/arm/dts/bcm2835-rpi-a.dts b/arch/arm/dts/bcm2835-rpi-a.dts index 306a84ee98..4b1af06c8d 100644 --- a/arch/arm/dts/bcm2835-rpi-a.dts +++ b/arch/arm/dts/bcm2835-rpi-a.dts @@ -1,6 +1,7 @@ /dts-v1/; #include "bcm2835.dtsi" #include "bcm2835-rpi.dtsi" +#include "bcm283x-rpi-usb-host.dtsi" / { compatible = "raspberrypi,model-a", "brcm,bcm2835"; @@ -14,7 +15,74 @@ };
Re: [U-Boot] [PATCH] fdt: update bcm283x device tree sources to Linux 4.14 state
On Monday, October 4 2017, 06:33:37 CEST Alexander Graf wrote: > Upstream Linux has received a few device tree updates to the RPi > which we should propagate into the builtin U-Boot one as well to > gain hardware support. > > This patch bumps the dts files to their 4.14 Linux counterparts. Looks good to me. > Signed-off-by: Alexander Graf Acked-by: Fabian Vogt > --- > arch/arm/dts/bcm2835-rpi-a-plus.dts| 74 +++- > arch/arm/dts/bcm2835-rpi-a.dts | 76 +++- > arch/arm/dts/bcm2835-rpi-b-plus.dts| 75 +++- > arch/arm/dts/bcm2835-rpi-b-rev2.dts| 75 +++- > arch/arm/dts/bcm2835-rpi-b.dts | 76 +++- > arch/arm/dts/bcm2835-rpi.dtsi | 34 +++- > arch/arm/dts/bcm2835.dtsi | 10 + > arch/arm/dts/bcm2836-rpi-2-b.dts | 9 +- > arch/arm/dts/bcm2836.dtsi | 11 ++ > arch/arm/dts/bcm2837-rpi-3-b.dts | 35 +++- > arch/arm/dts/bcm2837.dtsi | 13 +- > arch/arm/dts/bcm283x-rpi-smsc9512.dtsi | 2 +- > arch/arm/dts/bcm283x-rpi-smsc9514.dtsi | 2 +- > arch/arm/dts/bcm283x-rpi-usb-host.dtsi | 3 + > arch/arm/dts/bcm283x.dtsi | 325 > - > include/dt-bindings/clock/bcm2835.h| 2 + > include/dt-bindings/pinctrl/bcm2835.h | 5 + > 17 files changed, 801 insertions(+), 26 deletions(-) > create mode 100644 arch/arm/dts/bcm283x-rpi-usb-host.dtsi > > diff --git a/arch/arm/dts/bcm2835-rpi-a-plus.dts > b/arch/arm/dts/bcm2835-rpi-a-plus.dts > index 35ff4e7a4a..9f866491ef 100644 > --- a/arch/arm/dts/bcm2835-rpi-a-plus.dts > +++ b/arch/arm/dts/bcm2835-rpi-a-plus.dts > @@ -1,6 +1,7 @@ > /dts-v1/; > #include "bcm2835.dtsi" > #include "bcm2835-rpi.dtsi" > +#include "bcm283x-rpi-usb-host.dtsi" > > / { > compatible = "raspberrypi,model-a-plus", "brcm,bcm2835"; > @@ -21,7 +22,72 @@ > }; > > &gpio { > - pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>; > + /* > + * This is based on the unreleased schematic for the Model A+. > + * > + * Legend: > + * "NC" = not connected (no rail from the SoC) > + * "FOO" = GPIO line named "FOO" on the schematic > + * "FOO_N" = GPIO line named "FOO" on schematic, active low > + */ > + gpio-line-names = "SDA0", > + "SCL0", > + "SDA1", > + "SCL1", > + "GPIO_GCLK", > + "GPIO5", > + "GPIO6", > + "SPI_CE1_N", > + "SPI_CE0_N", > + "SPI_MISO", > + "SPI_MOSI", > + "SPI_SCLK", > + "GPIO12", > + "GPIO13", > + /* Serial port */ > + "TXD0", > + "RXD0", > + "GPIO16", > + "GPIO17", > + "GPIO18", > + "GPIO19", > + "GPIO20", > + "GPIO21", > + "GPIO22", > + "GPIO23", > + "GPIO24", > + "GPIO25", > + "GPIO26", > + "GPIO27", > + "SDA0", > + "SCL0", > + "NC", /* GPIO30 */ > + "NC", /* GPIO31 */ > + "CAM_GPIO1", /* GPIO32 */ > + "NC", /* GPIO33 */ > + "NC", /* GPIO34 */ > + "PWR_LOW_N", /* GPIO35 */ > + "NC", /* GPIO36 */ > + "NC", /* GPIO37 */ > + "USB_LIMIT", /* GPIO38 */ > + "NC", /* GPIO39 */ > + "PWM0_OUT", /* GPIO40 */ > + "CAM_GPIO0", /* GPIO41 */ > + "NC", /* GPIO42 */ > + "NC", /* GPIO43 */ > + "NC", /* GPIO44 */ > + "PWM1_OUT", /* GPIO45 */ > + "HDMI_HPD_N", > + "STATUS_LED", > + /* Used by SD Card */ > + "SD_CLK_R", > + "SD_CMD_R", > + "SD_DATA0_R", > + "SD_DATA1_R", > + "SD_DATA2_R", > + "SD_DATA3_R"; > + > + pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; > > /* I2S interface */ > i2s_alt0: i2s_alt0 { > @@ -33,3 +99,9 @@ > &hdmi { > hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>; > }; > + > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_gpio14>; > + status = "okay"; > +}; > diff --git a/arch/arm/dts/bcm2835-rpi-a.dts b/arch/arm/dts/bcm2835-rpi-a.dts > index 306a84ee98..4b1af06c8d 100644 > --- a/arch/arm/dts/bcm2835-rpi-a.dts > +++ b/arch/arm/dts/bcm2835-rp
Re: [U-Boot] [PATCH] fdt: update bcm283x device tree sources to Linux 4.14 state
On 04.10.17 08:59, Fabian Vogt wrote: On Monday, October 4 2017, 06:33:37 CEST Alexander Graf wrote: Upstream Linux has received a few device tree updates to the RPi which we should propagate into the builtin U-Boot one as well to gain hardware support. This patch bumps the dts files to their 4.14 Linux counterparts. Looks good to me. Signed-off-by: Alexander Graf Acked-by: Fabian Vogt My testing just revealed that this breaks on the RPi 1B. It doesn't find the SD card. I'll dig a bit. Alex ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot