* [PATCH 2/8] ARM: dts: am335x-wega: Fix audio codec by using simple-audio-card driver.
2023-02-14 13:22 [PATCH 1/8] ARM: dts: am335x-phycore-som: Add alias for TPS65910 RTC Steffen Hemer
@ 2023-02-14 13:22 ` Steffen Hemer
2023-02-14 13:22 ` [PATCH 3/8] ARM: dts: am335x-wega: Change node name of sound card, remove underscores Steffen Hemer
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Steffen Hemer @ 2023-02-14 13:22 UTC (permalink / raw)
To: linux-omap; +Cc: upstream, krzysztof.kozlowski+dt, robh+dt, tony, bcousson
Sound did not work with the previous EVM sound card binding, EVM dts
switched to using 'simple-audio-card', so this fixes audio codec by using
simple-audio-card driver.
Signed-off-by: Steffen Hemer <s.hemer@phytec.de>
---
arch/arm/boot/dts/am335x-wega.dtsi | 46 ++++++++++++++++++++----------
1 file changed, 31 insertions(+), 15 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi
index f957fea8208e..6c5d26bbe952 100644
--- a/arch/arm/boot/dts/am335x-wega.dtsi
+++ b/arch/arm/boot/dts/am335x-wega.dtsi
@@ -8,8 +8,34 @@ / {
model = "Phytec AM335x phyBOARD-WEGA";
compatible = "phytec,am335x-wega", "phytec,am335x-phycore-som", "ti,am33xx";
- sound: sound_iface {
- compatible = "ti,da830-evm-audio";
+ sound: sound-iface {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "snd-wega";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,bitclock-master = <&sound_iface_main>;
+ simple-audio-card,frame-master = <&sound_iface_main>;
+ simple-audio-card,mclk-fs = <32>;
+ simple-audio-card,widgets =
+ "Line", "Line In",
+ "Line", "Line Out",
+ "Speaker", "Speaker";
+ simple-audio-card,routing =
+ "Line Out", "LLOUT",
+ "Line Out", "RLOUT",
+ "Speaker", "SPOP",
+ "Speaker", "SPOM",
+ "LINE1L", "Line In",
+ "LINE1R", "Line In";
+
+ simple-audio-card,cpu {
+ sound-dai = <&mcasp0>;
+ };
+
+ sound_iface_main: simple-audio-card,codec {
+ sound-dai = <&tlv320aic3007>;
+ clocks = <&mcasp0_fck>;
+ };
+
};
vcc3v3: fixedregulator1 {
@@ -36,6 +62,7 @@ AM33XX_PADCONF(AM335X_PIN_MCASP0_AXR1, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
&i2c0 {
tlv320aic3007: tlv320aic3007@18 {
+ #sound-dai-cells = <0>;
compatible = "ti,tlv320aic3007";
reg = <0x18>;
AVDD-supply = <&vcc3v3>;
@@ -47,6 +74,7 @@ tlv320aic3007: tlv320aic3007@18 {
};
&mcasp0 {
+ #sound-dai-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&mcasp0_pins>;
op-mode = <0>; /* DAVINCI_MCASP_IIS_MODE */
@@ -59,19 +87,6 @@ &mcasp0 {
status = "okay";
};
-&sound {
- ti,model = "AM335x-Wega";
- ti,audio-codec = <&tlv320aic3007>;
- ti,mcasp-controller = <&mcasp0>;
- ti,audio-routing =
- "Line Out", "LLOUT",
- "Line Out", "RLOUT",
- "LINE1L", "Line In",
- "LINE1R", "Line In";
- clocks = <&mcasp0_fck>;
- clock-names = "mclk";
- status = "okay";
-};
/* CAN Busses */
&am33xx_pinmux {
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/8] ARM: dts: am335x-wega: Change node name of sound card, remove underscores.
2023-02-14 13:22 [PATCH 1/8] ARM: dts: am335x-phycore-som: Add alias for TPS65910 RTC Steffen Hemer
2023-02-14 13:22 ` [PATCH 2/8] ARM: dts: am335x-wega: Fix audio codec by using simple-audio-card driver Steffen Hemer
@ 2023-02-14 13:22 ` Steffen Hemer
2023-02-14 13:22 ` [PATCH 4/8] ARM: dts: am335x-pcm-935: Remove underscore in node names Steffen Hemer
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Steffen Hemer @ 2023-02-14 13:22 UTC (permalink / raw)
To: linux-omap; +Cc: upstream, krzysztof.kozlowski+dt, robh+dt, tony, bcousson
Change node name of sound card to recommended generic and remove also
further underscores in other node names.
Signed-off-by: Steffen Hemer <s.hemer@phytec.de>
---
arch/arm/boot/dts/am335x-wega.dtsi | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi
index 6c5d26bbe952..7e9a07b519bd 100644
--- a/arch/arm/boot/dts/am335x-wega.dtsi
+++ b/arch/arm/boot/dts/am335x-wega.dtsi
@@ -8,7 +8,7 @@ / {
model = "Phytec AM335x phyBOARD-WEGA";
compatible = "phytec,am335x-wega", "phytec,am335x-phycore-som", "ti,am33xx";
- sound: sound-iface {
+ sound: sound {
compatible = "simple-audio-card";
simple-audio-card,name = "snd-wega";
simple-audio-card,format = "i2s";
@@ -50,7 +50,7 @@ vcc3v3: fixedregulator1 {
/* Audio */
&am33xx_pinmux {
- mcasp0_pins: pinmux_mcasp0 {
+ mcasp0_pins: pinmux-mcasp0 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKX, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKX, PIN_INPUT_PULLDOWN, MUX_MODE0)
@@ -91,7 +91,7 @@ &mcasp0 {
/* CAN Busses */
&am33xx_pinmux {
- dcan1_pins: pinmux_dcan1 {
+ dcan1_pins: pinmux-dcan1 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT_PULLUP, MUX_MODE2) /* uart0_ctsn.d_can1_tx */
AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT_PULLUP, MUX_MODE2) /* uart0_rtsn.d_can1_rx */
@@ -107,7 +107,7 @@ &dcan1 {
/* Ethernet */
&am33xx_pinmux {
- ethernet1_pins: pinmux_ethernet1 {
+ ethernet1_pins: pinmux-ethernet1 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_GPMC_A0, PIN_OUTPUT, MUX_MODE1) /* gpmc_a0.mii2_txen */
AM33XX_PADCONF(AM335X_PIN_GPMC_A1, PIN_INPUT_PULLDOWN, MUX_MODE1) /* gpmc_a1.mii2_rxdv */
@@ -147,7 +147,7 @@ &mac_sw {
/* MMC */
&am33xx_pinmux {
- mmc1_pins: pinmux_mmc1 {
+ mmc1_pins: pinmux-mmc1 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
@@ -177,14 +177,14 @@ &vdig1_reg {
/* UARTs */
&am33xx_pinmux {
- uart0_pins: pinmux_uart0 {
+ uart0_pins: pinmux-uart0 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
>;
};
- uart1_pins: pinmux_uart1_pins {
+ uart1_pins: pinmux-uart1 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/8] ARM: dts: am335x-pcm-935: Remove underscore in node names.
2023-02-14 13:22 [PATCH 1/8] ARM: dts: am335x-phycore-som: Add alias for TPS65910 RTC Steffen Hemer
2023-02-14 13:22 ` [PATCH 2/8] ARM: dts: am335x-wega: Fix audio codec by using simple-audio-card driver Steffen Hemer
2023-02-14 13:22 ` [PATCH 3/8] ARM: dts: am335x-wega: Change node name of sound card, remove underscores Steffen Hemer
@ 2023-02-14 13:22 ` Steffen Hemer
2023-02-14 13:22 ` [PATCH 5/8] ARM: dts: am335x-regor: " Steffen Hemer
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Steffen Hemer @ 2023-02-14 13:22 UTC (permalink / raw)
To: linux-omap; +Cc: upstream, krzysztof.kozlowski+dt, robh+dt, tony, bcousson
Remove underscore in node names following conventions.
Signed-off-by: Steffen Hemer <s.hemer@phytec.de>
---
arch/arm/boot/dts/am335x-pcm-953.dtsi | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-pcm-953.dtsi b/arch/arm/boot/dts/am335x-pcm-953.dtsi
index 947497413977..92f2a283fe92 100644
--- a/arch/arm/boot/dts/am335x-pcm-953.dtsi
+++ b/arch/arm/boot/dts/am335x-pcm-953.dtsi
@@ -29,7 +29,7 @@ vcc1v8: fixedregulator2 {
};
/* User IO */
- user_leds: user_leds {
+ user_leds: user-leds {
compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&user_leds_pins>;
@@ -47,7 +47,7 @@ user-led1 {
};
};
- user_buttons: user_buttons {
+ user_buttons: user-buttons {
compatible = "gpio-keys";
pinctrl-names = "default";
pinctrl-0 = <&user_buttons_pins>;
@@ -70,14 +70,14 @@ button-1 {
};
&am33xx_pinmux {
- user_buttons_pins: pinmux_user_buttons {
+ user_buttons_pins: pinmux-user-buttons {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_EMU0, PIN_INPUT_PULLDOWN, MUX_MODE7) /* emu0.gpio3_7 */
AM33XX_PADCONF(AM335X_PIN_EMU1, PIN_INPUT_PULLDOWN, MUX_MODE7) /* emu1.gpio3_8 */
>;
};
- user_leds_pins: pinmux_user_leds {
+ user_leds_pins: pinmux-user-leds {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_GPMC_CSN1, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* gpmc_csn1.gpio1_30 */
AM33XX_PADCONF(AM335X_PIN_GPMC_CSN2, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* gpmc_csn2.gpio1_31 */
@@ -87,7 +87,7 @@ AM33XX_PADCONF(AM335X_PIN_GPMC_CSN2, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* gpmc_csn
/* CAN */
&am33xx_pinmux {
- dcan1_pins: pinmux_dcan1 {
+ dcan1_pins: pinmux-dcan1 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_OUTPUT_PULLUP, MUX_MODE2) /* uart1_rxd.dcan1_tx_mux2 */
AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_INPUT_PULLUP, MUX_MODE2) /* uart1_txd.dcan1_rx_mux2 */
@@ -144,7 +144,7 @@ &am33xx_pinmux {
pinctrl-names = "default";
pinctrl-0 = <&cb_gpio_pins>;
- cb_gpio_pins: pinmux_cb_gpio {
+ cb_gpio_pins: pinmux-cb-gpio {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* uart0_ctsn.gpio1_8 */
AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* uart0_rtsn.gpio1_9 */
@@ -154,7 +154,7 @@ AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* uart0_r
/* MMC */
&am33xx_pinmux {
- mmc1_pins: pinmux_mmc1_pins {
+ mmc1_pins: pinmux-mmc1-pins {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
@@ -178,14 +178,14 @@ &mmc1 {
/* UARTs */
&am33xx_pinmux {
- uart0_pins: pinmux_uart0 {
+ uart0_pins: pinmux-uart0 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
>;
};
- uart1_pins: pinmux_uart1 {
+ uart1_pins: pinmux-uart1 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
@@ -194,14 +194,14 @@ AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
>;
};
- uart2_pins: pinmux_uart2 {
+ uart2_pins: pinmux-uart2 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_INPUT_PULLUP, MUX_MODE1) /* mii1_tx_clk.uart2_rxd */
AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_OUTPUT_PULLDOWN, MUX_MODE1) /* mii1_rx_clk.uart2_txd */
>;
};
- uart3_pins: pinmux_uart3 {
+ uart3_pins: pinmux-uart3 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLUP, MUX_MODE1) /* mii1_rxd3.uart3_rxd */
AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_OUTPUT_PULLDOWN, MUX_MODE1) /* mii1_rxd2.uart3_txd */
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/8] ARM: dts: am335x-regor: Remove underscore in node names.
2023-02-14 13:22 [PATCH 1/8] ARM: dts: am335x-phycore-som: Add alias for TPS65910 RTC Steffen Hemer
` (2 preceding siblings ...)
2023-02-14 13:22 ` [PATCH 4/8] ARM: dts: am335x-pcm-935: Remove underscore in node names Steffen Hemer
@ 2023-02-14 13:22 ` Steffen Hemer
2023-02-14 13:23 ` [PATCH 6/8] ARM: dts: am335x-phycore-som: " Steffen Hemer
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Steffen Hemer @ 2023-02-14 13:22 UTC (permalink / raw)
To: linux-omap; +Cc: upstream, krzysztof.kozlowski+dt, robh+dt, tony, bcousson
Remove underscore in node names following conventions.
Signed-off-by: Steffen Hemer <s.hemer@phytec.de>
---
arch/arm/boot/dts/am335x-regor.dtsi | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-regor.dtsi b/arch/arm/boot/dts/am335x-regor.dtsi
index 7b3966ee51b9..3894f14a914c 100644
--- a/arch/arm/boot/dts/am335x-regor.dtsi
+++ b/arch/arm/boot/dts/am335x-regor.dtsi
@@ -18,7 +18,7 @@ vcc3v3: fixedregulator@1 {
};
/* User IO */
- user_leds: user_leds {
+ user_leds: user-leds {
compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&user_leds_pins>;
@@ -39,7 +39,7 @@ error-led {
/* User Leds */
&am33xx_pinmux {
- user_leds_pins: pinmux_user_leds {
+ user_leds_pins: pinmux-user-leds {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_LCD_VSYNC, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* lcd_hsync.gpio2_22 */
AM33XX_PADCONF(AM335X_PIN_MCASP0_FSX, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* mcasp0_fsx.gpio3_15 */
@@ -49,7 +49,7 @@ AM33XX_PADCONF(AM335X_PIN_MCASP0_FSX, PIN_OUTPUT_PULLDOWN, MUX_MODE7) /* mcasp0_
/* CAN Busses */
&am33xx_pinmux {
- dcan1_pins: pinmux_dcan1 {
+ dcan1_pins: pinmux-dcan1 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT_PULLUP, MUX_MODE2) /* uart0_ctsn.d_can1_tx */
AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT_PULLUP, MUX_MODE2) /* uart0_rtsn.d_can1_rx */
@@ -65,7 +65,7 @@ &dcan1 {
/* Ethernet */
&am33xx_pinmux {
- ethernet1_pins: pinmux_ethernet1 {
+ ethernet1_pins: pinmux-ethernet1 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_GPMC_A0, PIN_OUTPUT, MUX_MODE1) /* gpmc_a0.mii2_txen */
AM33XX_PADCONF(AM335X_PIN_GPMC_A1, PIN_INPUT_PULLDOWN, MUX_MODE1) /* gpmc_a1.mii2_rxdv */
@@ -108,7 +108,7 @@ &am33xx_pinmux {
pinctrl-names = "default";
pinctrl-0 = <&user_gpios_pins>;
- user_gpios_pins: pinmux_user_gpios {
+ user_gpios_pins: pinmux-user-gpios {
pinctrl-single,pins = <
/* DIGIN 1-4 */
AM33XX_PADCONF(AM335X_PIN_GPMC_AD11, PIN_INPUT, MUX_MODE7) /* gpmc_ad11.gpio0_27 */
@@ -126,7 +126,7 @@ AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_OUTPUT, MUX_MODE7) /* gpmc_ad12.gpio1_
/* MMC */
&am33xx_pinmux {
- mmc1_pins: pinmux_mmc1 {
+ mmc1_pins: pinmux-mmc1 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
@@ -155,14 +155,14 @@ &i2c_rtc {
/* UARTs */
&am33xx_pinmux {
- uart0_pins: pinmux_uart0 {
+ uart0_pins: pinmux-uart0 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
>;
};
- uart2_pins: pinmux_uart2 {
+ uart2_pins: pinmux-uart2 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_INPUT_PULLUP, MUX_MODE1) /* mii1_tx_clk.uart2_rxd */
AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_OUTPUT_PULLDOWN, MUX_MODE1) /* mii1_rx_clk.uart2_txd */
@@ -184,7 +184,7 @@ &uart2 {
/* RS485 - UART1 */
&am33xx_pinmux {
- uart1_rs485_pins: pinmux_uart1_rs485_pins {
+ uart1_rs485_pins: pinmux-uart1-rs485-pins {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/8] ARM: dts: am335x-phycore-som: Remove underscore in node names.
2023-02-14 13:22 [PATCH 1/8] ARM: dts: am335x-phycore-som: Add alias for TPS65910 RTC Steffen Hemer
` (3 preceding siblings ...)
2023-02-14 13:22 ` [PATCH 5/8] ARM: dts: am335x-regor: " Steffen Hemer
@ 2023-02-14 13:23 ` Steffen Hemer
2023-02-14 13:23 ` [PATCH 7/8] ARM: dts: am335x-pcm-953: Remove superseded/invalid LED trigger Steffen Hemer
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Steffen Hemer @ 2023-02-14 13:23 UTC (permalink / raw)
To: linux-omap; +Cc: upstream, krzysztof.kozlowski+dt, robh+dt, tony, bcousson
Remove underscore in node names following conventions.
Signed-off-by: Steffen Hemer <s.hemer@phytec.de>
---
arch/arm/boot/dts/am335x-phycore-som.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
index 6819cec588a7..5bb05620da56 100644
--- a/arch/arm/boot/dts/am335x-phycore-som.dtsi
+++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
@@ -49,7 +49,7 @@ &sham {
/* EMMC */
&am33xx_pinmux {
- emmc_pins: pinmux_emmc_pins {
+ emmc_pins: pinmux-emmc-pins {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_GPMC_CSN1, PIN_INPUT_PULLUP, MUX_MODE2) /* gpmc_csn1.mmc1_clk */
AM33XX_PADCONF(AM335X_PIN_GPMC_CSN2, PIN_INPUT_PULLUP, MUX_MODE2) /* gpmc_csn2.mmc1_cmd */
@@ -125,7 +125,7 @@ &mac_sw {
/* I2C Busses */
&am33xx_pinmux {
- i2c0_pins: pinmux_i2c0 {
+ i2c0_pins: pinmux-i2c0 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT, MUX_MODE0)
@@ -165,7 +165,7 @@ i2c_rtc: rtc@68 {
/* NAND memory */
&am33xx_pinmux {
- nandflash_pins: pinmux_nandflash {
+ nandflash_pins: pinmux-nandflash {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_GPMC_AD0, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_GPMC_AD1, PIN_INPUT_PULLUP, MUX_MODE0)
@@ -317,7 +317,7 @@ vmmc_reg: regulator@12 {
/* SPI Busses */
&am33xx_pinmux {
- spi0_pins: pinmux_spi0 {
+ spi0_pins: pinmux-spi0 {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT_PULLDOWN, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_INPUT_PULLDOWN, MUX_MODE0)
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 7/8] ARM: dts: am335x-pcm-953: Remove superseded/invalid LED trigger.
2023-02-14 13:22 [PATCH 1/8] ARM: dts: am335x-phycore-som: Add alias for TPS65910 RTC Steffen Hemer
` (4 preceding siblings ...)
2023-02-14 13:23 ` [PATCH 6/8] ARM: dts: am335x-phycore-som: " Steffen Hemer
@ 2023-02-14 13:23 ` Steffen Hemer
2023-02-14 13:23 ` [PATCH 8/8] ARM: dts: am335x-phycore-som: Remove superseded/invalid GPMC NAND type Steffen Hemer
2023-03-27 8:18 ` [PATCH 1/8] ARM: dts: am335x-phycore-som: Add alias for TPS65910 RTC Tony Lindgren
7 siblings, 0 replies; 9+ messages in thread
From: Steffen Hemer @ 2023-02-14 13:23 UTC (permalink / raw)
To: linux-omap; +Cc: upstream, krzysztof.kozlowski+dt, robh+dt, tony, bcousson
According to docu and dtschema check, 'linux,default-trigger = gpio' is
no longer valid, so remove it.
Signed-off-by: Steffen Hemer <s.hemer@phytec.de>
---
arch/arm/boot/dts/am335x-pcm-953.dtsi | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-pcm-953.dtsi b/arch/arm/boot/dts/am335x-pcm-953.dtsi
index 92f2a283fe92..67c7fcc52ce6 100644
--- a/arch/arm/boot/dts/am335x-pcm-953.dtsi
+++ b/arch/arm/boot/dts/am335x-pcm-953.dtsi
@@ -36,13 +36,11 @@ user_leds: user-leds {
user-led0 {
gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "gpio";
default-state = "on";
};
user-led1 {
gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "gpio";
default-state = "on";
};
};
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 8/8] ARM: dts: am335x-phycore-som: Remove superseded/invalid GPMC NAND type.
2023-02-14 13:22 [PATCH 1/8] ARM: dts: am335x-phycore-som: Add alias for TPS65910 RTC Steffen Hemer
` (5 preceding siblings ...)
2023-02-14 13:23 ` [PATCH 7/8] ARM: dts: am335x-pcm-953: Remove superseded/invalid LED trigger Steffen Hemer
@ 2023-02-14 13:23 ` Steffen Hemer
2023-03-27 8:18 ` [PATCH 1/8] ARM: dts: am335x-phycore-som: Add alias for TPS65910 RTC Tony Lindgren
7 siblings, 0 replies; 9+ messages in thread
From: Steffen Hemer @ 2023-02-14 13:23 UTC (permalink / raw)
To: linux-omap; +Cc: upstream, krzysztof.kozlowski+dt, robh+dt, tony, bcousson
According to docu and dtschema check, 'gpmc,device-nand = true' is
no longer valid, so remove it.
Signed-off-by: Steffen Hemer <s.hemer@phytec.de>
---
arch/arm/boot/dts/am335x-phycore-som.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
index 5bb05620da56..034dc5181679 100644
--- a/arch/arm/boot/dts/am335x-phycore-som.dtsi
+++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
@@ -203,7 +203,6 @@ nandflash: nand@0,0 {
rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */
nand-bus-width = <8>;
ti,nand-ecc-opt = "bch8";
- gpmc,device-nand = "true";
gpmc,device-width = <1>;
gpmc,sync-clk-ps = <0>;
gpmc,cs-on-ns = <0>;
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/8] ARM: dts: am335x-phycore-som: Add alias for TPS65910 RTC
2023-02-14 13:22 [PATCH 1/8] ARM: dts: am335x-phycore-som: Add alias for TPS65910 RTC Steffen Hemer
` (6 preceding siblings ...)
2023-02-14 13:23 ` [PATCH 8/8] ARM: dts: am335x-phycore-som: Remove superseded/invalid GPMC NAND type Steffen Hemer
@ 2023-03-27 8:18 ` Tony Lindgren
7 siblings, 0 replies; 9+ messages in thread
From: Tony Lindgren @ 2023-03-27 8:18 UTC (permalink / raw)
To: Steffen Hemer
Cc: linux-omap, upstream, krzysztof.kozlowski+dt, robh+dt, bcousson
* Steffen Hemer <s.hemer@phytec.de> [230214 15:23]:
> Without an alias for the TPS65910 RTC, it snatches the rtc0 device in
> advance to the I2C RTC assigned to that alias.
Applying all eight patches into omap-for-v6.4/dt thanks.
Tony
^ permalink raw reply [flat|nested] 9+ messages in thread