Commit fcf371fd authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Device tree changes for omaps for v5.5

This series of changes adds support for few new boards, moves
remaining ti wilink bluetooth users to use the serdev driver,
and improves support for existing devices:

- Add support for NetCAN Plus devices

- Configure wilink bluetooth for logicpd-torpedo and omap3-igep

- Switch to using generic LCD panel for logicpd-torpedo and
  increase camera pixel clock

- Configure droid4 for 300mA USB host mode and move to a common file
  to start adding support for droid bionic

- Rename ocmcram node to sram

* tag 'omap-for-v5.5/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: add DTS for NetCom Plus 4xx and 8xx device series
  ARM: dts: add DTS for NetCom Plus 1xx and 2xx device series
  ARM: dts: add DTS for NetCAN Plus devices
  ARM: dts: omap: Rename "ocmcram" node to "sram"
  ARM: dts: logicpd-torpedo-37xx-devkit: Increase camera pixel clock
  ARM: dts: am: Rename "ocmcram" node to "sram"
  ARM: dts: logicpd-torpedo: Disable Bluetooth Serial DMA
  ARM: dts: IGEP: Add WiLink UART node
  ARM: dts: LogicPD Torpedo: Add WiLink UART node
  ARM: dts: logicpd-torpedo-37xx-devkit-28: Reference new DRM panel
  ARM: dts: logicpd-torpedo-baseboard: Reduce video regulator chatter
  ARM: dts: Add minimal support for Droid Bionic xt875
  ARM: dts: omap4-droid4: Allow 300mA current for USB peripherals
  ARM: dts: Use level interrupt for omap4 & 5 wlcore

Link: https://lore.kernel.org/r/pull-1571934890-285615@atomide.com-2


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 71dd33b9 fedc8844

arch/arm/boot/dts/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -756,6 +756,9 @@ dtb-$(CONFIG_SOC_AM33XX) += \ 
	am335x-moxa-uc-2101.dtb \

	am335x-moxa-uc-8100-me-t.dtb \

	am335x-nano.dtb \

	am335x-netcan-plus-1xx.dtb \

	am335x-netcom-plus-2xx.dtb \

	am335x-netcom-plus-8xx.dtb \

	am335x-pdu001.dtb \

	am335x-pepper.dtb \

	am335x-phycore-rdk.dtb \
@@ -768,6 +771,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ 
	am335x-wega-rdk.dtb \

	am335x-osd3358-sm-red.dtb

dtb-$(CONFIG_ARCH_OMAP4) += \

	omap4-droid-bionic-xt875.dtb \

	omap4-droid4-xt894.dtb \

	omap4-duovero-parlor.dtb \

	omap4-kc1.dtb \

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

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

/*

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

 */



/*

 * VScom OnRISC

 * http://www.vscom.de

 */



/dts-v1/;



#include "am335x-baltos.dtsi"

#include "am335x-baltos-leds.dtsi"



/ {

	model = "NetCAN";



	leds {

		pinctrl-names = "default";

		pinctrl-0 = <&user_leds_s0>;



		compatible = "gpio-leds";



		led@1 {

			label = "can_data";

			linux,default-trigger = "netdev";

			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

		led@2 {

			label = "can_error";

			gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};

	};

};



&am33xx_pinmux {

	user_leds_s0: user_leds_s0 {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_OUTPUT_PULLDOWN, MUX_MODE7)	/* CAN Data LED */

			AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE7)	/* CAN Error LED */

		>;

	};



	dcan1_pins: pinmux_dcan1_pins {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT, MUX_MODE2)	/* CAN TX */

			AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT, MUX_MODE2)	/* CAN RX */

		>;

	};

};



&usb0_phy {

	status = "okay";

};



&usb0 {

	status = "okay";

	dr_mode = "host";

};



&davinci_mdio {

	phy0: ethernet-phy@0 {

		reg = <1>;

	};

};



&cpsw_emac0 {

	phy-mode = "rmii";

	dual_emac_res_vlan = <1>;

	phy-handle = <&phy0>;

};



&cpsw_emac1 {

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};



&dcan1 {

	pinctrl-names = "default";

	pinctrl-0 = <&dcan1_pins>;



	status = "okay";

};

arch/arm/boot/dts/am335x-netcom-plus-2xx.dts

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

/*

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

 */



/*

 * VScom OnRISC

 * http://www.vscom.de

 */



/dts-v1/;



#include "am335x-baltos.dtsi"

#include "am335x-baltos-leds.dtsi"



/ {

	model = "NetCom Plus";

};



&am33xx_pinmux {

	uart1_pins: pinmux_uart1_pins {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT, MUX_MODE0)			/* RX */

			AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_INPUT, MUX_MODE0)			/* TX */

			AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE0)		/* CTS */

			AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_OUTPUT_PULLDOWN, MUX_MODE0)		/* RTS */

			AM33XX_PADCONF(AM335X_PIN_LCD_VSYNC, PIN_OUTPUT_PULLDOWN, MUX_MODE7)		/* DTR */

			AM33XX_PADCONF(AM335X_PIN_LCD_HSYNC, PIN_INPUT_PULLDOWN, MUX_MODE7)		/* DSR */

			AM33XX_PADCONF(AM335X_PIN_LCD_PCLK, PIN_INPUT_PULLDOWN, MUX_MODE7)		/* DCD */

			AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_INPUT_PULLDOWN, MUX_MODE7)	/* RI */

		>;

	};



	uart2_pins: pinmux_uart2_pins {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT, MUX_MODE1)		/* RX */

			AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_OUTPUT, MUX_MODE1)      		/* TX */

			AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLDOWN, MUX_MODE2)	/* CTS */

			AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_OUTPUT_PULLDOWN, MUX_MODE2)	/* RTS */

			AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_OUTPUT_PULLDOWN, MUX_MODE7)	/* DTR */

			AM33XX_PADCONF(AM335X_PIN_GPMC_AD13, PIN_INPUT_PULLDOWN, MUX_MODE7)	/* DSR */

			AM33XX_PADCONF(AM335X_PIN_GPMC_AD14, PIN_INPUT_PULLDOWN, MUX_MODE7)	/* DCD */

			AM33XX_PADCONF(AM335X_PIN_GPMC_AD15, PIN_INPUT_PULLDOWN, MUX_MODE7)	/* RI */

		>;

	};

};



&usb0_phy {

	status = "okay";

};



&usb0 {

	status = "okay";

	dr_mode = "host";

};



&uart1 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart1_pins>;

	dtr-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;

	dsr-gpios = <&gpio2 23 GPIO_ACTIVE_LOW>;

	dcd-gpios = <&gpio2 24 GPIO_ACTIVE_LOW>;

	rng-gpios = <&gpio2 25 GPIO_ACTIVE_LOW>;



	status = "okay";

};



&uart2 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart2_pins>;

	dtr-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;

	dsr-gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;

	dcd-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;

	rng-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;



	status = "okay";

};



&davinci_mdio {

	phy0: ethernet-phy@0 {

		reg = <1>;

	};

};



&cpsw_emac0 {

	phy-mode = "rmii";

	dual_emac_res_vlan = <1>;

	phy-handle = <&phy0>;

};



&cpsw_emac1 {

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};

arch/arm/boot/dts/am335x-netcom-plus-8xx.dts

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

/*

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

 */



/*

 * VScom OnRISC

 * http://www.vscom.de

 */



/dts-v1/;



#include "am335x-baltos.dtsi"



/ {

	model = "NetCom Plus";

};



&am33xx_pinmux {

	pinctrl-names = "default";

	pinctrl-0 = <&dip_switches>;



	dip_switches: pinmux_dip_switches {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_INPUT_PULLDOWN, MUX_MODE7)

			AM33XX_PADCONF(AM335X_PIN_GPMC_AD13, PIN_INPUT_PULLDOWN, MUX_MODE7)

			AM33XX_PADCONF(AM335X_PIN_GPMC_AD14, PIN_INPUT_PULLDOWN, MUX_MODE7)

			AM33XX_PADCONF(AM335X_PIN_GPMC_AD15, PIN_INPUT_PULLDOWN, MUX_MODE7)

		>;

	};



	tca6416_pins: pinmux_tca6416_pins {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_INPUT_PULLUP, MUX_MODE7)

		>;

	};



	i2c2_pins: pinmux_i2c2_pins {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE3)

			AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_INPUT_PULLDOWN, MUX_MODE3)

		>;

	};

};



&usb0_phy {

	status = "okay";

};



&usb1_phy {

	status = "okay";

};



&usb0 {

	status = "okay";

	dr_mode = "host";

};



&usb1 {

	status = "okay";

	dr_mode = "host";

};



&i2c1 {

	tca6416a: gpio@20 {

		compatible = "ti,tca6416";

		reg = <0x20>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-parent = <&gpio0>;

		interrupts = <20 IRQ_TYPE_EDGE_RISING>;

		pinctrl-names = "default";

		pinctrl-0 = <&tca6416_pins>;

	};

};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins>;



	status = "okay";

	clock-frequency = <400000>;



	tca6416b: gpio@20 {

		compatible = "ti,tca6416";

		reg = <0x20>;

		gpio-controller;

		#gpio-cells = <2>;

	};



	tca6416c: gpio@21 {

		compatible = "ti,tca6416";

		reg = <0x21>;

		gpio-controller;

		#gpio-cells = <2>;

	};

};



&davinci_mdio {

	phy0: ethernet-phy@0 {

		reg = <1>;

	};

};



&cpsw_emac0 {

	phy-mode = "rmii";

	dual_emac_res_vlan = <1>;

	phy-handle = <&phy0>;

};



&cpsw_emac1 {

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};

arch/arm/boot/dts/am33xx.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -393,20 +393,20 @@ 
			};

		};



		ocmcram: ocmcram@40300000 {

		ocmcram: sram@40300000 {

			compatible = "mmio-sram";

			reg = <0x40300000 0x10000>; /* 64k */

			ranges = <0x0 0x40300000 0x10000>;

			#address-cells = <1>;

			#size-cells = <1>;



			pm_sram_code: pm-sram-code@0 {

			pm_sram_code: pm-code-sram@0 {

				compatible = "ti,sram";

				reg = <0x0 0x1000>;

				protect-exec;

			};



			pm_sram_data: pm-sram-data@1000 {

			pm_sram_data: pm-data-sram@1000 {

				compatible = "ti,sram";

				reg = <0x1000 0x1000>;

				pool;

CRA Git | Maintained and supported by SUSTech CRA and CCSE