Unverified Commit 3df51252 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.15/dt-signed' of... 

Merge tag 'omap-for-v5.15/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

Devicetree changes for omaps for v5.15

Devicetree changes for omaps to configure more devices, and
add support for new SoC variants and devices:

- Add add gpio-line-names for am335x-boneblue

- Add support for dra762 abz package

- Two patches for McASP support on omap4

- Three patches to add support for am335x-sancloud-bbe-lite

- A series of changes to configure PRUSS for am3/4/5

* tag 'omap-for-v5.15/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am57xx: Add PRUSS MDIO controller nodes
  ARM: dts: am57xx: Add PRU-ICSS nodes
  ARM: dts: am4372: Add PRUSS MDIO controller node
  ARM: dts: am4372: Add the PRU-ICSS0 DT node
  ARM: dts: am4372: Add the PRU-ICSS1 DT node
  ARM: dts: am335x-icev2: Enable PRU-ICSS module
  ARM: dts: am335x-evmsk: Enable PRU-ICSS module
  ARM: dts: am335x-evm: Enable PRU-ICSS module
  ARM: dts: am335x-bone-common: Enable PRU-ICSS node
  ARM: dts: am33xx-l4: Add PRUSS MDIO controller node
  ARM: dts: am33xx-l4: Add PRUSS node
  ARM: dts: am335x-sancloud-bbe-lite: New devicetree
  ARM: dts: am335x-sancloud-bbe: Extract common code
  ARM: dts: am335x-boneblack: Extract HDMI config
  ARM: dts: omap4-l4-abe: Add McASP configuration
  ARM: dts: omap4-l4-abe: Correct sidle modes for McASP
  ARM: dts: Add support for dra762 abz package
  ARM: dts: am335x-boneblue: add gpio-line-names

Link: https://lore.kernel.org/r/pull-1628153040-834155@atomide.com-3


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8e816b99 8c054cd2

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -845,6 +845,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-bone-common.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -397,3 +397,7 @@ 
	clocks = <&clk_32768_ck>, <&clk_24mhz_clkctrl AM3_CLK_24MHZ_CLKDIV32K_CLKCTRL 0>;

	clock-names = "ext-clk", "int-clk";

};



&pruss_tm {

	status = "okay";

};

arch/arm/boot/dts/am335x-boneblack-common.dtsi

+0 −135
Original line number Diff line number Diff line
@@ -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 @@ 
	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

0 → 100644
+141 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (C) 2012 Texas Instruments Incorporated - https://www.ti.com/

 */



#include <dt-bindings/display/tda998x.h>

#include <dt-bindings/interrupt-controller/irq.h>



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

				};

			};

		};

	};

};



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

};



/ {

	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-wireless.dts

+1 −0
Original line number Diff line number Diff line
@@ -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>



/ {