Commit 8881ec52 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'omap-for-v4.20/dt-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Devicetree changes for omap variants

This branch contains a series of improvments for omap3-gta04 phone,
and a series of clean-up for am335x to remove the deprecated phy_id
property.

The rest is to configure am57xx-idk boards for leds, load trigger,
and smps, am3517-evm audio configuration, beaglebone hdmi cec support,
coresight binding update, and fixes for i2c and spi warnings.

* tag 'omap-for-v4.20/dt-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (70 commits)
  ARM: dts: add omap3-gta04a5one to Makefile
  ARM: dts: omap3-gta04: add pulldown/up settings for twl4030 gpio
  ARM: dts: am335x-boneblack: add cec support
  ARM: dts: am3517-evm: Add support for UI board and Audio
  ARM: dts: gta04: add serial console wakeup irq
  ARM: dts: am57xx-idk-common: Hook smps12 regulator as cpu vdd-supply
  ARM: dts: omap: Update coresight bindings for hardware ports
  ARM: dts: ti: Fix SPI and I2C bus warnings
  ARM: dts: dra62x-j5eco-evm: get rid of phy_id property
  ARM: dts: dm8148-t410: get rid of phy_id property
  ARM: dts: dm8148-evm: get rid of phy_id property
  ARM: dts: am57xx-cl-som-am57x: get rid of phy_id property
  ARM: dts: am57xx-idk-common: get rid of phy_id property
  ARM: dts: dra7-evm: get rid of phy_id property
  ARM: dts: dra71-evm: get rid of phy_id property
  ARM: dts: dra72-evm-revc: get rid of phy_id property
  ARM: dts: dra72-evm: get rid of phy_id property
  ARM: dts: dra76-evm: get rid of phy_id property
  ARM: dts: am437x-cm-t43: get rid of phy_id property
  ARM: dts: am437x-gp-evm: get rid of phy_id property
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e9a4dd99 20bcd4a4
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -653,6 +653,7 @@ dtb-$(CONFIG_ARCH_OMAP3) += \
	omap3-gta04a3.dtb \
	omap3-gta04a4.dtb \
	omap3-gta04a5.dtb \
	omap3-gta04a5one.dtb \
	omap3-ha.dtb \
	omap3-ha-lcd.dtb \
	omap3-igep0020.dtb \
+5 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@
};

&cpsw_emac0 {
	phy_id = <&davinci_mdio>, <0>;
	phy-handle = <&ethphy0>;
	phy-mode = "mii";
};

@@ -396,6 +396,10 @@
	pinctrl-0 = <&davinci_mdio_default>;
	pinctrl-1 = <&davinci_mdio_sleep>;
	status = "okay";

	ethphy0: ethernet-phy@0 {
		reg = <0>;
	};
};

&mmc1 {
+4 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@
 */

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

&ldo3_reg {
	regulator-min-microvolt = <1800000>;
@@ -88,9 +89,11 @@
};

&i2c0 {
	tda19988: tda19988 {
	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>;
+5 −1
Original line number Diff line number Diff line
@@ -140,10 +140,14 @@
	pinctrl-0 = <&davinci_mdio_default>;
	pinctrl-1 = <&davinci_mdio_sleep>;
	status = "okay";

	ethphy0: ethernet-phy@0 {
		reg = <0>;
	};
};

&cpsw_emac0 {
	phy_id = <&davinci_mdio>, <0>;
	phy-handle = <&ethphy0>;
	phy-mode = "rmii";
};

+5 −1
Original line number Diff line number Diff line
@@ -486,10 +486,14 @@ status = "okay";
	pinctrl-0 = <&davinci_mdio_default>;
	pinctrl-1 = <&davinci_mdio_sleep>;
	status = "okay";

	ethphy0: ethernet-phy@0 {
		reg = <0>;
	};
};

&cpsw_emac0 {
	phy_id = <&davinci_mdio>, <0>;
	phy-handle = <&ethphy0>;
	phy-mode = "rgmii-txid";
};

Loading