Commit 8f62581f authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'baltos' into omap-for-v5.3/dt

parents e3630fd9 2cdc9c20

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_PCLK, PIN_INPUT_PULLDOWN, MUX_MODE7) /* lcd_p 
			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_emac0 { 
};



&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_GPMC_AD15, PIN_INPUT_PULLDOWN, MUX_MODE7) /* gpmc_ 
			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 @@ fixed-link { 
};



&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 @@ AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKR, PIN_INPUT_PULLUP, MUX_MODE7) /* mca 
		>;

	};



	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 @@ fixed-link { 
};



&cpsw_emac1 {

	phy-mode = "rgmii-txid";

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <2>;

	phy-handle = <&phy1>;

};
@@ -139,3 +144,9 @@ &dcan1 { 


	status = "okay";

};



&mmc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	cd-gpios = <&gpio2 18 GPIO_ACTIVE_LOW>;

};