* [PATCH 1/4] ARM: dts: am335x-boneblack: Extract HDMI config
2021-06-17 9:33 [PATCH 0/4] Add support for the SanCloud BBE Lite Paul Barker
@ 2021-06-17 9:33 ` Paul Barker
2021-06-17 9:33 ` [PATCH 2/4] ARM: dts: am335x-sancloud-bbe: Extract common code Paul Barker
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Paul Barker @ 2021-06-17 9:33 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren, linux-omap, devicetree
Cc: Paul Barker, Marc Murphy
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.
Signed-off-by: Paul Barker <paul.barker@sancloud.com>
---
.../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%)
diff --git a/arch/arm/boot/dts/am335x-boneblack-common.dtsi b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
index 64c3e9269f40..10494c4431b9 100644
--- a/arch/arm/boot/dts/am335x-boneblack-common.dtsi
+++ b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
@@ -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>;
- };
- };
};
diff --git a/arch/arm/boot/dts/am335x-boneblack-common.dtsi b/arch/arm/boot/dts/am335x-boneblack-hdmi.dtsi
similarity index 90%
copy from arch/arm/boot/dts/am335x-boneblack-common.dtsi
copy to arch/arm/boot/dts/am335x-boneblack-hdmi.dtsi
index 64c3e9269f40..7cfddada9348 100644
--- a/arch/arm/boot/dts/am335x-boneblack-common.dtsi
+++ b/arch/arm/boot/dts/am335x-boneblack-hdmi.dtsi
@@ -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";
diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
index 86cad9912906..2bec2287fefe 100644
--- a/arch/arm/boot/dts/am335x-boneblack-wireless.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
@@ -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>
/ {
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
index e2ee8b8c07bc..9312197316f0 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -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";
diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe.dts b/arch/arm/boot/dts/am335x-sancloud-bbe.dts
index 275ba339adf4..c82295654bdd 100644
--- a/arch/arm/boot/dts/am335x-sancloud-bbe.dts
+++ b/arch/arm/boot/dts/am335x-sancloud-bbe.dts
@@ -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>
/ {
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/4] ARM: dts: am335x-sancloud-bbe: Extract common code
2021-06-17 9:33 [PATCH 0/4] Add support for the SanCloud BBE Lite Paul Barker
2021-06-17 9:33 ` [PATCH 1/4] ARM: dts: am335x-boneblack: Extract HDMI config Paul Barker
@ 2021-06-17 9:33 ` Paul Barker
2021-06-17 9:33 ` [PATCH 3/4] ARM: dts: am335x-sancloud-bbe-lite: New devicetree Paul Barker
2021-06-17 9:33 ` [PATCH 4/4] MAINTAINERS: Adopt SanCloud dts files as supported Paul Barker
3 siblings, 0 replies; 8+ messages in thread
From: Paul Barker @ 2021-06-17 9:33 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren, linux-omap, devicetree
Cc: Paul Barker, Marc Murphy
The Sancloud BBE, BBE Lite and BBE Extended+WiFi share a common hardware
base so we can avoid duplication via a dtsi file.
Signed-off-by: Paul Barker <paul.barker@sancloud.com>
---
...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%)
diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe.dts b/arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi
similarity index 76%
copy from arch/arm/boot/dts/am335x-sancloud-bbe.dts
copy to arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi
index c82295654bdd..bd9c21813192 100644
--- a/arch/arm/boot/dts/am335x-sancloud-bbe.dts
+++ b/arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe.dts b/arch/arm/boot/dts/am335x-sancloud-bbe.dts
index c82295654bdd..2a0ac9f5dda7 100644
--- a/arch/arm/boot/dts/am335x-sancloud-bbe.dts
+++ b/arch/arm/boot/dts/am335x-sancloud-bbe.dts
@@ -8,6 +8,7 @@
#include "am335x-bone-common.dtsi"
#include "am335x-boneblack-common.dtsi"
#include "am335x-boneblack-hdmi.dtsi"
+#include "am335x-sancloud-bbe-common.dtsi"
#include <dt-bindings/interrupt-controller/irq.h>
/ {
@@ -16,66 +17,6 @@ / {
};
&am33xx_pinmux {
- pinctrl-names = "default";
-
- cpsw_default: cpsw_default {
- pinctrl-single,pins = <
- /* Slave 1 */
- AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txen.rgmii1_tctl */
- AM33XX_PADCONF(AM335X_PIN_MII1_RX_DV, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxdv.rgmii1_rctl */
- AM33XX_PADCONF(AM335X_PIN_MII1_TXD3, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txd3.rgmii1_td3 */
- AM33XX_PADCONF(AM335X_PIN_MII1_TXD2, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txd2.rgmii1_td2 */
- AM33XX_PADCONF(AM335X_PIN_MII1_TXD1, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txd1.rgmii1_td1 */
- AM33XX_PADCONF(AM335X_PIN_MII1_TXD0, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txd0.rgmii1_td0 */
- AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mii1_txclk.rgmii1_tclk */
- AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxclk.rgmii1_rclk */
- AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxd3.rgmii1_rd3 */
- AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxd2.rgmii1_rd2 */
- AM33XX_PADCONF(AM335X_PIN_MII1_RXD1, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxd1.rgmii1_rd1 */
- AM33XX_PADCONF(AM335X_PIN_MII1_RXD0, PIN_INPUT_PULLDOWN, MUX_MODE2) /* mii1_rxd0.rgmii1_rd0 */
- >;
- };
-
- cpsw_sleep: cpsw_sleep {
- pinctrl-single,pins = <
- /* Slave 1 reset value */
- AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_INPUT_PULLDOWN, MUX_MODE7)
- AM33XX_PADCONF(AM335X_PIN_MII1_RX_DV, PIN_INPUT_PULLDOWN, MUX_MODE7)
- AM33XX_PADCONF(AM335X_PIN_MII1_TXD3, PIN_INPUT_PULLDOWN, MUX_MODE7)
- AM33XX_PADCONF(AM335X_PIN_MII1_TXD2, PIN_INPUT_PULLDOWN, MUX_MODE7)
- AM33XX_PADCONF(AM335X_PIN_MII1_TXD1, PIN_INPUT_PULLDOWN, MUX_MODE7)
- AM33XX_PADCONF(AM335X_PIN_MII1_TXD0, PIN_INPUT_PULLDOWN, MUX_MODE7)
- AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_INPUT_PULLDOWN, MUX_MODE7)
- AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_INPUT_PULLDOWN, MUX_MODE7)
- AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLDOWN, MUX_MODE7)
- AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_INPUT_PULLDOWN, MUX_MODE7)
- AM33XX_PADCONF(AM335X_PIN_MII1_RXD1, PIN_INPUT_PULLDOWN, MUX_MODE7)
- AM33XX_PADCONF(AM335X_PIN_MII1_RXD0, PIN_INPUT_PULLDOWN, MUX_MODE7)
- >;
- };
-
- davinci_mdio_default: davinci_mdio_default {
- pinctrl-single,pins = <
- /* MDIO */
- AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
- AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)
- >;
- };
-
- davinci_mdio_sleep: davinci_mdio_sleep {
- pinctrl-single,pins = <
- /* MDIO reset value */
- AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
- AM33XX_PADCONF(AM335X_PIN_MDC, PIN_INPUT_PULLDOWN, MUX_MODE7)
- >;
- };
-
- usb_hub_ctrl: usb_hub_ctrl {
- pinctrl-single,pins = <
- 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 */
@@ -89,29 +30,6 @@ AM33XX_PADCONF(AM335X_PIN_GPMC_A10, PIN_INPUT, MUX_MODE7) /* gpmc_a10.gpio1_
};
};
-&mac {
- pinctrl-names = "default", "sleep";
- pinctrl-0 = <&cpsw_default>;
- pinctrl-1 = <&cpsw_sleep>;
- status = "okay";
-};
-
-&davinci_mdio {
- pinctrl-names = "default", "sleep";
- pinctrl-0 = <&davinci_mdio_default>;
- pinctrl-1 = <&davinci_mdio_sleep>;
- status = "okay";
-
- ethphy0: ethernet-phy@0 {
- reg = <0>;
- };
-};
-
-&cpsw_emac0 {
- phy-handle = <ðphy0>;
- phy-mode = "rgmii-id";
-};
-
&i2c0 {
lps331ap: barometer@5c {
compatible = "st,lps331ap-press";
@@ -128,11 +46,4 @@ mpu6050: accelerometer@68 {
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>;
- reset-gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
- /* wifi on port 4 */
- };
};
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/4] ARM: dts: am335x-sancloud-bbe-lite: New devicetree
2021-06-17 9:33 [PATCH 0/4] Add support for the SanCloud BBE Lite Paul Barker
2021-06-17 9:33 ` [PATCH 1/4] ARM: dts: am335x-boneblack: Extract HDMI config Paul Barker
2021-06-17 9:33 ` [PATCH 2/4] ARM: dts: am335x-sancloud-bbe: Extract common code Paul Barker
@ 2021-06-17 9:33 ` Paul Barker
2021-06-18 16:02 ` Robert Nelson
2021-06-17 9:33 ` [PATCH 4/4] MAINTAINERS: Adopt SanCloud dts files as supported Paul Barker
3 siblings, 1 reply; 8+ messages in thread
From: Paul Barker @ 2021-06-17 9:33 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren, linux-omap, devicetree
Cc: Paul Barker, Marc Murphy, Arnd Bergmann, Olof Johansson
This adds support for the Sancloud BBE Lite which shares a common
hardware base with the non-Lite version of the BBE.
Signed-off-by: Paul Barker <paul.barker@sancloud.com>
---
arch/arm/boot/dts/Makefile | 1 +
.../arm/boot/dts/am335x-sancloud-bbe-lite.dts | 51 +++++++++++++++++++
2 files changed, 52 insertions(+)
create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index f8f09c5066e7..8629c941f573 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -834,6 +834,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 \
diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts b/arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts
new file mode 100644
index 000000000000..9c311bd106f6
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (C) 2021 SanCloud Ltd
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
+#include "am335x-boneblack-common.dtsi"
+#include "am335x-sancloud-bbe-common.dtsi"
+
+/ {
+ model = "SanCloud BeagleBone Enhanced Lite";
+ compatible = "sancloud,am335x-boneenhanced",
+ "ti,am335x-bone-black",
+ "ti,am335x-bone",
+ "ti,am33xx";
+};
+
+&am33xx_pinmux {
+ bb_spi0_pins: pinmux_bb_spi0_pins {
+ pinctrl-single,pins = <
+ AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT, MUX_MODE0)
+ AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_INPUT, MUX_MODE0)
+ AM33XX_PADCONF(AM335X_PIN_SPI0_D1, PIN_INPUT, MUX_MODE0)
+ AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT, MUX_MODE0)
+ >;
+ };
+};
+
+&spi0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&bb_spi0_pins>;
+
+ channel@0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ compatible = "micron,spi-authenta";
+ symlink = "spi/0.0";
+
+ reg = <0>;
+ spi-max-frequency = <16000000>;
+ spi-cpha;
+ };
+};
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 3/4] ARM: dts: am335x-sancloud-bbe-lite: New devicetree
2021-06-17 9:33 ` [PATCH 3/4] ARM: dts: am335x-sancloud-bbe-lite: New devicetree Paul Barker
@ 2021-06-18 16:02 ` Robert Nelson
2021-06-29 13:10 ` Paul Barker
0 siblings, 1 reply; 8+ messages in thread
From: Robert Nelson @ 2021-06-18 16:02 UTC (permalink / raw)
To: Paul Barker
Cc: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
Marc Murphy, Arnd Bergmann, Olof Johansson
Hi Paul,
On Thu, Jun 17, 2021 at 4:35 AM Paul Barker <paul.barker@sancloud.com> wrote:
>
> This adds support for the Sancloud BBE Lite which shares a common
> hardware base with the non-Lite version of the BBE.
>
> Signed-off-by: Paul Barker <paul.barker@sancloud.com>
> ---
> arch/arm/boot/dts/Makefile | 1 +
> .../arm/boot/dts/am335x-sancloud-bbe-lite.dts | 51 +++++++++++++++++++
> 2 files changed, 52 insertions(+)
> create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index f8f09c5066e7..8629c941f573 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -834,6 +834,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 \
> diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts b/arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts
> new file mode 100644
> index 000000000000..9c311bd106f6
> --- /dev/null
> +++ b/arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts
> @@ -0,0 +1,51 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
> + * Copyright (C) 2021 SanCloud Ltd
> + */
> +/dts-v1/;
> +
> +#include "am33xx.dtsi"
> +#include "am335x-bone-common.dtsi"
> +#include "am335x-boneblack-common.dtsi"
> +#include "am335x-sancloud-bbe-common.dtsi"
> +
> +/ {
> + model = "SanCloud BeagleBone Enhanced Lite";
> + compatible = "sancloud,am335x-boneenhanced",
> + "ti,am335x-bone-black",
> + "ti,am335x-bone",
> + "ti,am33xx";
> +};
> +
> +&am33xx_pinmux {
> + bb_spi0_pins: pinmux_bb_spi0_pins {
> + pinctrl-single,pins = <
> + AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT, MUX_MODE0)
> + AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_INPUT, MUX_MODE0)
> + AM33XX_PADCONF(AM335X_PIN_SPI0_D1, PIN_INPUT, MUX_MODE0)
> + AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT, MUX_MODE0)
> + >;
> + };
> +};
> +
> +&spi0 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&bb_spi0_pins>;
> +
> + channel@0 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + compatible = "micron,spi-authenta";
> + symlink = "spi/0.0";
Sorry, this "symlink" is an undocumented "feature" of the
BeagleBoard.org tree.. We use it to help "identity" spi/usart/i2c
nodes names when they dynamically change node numbers based on kernel
versions or even 'drivers'....
https://github.com/beagleboard/customizations/blob/master/etc/udev/rules.d/10-of-symlink.rules
For 'mainline' we need to remove it..
Regards,
--
Robert Nelson
https://rcn-ee.com/
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 3/4] ARM: dts: am335x-sancloud-bbe-lite: New devicetree
2021-06-18 16:02 ` Robert Nelson
@ 2021-06-29 13:10 ` Paul Barker
2021-07-20 8:41 ` Paul Barker
0 siblings, 1 reply; 8+ messages in thread
From: Paul Barker @ 2021-06-29 13:10 UTC (permalink / raw)
To: Robert Nelson
Cc: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
Marc Murphy, Arnd Bergmann, Olof Johansson
[-- Attachment #1: Type: text/plain, Size: 3606 bytes --]
On Fri, 18 Jun 2021 11:02:12 -0500
Robert Nelson <robertcnelson@gmail.com> wrote:
> Hi Paul,
>
> On Thu, Jun 17, 2021 at 4:35 AM Paul Barker
> <paul.barker@sancloud.com> wrote:
> >
> > This adds support for the Sancloud BBE Lite which shares a common
> > hardware base with the non-Lite version of the BBE.
> >
> > Signed-off-by: Paul Barker <paul.barker@sancloud.com>
> > ---
> > arch/arm/boot/dts/Makefile | 1 +
> > .../arm/boot/dts/am335x-sancloud-bbe-lite.dts | 51
> > +++++++++++++++++++ 2 files changed, 52 insertions(+)
> > create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts
> >
> > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> > index f8f09c5066e7..8629c941f573 100644
> > --- a/arch/arm/boot/dts/Makefile
> > +++ b/arch/arm/boot/dts/Makefile
> > @@ -834,6 +834,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 \
> > diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts
> > b/arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts new file mode
> > 100644 index 000000000000..9c311bd106f6
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts
> > @@ -0,0 +1,51 @@
> > +// SPDX-License-Identifier: GPL-2.0-only
> > +/*
> > + * Copyright (C) 2012 Texas Instruments Incorporated -
> > http://www.ti.com/
> > + * Copyright (C) 2021 SanCloud Ltd
> > + */
> > +/dts-v1/;
> > +
> > +#include "am33xx.dtsi"
> > +#include "am335x-bone-common.dtsi"
> > +#include "am335x-boneblack-common.dtsi"
> > +#include "am335x-sancloud-bbe-common.dtsi"
> > +
> > +/ {
> > + model = "SanCloud BeagleBone Enhanced Lite";
> > + compatible = "sancloud,am335x-boneenhanced",
> > + "ti,am335x-bone-black",
> > + "ti,am335x-bone",
> > + "ti,am33xx";
> > +};
> > +
> > +&am33xx_pinmux {
> > + bb_spi0_pins: pinmux_bb_spi0_pins {
> > + pinctrl-single,pins = <
> > + AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK,
> > PIN_INPUT, MUX_MODE0)
> > + AM33XX_PADCONF(AM335X_PIN_SPI0_D0,
> > PIN_INPUT, MUX_MODE0)
> > + AM33XX_PADCONF(AM335X_PIN_SPI0_D1,
> > PIN_INPUT, MUX_MODE0)
> > + AM33XX_PADCONF(AM335X_PIN_SPI0_CS0,
> > PIN_INPUT, MUX_MODE0)
> > + >;
> > + };
> > +};
> > +
> > +&spi0 {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + status = "okay";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&bb_spi0_pins>;
> > +
> > + channel@0 {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + compatible = "micron,spi-authenta";
> > + symlink = "spi/0.0";
>
> Sorry, this "symlink" is an undocumented "feature" of the
> BeagleBoard.org tree.. We use it to help "identity" spi/usart/i2c
> nodes names when they dynamically change node numbers based on kernel
> versions or even 'drivers'....
>
> https://github.com/beagleboard/customizations/blob/master/etc/udev/rules.d/10-of-symlink.rules
>
> For 'mainline' we need to remove it..
Ok, that's a straightforward change. I'll send an updated patch series
later in the week.
Thanks,
--
Paul Barker
Principal Software Engineer
SanCloud Ltd
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 3/4] ARM: dts: am335x-sancloud-bbe-lite: New devicetree
2021-06-29 13:10 ` Paul Barker
@ 2021-07-20 8:41 ` Paul Barker
0 siblings, 0 replies; 8+ messages in thread
From: Paul Barker @ 2021-07-20 8:41 UTC (permalink / raw)
Cc: Benoît Cousson, Tony Lindgren, linux-omap, devicetree,
Marc Murphy, Arnd Bergmann, Olof Johansson
[-- Attachment #1: Type: text/plain, Size: 3979 bytes --]
On Tue, 29 Jun 2021 14:10:33 +0100
Paul Barker <paul.barker@sancloud.com> wrote:
> On Fri, 18 Jun 2021 11:02:12 -0500
> Robert Nelson <robertcnelson@gmail.com> wrote:
>
> > Hi Paul,
> >
> > On Thu, Jun 17, 2021 at 4:35 AM Paul Barker
> > <paul.barker@sancloud.com> wrote:
> > >
> > > This adds support for the Sancloud BBE Lite which shares a common
> > > hardware base with the non-Lite version of the BBE.
> > >
> > > Signed-off-by: Paul Barker <paul.barker@sancloud.com>
> > > ---
> > > arch/arm/boot/dts/Makefile | 1 +
> > > .../arm/boot/dts/am335x-sancloud-bbe-lite.dts | 51
> > > +++++++++++++++++++ 2 files changed, 52 insertions(+)
> > > create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts
> > >
> > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> > > index f8f09c5066e7..8629c941f573 100644
> > > --- a/arch/arm/boot/dts/Makefile
> > > +++ b/arch/arm/boot/dts/Makefile
> > > @@ -834,6 +834,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 \
> > > diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts
> > > b/arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts new file mode
> > > 100644 index 000000000000..9c311bd106f6
> > > --- /dev/null
> > > +++ b/arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts
> > > @@ -0,0 +1,51 @@
> > > +// SPDX-License-Identifier: GPL-2.0-only
> > > +/*
> > > + * Copyright (C) 2012 Texas Instruments Incorporated -
> > > http://www.ti.com/
> > > + * Copyright (C) 2021 SanCloud Ltd
> > > + */
> > > +/dts-v1/;
> > > +
> > > +#include "am33xx.dtsi"
> > > +#include "am335x-bone-common.dtsi"
> > > +#include "am335x-boneblack-common.dtsi"
> > > +#include "am335x-sancloud-bbe-common.dtsi"
> > > +
> > > +/ {
> > > + model = "SanCloud BeagleBone Enhanced Lite";
> > > + compatible = "sancloud,am335x-boneenhanced",
> > > + "ti,am335x-bone-black",
> > > + "ti,am335x-bone",
> > > + "ti,am33xx";
> > > +};
> > > +
> > > +&am33xx_pinmux {
> > > + bb_spi0_pins: pinmux_bb_spi0_pins {
> > > + pinctrl-single,pins = <
> > > + AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK,
> > > PIN_INPUT, MUX_MODE0)
> > > + AM33XX_PADCONF(AM335X_PIN_SPI0_D0,
> > > PIN_INPUT, MUX_MODE0)
> > > + AM33XX_PADCONF(AM335X_PIN_SPI0_D1,
> > > PIN_INPUT, MUX_MODE0)
> > > + AM33XX_PADCONF(AM335X_PIN_SPI0_CS0,
> > > PIN_INPUT, MUX_MODE0)
> > > + >;
> > > + };
> > > +};
> > > +
> > > +&spi0 {
> > > + #address-cells = <1>;
> > > + #size-cells = <0>;
> > > +
> > > + status = "okay";
> > > + pinctrl-names = "default";
> > > + pinctrl-0 = <&bb_spi0_pins>;
> > > +
> > > + channel@0 {
> > > + #address-cells = <1>;
> > > + #size-cells = <0>;
> > > +
> > > + compatible = "micron,spi-authenta";
> > > + symlink = "spi/0.0";
> >
> > Sorry, this "symlink" is an undocumented "feature" of the
> > BeagleBoard.org tree.. We use it to help "identity" spi/usart/i2c
> > nodes names when they dynamically change node numbers based on kernel
> > versions or even 'drivers'....
> >
> > https://github.com/beagleboard/customizations/blob/master/etc/udev/rules.d/10-of-symlink.rules
> >
> > For 'mainline' we need to remove it..
>
> Ok, that's a straightforward change. I'll send an updated patch series
> later in the week.
>
> Thanks,
>
Sorry folks, v2 got delayed due to illness. I've sent it today.
Thanks,
--
Paul Barker
Principal Software Engineer
SanCloud Ltd
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4/4] MAINTAINERS: Adopt SanCloud dts files as supported
2021-06-17 9:33 [PATCH 0/4] Add support for the SanCloud BBE Lite Paul Barker
` (2 preceding siblings ...)
2021-06-17 9:33 ` [PATCH 3/4] ARM: dts: am335x-sancloud-bbe-lite: New devicetree Paul Barker
@ 2021-06-17 9:33 ` Paul Barker
3 siblings, 0 replies; 8+ messages in thread
From: Paul Barker @ 2021-06-17 9:33 UTC (permalink / raw)
To: Benoît Cousson, Tony Lindgren, linux-omap, devicetree
Cc: Paul Barker, Marc Murphy
Myself and Marc are happy to maintain these device tree files going
forward.
Signed-off-by: Paul Barker <paul.barker@sancloud.com>
Acked-by: Marc Murphy <marc.murphy@sancloud.com>
---
MAINTAINERS | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index bc0ceef87b73..70ff908ac891 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16234,6 +16234,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 <paul.barker@sancloud.com>
+R: Marc Murphy <marc.murphy@sancloud.com>
+S: Supported
+F: arch/arm/boot/dts/am335x-sancloud*
+
SC1200 WDT DRIVER
M: Zwane Mwaikambo <zwanem@gmail.com>
S: Maintained
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread