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

Commit 8446cef1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'keystone-dts' of... 

Merge tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone

 into next/dt

Pull "Keystone DTS updates for v3.18" from Santosh Shilimkar"

- Add IRQ and GPIO nodes
- Fix SPI chip select
- Fix usb and pcie clock nodes

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

* tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone: fix bindings for pcie and usb clock nodes
  ARM: dts: keystone: k2l: Fix chip selects for SPI devices
  ARM: dts: keystone: add dsp gpio controllers nodes
  ARM: dts: keystone: add keystone irq controller node
parents a0f95e35 b2ed7d98

arch/arm/boot/dts/k2e-clocks.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ clocks { 
		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk16>;

		clock-output-names = "usb";

		clock-output-names = "usb1";

		reg = <0x02350004 0xb00>, <0x02350000 0x400>;

		reg-names = "control", "domain";

		domain-id = <0>;
@@ -60,8 +60,8 @@ clocks { 
		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk12>;

		clock-output-names = "pcie";

		reg = <0x0235006c 0xb00>, <0x02350000 0x400>;

		clock-output-names = "pcie1";

		reg = <0x0235006c 0xb00>, <0x02350048 0x400>;

		reg-names = "control", "domain";

		domain-id = <18>;

	};

arch/arm/boot/dts/k2e.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -76,5 +76,12 @@ 
				usb-phy = <&usb1_phy>, <&usb1_phy>;

			};

		};



		dspgpio0: keystone_dsp_gpio@02620240 {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x240>;

		};

	};

};

arch/arm/boot/dts/k2hk.dtsi

+56 −0
Original line number Diff line number Diff line
@@ -42,5 +42,61 @@ 


	soc {

		/include/ "k2hk-clocks.dtsi"



		dspgpio0: keystone_dsp_gpio@02620240 {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x240>;

		};



		dspgpio1: keystone_dsp_gpio@2620244 {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x244>;

		};



		dspgpio2: keystone_dsp_gpio@2620248 {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x248>;

		};



		dspgpio3: keystone_dsp_gpio@262024c {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x24c>;

		};



		dspgpio4: keystone_dsp_gpio@2620250 {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x250>;

		};



		dspgpio5: keystone_dsp_gpio@2620254 {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x254>;

		};



		dspgpio6: keystone_dsp_gpio@2620258 {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x258>;

		};



		dspgpio7: keystone_dsp_gpio@262025c {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x25c>;

		};

	};

};

arch/arm/boot/dts/k2l.dtsi

+42 −0
Original line number Diff line number Diff line
@@ -51,5 +51,47 @@ 
			clocks	= <&clkuart3>;

			interrupts = <GIC_SPI 435 IRQ_TYPE_EDGE_RISING>;

		};



		dspgpio0: keystone_dsp_gpio@02620240 {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x240>;

		};



		dspgpio1: keystone_dsp_gpio@2620244 {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x244>;

		};



		dspgpio2: keystone_dsp_gpio@2620248 {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x248>;

		};



		dspgpio3: keystone_dsp_gpio@262024c {

			compatible = "ti,keystone-dsp-gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x24c>;

		};

	};

};



&spi0 {

       ti,davinci-spi-num-cs = <5>;

};



&spi1 {

       ti,davinci-spi-num-cs = <3>;

};



&spi2 {

       ti,davinci-spi-num-cs = <5>;

       /* Pin muxed. Enabled and configured by Bootloader */

       status = "disabled";

};

arch/arm/boot/dts/keystone.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -277,5 +277,13 @@ 
			clock-names = "fck";

			bus_freq	= <2500000>;

		};



		kirq0: keystone_irq@26202a0 {

			compatible = "ti,keystone-irq";

			interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;

			interrupt-controller;

			#interrupt-cells = <1>;

			ti,syscon-dev = <&devctrl 0x2a0>;

		};

	};

};