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

Commit ea99a354 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'keystone_dts_for_4.17' of... 

Merge tag 'keystone_dts_for_4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt

Pull "ARM: Keystone DTS for 4.17" from Santosh Shilimkar:

 - Andrew's various DTS warning fixes
 - clock address separator fix
 - EDAC support for EMIF
 - serial dts node unit address format fix

* tag 'keystone_dts_for_4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone-k2g: Fix unit-address formatting for serial nodes
  dt-bindings: memory: ti-emif: add edac support under emif
  ARM: dts: keystone-k2e-clocks: Fix missing unit address separator
  ARM: dts: keystone-k2g: Move usb-phy nodes out of soc0
  ARM: dts: keystone-k2g: Move keystone_dsp_gpio to under device-state-control
  ARM: dts: keystone-k2g: Move keystone_irq to under device-state-control
  ARM: dts: keystone-k2hk: Move keystone_dsp_gpio to under device-state-control
  ARM: dts: keystone-k2l: Move keystone_dsp_gpio to under device-state-control
  ARM: dts: keystone-k2e: Move keystone_dsp_gpio to under device-state-control
  ARM: dts: keystone: Move reset-controller to under device-state-control
  ARM: dts: keystone: Move keystone_irq to under device-state-control
parents e94e5cb8 07f3398d

Documentation/devicetree/bindings/memory-controllers/ti/emif.txt

+12 −1
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ 
EMIF - External Memory Interface - is an SDRAM controller used in

TI SoCs. EMIF supports, based on the IP revision, one or more of

DDR2/DDR3/LPDDR2 protocols. This binding describes a given instance

of the EMIF IP and memory parts attached to it.

of the EMIF IP and memory parts attached to it. Certain revisions

of the EMIF controller also contain optional ECC support, which

corrects one bit errors and detects two bit errors.



Required properties:

- compatible	: Should be of the form "ti,emif-<ip-rev>" where <ip-rev>
@@ -11,6 +13,8 @@ Required properties: 
  compatible should be one of the following:

  	     "ti,emif-am3352"

	     "ti,emif-am4372"

	     "ti,emif-dra7xx"

	     "ti,emif-keystone"



- phy-type	: <u32> indicating the DDR phy type. Following are the

  allowed values
@@ -22,6 +26,7 @@ Required properties: 
- ti,hwmods	: For TI hwmods processing and omap device creation

  the value shall be "emif<n>" where <n> is the number of the EMIF

  instance with base 1.

- interrupts	: interrupt used by the controller



Required only for "ti,emif-am3352" and "ti,emif-am4372":

- sram			: Phandles for generic sram driver nodes,
@@ -71,3 +76,9 @@ emif: emif@4c000000 { 
        sram = <&pm_sram_code

                &pm_sram_data>;

};



emif1: emif@4c000000 {

	compatible = "ti,emif-dra7xx";

	reg = <0x4c000000 0x200>;

	interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;

};

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ clocks { 
		domain-id = <0>;

	};



	clkhyperlink0: clkhyperlink02350030 {

	clkhyperlink0: clkhyperlink0@2350030 {

		#clock-cells = <0>;

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

		clocks = <&chipclk12>;

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

+8 −5
Original line number Diff line number Diff line
@@ -109,12 +109,15 @@ 
			};

		};



		dspgpio0: keystone_dsp_gpio@2620240 {

		devctrl: device-state-control@2620000 {

			dspgpio0: keystone_dsp_gpio@240 {

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

				reg = <0x240 0x4>;

				gpio-controller;

				#gpio-cells = <2>;

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

			};

		};



		dsp0: dsp@10800000 {

			compatible = "ti,k2e-dsp";

arch/arm/boot/dts/keystone-k2g.dtsi

+41 −28
Original line number Diff line number Diff line
@@ -69,6 +69,24 @@ 
		interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;

	};



	usbphy {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "simple-bus";



		usb0_phy: usb-phy@0 {

			compatible = "usb-nop-xceiv";

			reg = <0>;

			status = "disabled";

		};



		usb1_phy: usb-phy@1 {

			compatible = "usb-nop-xceiv";

			reg = <1>;

			status = "disabled";

		};

	};



	soc0: soc@0 {

		#address-cells = <1>;

		#size-cells = <1>;
@@ -97,8 +115,28 @@ 
		};



		devctrl: device-state-control@2620000 {

			compatible = "ti,keystone-devctrl", "syscon";

			compatible = "ti,keystone-devctrl", "syscon", "simple-mfd";

			reg = <0x02620000 0x1000>;

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0x02620000 0x1000>;



			kirq0: keystone_irq@2a0 {

				compatible = "ti,keystone-irq";

				reg = <0x2a0 0x10>;

				interrupts = <GIC_SPI 1 IRQ_TYPE_EDGE_RISING>;

				interrupt-controller;

				#interrupt-cells = <1>;

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

			};



			dspgpio0: keystone_dsp_gpio@240 {

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

				reg = <0x240 0x4>;

				gpio-controller;

				#gpio-cells = <2>;

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

			};

		};



		uart0: serial@2530c00 {
@@ -113,7 +151,7 @@ 
			status = "disabled";

		};



		uart1: serial@02531000 {

		uart1: serial@2531000 {

			compatible = "ti,da830-uart", "ns16550a";

			current-speed = <115200>;

			reg-shift = <2>;
@@ -125,7 +163,7 @@ 
			status = "disabled";

		};



		uart2: serial@02531400 {

		uart2: serial@2531400 {

			compatible = "ti,da830-uart", "ns16550a";

			current-speed = <115200>;

			reg-shift = <2>;
@@ -188,21 +226,6 @@ 
			status = "disabled";

		};



		kirq0: keystone_irq@26202a0 {

			compatible = "ti,keystone-irq";

			interrupts = <GIC_SPI 1 IRQ_TYPE_EDGE_RISING>;

			interrupt-controller;

			#interrupt-cells = <1>;

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

		};



		dspgpio0: keystone_dsp_gpio@2620240 {

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

			gpio-controller;

			#gpio-cells = <2>;

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

		};



		dsp0: dsp@10800000 {

			compatible = "ti,k2g-dsp";

			reg = <0x10800000 0x00100000>,
@@ -460,11 +483,6 @@ 
			status = "disabled";

		};



		usb0_phy: usb-phy@0 {

			compatible = "usb-nop-xceiv";

			status = "disabled";

		};



		keystone_usb0: keystone-dwc3@2680000 {

			compatible = "ti,keystone-dwc3";

			#address-cells = <1>;
@@ -488,11 +506,6 @@ 
			};

		};



		usb1_phy: usb-phy@1 {

			compatible = "usb-nop-xceiv";

			status = "disabled";

		};



		keystone_usb1: keystone-dwc3@2580000 {

			compatible = "ti,keystone-dwc3";

			#address-cells = <1>;

arch/arm/boot/dts/keystone-k2hk.dtsi

+57 −47
Original line number Diff line number Diff line
@@ -87,61 +87,71 @@ 
			};

		};



		dspgpio0: keystone_dsp_gpio@2620240 {

		devctrl: device-state-control@2620000 {

			dspgpio0: keystone_dsp_gpio@240 {

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

				reg = <0x240 0x4>;

				gpio-controller;

				#gpio-cells = <2>;

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

			};



		dspgpio1: keystone_dsp_gpio@2620244 {

			dspgpio1: keystone_dsp_gpio@244 {

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

				reg = <0x244 0x4>;

				gpio-controller;

				#gpio-cells = <2>;

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

			};



		dspgpio2: keystone_dsp_gpio@2620248 {

			dspgpio2: keystone_dsp_gpio@248 {

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

				reg = <0x248 0x4>;

				gpio-controller;

				#gpio-cells = <2>;

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

			};



		dspgpio3: keystone_dsp_gpio@262024c {

			dspgpio3: keystone_dsp_gpio@24c {

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

				reg = <0x24c 0x4>;

				gpio-controller;

				#gpio-cells = <2>;

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

			};



		dspgpio4: keystone_dsp_gpio@2620250 {

			dspgpio4: keystone_dsp_gpio@250 {

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

				reg = <0x250 0x4>;

				gpio-controller;

				#gpio-cells = <2>;

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

			};



		dspgpio5: keystone_dsp_gpio@2620254 {

			dspgpio5: keystone_dsp_gpio@254 {

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

				reg = <0x254 0x4>;

				gpio-controller;

				#gpio-cells = <2>;

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

			};



		dspgpio6: keystone_dsp_gpio@2620258 {

			dspgpio6: keystone_dsp_gpio@258 {

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

				reg = <0x258 0x4>;

				gpio-controller;

				#gpio-cells = <2>;

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

			};



		dspgpio7: keystone_dsp_gpio@262025c {

			dspgpio7: keystone_dsp_gpio@25c {

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

				reg = <0x25c 0x4>;

				gpio-controller;

				#gpio-cells = <2>;

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

			};

		};



		dsp0: dsp@10800000 {

			compatible = "ti,k2hk-dsp";