Commit 0fe8f1e5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'am654-for-v5.1-part2' of... 

Merge tag 'am654-for-v5.1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux into HEAD

AM654x SoC updates for v5.1 (part 2)

Contains a few DT updates on top of part 1 of the pull:

- MSMC RAM support (on-chip SRAM)
- Main system control module support
- USB support
- ADC support

There is an extra dt-binding update included, which has been acked
by Rob.

* tag 'am654-for-v5.1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux

:
  arm64: dts: ti: k3-am65-mcu: Add ADC nodes
  dt-bindings: input: ti-tsc-adc: Add new compatible for AM654 SoCs
  arm64: dts: ti: k3-am654-base-board: enable USB1
  arm64: dts: ti: k3-am6: add USB support
  arm64: dts: ti: am654: Add Main System Control Module node
  arm64: dts: ti: k3-am65: Add MSMC RAM node

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a882bd15 aa6eaaa2

Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -2,7 +2,12 @@ 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~





Required properties:

Required properties:

- mfd

	compatible: Should be

		"ti,am3359-tscadc" for AM335x/AM437x SoCs

		"ti,am654-tscadc", "ti,am3359-tscadc" for AM654 SoCs

- child "tsc"

- child "tsc"

	compatible: Should be "ti,am3359-tsc".

	ti,wires: Wires refer to application modes i.e. 4/5/8 wire touchscreen

	ti,wires: Wires refer to application modes i.e. 4/5/8 wire touchscreen

		  support on the platform.

		  support on the platform.

	ti,x-plate-resistance: X plate resistance

	ti,x-plate-resistance: X plate resistance
@@ -25,6 +30,9 @@ Required properties: 
			AIN0 = 0, AIN1 = 1 and so on till AIN7 = 7.

			AIN0 = 0, AIN1 = 1 and so on till AIN7 = 7.

			XP  = 0, XN = 1, YP = 2, YN = 3.

			XP  = 0, XN = 1, YP = 2, YN = 3.

- child "adc"

- child "adc"

	compatible: Should be

		    "ti,am3359-adc" for AM335x/AM437x SoCs

		    "ti,am654-adc", "ti,am3359-adc" for AM654 SoCs

	ti,adc-channels: List of analog inputs available for ADC.

	ti,adc-channels: List of analog inputs available for ADC.

			 AIN0 = 0, AIN1 = 1 and so on till AIN7 = 7.

			 AIN0 = 0, AIN1 = 1 and so on till AIN7 = 7.

arch/arm64/boot/dts/ti/k3-am65-main.dtsi

+104 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,26 @@ 
 */

 */





&cbass_main {

&cbass_main {

	msmc_ram: sram@70000000 {

		compatible = "mmio-sram";

		reg = <0x0 0x70000000 0x0 0x200000>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x0 0x70000000 0x200000>;



		atf-sram@0 {

			reg = <0x0 0x20000>;

		};



		sysfw-sram@f0000 {

			reg = <0xf0000 0x10000>;

		};



		l3cache-sram@100000 {

			reg = <0x100000 0x100000>;

		};

	};



	gic500: interrupt-controller@1800000 {

	gic500: interrupt-controller@1800000 {

		compatible = "arm,gic-v3";

		compatible = "arm,gic-v3";

		#address-cells = <2>;

		#address-cells = <2>;
@@ -205,4 +225,88 @@ 
		ti,trm-icp = <0x8>;

		ti,trm-icp = <0x8>;

		dma-coherent;

		dma-coherent;

	};

	};



	scm_conf: scm_conf@100000 {

		compatible = "syscon", "simple-mfd";

		reg = <0 0x00100000 0 0x1c000>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x0 0x00100000 0x1c000>;

	};



	dwc3_0: dwc3@4000000 {

		compatible = "ti,am654-dwc3";

		reg = <0x0 0x4000000 0x0 0x4000>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x0 0x4000000 0x20000>;

		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;

		dma-coherent;

		power-domains = <&k3_pds 151>;

		assigned-clocks = <&k3_clks 151 2>, <&k3_clks 151 7>;

		assigned-clock-parents = <&k3_clks 151 4>,	/* set REF_CLK to 20MHz i.e. PER0_PLL/48 */

					 <&k3_clks 151 9>;	/* set PIPE3_TXB_CLK to CLK_12M_RC/256 (for HS only) */



		usb0: usb@10000 {

			compatible = "snps,dwc3";

			reg = <0x10000 0x10000>;

			interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "peripheral",

					  "host",

					  "otg";

			maximum-speed = "high-speed";

			dr_mode = "otg";

			phys = <&usb0_phy>;

			phy-names = "usb2-phy";

			snps,dis_u3_susphy_quirk;

		};

	};



	usb0_phy: phy@4100000 {

		compatible = "ti,am654-usb2", "ti,omap-usb2";

		reg = <0x0 0x4100000 0x0 0x54>;

		syscon-phy-power = <&scm_conf 0x4000>;

		clocks = <&k3_clks 151 0>, <&k3_clks 151 1>;

		clock-names = "wkupclk", "refclk";

		#phy-cells = <0>;

	};



	dwc3_1: dwc3@4020000 {

		compatible = "ti,am654-dwc3";

		reg = <0x0 0x4020000 0x0 0x4000>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x0 0x0 0x4020000 0x20000>;

		interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;

		dma-coherent;

		power-domains = <&k3_pds 152>;

		assigned-clocks = <&k3_clks 152 2>;

		assigned-clock-parents = <&k3_clks 152 4>;	/* set REF_CLK to 20MHz i.e. PER0_PLL/48 */



		usb1: usb@10000 {

			compatible = "snps,dwc3";

			reg = <0x10000 0x10000>;

			interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "peripheral",

					  "host",

					  "otg";

			maximum-speed = "high-speed";

			dr_mode = "otg";

			phys = <&usb1_phy>;

			phy-names = "usb2-phy";

		};

	};



	usb1_phy: phy@4110000 {

		compatible = "ti,am654-usb2", "ti,omap-usb2";

		reg = <0x0 0x4110000 0x0 0x54>;

		syscon-phy-power = <&scm_conf 0x4020>;

		clocks = <&k3_clks 152 0>, <&k3_clks 152 1>;

		clock-names = "wkupclk", "refclk";

		#phy-cells = <0>;

	};

};
 
};

arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi

+30 −0
Original line number Original line Diff line number Diff line
@@ -57,4 +57,34 @@ 
		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <0>;

		#size-cells = <0>;

	};

	};



	tscadc0: tscadc@40200000 {

		compatible = "ti,am654-tscadc", "ti,am3359-tscadc";

		reg = <0x0 0x40200000 0x0 0x1000>;

		interrupts = <GIC_SPI 580 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&k3_clks 0 2>;

		assigned-clocks = <&k3_clks 0 2>;

		assigned-clock-rates = <60000000>;

		clock-names = "adc_tsc_fck";



		adc {

			#io-channel-cells = <1>;

			compatible = "ti,am654-adc", "ti,am3359-adc";

		};

	};



	tscadc1: tscadc@40210000 {

		compatible = "ti,am654-tscadc", "ti,am3359-tscadc";

		reg = <0x0 0x40210000 0x0 0x1000>;

		interrupts = <GIC_SPI 581 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&k3_clks 1 2>;

		assigned-clocks = <&k3_clks 1 2>;

		assigned-clock-rates = <60000000>;

		clock-names = "adc_tsc_fck";



		adc {

			#io-channel-cells = <1>;

			compatible = "ti,am654-adc", "ti,am3359-adc";

		};

	};

};
 
};

arch/arm64/boot/dts/ti/k3-am654-base-board.dts

+40 −0
Original line number Original line Diff line number Diff line
@@ -86,6 +86,12 @@ 
			AM65X_IOPAD(0x01b0, PIN_INPUT, 0) /* (C25) MMC0_DS */

			AM65X_IOPAD(0x01b0, PIN_INPUT, 0) /* (C25) MMC0_DS */

		>;

		>;

	};

	};



	usb1_pins_default: usb1_pins_default {

		pinctrl-single,pins = <

			AM65X_IOPAD(0x02c0, PIN_OUTPUT, 0) /* (AC8) USB1_DRVVBUS */

		>;

	};

};

};





&main_pmx1 {

&main_pmx1 {
@@ -188,3 +194,37 @@ 
	non-removable;

	non-removable;

	ti,driver-strength-ohm = <50>;

	ti,driver-strength-ohm = <50>;

};

};



&dwc3_1 {

	status = "okay";

};



&usb1_phy {

	status = "okay";

};



&usb1 {

	pinctrl-names = "default";

	pinctrl-0 = <&usb1_pins_default>;

	dr_mode = "otg";

};



&dwc3_0 {

	status = "disabled";

};



&usb0_phy {

	status = "disabled";

};



&tscadc0 {

	adc {

		ti,adc-channels = <0 1 2 3 4 5 6 7>;

	};

};



&tscadc1 {

	adc {

		ti,adc-channels = <0 1 2 3 4 5 6 7>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE