Commit c0d32456 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.11/fixes-not-urgent-signed' of... 

Merge tag 'omap-for-v4.11/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

Non-urgent fixes for omaps for v4.11 merge window. These all are
fixes for things that have never worked or have been broken for
a long time and nobody noticed:

- Fix omap3 off mode pull defines
- Allow multiple pdata quirks instead of just one
- Fix am335x and dm814x scm syscon to probe children too
- Fix compatible for ti81xx to allow use with 8250_omap as well
- Fix 8250_omap on omap5 by adding HWMOD_SWSUP_SIDLE_ACT flag
- Fix SoC detection for omap36/37 SoCs

* tag 'omap-for-v4.11/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP3: Fix SoC detection of OMAP36/37 Family
  ARM: OMAP5: Add HWMOD_SWSUP_SIDLE_ACT flag for UART
  ARM: dts: Fix compatible for ti81xx uarts for 8250
  ARM: dts: Fix am335x and dm814x scm syscon to probe children
  ARM: OMAP2+: Fix init for multiple quirks for the same SoC
  ARM: dts: Fix omap3 off mode pull defines

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2af49ab6 631af44c

arch/arm/boot/dts/am33xx.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -144,10 +144,11 @@ 
				};



				scm_conf: scm_conf@0 {

					compatible = "syscon";

					compatible = "syscon", "simple-bus";

					reg = <0x0 0x800>;

					#address-cells = <1>;

					#size-cells = <1>;

					ranges = <0 0 0x800>;



					scm_clocks: clocks {

						#address-cells = <1>;

arch/arm/boot/dts/dm814x.dtsi

+5 −4
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ 
			};



			uart1: uart@20000 {

				compatible = "ti,omap3-uart";

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				ti,hwmods = "uart1";

				reg = <0x20000 0x2000>;

				clock-frequency = <48000000>;
@@ -261,7 +261,7 @@ 
			};



			uart2: uart@22000 {

				compatible = "ti,omap3-uart";

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				ti,hwmods = "uart2";

				reg = <0x22000 0x2000>;

				clock-frequency = <48000000>;
@@ -271,7 +271,7 @@ 
			};



			uart3: uart@24000 {

				compatible = "ti,omap3-uart";

				compatible = "ti,am3352-uart", "ti,omap3-uart";

				ti,hwmods = "uart3";

				reg = <0x24000 0x2000>;

				clock-frequency = <48000000>;
@@ -331,10 +331,11 @@ 
				ranges = <0 0x140000 0x20000>;



				scm_conf: scm_conf@0 {

					compatible = "syscon";

					compatible = "syscon", "simple-bus";

					reg = <0x0 0x800>;

					#address-cells = <1>;

					#size-cells = <1>;

					ranges = <0 0 0x800>;



					scm_clocks: clocks {

						#address-cells = <1>;

arch/arm/boot/dts/dm816x.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ 
		};



		uart1: uart@48020000 {

			compatible = "ti,omap3-uart";

			compatible = "ti,am3352-uart", "ti,omap3-uart";

			ti,hwmods = "uart1";

			reg = <0x48020000 0x2000>;

			clock-frequency = <48000000>;
@@ -382,7 +382,7 @@ 
		};



		uart2: uart@48022000 {

			compatible = "ti,omap3-uart";

			compatible = "ti,am3352-uart", "ti,omap3-uart";

			ti,hwmods = "uart2";

			reg = <0x48022000 0x2000>;

			clock-frequency = <48000000>;
@@ -392,7 +392,7 @@ 
		};



		uart3: uart@48024000 {

			compatible = "ti,omap3-uart";

			compatible = "ti,am3352-uart", "ti,omap3-uart";

			ti,hwmods = "uart3";

			reg = <0x48024000 0x2000>;

			clock-frequency = <48000000>;

arch/arm/mach-omap2/id.c

+9 −1
Original line number Diff line number Diff line
@@ -223,7 +223,15 @@ static void __init omap3_cpuinfo(void) 
	 * and CPU class bits.

	 */

	if (soc_is_omap3630()) {

		cpu_name = "OMAP3630";

		if (omap3_has_iva() && omap3_has_sgx()) {

			cpu_name = (omap3_has_isp()) ? "OMAP3630/DM3730" : "OMAP3621";

		} else if (omap3_has_iva()) {

			cpu_name = "DM3725";

		} else if (omap3_has_sgx()) {

			cpu_name = "OMAP3615/AM3715";

		} else {

			cpu_name = (omap3_has_isp()) ? "AM3703" : "OMAP3611";

		}

	} else if (soc_is_am35xx()) {

		cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505";

	} else if (soc_is_ti816x()) {

arch/arm/mach-omap2/omap_hwmod_54xx_data.c

+6 −2
Original line number Diff line number Diff line
@@ -1748,6 +1748,7 @@ static struct omap_hwmod omap54xx_uart1_hwmod = { 
	.name		= "uart1",

	.class		= &omap54xx_uart_hwmod_class,

	.clkdm_name	= "l4per_clkdm",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.main_clk	= "func_48m_fclk",

	.prcm = {

		.omap4 = {
@@ -1763,6 +1764,7 @@ static struct omap_hwmod omap54xx_uart2_hwmod = { 
	.name		= "uart2",

	.class		= &omap54xx_uart_hwmod_class,

	.clkdm_name	= "l4per_clkdm",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.main_clk	= "func_48m_fclk",

	.prcm = {

		.omap4 = {
@@ -1778,7 +1780,7 @@ static struct omap_hwmod omap54xx_uart3_hwmod = { 
	.name		= "uart3",

	.class		= &omap54xx_uart_hwmod_class,

	.clkdm_name	= "l4per_clkdm",

	.flags		= DEBUG_OMAP4UART3_FLAGS,

	.flags		= DEBUG_OMAP4UART3_FLAGS | HWMOD_SWSUP_SIDLE_ACT,

	.main_clk	= "func_48m_fclk",

	.prcm = {

		.omap4 = {
@@ -1794,7 +1796,7 @@ static struct omap_hwmod omap54xx_uart4_hwmod = { 
	.name		= "uart4",

	.class		= &omap54xx_uart_hwmod_class,

	.clkdm_name	= "l4per_clkdm",

	.flags		= DEBUG_OMAP4UART4_FLAGS,

	.flags		= DEBUG_OMAP4UART4_FLAGS | HWMOD_SWSUP_SIDLE_ACT,

	.main_clk	= "func_48m_fclk",

	.prcm = {

		.omap4 = {
@@ -1810,6 +1812,7 @@ static struct omap_hwmod omap54xx_uart5_hwmod = { 
	.name		= "uart5",

	.class		= &omap54xx_uart_hwmod_class,

	.clkdm_name	= "l4per_clkdm",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.main_clk	= "func_48m_fclk",

	.prcm = {

		.omap4 = {
@@ -1825,6 +1828,7 @@ static struct omap_hwmod omap54xx_uart6_hwmod = { 
	.name		= "uart6",

	.class		= &omap54xx_uart_hwmod_class,

	.clkdm_name	= "l4per_clkdm",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.main_clk	= "func_48m_fclk",

	.prcm = {

		.omap4 = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE