| Message ID | 1523640478-4448-1-git-send-email-stefan.wahren@i2se.com |
|---|---|
| Headers | show |
| Series | ARM: bcm283x: RPi 3 B+ support and other improvements | expand |
Stefan Wahren <stefan.wahren@i2se.com> writes: > The main focus of the patch series is to provide support for the new > Raspberry Pi 3 B+ . The rest are parts which missed the merge window for 4.17. > > Since there are still some issues with LAN78XX, also apply Phil Elwell's > patches [1] and Dave Stevenson's patches [2] before testing. But they are not > required for the function of this series. This series all looks great to me, and is: Reviewed-by: Eric Anholt <eric@anholt.net>
On Fri, Apr 13, 2018 at 07:27:53PM +0200, Stefan Wahren wrote: > The Raspberry Pi 3 B+ has the following major differences compared > to the model 3 B: > * Microchip LAN7515 (Gigabit Ethernet) > * Cypress CYW43455 (802.11n/ac and BT 4.2) > > We need to add the USB LAN chip so the bootloader can add the MAC address. > This is necessary because there ain't a EEPROM or a valid OTP. > > Signed-off-by: Phil Elwell <phil@raspberrypi.org> > Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> > --- > arch/arm/boot/dts/Makefile | 1 + > arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 108 +++++++++++++++++++++++++++++ > arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi | 27 ++++++++ > 3 files changed, 136 insertions(+) > create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts > create mode 100644 arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 7e24249..a300a35 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -75,6 +75,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ > bcm2835-rpi-a-plus.dtb \ > bcm2836-rpi-2-b.dtb \ > bcm2837-rpi-3-b.dtb \ > + bcm2837-rpi-3-b-plus.dtb \ > bcm2835-rpi-zero.dtb \ > bcm2835-rpi-zero-w.dtb > dtb-$(CONFIG_ARCH_BCM_5301X) += \ > diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts > new file mode 100644 > index 0000000..4adb85e > --- /dev/null > +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts > @@ -0,0 +1,108 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/dts-v1/; > +#include "bcm2837.dtsi" > +#include "bcm2835-rpi.dtsi" > +#include "bcm283x-rpi-lan7515.dtsi" > +#include "bcm283x-rpi-usb-host.dtsi" > + > +/ { > + compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837"; > + model = "Raspberry Pi 3 Model B+"; > + > + chosen { > + /* 8250 auxiliary UART instead of pl011 */ > + stdout-path = "serial1:115200n8"; > + }; > + > + memory { > + reg = <0 0x40000000>; > + }; > + > + leds { > + act { > + gpios = <&gpio 29 GPIO_ACTIVE_HIGH>; > + }; > + > + pwr { > + label = "PWR"; > + gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; > + }; > + }; > + > + wifi_pwrseq: wifi-pwrseq { > + compatible = "mmc-pwrseq-simple"; > + reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>; > + }; > +}; > + > +&firmware { > + expgpio: gpio { > + compatible = "raspberrypi,firmware-gpio"; > + gpio-controller; > + #gpio-cells = <2>; > + gpio-line-names = "BT_ON", > + "WL_ON", > + "STATUS_LED", > + "LAN_RUN", > + "", > + "CAM_GPIO0", > + "CAM_GPIO1", > + ""; > + status = "okay"; > + }; > +}; > + > +&hdmi { > + hpd-gpios = <&gpio 28 GPIO_ACTIVE_LOW>; > +}; > + > +&pwm { > + pinctrl-names = "default"; > + pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio41>; > + status = "okay"; > +}; > + > +/* SDHCI is used to control the SDIO for wireless */ > +&sdhci { > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-names = "default"; > + pinctrl-0 = <&emmc_gpio34>; > + status = "okay"; > + bus-width = <4>; > + non-removable; > + mmc-pwrseq = <&wifi_pwrseq>; > + > + brcmf: wifi@1 { > + reg = <1>; > + compatible = "brcm,bcm4329-fmac"; > + }; > +}; > + > +/* SDHOST is used to drive the SD card */ > +&sdhost { > + pinctrl-names = "default"; > + pinctrl-0 = <&sdhost_gpio48>; > + status = "okay"; > + bus-width = <4>; > +}; > + > +/* uart0 communicates with the BT module */ > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_ctsrts_gpio30 &uart0_gpio32 &gpclk2_gpio43>; > + status = "okay"; > + > + bluetooth { > + compatible = "brcm,bcm43438-bt"; > + max-speed = <2000000>; > + shutdown-gpios = <&expgpio 0 GPIO_ACTIVE_HIGH>; > + }; > +}; > + > +/* uart1 is mapped to the pin header */ > +&uart1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart1_gpio14>; > + status = "okay"; > +}; > diff --git a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi > new file mode 100644 > index 0000000..169203c > --- /dev/null > +++ b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi Why the separate file? This can be shared? > @@ -0,0 +1,27 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/ { > + aliases { > + ethernet0 = ðernet; > + }; > +}; > + > +&usb { > + usb1@1 { > + compatible = "usb424,2514"; > + reg = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + usb1_1@1 { usb-port@1 > + compatible = "usb424,2514"; There's really 2 levels of hubs? > + reg = <1>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + ethernet: usbether@1 { ethernet@1 > + compatible = "usb424,7800"; > + reg = <1>; > + }; > + }; > + }; > +}; > -- > 2.7.4 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Rob, Am 16.04.2018 um 22:43 schrieb Rob Herring: > On Fri, Apr 13, 2018 at 07:27:53PM +0200, Stefan Wahren wrote: >> The Raspberry Pi 3 B+ has the following major differences compared >> to the model 3 B: >> * Microchip LAN7515 (Gigabit Ethernet) >> * Cypress CYW43455 (802.11n/ac and BT 4.2) >> >> We need to add the USB LAN chip so the bootloader can add the MAC address. >> This is necessary because there ain't a EEPROM or a valid OTP. >> >> Signed-off-by: Phil Elwell <phil@raspberrypi.org> >> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> >> --- >> arch/arm/boot/dts/Makefile | 1 + >> arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 108 +++++++++++++++++++++++++++++ >> arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi | 27 ++++++++ >> 3 files changed, 136 insertions(+) >> create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts >> create mode 100644 arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi >> >> ... >> diff --git a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi >> new file mode 100644 >> index 0000000..169203c >> --- /dev/null >> +++ b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi > Why the separate file? This can be shared? this comes from the assumption the RPi 3 B+ won't be the only RPi board with a LAN7515. Should i fold it in the dts file as long as we don't have a second board? > >> @@ -0,0 +1,27 @@ >> +// SPDX-License-Identifier: GPL-2.0 >> +/ { >> + aliases { >> + ethernet0 = ðernet; >> + }; >> +}; >> + >> +&usb { >> + usb1@1 { >> + compatible = "usb424,2514"; >> + reg = <1>; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + usb1_1@1 { > usb-port@1 > >> + compatible = "usb424,2514"; > There's really 2 levels of hubs? Yes, lsusb -t shows the following: /: Bus 01.Port 1: Dev 1, Class=root_hub, Driver=dwc2/1p, 480M |__ Port 1: Dev 2, If 0, Class=Hub, Driver=hub/4p, 480M |__ Port 1: Dev 3, If 0, Class=Hub, Driver=hub/3p, 480M |__ Port 2: Dev 5, If 0, Class=Human Interface Device, Driver=usbhid, 1.5M |__ Port 1: Dev 6, If 0, Class=Vendor Specific Class, Driver=lan78xx, 480M |__ Port 2: Dev 7, If 0, Class=Mass Storage, Driver=usb-storage, 480M |__ Port 3: Dev 4, If 0, Class=Human Interface Device, Driver=usbhid, 1.5M > >> + reg = <1>; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + ethernet: usbether@1 { > ethernet@1 > >> + compatible = "usb424,7800"; >> + reg = <1>; >> + }; >> + }; >> + }; >> +}; >> -- >> 2.7.4 >> > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Stefan Wahren <stefan.wahren@i2se.com> writes: > Hi Rob, > > Am 16.04.2018 um 22:43 schrieb Rob Herring: >> On Fri, Apr 13, 2018 at 07:27:53PM +0200, Stefan Wahren wrote: >>> The Raspberry Pi 3 B+ has the following major differences compared >>> to the model 3 B: >>> * Microchip LAN7515 (Gigabit Ethernet) >>> * Cypress CYW43455 (802.11n/ac and BT 4.2) >>> >>> We need to add the USB LAN chip so the bootloader can add the MAC address. >>> This is necessary because there ain't a EEPROM or a valid OTP. >>> >>> Signed-off-by: Phil Elwell <phil@raspberrypi.org> >>> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> >>> --- >>> arch/arm/boot/dts/Makefile | 1 + >>> arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 108 +++++++++++++++++++++++++++++ >>> arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi | 27 ++++++++ >>> 3 files changed, 136 insertions(+) >>> create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts >>> create mode 100644 arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi >>> >>> ... >>> diff --git a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi >>> new file mode 100644 >>> index 0000000..169203c >>> --- /dev/null >>> +++ b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi >> Why the separate file? This can be shared? > > this comes from the assumption the RPi 3 B+ won't be the only RPi board > with a LAN7515. Should i fold it in the dts file as long as we don't > have a second board? I think it's great as is -- our other network chips are hooked up this way and it makes 3b+ match all the others. Also, while I have no specific knowledge, it seems likely that this would get reused.
Hi Rob, > Eric Anholt <eric@anholt.net> hat am 17. April 2018 um 18:02 geschrieben: > > > Stefan Wahren <stefan.wahren@i2se.com> writes: > > > Hi Rob, > > > > Am 16.04.2018 um 22:43 schrieb Rob Herring: > >> On Fri, Apr 13, 2018 at 07:27:53PM +0200, Stefan Wahren wrote: > >>> The Raspberry Pi 3 B+ has the following major differences compared > >>> to the model 3 B: > >>> * Microchip LAN7515 (Gigabit Ethernet) > >>> * Cypress CYW43455 (802.11n/ac and BT 4.2) > >>> > >>> We need to add the USB LAN chip so the bootloader can add the MAC address. > >>> This is necessary because there ain't a EEPROM or a valid OTP. > >>> > >>> Signed-off-by: Phil Elwell <phil@raspberrypi.org> > >>> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> > >>> --- > >>> arch/arm/boot/dts/Makefile | 1 + > >>> arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 108 +++++++++++++++++++++++++++++ > >>> arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi | 27 ++++++++ > >>> 3 files changed, 136 insertions(+) > >>> create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts > >>> create mode 100644 arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi > >>> > >>> ... > >>> diff --git a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi > >>> new file mode 100644 > >>> index 0000000..169203c > >>> --- /dev/null > >>> +++ b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi > >> Why the separate file? This can be shared? > > > > this comes from the assumption the RPi 3 B+ won't be the only RPi board > > with a LAN7515. Should i fold it in the dts file as long as we don't > > have a second board? > > I think it's great as is -- our other network chips are hooked up this > way and it makes 3b+ match all the others. Also, while I have no > specific knowledge, it seems likely that this would get reused. sorry for my impatience, but what's your opinion? Stefan -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Catalin, hi Will, > Stefan Wahren <stefan.wahren@i2se.com> hat am 13. April 2018 um 19:27 geschrieben: > > > This adds a reference to the dts of the Raspberry Pi 3 B+ > in arm, so don't need to maintain the content in arm64. are you okay with the arm64 parts of this series? > > Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> > --- > arch/arm64/boot/dts/broadcom/Makefile | 3 ++- > arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts | 2 ++ > 2 files changed, 4 insertions(+), 1 deletion(-) > create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts > > diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile > index 2a2591e..1193a9e 100644 > --- a/arch/arm64/boot/dts/broadcom/Makefile > +++ b/arch/arm64/boot/dts/broadcom/Makefile > @@ -1,5 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0 > -dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb > +dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb \ > + bcm2837-rpi-3-b-plus.dtb > > subdir-y += northstar2 > subdir-y += stingray > diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts > new file mode 100644 > index 0000000..46ad202 > --- /dev/null > +++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts > @@ -0,0 +1,2 @@ > +// SPDX-License-Identifier: GPL-2.0 > +#include "arm/bcm2837-rpi-3-b-plus.dts" > -- > 2.7.4 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Apr 20, 2018 at 6:24 AM, Stefan Wahren <stefan.wahren@i2se.com> wrote: > Hi Rob, > >> Eric Anholt <eric@anholt.net> hat am 17. April 2018 um 18:02 geschrieben: >> >> >> Stefan Wahren <stefan.wahren@i2se.com> writes: >> >> > Hi Rob, >> > >> > Am 16.04.2018 um 22:43 schrieb Rob Herring: >> >> On Fri, Apr 13, 2018 at 07:27:53PM +0200, Stefan Wahren wrote: >> >>> The Raspberry Pi 3 B+ has the following major differences compared >> >>> to the model 3 B: >> >>> * Microchip LAN7515 (Gigabit Ethernet) >> >>> * Cypress CYW43455 (802.11n/ac and BT 4.2) >> >>> >> >>> We need to add the USB LAN chip so the bootloader can add the MAC address. >> >>> This is necessary because there ain't a EEPROM or a valid OTP. >> >>> >> >>> Signed-off-by: Phil Elwell <phil@raspberrypi.org> >> >>> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> >> >>> --- >> >>> arch/arm/boot/dts/Makefile | 1 + >> >>> arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 108 +++++++++++++++++++++++++++++ >> >>> arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi | 27 ++++++++ >> >>> 3 files changed, 136 insertions(+) >> >>> create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts >> >>> create mode 100644 arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi >> >>> >> >>> ... >> >>> diff --git a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi >> >>> new file mode 100644 >> >>> index 0000000..169203c >> >>> --- /dev/null >> >>> +++ b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi >> >> Why the separate file? This can be shared? >> > >> > this comes from the assumption the RPi 3 B+ won't be the only RPi board >> > with a LAN7515. Should i fold it in the dts file as long as we don't >> > have a second board? >> >> I think it's great as is -- our other network chips are hooked up this >> way and it makes 3b+ match all the others. Also, while I have no >> specific knowledge, it seems likely that this would get reused. > > sorry for my impatience, but what's your opinion? It's fine as-is. Rob -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html