Commit 569519de authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branches 'omap-for-v5.13/genpd-dra7', 'omap-for-v5.13/genpd-omap4' and... 

Merge branches 'omap-for-v5.13/genpd-dra7', 'omap-for-v5.13/genpd-omap4' and 'omap-for-v5.13/genpd-omap5' into omap-for-v5.13/genpd-drop-legacy

Merge together branches dropping legacy data to avoid a minor merge conflict.
parents 083516ad 54bc4edb 2584d7e7 229e1e11

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

+0 −1
Original line number Diff line number Diff line
@@ -576,7 +576,6 @@ target-module@8000 { /* 0x4a108000, ap 29 1e.0 */ 


		target-module@40000 {			/* 0x4a140000, ap 31 06.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "sata";

			reg = <0x400fc 4>,

			      <0x41100 4>;

			reg-names = "rev", "sysc";

arch/arm/boot/dts/dra7.dtsi

+0 −5
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ pcie1_rc: pcie@51000000 { 
				#interrupt-cells = <1>;

				num-lanes = <1>;

				linux,pci-domain = <0>;

				ti,hwmods = "pcie1";

				phys = <&pcie1_phy>;

				phy-names = "pcie-phy0";

				ti,syscon-lane-sel = <&scm_conf_pcie 0x18>;
@@ -242,7 +241,6 @@ pcie1_ep: pcie_ep@51000000 { 
				num-lanes = <1>;

				num-ib-windows = <4>;

				num-ob-windows = <16>;

				ti,hwmods = "pcie1";

				phys = <&pcie1_phy>;

				phy-names = "pcie-phy0";

				ti,syscon-unaligned-access = <&scm_conf1 0x14 1>;
@@ -287,7 +285,6 @@ pcie2_rc: pcie@51800000 { 
				#interrupt-cells = <1>;

				num-lanes = <1>;

				linux,pci-domain = <1>;

				ti,hwmods = "pcie2";

				phys = <&pcie2_phy>;

				phy-names = "pcie-phy0";

				interrupt-map-mask = <0 0 0 7>;
@@ -468,7 +465,6 @@ edma_tptc1: dma@0 { 


		target-module@4e000000 {

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "dmm";

			reg = <0x4e000000 0x4>,

			      <0x4e000010 0x4>;

			reg-names = "rev", "sysc";
@@ -772,7 +768,6 @@ abb_gpu: regulator-abb-gpu { 


		target-module@4b300000 {

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "qspi";

			reg = <0x4b300000 0x4>,

			      <0x4b300010 0x4>;

			reg-names = "rev", "sysc";

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

+0 −4
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ segment@0 { /* 0x4a000000 */ 


		target-module@2000 {			/* 0x4a002000, ap 3 06.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "ctrl_module_core";

			reg = <0x2000 0x4>,

			      <0x2010 0x4>;

			reg-names = "rev", "sysc";
@@ -656,7 +655,6 @@ segment@100000 { /* 0x4a100000 */ 


		target-module@0 {			/* 0x4a100000, ap 21 2a.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "ctrl_module_pad_core";

			reg = <0x0 0x4>,

			      <0x10 0x4>;

			reg-names = "rev", "sysc";
@@ -1047,7 +1045,6 @@ scrm_clockdomains: clockdomains { 


		target-module@c000 {			/* 0x4a30c000, ap 19 2c.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "ctrl_module_wkup";

			reg = <0xc000 0x4>,

			      <0xc010 0x4>;

			reg-names = "rev", "sysc";
@@ -1208,7 +1205,6 @@ keypad: keypad@0 { 


		target-module@e000 {			/* 0x4a31e000, ap 21 30.0 */

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "ctrl_module_pad_wkup";

			reg = <0xe000 0x4>,

			      <0xe010 0x4>;

			reg-names = "rev", "sysc";

arch/arm/boot/dts/omap4.dtsi

+1 −7
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ wakeupgen: interrupt-controller@48281000 { 
	 * hierarchy.

	 */

	ocp {

		compatible = "simple-bus";

		compatible = "simple-pm-bus";

		power-domains = <&prm_l4per>;

		clocks = <&l3_1_clkctrl OMAP4_L3_MAIN_1_CLKCTRL 0>,

			 <&l3_2_clkctrl OMAP4_L3_MAIN_2_CLKCTRL 0>,
@@ -115,7 +115,6 @@ ocp { 
		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";



		l3-noc@44000000 {

			compatible = "ti,omap4-l3-noc";
@@ -192,7 +191,6 @@ gpmc: gpmc@50000000 { 


		target-module@52000000 {

			compatible = "ti,sysc-omap4", "ti,sysc";

			ti,hwmods = "iss";

			reg = <0x52000000 0x4>,

			      <0x52000010 0x4>;

			reg-names = "rev", "sysc";
@@ -224,7 +222,6 @@ target-module@52000000 { 
		 */

		target-module@54000000 {

			compatible = "ti,sysc-omap4-simple", "ti,sysc";

			ti,hwmods = "debugss";

			power-domains = <&prm_emu>;

			clocks = <&emu_sys_clkctrl OMAP4_DEBUGSS_CLKCTRL 0>;

			clock-names = "fck";
@@ -288,7 +285,6 @@ target-module@4012c000 { 


		target-module@4e000000 {

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "dmm";

			reg = <0x4e000000 0x4>,

			      <0x4e000010 0x4>;

			reg-names = "rev", "sysc";
@@ -308,7 +304,6 @@ dmm@0 { 


		target-module@4c000000 {

			compatible = "ti,sysc-omap4-simple", "ti,sysc";

			ti,hwmods = "emif1";

			reg = <0x4c000000 0x4>;

			reg-names = "rev";

			clocks = <&l3_emif_clkctrl OMAP4_EMIF1_CLKCTRL 0>;
@@ -331,7 +326,6 @@ emif1: emif@0 { 


		target-module@4d000000 {

			compatible = "ti,sysc-omap4-simple", "ti,sysc";

			ti,hwmods = "emif2";

			reg = <0x4d000000 0x4>;

			reg-names = "rev";

			clocks = <&l3_emif_clkctrl OMAP4_EMIF2_CLKCTRL 0>;

arch/arm/boot/dts/omap5.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ ocp { 
		#size-cells = <1>;

		ranges = <0 0 0 0xc0000000>;

		dma-ranges = <0x80000000 0x0 0x80000000 0x80000000>;

		ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";



		l3-noc@44000000 {

			compatible = "ti,omap5-l3-noc";
@@ -279,7 +278,6 @@ ipu: ipu@55020000 { 


		target-module@4e000000 {

			compatible = "ti,sysc-omap2", "ti,sysc";

			ti,hwmods = "dmm";

			reg = <0x4e000000 0x4>,

			      <0x4e000010 0x4>;

			reg-names = "rev", "sysc";
@@ -299,7 +297,6 @@ dmm@0 { 


		target-module@4c000000 {

			compatible = "ti,sysc-omap4-simple", "ti,sysc";

			ti,hwmods = "emif1";

			reg = <0x4c000000 0x4>;

			reg-names = "rev";

			clocks = <&emif_clkctrl OMAP5_EMIF1_CLKCTRL 0>;
@@ -322,7 +319,6 @@ emif1: emif@0 { 


		target-module@4d000000 {

			compatible = "ti,sysc-omap4-simple", "ti,sysc";

			ti,hwmods = "emif2";

			reg = <0x4d000000 0x4>;

			reg-names = "rev";

			clocks = <&emif_clkctrl OMAP5_EMIF2_CLKCTRL 0>;