Unverified Commit 79a90599 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-6.1/dt-signed' of... 

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

Devicetree changes for omaps

A series of changes for am335x baltos and netcom devices to update nand
transfer type and configure gpio-line-names.

* tag 'omap-for-6.1/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-netcom: add GPIO names for NetCom Plus 2-port devices
  ARM: dts: am335x-netcom: add GPIO names for NetCom Plus 8-port devices
  ARM: dts: am335x-netcan: add GPIO names for NetCAN Plus device
  ARM: dts: am335x-baltos: add GPIO names for ir2110 device
  ARM: dts: am335x-baltos: add GPIO names for ir3220 and ir5221 devices
  ARM: dts: am335x-baltos: change nand-xfer-type

Link: https://lore.kernel.org/r/pull-1663587735-853102@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 141258d4 8e9d75fd

arch/arm/boot/dts/am335x-baltos-ir2110.dts

+144 −0
Original line number Diff line number Diff line
@@ -81,3 +81,147 @@ &mmc1 { 
	pinctrl-0 = <&mmc1_pins>;

	cd-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;

};



&gpio0 {

	gpio-line-names =

		"MDIO",

		"MDC",

		"NC",

		"NC",

		"I2C1_SDA",

		"I2C1_SCL",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"UART1_CTSN",

		"UART1_RTSN",

		"UART1_RX",

		"UART1_TX",

		"onrisc:blue:wlan",

		"onrisc:green:app",

		"USB0_DRVVBUS",

		"ETH2_INT",

		"NC",

		"RMII1_TXD1",

		"MMC1_DAT0",

		"MMC1_DAT1",

		"NC",

		"NC",

		"MMC1_DAT2",

		"MMC1_DAT3",

		"RMII1_TXD0",

		"NC",

		"GPMC_WAIT0",

		"GPMC_WP_N";

};



&gpio1 {

	gpio-line-names =

		"GPMC_AD0",

		"GPMC_AD1",

		"GPMC_AD2",

		"GPMC_AD3",

		"GPMC_AD4",

		"GPMC_AD5",

		"GPMC_AD6",

		"GPMC_AD7",

		"NC",

		"NC",

		"CONSOLE_RX",

		"CONSOLE_TX",

		"NC",

		"NC",

		"NC",

		"SD_CD",

		"RGMII2_TCTL",

		"RGMII2_RCTL",

		"RGMII2_TD3",

		"RGMII2_TD2",

		"RGMII2_TD1",

		"RGMII2_TD0",

		"RGMII2_TCLK",

		"RGMII2_RCLK",

		"RGMII2_RD3",

		"RGMII2_RD2",

		"RGMII2_RD1",

		"RGMII2_RD0",

		"PMIC_INT1",

		"GPMC_CSN0_Flash",

		"MMC1_CLK",

		"MMC1_CMD";

};



&gpio2 {

	gpio-line-names =

		"GPMC_CSN3_BUS",

		"GPMC_CLK",

		"GPMC_ADVN_ALE",

		"GPMC_OEN_RE_N",

		"GPMC_WE_N",

		"GPMC_BEN0_CLE",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"SW2_0",

		"SW2_1",

		"RMII1_RXD1",

		"RMII1_RXD0",

		"UART1_DTR",

		"UART1_DSR",

		"UART1_DCD",

		"UART1_RI",

		"MMC0_DAT3",

		"MMC0_DAT2",

		"MMC0_DAT1",

		"MMC0_DAT0",

		"MMC0_CLK",

		"MMC0_CMD";

};



&gpio3 {

	gpio-line-names =

		"onrisc:red:power",

		"RMII1_CRS_DV",

		"RMII1_RXER",

		"RMII1_TXEN",

		"NC",

		"NC",

		"NC",

		"WLAN_IRQ",

		"WLAN_EN",

		"SW2_2",

		"SW2_3",

		"NC",

		"NC",

		"NC",

		"ModeA0",

		"ModeA1",

		"ModeA2",

		"ModeA3",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC";

};

arch/arm/boot/dts/am335x-baltos-ir3220.dts

+148 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ tca6416: gpio@20 { 
		interrupts = <20 IRQ_TYPE_EDGE_RISING>;

		pinctrl-names = "default";

		pinctrl-0 = <&tca6416_pins>;

		gpio-line-names = "GP_IN0", "GP_IN1", "GP_IN2", "GP_IN3",

				  "GP_OUT0", "GP_OUT1", "GP_OUT2", "GP_OUT3",

				  "ModeA0", "ModeA1", "ModeA2", "ModeA3",

				  "ModeB0", "ModeB1", "ModeB2", "ModeB3";

	};

};
@@ -123,3 +127,147 @@ &mmc1 { 
	pinctrl-0 = <&mmc1_pins>;

	cd-gpios = <&gpio2 18 GPIO_ACTIVE_LOW>;

};



&gpio0 {

	gpio-line-names =

		"MDIO",

		"MDC",

		"UART2_RX",

		"UART2_TX",

		"I2C1_SDA",

		"I2C1_SCL",

		"WLAN_BTN",

		"W_DISABLE",

		"NC",

		"NC",

		"NC",

		"NC",

		"UART1_CTSN",

		"UART1_RTSN",

		"UART1_RX",

		"UART1_TX",

		"onrisc:blue:wlan",

		"onrisc:green:app",

		"USB0_DRVVBUS",

		"ETH2_INT",

		"TCA6416_INT",

		"RMII1_TXD1",

		"MMC1_DAT0",

		"MMC1_DAT1",

		"NC",

		"NC",

		"MMC1_DAT2",

		"MMC1_DAT3",

		"RMII1_TXD0",

		"NC",

		"GPMC_WAIT0",

		"GPMC_WP_N";

};



&gpio1 {

	gpio-line-names =

		"GPMC_AD0",

		"GPMC_AD1",

		"GPMC_AD2",

		"GPMC_AD3",

		"GPMC_AD4",

		"GPMC_AD5",

		"GPMC_AD6",

		"GPMC_AD7",

		"NC",

		"NC",

		"CONSOLE_RX",

		"CONSOLE_TX",

		"UART2_DTR",

		"UART2_DSR",

		"UART2_DCD",

		"UART2_RI",

		"RGMII2_TCTL",

		"RGMII2_RCTL",

		"RGMII2_TD3",

		"RGMII2_TD2",

		"RGMII2_TD1",

		"RGMII2_TD0",

		"RGMII2_TCLK",

		"RGMII2_RCLK",

		"RGMII2_RD3",

		"RGMII2_RD2",

		"RGMII2_RD1",

		"RGMII2_RD0",

		"PMIC_INT1",

		"GPMC_CSN0_Flash",

		"MMC1_CLK",

		"MMC1_CMD";

};



&gpio2 {

	gpio-line-names =

		"GPMC_CSN3_BUS",

		"GPMC_CLK",

		"GPMC_ADVN_ALE",

		"GPMC_OEN_RE_N",

		"GPMC_WE_N",

		"GPMC_BEN0_CLE",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"SD_CD",

		"SD_WP",

		"RMII1_RXD1",

		"RMII1_RXD0",

		"UART1_DTR",

		"UART1_DSR",

		"UART1_DCD",

		"UART1_RI",

		"MMC0_DAT3",

		"MMC0_DAT2",

		"MMC0_DAT1",

		"MMC0_DAT0",

		"MMC0_CLK",

		"MMC0_CMD";

};



&gpio3 {

	gpio-line-names =

		"onrisc:red:power",

		"RMII1_CRS_DV",

		"RMII1_RXER",

		"RMII1_TXEN",

		"3G_PWR_EN",

		"UART2_CTSN",

		"UART2_RTSN",

		"WLAN_IRQ",

		"WLAN_EN",

		"NC",

		"NC",

		"NC",

		"NC",

		"USB1_DRVVBUS",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC";

};

arch/arm/boot/dts/am335x-baltos-ir5221.dts

+148 −0
Original line number Diff line number Diff line
@@ -99,6 +99,10 @@ tca6416: gpio@20 { 
		interrupts = <20 IRQ_TYPE_EDGE_RISING>;

		pinctrl-names = "default";

		pinctrl-0 = <&tca6416_pins>;

		gpio-line-names = "GP_IN0", "GP_IN1", "GP_IN2", "GP_IN3",

				  "GP_OUT0", "GP_OUT1", "GP_OUT2", "GP_OUT3",

				  "ModeA0", "ModeA1", "ModeA2", "ModeA3",

				  "ModeB0", "ModeB1", "ModeB2", "ModeB3";

	};

};
@@ -147,3 +151,147 @@ &mmc1 { 
	pinctrl-0 = <&mmc1_pins>;

	cd-gpios = <&gpio2 18 GPIO_ACTIVE_LOW>;

};



&gpio0 {

	gpio-line-names =

		"MDIO",

		"MDC",

		"UART2_RX",

		"UART2_TX",

		"I2C1_SDA",

		"I2C1_SCL",

		"WLAN_BTN",

		"W_DISABLE",

		"NC",

		"NC",

		"NC",

		"NC",

		"UART1_CTSN",

		"UART1_RTSN",

		"UART1_RX",

		"UART1_TX",

		"onrisc:blue:wlan",

		"onrisc:green:app",

		"USB0_DRVVBUS",

		"ETH2_INT",

		"TCA6416_INT",

		"RMII1_TXD1",

		"MMC1_DAT0",

		"MMC1_DAT1",

		"NC",

		"NC",

		"MMC1_DAT2",

		"MMC1_DAT3",

		"RMII1_TXD0",

		"NC",

		"GPMC_WAIT0",

		"GPMC_WP_N";

};



&gpio1 {

	gpio-line-names =

		"GPMC_AD0",

		"GPMC_AD1",

		"GPMC_AD2",

		"GPMC_AD3",

		"GPMC_AD4",

		"GPMC_AD5",

		"GPMC_AD6",

		"GPMC_AD7",

		"DCAN1_TX",

		"DCAN1_RX",

		"CONSOLE_RX",

		"CONSOLE_TX",

		"UART2_DTR",

		"UART2_DSR",

		"UART2_DCD",

		"UART2_RI",

		"RGMII2_TCTL",

		"RGMII2_RCTL",

		"RGMII2_TD3",

		"RGMII2_TD2",

		"RGMII2_TD1",

		"RGMII2_TD0",

		"RGMII2_TCLK",

		"RGMII2_RCLK",

		"RGMII2_RD3",

		"RGMII2_RD2",

		"RGMII2_RD1",

		"RGMII2_RD0",

		"PMIC_INT1",

		"GPMC_CSN0_Flash",

		"MMC1_CLK",

		"MMC1_CMD";

};



&gpio2 {

	gpio-line-names =

		"GPMC_CSN3_BUS",

		"GPMC_CLK",

		"GPMC_ADVN_ALE",

		"GPMC_OEN_RE_N",

		"GPMC_WE_N",

		"GPMC_BEN0_CLE",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"SD_CD",

		"SD_WP",

		"RMII1_RXD1",

		"RMII1_RXD0",

		"UART1_DTR",

		"UART1_DSR",

		"UART1_DCD",

		"UART1_RI",

		"MMC0_DAT3",

		"MMC0_DAT2",

		"MMC0_DAT1",

		"MMC0_DAT0",

		"MMC0_CLK",

		"MMC0_CMD";

};



&gpio3 {

	gpio-line-names =

		"onrisc:red:power",

		"RMII1_CRS_DV",

		"RMII1_RXER",

		"RMII1_TXEN",

		"3G_PWR_EN",

		"UART2_CTSN",

		"UART2_RTSN",

		"WLAN_IRQ",

		"WLAN_EN",

		"NC",

		"NC",

		"NC",

		"NC",

		"USB1_DRVVBUS",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC";

};

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

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ nand@0,0 { 
		rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */

		nand-bus-width = <8>;

		ti,nand-ecc-opt = "bch8";

		ti,nand-xfer-type = "polled";

		ti,nand-xfer-type = "prefetch-dma";



		gpmc,device-nand = "true";

		gpmc,device-width = <1>;

arch/arm/boot/dts/am335x-netcan-plus-1xx.dts

+144 −0
Original line number Diff line number Diff line
@@ -85,3 +85,147 @@ &dcan1 { 


	status = "okay";

};



&gpio0 {

	gpio-line-names =

		"MDIO",

		"MDC",

		"NC",

		"NC",

		"I2C1_SDA",

		"I2C1_SCL",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"can_data",

		"can_error",

		"onrisc:blue:wlan",

		"onrisc:green:app",

		"USB0_DRVVBUS",

		"ETH2_INT",

		"NC",

		"NC",

		"MMC1_DAT0",

		"MMC1_DAT1",

		"NC",

		"NC",

		"MMC1_DAT2",

		"MMC1_DAT3",

		"NC",

		"NC",

		"GPMC_WAIT0",

		"GPMC_WP_N";

};



&gpio1 {

	gpio-line-names =

		"GPMC_AD0",

		"GPMC_AD1",

		"GPMC_AD2",

		"GPMC_AD3",

		"GPMC_AD4",

		"GPMC_AD5",

		"GPMC_AD6",

		"GPMC_AD7",

		"DCAN1_TX",

		"DCAN1_RX",

		"CONSOLE_RX",

		"CONSOLE_TX",

		"NC",

		"NC",

		"NC",

		"NC",

		"RGMII2_TCTL",

		"RGMII2_RCTL",

		"RGMII2_TD3",

		"RGMII2_TD2",

		"RGMII2_TD1",

		"RGMII2_TD0",

		"RGMII2_TCLK",

		"RGMII2_RCLK",

		"RGMII2_RD3",

		"RGMII2_RD2",

		"RGMII2_RD1",

		"RGMII2_RD0",

		"PMIC_INT1",

		"GPMC_CSN0_Flash",

		"MMC1_CLK",

		"MMC1_CMD";

};



&gpio2 {

	gpio-line-names =

		"GPMC_CSN3_BUS",

		"GPMC_CLK",

		"GPMC_ADVN_ALE",

		"GPMC_OEN_RE_N",

		"GPMC_WE_N",

		"GPMC_BEN0_CLE",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"SW2_0",

		"SW2_1",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"MMC0_DAT3",

		"MMC0_DAT2",

		"MMC0_DAT1",

		"MMC0_DAT0",

		"MMC0_CLK",

		"MMC0_CMD";

};



&gpio3 {

	gpio-line-names =

		"onrisc:red:power",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"WLAN_IRQ",

		"WLAN_EN",

		"SW2_2",

		"SW2_3",

		"NC",

		"NC",

		"NC",

		"ModeA0",

		"ModeA1",

		"ModeA2",

		"ModeA3",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC";

};