Commit 10f9d7fd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'am654-for-v4.21' of... 

Merge tag 'am654-for-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux into next/dt

AM65x DT changes for 4.21. Includes:

- Pinctrl support
- I2C support
- ECAP PWM support
- Power domain handling for UARTs
- McSPI support

* tag 'am654-for-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/kristo/linux

:
  arm64: dts: ti: k3-am654: Enable main domain McSPI0
  arm64: dts: ti: k3-am654: Add McSPI DT nodes
  arm64: dts: ti: k3-am654: Populate power-domain property for UART nodes
  arm64: dts: ti: k3-am654-base-board: Enable ECAP PWM
  arm64: dts: ti: k3-am65-main: Add ECAP PWM node
  arm64: dts: ti: k3-am654-base-board: Add I2C nodes
  arm64: dts: ti: am654-base-board: Add pinmux for main uart0
  arm64: dts: ti: k3-am65: Add pinctrl regions
  dt-bindings: pinctrl: k3: Introduce pinmux definitions
  arm64: dts: ti: k3-am654: Fix wakeup_uart reg address

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 826833df 5da94b50

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2204,6 +2204,7 @@ S: Supported 
F:	Documentation/devicetree/bindings/arm/ti/k3.txt

F:	arch/arm64/boot/dts/ti/Makefile

F:	arch/arm64/boot/dts/ti/k3-*

F:	include/dt-bindings/pinctrl/k3.h



ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE

M:	Santosh Shilimkar <ssantosh@kernel.org>

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

+124 −2
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
		interrupts = <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>;

		clock-frequency = <48000000>;

		current-speed = <115200>;

		power-domains = <&k3_pds 146>;

	};



	main_uart1: serial@2810000 {
@@ -57,7 +58,7 @@ 
		reg-io-width = <4>;

		interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>;

		clock-frequency = <48000000>;

		current-speed = <115200>;

		power-domains = <&k3_pds 147>;

	};



	main_uart2: serial@2820000 {
@@ -67,6 +68,127 @@ 
		reg-io-width = <4>;

		interrupts = <GIC_SPI 194 IRQ_TYPE_LEVEL_HIGH>;

		clock-frequency = <48000000>;

		current-speed = <115200>;

		power-domains = <&k3_pds 148>;

	};



	main_pmx0: pinmux@11c000 {

		compatible = "pinctrl-single";

		reg = <0x0 0x11c000 0x0 0x2e4>;

		#pinctrl-cells = <1>;

		pinctrl-single,register-width = <32>;

		pinctrl-single,function-mask = <0xffffffff>;

	};



	main_pmx1: pinmux@11c2e8 {

		compatible = "pinctrl-single";

		reg = <0x0 0x11c2e8 0x0 0x24>;

		#pinctrl-cells = <1>;

		pinctrl-single,register-width = <32>;

		pinctrl-single,function-mask = <0xffffffff>;

	};



	main_i2c0: i2c@2000000 {

		compatible = "ti,am654-i2c", "ti,omap4-i2c";

		reg = <0x0 0x2000000 0x0 0x100>;

		interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-names = "fck";

		clocks = <&k3_clks 110 1>;

		power-domains = <&k3_pds 110>;

	};



	main_i2c1: i2c@2010000 {

		compatible = "ti,am654-i2c", "ti,omap4-i2c";

		reg = <0x0 0x2010000 0x0 0x100>;

		interrupts = <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-names = "fck";

		clocks = <&k3_clks 111 1>;

		power-domains = <&k3_pds 111>;

	};



	main_i2c2: i2c@2020000 {

		compatible = "ti,am654-i2c", "ti,omap4-i2c";

		reg = <0x0 0x2020000 0x0 0x100>;

		interrupts = <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-names = "fck";

		clocks = <&k3_clks 112 1>;

		power-domains = <&k3_pds 112>;

	};



	main_i2c3: i2c@2030000 {

		compatible = "ti,am654-i2c", "ti,omap4-i2c";

		reg = <0x0 0x2030000 0x0 0x100>;

		interrupts = <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-names = "fck";

		clocks = <&k3_clks 113 1>;

		power-domains = <&k3_pds 113>;

	};



	ecap0: pwm@3100000 {

		compatible = "ti,am654-ecap", "ti,am3352-ecap";

		#pwm-cells = <3>;

		reg = <0x0 0x03100000 0x0 0x60>;

		power-domains = <&k3_pds 39>;

		clocks = <&k3_clks 39 0>;

		clock-names = "fck";

	};



	main_spi0: spi@2100000 {

		compatible = "ti,am654-mcspi","ti,omap4-mcspi";

		reg = <0x0 0x2100000 0x0 0x400>;

		interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&k3_clks 137 1>;

		power-domains = <&k3_pds 137>;

		#address-cells = <1>;

		#size-cells = <0>;

	};



	main_spi1: spi@2110000 {

		compatible = "ti,am654-mcspi","ti,omap4-mcspi";

		reg = <0x0 0x2110000 0x0 0x400>;

		interrupts = <GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&k3_clks 138 1>;

		power-domains = <&k3_pds 138>;

		#address-cells = <1>;

		#size-cells = <0>;

		assigned-clocks = <&k3_clks 137 1>;

		assigned-clock-rates = <48000000>;

	};



	main_spi2: spi@2120000 {

		compatible = "ti,am654-mcspi","ti,omap4-mcspi";

		reg = <0x0 0x2120000 0x0 0x400>;

		interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&k3_clks 139 1>;

		power-domains = <&k3_pds 139>;

		#address-cells = <1>;

		#size-cells = <0>;

	};



	main_spi3: spi@2130000 {

		compatible = "ti,am654-mcspi","ti,omap4-mcspi";

		reg = <0x0 0x2130000 0x0 0x400>;

		interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&k3_clks 140 1>;

		power-domains = <&k3_pds 140>;

		#address-cells = <1>;

		#size-cells = <0>;

	};



	main_spi4: spi@2140000 {

		compatible = "ti,am654-mcspi","ti,omap4-mcspi";

		reg = <0x0 0x2140000 0x0 0x400>;

		interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&k3_clks 141 1>;

		power-domains = <&k3_pds 141>;

		#address-cells = <1>;

		#size-cells = <0>;

	};

};

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

+42 −0
Original line number Diff line number Diff line
@@ -14,5 +14,47 @@ 
			interrupts = <GIC_SPI 565 IRQ_TYPE_LEVEL_HIGH>;

			clock-frequency = <96000000>;

			current-speed = <115200>;

			power-domains = <&k3_pds 149>;

	};



	mcu_i2c0: i2c@40b00000 {

		compatible = "ti,am654-i2c", "ti,omap4-i2c";

		reg = <0x0 0x40b00000 0x0 0x100>;

		interrupts = <GIC_SPI 564 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-names = "fck";

		clocks = <&k3_clks 114 1>;

		power-domains = <&k3_pds 114>;

	};



	mcu_spi0: spi@40300000 {

		compatible = "ti,am654-mcspi","ti,omap4-mcspi";

		reg = <0x0 0x40300000 0x0 0x400>;

		interrupts = <GIC_SPI 560 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&k3_clks 142 1>;

		power-domains = <&k3_pds 142>;

		#address-cells = <1>;

		#size-cells = <0>;

	};



	mcu_spi1: spi@40310000 {

		compatible = "ti,am654-mcspi","ti,omap4-mcspi";

		reg = <0x0 0x40310000 0x0 0x400>;

		interrupts = <GIC_SPI 561 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&k3_clks 143 1>;

		power-domains = <&k3_pds 143>;

		#address-cells = <1>;

		#size-cells = <0>;

	};



	mcu_spi2: spi@40320000 {

		compatible = "ti,am654-mcspi","ti,omap4-mcspi";

		reg = <0x0 0x40320000 0x0 0x400>;

		interrupts = <GIC_SPI 562 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&k3_clks 144 1>;

		power-domains = <&k3_pds 144>;

		#address-cells = <1>;

		#size-cells = <0>;

	};

};

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

+21 −1
Original line number Diff line number Diff line
@@ -34,13 +34,33 @@ 
		};

	};



	wkup_pmx0: pinmux@4301c000 {

		compatible = "pinctrl-single";

		reg = <0x4301c000 0x118>;

		#pinctrl-cells = <1>;

		pinctrl-single,register-width = <32>;

		pinctrl-single,function-mask = <0xffffffff>;

	};



	wkup_uart0: serial@42300000 {

		compatible = "ti,am654-uart";

		reg = <0x00 0x42300000 0x00 0x100>;

		reg = <0x42300000 0x100>;

		reg-shift = <2>;

		reg-io-width = <4>;

		interrupts = <GIC_SPI 697 IRQ_TYPE_LEVEL_HIGH>;

		clock-frequency = <48000000>;

		current-speed = <115200>;

		power-domains = <&k3_pds 150>;

	};



	wkup_i2c0: i2c@42120000 {

		compatible = "ti,am654-i2c", "ti,omap4-i2c";

		reg = <0x42120000 0x100>;

		interrupts = <GIC_SPI 696 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-names = "fck";

		clocks = <&k3_clks 115 1>;

		power-domains = <&k3_pds 115>;

	};

};

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

+7 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/pinctrl/k3.h>



/ {

	model = "Texas Instruments K3 AM654 SoC";
@@ -22,6 +23,12 @@ 
		serial2 = &main_uart0;

		serial3 = &main_uart1;

		serial4 = &main_uart2;

		i2c0 = &wkup_i2c0;

		i2c1 = &mcu_i2c0;

		i2c2 = &main_i2c0;

		i2c3 = &main_i2c1;

		i2c4 = &main_i2c2;

		i2c5 = &main_i2c3;

	};



	chosen { };

CRA Git | Maintained and supported by SUSTech CRA and CCSE