Add support for the SanCloud BBE Lite
v2 cover Add support for the SanCloud BBE Lite
The Lite variant of the SanCloud BeagleBone Enhanced (BBE) removes the HDMI encoder, barometer and accelerometer chips and adds a Micron Authenta SPI flash chip.
The device tree entries shared with the original BBE and the BegleBone Black are refactored to avoid unnecessary duplication and avoid having to override the status of nodes to "disabled" in any of the dts files.
The final patch in this series adds myself and Marc from Sancloud as maintainers for the device trees for SanCloud hardware. We're happy to review any future patches to these files so that the SanCloud boards work well with the mainline kernel. We expect the patch volume to be pretty low and we expect that patches to these files will flow upstream via the existing OMAP device tree maintainers and linux-omap mailing list. If there's anything else we need to do to adopt these dts files as supported please let us know.
Changes from v1:
* Dropped symlink property from the spi channel node, this isn't needed outside of the BeagleBoard.org tree as pointed out by Robert Nelson.
Paul Barker (4):
ARM: dts: am335x-boneblack: Extract HDMI config
ARM: dts: am335x-sancloud-bbe: Extract common code
ARM: dts: am335x-sancloud-bbe-lite: New devicetree
MAINTAINERS: Adopt SanCloud dts files as supported
MAINTAINERS | 6 +
arch/arm/boot/dts/Makefile | 1 +
.../arm/boot/dts/am335x-boneblack-common.dtsi | 135 ------------------
...common.dtsi => am335x-boneblack-hdmi.dtsi} | 28 ----
.../boot/dts/am335x-boneblack-wireless.dts | 1 +
arch/arm/boot/dts/am335x-boneblack.dts | 1 +
...be.dts => am335x-sancloud-bbe-common.dtsi} | 41 ------
.../arm/boot/dts/am335x-sancloud-bbe-lite.dts | 50 +++++++
arch/arm/boot/dts/am335x-sancloud-bbe.dts | 92 +-----------
9 files changed, 61 insertions(+), 294 deletions(-)
copy arch/arm/boot/dts/{am335x-boneblack-common.dtsi => am335x-boneblack-hdmi.dtsi} (90%)
copy arch/arm/boot/dts/{am335x-sancloud-bbe.dts => am335x-sancloud-bbe-common.dtsi} (77%)
create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe-lite.dtsbase-commit: 2734d6c1b1a089fb593ef6a23d4b70903526fe0c
Signature · 1 line
2.26.2
PATCH v2 1/4 ARM: dts: am335x-boneblack: Extract HDMI config
Move the HDMI hardware configuration for the BeagleBone Black out of the boneblack common dtsi file and into its own separate dtsi file. This allows the devicetree for BeagleBone Black derivatives which lack the hdmi encoding hardware to include the common dtsi file without needing to duplicate configuration or override the status of all hdmi-related nodes.
---
.../arm/boot/dts/am335x-boneblack-common.dtsi | 135 ------------------
...common.dtsi => am335x-boneblack-hdmi.dtsi} | 28 ----
.../boot/dts/am335x-boneblack-wireless.dts | 1 +
arch/arm/boot/dts/am335x-boneblack.dts | 1 +
arch/arm/boot/dts/am335x-sancloud-bbe.dts | 1 +
5 files changed, 3 insertions(+), 163 deletions(-)
copy arch/arm/boot/dts/{am335x-boneblack-common.dtsi => am335x-boneblack-hdmi.dtsi} (90%)arch/arm/boot/dts/am335x-boneblack-common.dtsi +0 -135
@@ -3,9 +3,6 @@ * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/ */ -#include <dt-bindings/display/tda998x.h> -#include <dt-bindings/interrupt-controller/irq.h> - &ldo3_reg { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
@@ -25,145 +22,13 @@ &mmc2 { non-removable; }; -&am33xx_pinmux { - nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins { - pinctrl-single,pins = < - AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT_PULLDOWN, MUX_MODE3) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA0, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA1, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA2, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA3, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA4, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA5, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA6, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA7, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA8, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA9, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA10, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA11, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA12, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA13, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA14, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_DATA15, PIN_OUTPUT, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_VSYNC, PIN_OUTPUT_PULLDOWN, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_HSYNC, PIN_OUTPUT_PULLDOWN, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_PCLK, PIN_OUTPUT_PULLDOWN, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE0) - >; - }; - - nxp_hdmi_bonelt_off_pins: nxp_hdmi_bonelt_off_pins { - pinctrl-single,pins = < - AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT_PULLDOWN, MUX_MODE3) - >; - }; - - mcasp0_pins: mcasp0_pins { - pinctrl-single,pins = < - AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKX, PIN_INPUT_PULLUP, MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */ - AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKR, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2*/ - AM33XX_PADCONF(AM335X_PIN_MCASP0_FSX, PIN_OUTPUT_PULLUP, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKX, PIN_OUTPUT_PULLDOWN, MUX_MODE0) - AM33XX_PADCONF(AM335X_PIN_GPMC_A11, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* gpmc_a11.GPIO1_27 */ - >; - }; -}; - -&lcdc { - status = "okay"; - - /* If you want to get 24 bit RGB and 16 BGR mode instead of - * current 16 bit RGB and 24 BGR modes, set the propety - * below to "crossed" and uncomment the video-ports -property - * in tda19988 node. - */ - blue-and-red-wiring = "straight"; - - port { - lcdc_0: endpoint@0 { - remote-endpoint = <&hdmi_0>; - }; - }; -}; - -&i2c0 { - tda19988: tda19988@70 { - compatible = "nxp,tda998x"; - reg = <0x70>; - nxp,calib-gpios = <&gpio1 25 0>; - interrupts-extended = <&gpio1 25 IRQ_TYPE_LEVEL_LOW>; - - pinctrl-names = "default", "off"; - pinctrl-0 = <&nxp_hdmi_bonelt_pins>; - pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; - - /* Convert 24bit BGR to RGB, e.g. cross red and blue wiring */ - /* video-ports = <0x234501>; */ - - #sound-dai-cells = <0>; - audio-ports = < TDA998x_I2S 0x03>; - - ports { - port@0 { - hdmi_0: endpoint@0 { - remote-endpoint = <&lcdc_0>; - }; - }; - }; - }; -}; - &rtc { system-power-controller; }; -&mcasp0 { - #sound-dai-cells = <0>; - pinctrl-names = "default"; - pinctrl-0 = <&mcasp0_pins>; - status = "okay"; - op-mode = <0>; /* MCASP_IIS_MODE */ - tdm-slots = <2>; - serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ - 0 0 1 0 - >; - tx-num-evt = <32>; - rx-num-evt = <32>; -}; - / { memory@80000000 { device_type = "memory"; reg = <0x80000000 0x20000000>; /* 512 MB */ }; - - clk_mcasp0_fixed: clk_mcasp0_fixed { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <24576000>; - }; - - clk_mcasp0: clk_mcasp0 { - #clock-cells = <0>; - compatible = "gpio-gate-clock"; - clocks = <&clk_mcasp0_fixed>; - enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */ - }; - - sound { - compatible = "simple-audio-card"; - simple-audio-card,name = "TI BeagleBone Black"; - simple-audio-card,format = "i2s"; - simple-audio-card,bitclock-master = <&dailink0_master>; - simple-audio-card,frame-master = <&dailink0_master>; - - dailink0_master: simple-audio-card,cpu { - sound-dai = <&mcasp0>; - clocks = <&clk_mcasp0>; - }; - - simple-audio-card,codec { - sound-dai = <&tda19988>; - }; - }; };
arch/arm/boot/dts/am335x-boneblack-hdmi.dtsi renamed from arch/arm/boot/dts/am335x-boneblack-common.dtsi +0 -28
@@ -6,25 +6,6 @@ #include <dt-bindings/display/tda998x.h> #include <dt-bindings/interrupt-controller/irq.h> -&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"; - non-removable; -}; - &am33xx_pinmux { nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins { pinctrl-single,pins = <
@@ -113,10 +94,6 @@ hdmi_0: endpoint@0 { }; }; -&rtc { - system-power-controller; -}; - &mcasp0 { #sound-dai-cells = <0>; pinctrl-names = "default";
@@ -132,11 +109,6 @@ &mcasp0 { }; / { - memory@80000000 { - device_type = "memory"; - reg = <0x80000000 0x20000000>; /* 512 MB */ - }; - clk_mcasp0_fixed: clk_mcasp0_fixed { #clock-cells = <0>; compatible = "fixed-clock";
arch/arm/boot/dts/am335x-boneblack-wireless.dts +1 -0
@@ -7,6 +7,7 @@ #include "am33xx.dtsi" #include "am335x-bone-common.dtsi" #include "am335x-boneblack-common.dtsi" +#include "am335x-boneblack-hdmi.dtsi" #include <dt-bindings/interrupt-controller/irq.h> / {
arch/arm/boot/dts/am335x-boneblack.dts +1 -0
@@ -7,6 +7,7 @@ #include "am33xx.dtsi" #include "am335x-bone-common.dtsi" #include "am335x-boneblack-common.dtsi" +#include "am335x-boneblack-hdmi.dtsi" / { model = "TI AM335x BeagleBone Black";
arch/arm/boot/dts/am335x-sancloud-bbe.dts +1 -0
@@ -7,6 +7,7 @@ #include "am33xx.dtsi" #include "am335x-bone-common.dtsi" #include "am335x-boneblack-common.dtsi" +#include "am335x-boneblack-hdmi.dtsi" #include <dt-bindings/interrupt-controller/irq.h> / {
Signature · 1 line
2.26.2
PATCH v2 2/4 ARM: dts: am335x-sancloud-bbe: Extract common code
In reply to Paul BarkerThe Sancloud BBE, BBE Lite and BBE Extended+WiFi share a common hardware base so we can avoid duplication via a dtsi file.
---
...be.dts => am335x-sancloud-bbe-common.dtsi} | 42 ---------
arch/arm/boot/dts/am335x-sancloud-bbe.dts | 91 +------------------
2 files changed, 1 insertion(+), 132 deletions(-)
copy arch/arm/boot/dts/{am335x-sancloud-bbe.dts => am335x-sancloud-bbe-common.dtsi} (76%)arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi renamed from arch/arm/boot/dts/am335x-sancloud-bbe.dts +0 -42
@@ -2,22 +2,8 @@ /* * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/ */ -/dts-v1/; - -#include "am33xx.dtsi" -#include "am335x-bone-common.dtsi" -#include "am335x-boneblack-common.dtsi" -#include "am335x-boneblack-hdmi.dtsi" -#include <dt-bindings/interrupt-controller/irq.h> - -/ { - model = "SanCloud BeagleBone Enhanced"; - compatible = "sancloud,am335x-boneenhanced", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; -}; &am33xx_pinmux { - pinctrl-names = "default"; - cpsw_default: cpsw_default { pinctrl-single,pins = < /* Slave 1 */
@@ -75,18 +61,6 @@ usb_hub_ctrl: usb_hub_ctrl { AM33XX_PADCONF(AM335X_PIN_RMII1_REF_CLK, PIN_OUTPUT_PULLUP, MUX_MODE7) /* rmii1_refclk.gpio0_29 */ >; }; - - mpu6050_pins: pinmux_mpu6050_pins { - pinctrl-single,pins = < - AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT, MUX_MODE7) /* uart0_ctsn.gpio1_8 */ - >; - }; - - lps3331ap_pins: pinmux_lps3331ap_pins { - pinctrl-single,pins = < - AM33XX_PADCONF(AM335X_PIN_GPMC_A10, PIN_INPUT, MUX_MODE7) /* gpmc_a10.gpio1_26 */ - >; - }; }; &mac {
@@ -113,22 +87,6 @@ &cpsw_emac0 { }; &i2c0 { - lps331ap: barometer@5c { - compatible = "st,lps331ap-press"; - st,drdy-int-pin = <1>; - reg = <0x5c>; - interrupt-parent = <&gpio1>; - interrupts = <26 IRQ_TYPE_EDGE_RISING>; - }; - - mpu6050: accelerometer@68 { - compatible = "invensense,mpu6050"; - reg = <0x68>; - interrupt-parent = <&gpio0>; - interrupts = <2 IRQ_TYPE_EDGE_RISING>; - orientation = <0xff 0 0 0 1 0 0 0 0xff>; - }; - usb2512b: usb-hub@2c { compatible = "microchip,usb2512b"; reg = <0x2c>;
arch/arm/boot/dts/am335x-sancloud-bbe.dts +1 -90
113 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v2 3/4 ARM: dts: am335x-sancloud-bbe-lite: New devicetree
In reply to Paul BarkerThis adds support for the Sancloud BBE Lite which shares a common hardware base with the non-Lite version of the BBE.
--- arch/arm/boot/dts/Makefile | 1 + .../arm/boot/dts/am335x-sancloud-bbe-lite.dts | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -843,6 +843,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ am335x-pocketbeagle.dtb \ am335x-regor-rdk.dtb \ am335x-sancloud-bbe.dtb \ + am335x-sancloud-bbe-lite.dtb \ am335x-shc.dtb \ am335x-sbc-t335.dtb \ am335x-sl50.dtb \
arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts new file +50 -0
50 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v2 4/4 MAINTAINERS: Adopt SanCloud dts files as supported
In reply to Paul BarkerMyself and Marc are happy to maintain these device tree files going forward.
--- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
MAINTAINERS +6 -0
@@ -16447,6 +16447,12 @@ F: drivers/phy/samsung/phy-s5pv210-usb2.c F: drivers/phy/samsung/phy-samsung-usb2.c F: drivers/phy/samsung/phy-samsung-usb2.h +SANCLOUD BEAGLEBONE ENHANCED DEVICE TREE +M: Paul Barker <[email protected]> +R: Marc Murphy <[email protected]> +S: Supported +F: arch/arm/boot/dts/am335x-sancloud* + SC1200 WDT DRIVER M: Zwane Mwaikambo <[email protected]> S: Maintained
Signature · 1 line
2.26.2
Quoted 3 lines · Paul Barker
The Lite variant of the SanCloud BeagleBone Enhanced (BBE) removes the HDMI encoder, barometer and accelerometer chips and adds a Micron Authenta SPI flash chip.
Thanks applying all for v5.15 merge window.
Regards,
Tony
Quoted 6 lines · On Tue, 27 Jul 2021 11:55:21 +0300 Tony Lindgren <[email protected]> wrote:
Quoted 3 lines · Paul Barker
The Lite variant of the SanCloud BeagleBone Enhanced (BBE) removes the HDMI encoder, barometer and accelerometer chips and adds a Micron Authenta SPI flash chip.
Thanks applying all for v5.15 merge window.
I tested the for-next branch of linux-omap to confirm that things worked with these patches applied. There was a NULL pointer dereference in ptp_clock_register() during boot. The fix appears to be
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=55eac20617ca84129273ab248f4d7bfe456967de
which went into 5.14-rc2.
Merging for-next with 5.14-rc4 resulted in things working as expected.
Signature · 3 lines
Paul Barker Principal Software Engineer SanCloud Ltd
Quoted 8 lines · Paul Barker
Quoted 5 lines · On Tue, 27 Jul 2021 11:55:21 +0300 Tony Lindgren <[email protected]> wrote:
Quoted 3 lines · Paul Barker
The Lite variant of the SanCloud BeagleBone Enhanced (BBE) removes the HDMI encoder, barometer and accelerometer chips and adds a Micron Authenta SPI flash chip.
Quoted 7 lines
Quoted 1 line
Thanks applying all for v5.15 merge window.
I tested the for-next branch of linux-omap to confirm that things worked with these patches applied. There was a NULL pointer dereference in
ptp_clock_register()during boot. The fix appears to be
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=55eac20617ca84129273ab248f4d7bfe456967de
which went into 5.14-rc2.
Yeah so it seems, too bad it was not there for -rc1 already.
Quoted 1 line
Merging for-next with 5.14-rc4 resulted in things working as expected.
OK thanks for checking.
Regards,
Tony