Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51991d7e authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v4.15/fixes-dt' into omap-for-v4.16/dt

parents 1239738f bc686442

Documentation/devicetree/bindings/usb/am33xx-usb.txt

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ usb: usb@47400000 { 
		reg = <0x47401300 0x100>;

		reg-names = "phy";

		ti,ctrl_mod = <&ctrl_mod>;

		#phy-cells = <0>;

	};



	usb0: usb@47401000 {
@@ -141,6 +142,7 @@ usb: usb@47400000 { 
		reg = <0x47401b00 0x100>;

		reg-names = "phy";

		ti,ctrl_mod = <&ctrl_mod>;

		#phy-cells = <0>;

	};



	usb1: usb@47401800 {

arch/arm/boot/dts/am33xx.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -630,6 +630,7 @@ 
				reg-names = "phy";

				status = "disabled";

				ti,ctrl_mod = <&usb_ctrl_mod>;

				#phy-cells = <0>;

			};



			usb0: usb@47401000 {
@@ -678,6 +679,7 @@ 
				reg-names = "phy";

				status = "disabled";

				ti,ctrl_mod = <&usb_ctrl_mod>;

				#phy-cells = <0>;

			};



			usb1: usb@47401800 {

arch/arm/boot/dts/am4372.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -927,7 +927,8 @@ 
			reg = <0x48038000 0x2000>,

			      <0x46000000 0x400000>;

			reg-names = "mpu", "dat";

			interrupts = <80>, <81>;

			interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;

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

			status = "disabled";

			dmas = <&edma 8 2>,
@@ -941,7 +942,8 @@ 
			reg = <0x4803C000 0x2000>,

			      <0x46400000 0x400000>;

			reg-names = "mpu", "dat";

			interrupts = <82>, <83>;

			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;

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

			status = "disabled";

			dmas = <&edma 10 2>,

arch/arm/boot/dts/am437x-cm-t43.dts

+2 −2
Original line number Diff line number Diff line
@@ -301,8 +301,8 @@ 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&spi0_pins>;

	dmas = <&edma 16

		&edma 17>;

	dmas = <&edma 16 0

		&edma 17 0>;

	dma-names = "tx0", "rx0";



	flash: w25q64cvzpig@0 {

arch/arm/boot/dts/dm814x.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ 
				reg = <0x47401300 0x100>;

				reg-names = "phy";

				ti,ctrl_mod = <&usb_ctrl_mod>;

				#phy-cells = <0>;

			};



			usb0: usb@47401000 {