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

Commit ab8b1fdd authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v4.19/dt-sysc-v2' into omap-for-v4.19/dt

parents 91f6278b 77036896

Documentation/devicetree/bindings/arm/omap/l4.txt

+13 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
	       Should be "ti,omap2-l4-wkup" for OMAP2 family l4 wkup bus

	       Should be "ti,omap3-l4-core" for OMAP3 family l4 core bus

	       Should be "ti,omap4-l4-cfg" for OMAP4 family l4 cfg bus

	       Should be "ti,omap4-l4-per" for OMAP4 family l4 per bus

	       Should be "ti,omap4-l4-wkup" for OMAP4 family l4 wkup bus

	       Should be "ti,omap5-l4-cfg" for OMAP5 family l4 cfg bus

	       Should be "ti,omap5-l4-wkup" for OMAP5 family l4 wkup bus
@@ -15,11 +16,21 @@ Required properties: 
	       Should be "ti,am3-l4-wkup" for AM33xx family l4 wkup bus

	       Should be "ti,am4-l4-wkup" for AM43xx family l4 wkup bus

- ranges : contains the IO map range for the bus

- reg : registers link agent and interconnect agent and access protection

- reg-names : "la" for link agent, "ia0" to "ia3" for one to three

              interconnect agent instances, "ap" for access if it exists



Examples:



l4: l4@48000000 {

	compatible "ti,omap2-l4", "simple-bus";

l4: interconnect@48000000 {

	compatible "ti,omap4-l4-per", "simple-bus";

	reg = <0x48000000 0x800>,

	      <0x48000800 0x800>,

	      <0x48001000 0x400>,

	      <0x48001400 0x400>,

	      <0x48001800 0x400>,

	      <0x48001c00 0x400>;

	reg-names = "ap", "la", "ia0", "ia1", "ia2", "ia3";

	#address-cells = <1>;

	#size-cells = <1>;

	ranges = <0 0x48000000 0x100000>;

arch/arm/boot/dts/omap4-l4.dtsi

0 → 100644
+2444 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/boot/dts/omap4-panda-es.dts

+1 −1
Original line number Diff line number Diff line
@@ -80,6 +80,6 @@ 
	};

};



&gpio1 {

&gpio1_target {

	 ti,no-reset-on-init;

};

arch/arm/boot/dts/omap4.dtsi

+32 −780

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/boot/dts/omap4460.dtsi

+36 −0
Original line number Diff line number Diff line
@@ -92,4 +92,40 @@ 
	coefficients = <348 (-9301)>;

};



/* Only some L4 CFG interconnect ranges are different on 4460 */

&l4_cfg_segment_300000 {

	ranges = <0x00000000 0x00300000 0x020000>,	/* ap 67 */

		 <0x00040000 0x00340000 0x001000>,	/* ap 68 */

		 <0x00020000 0x00320000 0x004000>,	/* ap 71 */

		 <0x00024000 0x00324000 0x002000>,	/* ap 72 */

		 <0x00026000 0x00326000 0x001000>,	/* ap 73 */

		 <0x00027000 0x00327000 0x001000>,	/* ap 74 */

		 <0x00028000 0x00328000 0x001000>,	/* ap 75 */

		 <0x00029000 0x00329000 0x001000>,	/* ap 76 */

		 <0x00030000 0x00330000 0x010000>,	/* ap 77 */

		 <0x0002a000 0x0032a000 0x002000>,	/* ap 90 */

		 <0x0002c000 0x0032c000 0x004000>,	/* ap 91 */

		 <0x00010000 0x00310000 0x008000>,	/* ap 92 */

		 <0x00018000 0x00318000 0x004000>,	/* ap 93 */

		 <0x0001c000 0x0031c000 0x002000>,	/* ap 94 */

		 <0x0001e000 0x0031e000 0x002000>;	/* ap 95 */

};



&l4_cfg_target_0 {

	ranges = <0x00000000 0x00000000 0x00010000>,

		 <0x00010000 0x00010000 0x00008000>,

		 <0x00018000 0x00018000 0x00004000>,

		 <0x0001c000 0x0001c000 0x00002000>,

		 <0x0001e000 0x0001e000 0x00002000>,

		 <0x00020000 0x00020000 0x00004000>,

		 <0x00024000 0x00024000 0x00002000>,

		 <0x00026000 0x00026000 0x00001000>,

		 <0x00027000 0x00027000 0x00001000>,

		 <0x00028000 0x00028000 0x00001000>,

		 <0x00029000 0x00029000 0x00001000>,

		 <0x0002a000 0x0002a000 0x00002000>,

		 <0x0002c000 0x0002c000 0x00004000>,

		 <0x00030000 0x00030000 0x00010000>;

};



/include/ "omap446x-clocks.dtsi"