Unverified Commit c2f71415 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v6.4/dt-signed' of... 

Merge tag 'omap-for-v6.4/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into soc/dt

Devicetree changes for omaps for v6.4

Devicetree changes for omaps for gta04, Phytec am335x devices, and to
drop a obsolete compatible property:

- A non-urgent fix for gta04 to enable more dma channels for some audio
  configurations

- Update the dts compatible and vendor prefixes for gta04

- A series of updates for Phytec am335x based boards to configure more
  devices like rtc and audio, and a few clean-up patches

- A change to drop the usage of "ti,omap36xx" compatible, the driver
  code already checks for "ti,omap3630" that is also alread set in the
  dts files. This makes the yaml binding conversion a bit simpler.

* tag 'omap-for-v6.4/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: omap: Drop ti,omap36xx compatible
  ARM: dts: am335x-phycore-som: Remove superseded/invalid GPMC NAND type.
  ARM: dts: am335x-pcm-953: Remove superseded/invalid LED trigger.
  ARM: dts: am335x-phycore-som: Remove underscore in node names.
  ARM: dts: am335x-regor: Remove underscore in node names.
  ARM: dts: am335x-pcm-935: Remove underscore in node names.
  ARM: dts: am335x-wega: Change node name of sound card, remove underscores.
  ARM: dts: am335x-wega: Fix audio codec by using simple-audio-card driver.
  ARM: dts: am335x-phycore-som: Add alias for TPS65910 RTC
  ARM: dts: omap3-gta04: fix compatible record for GTA04 board
  ARM: dts: gta04: fix excess dma channel usage

Link: https://lore.kernel.org/r/pull-1680180389-756753@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d707810e e341f338

Documentation/devicetree/bindings/vendor-prefixes.yaml

+4 −0
Original line number Diff line number Diff line
@@ -516,6 +516,8 @@ patternProperties: 
    description: GlobalTop Technology, Inc.

  "^gmt,.*":

    description: Global Mixed-mode Technology, Inc.

  "^goldelico,.*":

    description: Golden Delicious Computers GmbH & Co. KG

  "^goodix,.*":

    description: Shenzhen Huiding Technology Co., Ltd.

  "^google,.*":
@@ -977,6 +979,8 @@ patternProperties: 
    description: OpenCores.org

  "^openembed,.*":

    description: OpenEmbed

  "^openpandora,.*":

    description: OpenPandora GmbH

  "^openrisc,.*":

    description: OpenRISC.io

  "^option,.*":

arch/arm/boot/dts/am335x-pcm-953.dtsi

+11 −13
Original line number Diff line number Diff line
@@ -29,25 +29,23 @@ vcc1v8: fixedregulator2 { 
	};



	/* User IO */

	user_leds: user_leds {

	user_leds: user-leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

		pinctrl-0 = <&user_leds_pins>;



		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";

		};

	};



	user_buttons: user_buttons {

	user_buttons: user-buttons {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&user_buttons_pins>;
@@ -70,14 +68,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 +85,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 +142,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 +152,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 +176,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 +192,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 */

arch/arm/boot/dts/am335x-phycore-som.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ / { 
	aliases {

		rtc0 = &i2c_rtc;

		rtc1 = &rtc;

		rtc2 = &tps;

	};



	cpus {
@@ -48,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 */
@@ -124,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)
@@ -164,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)
@@ -202,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>;
@@ -316,7 +316,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)

arch/arm/boot/dts/am335x-regor.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -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)

arch/arm/boot/dts/am335x-wega.dtsi

+36 −21
Original line number Diff line number Diff line
@@ -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 {

		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 {
@@ -23,7 +49,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)
@@ -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,23 +87,10 @@ &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 {

	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 */
@@ -91,7 +106,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 */
@@ -131,7 +146,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)
@@ -161,14 +176,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)