Commit 0164a087 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

dts changes for omap variants for v5.3

This series of changes improves support for few boards:

- configure another lcd type for logicpd torpedo devkit

- a series of updates for am335x phytec boards

- configure mmc card detect pin for am335x-baltos

* tag 'omap-for-v5.3/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: am335x-baltos: add support for MMC1 CD pin
  ARM: dts: am335x-baltos: Fix PHY mode for ethernet
  ARM: dts: Add support for phyBOARD-REGOR-AM335x
  ARM: dts: am335x-pcm-953: Remove eth phy delay
  ARM: dts: am335x-pcm-953: Update user led names
  ARM: dts: am335x-phycore-som: Enable gpmc node in dts files
  ARM: dts: am335x-phycore-som: Add emmc node
  ARM: dts: am335x phytec boards: Remove regulator node
  ARM: dts: Add LCD type 28 support to LogicPD Torpedo DM3730 devkit

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3aa45174 8f62581f

Documentation/devicetree/bindings/arm/omap/omap.txt

+3 −0
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ Boards: 
- AM335X phyCORE-AM335x: Development kit

  compatible = "phytec,am335x-pcm-953", "phytec,am335x-phycore-som", "ti,am33xx"



- AM335x phyBOARD-REGOR: Single Board Computer

  compatible = "phytec,am335x-regor", "phytec,am335x-phycore-som", "ti,am33xx"



- AM335X UC-8100-ME-T: Communication-centric industrial computing platform

  compatible = "moxa,uc-8100-me-t", "ti,am33xx";

arch/arm/boot/dts/Makefile

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

	am335x-phycore-rdk.dtb \

	am335x-pocketbeagle.dtb \

	am335x-regor-rdk.dtb \

	am335x-sancloud-bbe.dtb \

	am335x-shc.dtb \

	am335x-sbc-t335.dtb \

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

+13 −1
Original line number Diff line number Diff line
@@ -33,6 +33,12 @@ 
			AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_INPUT_PULLDOWN, MUX_MODE7)      /* lcd_ac_bias_en.gpio2[25] RI */

		>;

	};



	mmc1_pins: pinmux_mmc1_pins {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_GPMC_AD15, PIN_INPUT, MUX_MODE7)     /* MMC1 CD */

		>;

	};

};



&uart1 {
@@ -68,7 +74,13 @@ 
};



&cpsw_emac1 {

	phy-mode = "rgmii-txid";

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	cd-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;

};

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

+13 −1
Original line number Diff line number Diff line
@@ -54,6 +54,12 @@ 
			AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKR, PIN_INPUT_PULLUP, MUX_MODE7)      /* mcasp0_aclkr.gpio3[18], INPUT_PULLDOWN | MODE7 */

		>;

	};



	mmc1_pins: pinmux_mmc1_pins {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT, MUX_MODE7)     /* MMC1 CD */

		>;

	};

};



&uart1 {
@@ -110,7 +116,13 @@ 
};



&cpsw_emac1 {

	phy-mode = "rgmii-txid";

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	cd-gpios = <&gpio2 18 GPIO_ACTIVE_LOW>;

};

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

+12 −1
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ 
		>;

	};



	mmc1_pins: pinmux_mmc1_pins {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT, MUX_MODE7)     /* MMC1 CD */

		>;

	};

};



&uart1 {
@@ -128,7 +133,7 @@ 
};



&cpsw_emac1 {

	phy-mode = "rgmii-txid";

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};
@@ -139,3 +144,9 @@ 


	status = "okay";

};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	cd-gpios = <&gpio2 18 GPIO_ACTIVE_LOW>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE