Unverified Commit 16ea3c96 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

ARM: dts: OMAP updates for v6.20

* tag 'omap-for-v6.20/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap

:
  ARM: dts: omap: dra7: Remove bogus #syscon-cells property
  ARM: dts: ti/omap: omap*: fix watchdog node names
  ARM: dts: ti: Drop unused .dtsi
  ARM: dts: Drop am335x-base0033 devicetree
  ARM: dts: tps65910: Add gpio & interrupt properties
  ARM: dts: omap: enable panic-indicator option
  ARM: dts: ti/omap: omap4-epson-embt2ws: add powerbutton

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d69af478 76f88d2e

arch/arm/boot/dts/ti/omap/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ dtb-$(CONFIG_SOC_AM33XX) += \ 
	am335x-baltos-ir2110.dtb \

	am335x-baltos-ir3220.dtb \

	am335x-baltos-ir5221.dtb \

	am335x-base0033.dtb \

	am335x-bone.dtb \

	am335x-boneblack.dtb \

	am335x-boneblack-wireless.dtb \

arch/arm/boot/dts/ti/omap/am335x-baltos-leds.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ led_power: led-power { 
			linux,default-trigger = "default-on";

			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;

			default-state = "on";

			panic-indicator;

		};

		led_wlan: led-wlan {

			label = "onrisc:blue:wlan";

arch/arm/boot/dts/ti/omap/am335x-base0033.dts

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

/*

 * am335x-base0033.dts - Device Tree file for IGEP AQUILA EXPANSION

 *

 * Copyright (C) 2013 ISEE 2007 SL - https://www.isee.biz

 */



#include "am335x-igep0033.dtsi"



/ {

	model = "IGEP COM AM335x on AQUILA Expansion";

	compatible = "isee,am335x-base0033", "isee,am335x-igep0033", "ti,am33xx";



	hdmi {

		compatible = "ti,tilcdc,slave";

		i2c = <&i2c0>;

		pinctrl-names = "default", "off";

		pinctrl-0 = <&nxp_hdmi_pins>;

		pinctrl-1 = <&nxp_hdmi_off_pins>;

		status = "okay";

	};



	leds_base {

		pinctrl-names = "default";

		pinctrl-0 = <&leds_base_pins>;



		compatible = "gpio-leds";



		led0 {

			label = "base:red:user";

			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;	/* gpio1_21 */

			default-state = "off";

		};



		led1 {

			label = "base:green:user";

			gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;	/* gpio2_0 */

			default-state = "off";

		};

	};

};



&am33xx_pinmux {

	nxp_hdmi_pins: nxp-hdmi-pins {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT, MUX_MODE3)	/* xdma_event_intr0.clkout1 */

			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, MUX_MODE0)

			AM33XX_PADCONF(AM335X_PIN_LCD_HSYNC, PIN_OUTPUT, MUX_MODE0)

			AM33XX_PADCONF(AM335X_PIN_LCD_PCLK, PIN_OUTPUT, MUX_MODE0)

			AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_OUTPUT, MUX_MODE0)

		>;

	};

	nxp_hdmi_off_pins: nxp-hdmi-off-pins {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT, MUX_MODE3)	/* xdma_event_intr0.clkout1 */

		>;

	};



	leds_base_pins: leds-base-pins {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_GPMC_A5, PIN_OUTPUT_PULLDOWN, MUX_MODE7)	/* gpmc_a5.gpio1_21 */

			AM33XX_PADCONF(AM335X_PIN_GPMC_CSN3, PIN_OUTPUT_PULLDOWN, MUX_MODE7)	/* gpmc_csn3.gpio2_0 */

		>;

	};

};



&lcdc {

	status = "okay";

};



&i2c0 {

	eeprom: eeprom@50 {

		compatible = "atmel,24c256";

		reg = <0x50>;

	};

};

arch/arm/boot/dts/ti/omap/am3703.dtsi

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

/*

 * Copyright (C) 2020 André Hentschel <nerv@dawncrow.de>

 */



#include "omap36xx.dtsi"



&iva {

	status = "disabled";

};



&sgx_module {

	status = "disabled";

};

arch/arm/boot/dts/ti/omap/am3715.dtsi

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

/*

 * Copyright (C) 2020 André Hentschel <nerv@dawncrow.de>

 */



#include "omap36xx.dtsi"



&iva {

	status = "disabled";

};