Commit 87ab16b6 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'omap-for-v5.11/dt-late-signed' into omap-for-v5.12-dt 

Late devicetree changes for omaps for v5.11 merge window

Here are few more late changes that would be nice to get into v5.11:

- More updates to use cpsw switchdev driver

- Enable gta04 PMIC power management

- Updates for dra7 for ECC support, 1.8GHz speed and keep the
  ldo0 regulator always on as specified in the data manual
parents 5c8fe583 4d4ce69f

arch/arm/boot/dts/am335x-evm.dts

+8 −5
Original line number Diff line number Diff line
@@ -684,28 +684,31 @@ 
	};

};



&mac {

&mac_sw {

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

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;

	status = "okay";

	slaves = <1>;

};



&davinci_mdio {

&davinci_mdio_sw {

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

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

	status = "okay";



	ethphy0: ethernet-phy@0 {

		reg = <0>;

	};

};



&cpsw_emac0 {

&cpsw_port1 {

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii-id";

	ti,dual-emac-pvid = <1>;

};



&cpsw_port2 {

	 status = "disabled";

};



&tscadc {

arch/arm/boot/dts/am335x-evmsk.dts

+6 −8
Original line number Diff line number Diff line
@@ -596,19 +596,17 @@ 
	};

};



&mac {

&mac_sw {

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

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;

	dual_emac = <1>;

	status = "okay";

};



&davinci_mdio {

&davinci_mdio_sw {

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

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

	status = "okay";



	ethphy0: ethernet-phy@0 {

		reg = <0>;
@@ -619,16 +617,16 @@ 
	};

};



&cpsw_emac0 {

&cpsw_port1 {

	phy-handle = <&ethphy0>;

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <1>;

	ti,dual-emac-pvid = <1>;

};



&cpsw_emac1 {

&cpsw_port2 {

	phy-handle = <&ethphy1>;

	phy-mode = "rgmii-id";

	dual_emac_res_vlan = <2>;

	ti,dual-emac-pvid = <2>;

};



&mmc1 {

arch/arm/boot/dts/am335x-icev2.dts

+6 −8
Original line number Diff line number Diff line
@@ -474,31 +474,29 @@ 
	};

};



&cpsw_emac0 {

&cpsw_port1 {

	phy-handle = <&ethphy0>;

	phy-mode = "rmii";

	dual_emac_res_vlan = <1>;

	ti,dual-emac-pvid = <1>;

};



&cpsw_emac1 {

&cpsw_port2 {

	phy-handle = <&ethphy1>;

	phy-mode = "rmii";

	dual_emac_res_vlan = <2>;

	ti,dual-emac-pvid = <2>;

};



&mac {

&mac_sw {

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

	pinctrl-0 = <&cpsw_default>;

	pinctrl-1 = <&cpsw_sleep>;

	status = "okay";

	dual_emac;

};



&davinci_mdio {

&davinci_mdio_sw {

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

	pinctrl-0 = <&davinci_mdio_default>;

	pinctrl-1 = <&davinci_mdio_sleep>;

	status = "okay";

	reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;

	reset-delay-us = <2>;   /* PHY datasheet states 1uS min */

arch/arm/boot/dts/am33xx-l4.dtsi

+49 −0
Original line number Diff line number Diff line
@@ -765,6 +765,55 @@ 
					phys = <&phy_gmii_sel 2 1>;

				};

			};



			mac_sw: switch@0 {

				compatible = "ti,am335x-cpsw-switch", "ti,cpsw-switch";

				reg = <0x0 0x4000>;

				ranges = <0 0 0x4000>;

				clocks = <&cpsw_125mhz_gclk>;

				clock-names = "fck";

				#address-cells = <1>;

				#size-cells = <1>;

				syscon = <&scm_conf>;

				status = "disabled";



				interrupts = <40 41 42 43>;

				interrupt-names = "rx_thresh", "rx", "tx", "misc";



				ethernet-ports {

					#address-cells = <1>;

					#size-cells = <0>;



					cpsw_port1: port@1 {

						reg = <1>;

						label = "port1";

						mac-address = [ 00 00 00 00 00 00 ];

						phys = <&phy_gmii_sel 1 1>;

					};



					cpsw_port2: port@2 {

						reg = <2>;

						label = "port2";

						mac-address = [ 00 00 00 00 00 00 ];

						phys = <&phy_gmii_sel 2 1>;

					};

				};



				davinci_mdio_sw: mdio@1000 {

					compatible = "ti,cpsw-mdio","ti,davinci_mdio";

					clocks = <&cpsw_125mhz_gclk>;

					clock-names = "fck";

					#address-cells = <1>;

					#size-cells = <0>;

					bus_freq = <1000000>;

					reg = <0x1000 0x100>;

				};



				cpts {

					clocks = <&cpsw_cpts_rft_clk>;

					clock-names = "cpts";

				};

			};

		};



		target-module@180000 {			/* 0x4a180000, ap 5 10.0 */

arch/arm/boot/dts/am574x-idk.dts

+4 −0
Original line number Diff line number Diff line
@@ -39,3 +39,7 @@ 
&m_can0 {

	status = "disabled";

};



&emif1 {

	status = "okay";

};