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

Commit dcc79d78 authored by Anatolij Gustschin's avatar Anatolij Gustschin Committed by Grant Likely
Browse files

powerpc/mpc5121: update mpc5121ads DTS



Collects several changes needed after applying
previous mpc5121 platform and driver patches:

- Add mpc5121 reset module node
- Clean up and fix NAND description, remove unused properties
  here and correct NAND flash chip size.
- Clean up I2C nodes: remove obsolete "cell-index" properties,
  add "fsl,preserve-clocking" property
- Add I2C RTC node for m41t61 RTC
- Add I2C nodes for AD7414 temperature sensor and AT24C32CD3 EEPROM
- Fix compatible property in DMA node
- Clean up CAN nodes, remove unused "cell-index" properties
- Fix compatible property in DIU node
- USB node changes:
    - use "fsl,mpc5121-usb2-dr" compatible property only
    - remove "port0" and "port1" properties as these are only used
      for multi-port host(MHP) module which is not available
      on MPC5121.
    - use 'fsl,invert-drvvbus' and 'fsl,invert-pwr-fault' in
      USB node for internal PHY to specify polarities
      of the appropriate port pins.

Signed-off-by: default avatarPiotr Ziecik <kosmo@semihalf.com>
Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
Signed-off-by: default avatarDetlev Zundel <dzu@denx.de>
Signed-off-by: default avatarAnatolij Gustschin <agust@denx.de>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 5b2b6255
Loading
Loading
Loading
Loading
+33 −22
Original line number Diff line number Diff line
@@ -62,17 +62,12 @@
		interrupt-parent = < &ipic >;
		#address-cells = <1>;
		#size-cells = <1>;
		bank-width = <1>;
		// ADS has two Hynix 512MB Nand flash chips in a single
		// stacked package.
		chips = <2>;
		nand0@0 {
			label = "nand0";
			reg = <0x00000000 0x02000000>; 	// first 32 MB of chip 0
		};
		nand1@20000000 {
			label = "nand1";
			reg = <0x20000000 0x02000000>; 	// first 32 MB of chip 1
		nand@0 {
			label = "nand";
			reg = <0x00000000 0x40000000>;	// 512MB + 512MB
		};
	};

@@ -166,6 +161,11 @@
			interrupt-parent = < &ipic >;
		};

		reset@e00 {	// Reset module
			compatible = "fsl,mpc5121-reset";
			reg = <0xe00 0x100>;
		};

		clock@f00 {	// Clock control
			compatible = "fsl,mpc5121-clock";
			reg = <0xf00 0x100>;
@@ -185,17 +185,15 @@
			interrupt-parent = < &ipic >;
		};

		mscan@1300 {
		can@1300 {
			compatible = "fsl,mpc5121-mscan";
			cell-index = <0>;
			interrupts = <12 0x8>;
			interrupt-parent = < &ipic >;
			reg = <0x1300 0x80>;
		};

		mscan@1380 {
		can@1380 {
			compatible = "fsl,mpc5121-mscan";
			cell-index = <1>;
			interrupts = <13 0x8>;
			interrupt-parent = < &ipic >;
			reg = <0x1380 0x80>;
@@ -205,17 +203,31 @@
			#address-cells = <1>;
			#size-cells = <0>;
			compatible = "fsl,mpc5121-i2c", "fsl-i2c";
			cell-index = <0>;
			reg = <0x1700 0x20>;
			interrupts = <9 0x8>;
			interrupt-parent = < &ipic >;
			fsl,preserve-clocking;

			hwmon@4a {
				compatible = "adi,ad7414";
				reg = <0x4a>;
			};

			eeprom@50 {
				compatible = "at,24c32";
				reg = <0x50>;
			};

			rtc@68 {
				compatible = "stm,m41t62";
				reg = <0x68>;
			};
		};

		i2c@1720 {
			#address-cells = <1>;
			#size-cells = <0>;
			compatible = "fsl,mpc5121-i2c", "fsl-i2c";
			cell-index = <1>;
			reg = <0x1720 0x20>;
			interrupts = <10 0x8>;
			interrupt-parent = < &ipic >;
@@ -225,7 +237,6 @@
			#address-cells = <1>;
			#size-cells = <0>;
			compatible = "fsl,mpc5121-i2c", "fsl-i2c";
			cell-index = <2>;
			reg = <0x1740 0x20>;
			interrupts = <11 0x8>;
			interrupt-parent = < &ipic >;
@@ -244,7 +255,7 @@
		};

		display@2100 {
			compatible = "fsl,mpc5121-diu", "fsl-diu";
			compatible = "fsl,mpc5121-diu", "fsl,diu";
			reg = <0x2100 0x100>;
			interrupts = <64 0x8>;
			interrupt-parent = < &ipic >;
@@ -277,7 +288,7 @@

		// USB1 using external ULPI PHY
		//usb@3000 {
		//	compatible = "fsl,mpc5121-usb2-dr", "fsl-usb2-dr";
		//	compatible = "fsl,mpc5121-usb2-dr";
		//	reg = <0x3000 0x1000>;
		//	#address-cells = <1>;
		//	#size-cells = <0>;
@@ -285,12 +296,11 @@
		//	interrupts = <43 0x8>;
		//	dr_mode = "otg";
		//	phy_type = "ulpi";
		//	port1;
		//};

		// USB0 using internal UTMI PHY
		usb@4000 {
			compatible = "fsl,mpc5121-usb2-dr", "fsl-usb2-dr";
			compatible = "fsl,mpc5121-usb2-dr";
			reg = <0x4000 0x1000>;
			#address-cells = <1>;
			#size-cells = <0>;
@@ -298,7 +308,8 @@
			interrupts = <44 0x8>;
			dr_mode = "otg";
			phy_type = "utmi_wide";
			port0;
			fsl,invert-drvvbus;
			fsl,invert-pwr-fault;
		};

		// IO control
@@ -365,7 +376,7 @@
		};

		dma@14000 {
			compatible = "fsl,mpc5121-dma2";
			compatible = "fsl,mpc5121-dma";
			reg = <0x14000 0x1800>;
			interrupts = <65 0x8>;
			interrupt-parent = < &ipic >;