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

Commit af8999f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC non-urgent fixes from Arnd Bergmann:
 "We sometimes collect non-critical fixes that come in during the later
  part of the merge window in a branch for the next release instead, and
  this is that contents for v4.11.

  Most of these are OMAP fixes, dealing with OMAP36/37 detection, quirks
  and setup. There's also some fixes for Davinci and a Kconfig fix for
  SCPI to only enable on ARM{,64}"

* tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  firmware: arm_scpi: Add hardware dependencies
  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
  bus: da850-mstpri: fix my e-mail address
  ARM: davinci: da850: fix da850_set_pll0rate()
  ARM: davinci: da850: coding style fix
parents 60e8d3e1 92f3e6eb

arch/arm/boot/dts/am33xx.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -145,10 +145,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
@@ -252,7 +252,7 @@ 
			};



			uart1: uart@20000 {

				compatible = "ti,omap3-uart";

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

				ti,hwmods = "uart1";

				reg = <0x20000 0x2000>;

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



			uart2: uart@22000 {

				compatible = "ti,omap3-uart";

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

				ti,hwmods = "uart2";

				reg = <0x22000 0x2000>;

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



			uart3: uart@24000 {

				compatible = "ti,omap3-uart";

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

				ti,hwmods = "uart3";

				reg = <0x24000 0x2000>;

				clock-frequency = <48000000>;
@@ -332,10 +332,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
@@ -373,7 +373,7 @@ 
		};



		uart1: uart@48020000 {

			compatible = "ti,omap3-uart";

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

			ti,hwmods = "uart1";

			reg = <0x48020000 0x2000>;

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



		uart2: uart@48022000 {

			compatible = "ti,omap3-uart";

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

			ti,hwmods = "uart2";

			reg = <0x48022000 0x2000>;

			clock-frequency = <48000000>;
@@ -393,7 +393,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-davinci/da850.c

+19 −5
Original line number Diff line number Diff line
@@ -1194,14 +1194,28 @@ static int da850_set_armrate(struct clk *clk, unsigned long index) 
	return clk_set_rate(pllclk, index);

}



static int da850_set_pll0rate(struct clk *clk, unsigned long index)

static int da850_set_pll0rate(struct clk *clk, unsigned long rate)

{

	unsigned int prediv, mult, postdiv;

	struct da850_opp *opp;

	struct pll_data *pll = clk->pll_data;

	struct cpufreq_frequency_table *freq;

	unsigned int prediv, mult, postdiv;

	struct da850_opp *opp = NULL;

	int ret;



	opp = (struct da850_opp *) cpufreq_info.freq_table[index].driver_data;

	rate /= 1000;



	for (freq = da850_freq_table;

	     freq->frequency != CPUFREQ_TABLE_END; freq++) {

		/* rate is in Hz, freq->frequency is in KHz */

		if (freq->frequency == rate) {

			opp = (struct da850_opp *)freq->driver_data;

			break;

		}

	}



	if (!opp)

		return -EINVAL;



	prediv = opp->prediv;

	mult = opp->mult;

	postdiv = opp->postdiv;

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()) {