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

Commit d71fc239 authored Sep 10, 2015 by Linus Torvalds

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

Pull late ARM SoC updates from Kevin Hilman:
 "This is a collection of a few late fixes and other misc stuff that had
  dependencies on things being merged from other trees.

  The bulk of the changes are for samsung/exynos SoCs for some changes
  that needed a few minor reworks so ended up a bit late.  The others
  are mainly for qcom SoCs: a couple fixes and some DTS updates"

* tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits)
  ARM: multi_v7_defconfig: Enable PBIAS regulator
  soc: qcom: smd: Correct fBLOCKREADINTR handling
  soc: qcom: smd: Use correct remote processor ID
  soc: qcom: smem: Fix errant private access
  ARM: dts: qcom: msm8974-sony-xperia-honami: Use stdout-path
  ARM: dts: qcom: msm8960-cdp: Use stdout-path
  ARM: dts: qcom: msm8660-surf: Use stdout-path
  ARM: dts: qcom: ipq8064-ap148: Use stdout-path
  ARM: dts: qcom: apq8084-mtp: Use stdout-path
  ARM: dts: qcom: apq8084-ifc6540: Use stdout-path
  ARM: dts: qcom: apq8074-dragonboard: Use stdout-path
  ARM: dts: qcom: apq8064-ifc6410: Use stdout-path
  ARM: dts: qcom: apq8064-cm-qs600: Use stdout-path
  ARM: dts: qcom: Label serial nodes for aliasing and stdout-path
  reset: ath79: Fix missing spin_lock_init
  reset: Add (devm_)reset_control_get stub functions
  ARM: EXYNOS: switch to using generic cpufreq driver for exynos4x12
  cpufreq: exynos: Remove unselectable rule for arm-exynos-cpufreq.o
  ARM: dts: add iommu property to JPEG device for exynos4
  ARM: dts: enable SPI1 for exynos4412-odroidu3
  ...

parents 519f526d c6e59bda

Documentation/devicetree/bindings/soc/qcom/qcom,smd.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,12 @@ The edge is described by the following properties:
		Definition: the identifier of the remote processor in the smd channel
		allocation table

		- qcom,remote-pid:
		Usage: optional
		Value type: <u32>
		Definition: the identifier for the remote processor as known by the rest
		of the system.

		= SMD DEVICES

		In turn, subnodes of the "edges" represent devices tied to SMD channels on that

arch/arm/boot/dts/exynos3250-monk.dts

+19 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,21 @@
		min-microvolt = <1100000>;
		max-microvolt = <2700000>;
		};

		thermal-zones {
		cpu_thermal: cpu-thermal {
		cooling-maps {
		map0 {
		/* Correspond to 500MHz at freq_table */
		cooling-device = <&cpu0 5 5>;
		};
		map1 {
		/* Correspond to 200MHz at freq_table */
		cooling-device = <&cpu0 8 8>;
		};
		};
		};
		};
		};

		&adc {
		@@ -141,6 +156,10 @@
		};
		};

		&cpu0 {
		cpu0-supply = <&buck2_reg>;
		};

		&exynos_usbphy {
		status = "okay";
		};

arch/arm/boot/dts/exynos3250-rinato.dts

+19 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,21 @@
		min-microvolt = <1100000>;
		max-microvolt = <2700000>;
		};

		thermal-zones {
		cpu_thermal: cpu-thermal {
		cooling-maps {
		map0 {
		/* Corresponds to 500MHz */
		cooling-device = <&cpu0 5 5>;
		};
		map1 {
		/* Corresponds to 200MHz */
		cooling-device = <&cpu0 8 8>;
		};
		};
		};
		};
		};

		&adc {
		@@ -132,6 +147,10 @@
		};
		};

		&cpu0 {
		cpu0-supply = <&buck2_reg>;
		};

		&exynos_usbphy {
		status = "okay";
		};

arch/arm/boot/dts/exynos3250.dtsi

+16 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,22 @@
		compatible = "arm,cortex-a7";
		reg = <0>;
		clock-frequency = <1000000000>;
		clocks = <&cmu CLK_ARM_CLK>;
		clock-names = "cpu";
		#cooling-cells = <2>;

		operating-points = <
		1000000 1150000
		900000 1112500
		800000 1075000
		700000 1037500
		600000 1000000
		500000 962500
		400000 925000
		300000 887500
		200000 850000
		100000 850000
		>;
		};

		cpu1: cpu@1 {

arch/arm/boot/dts/exynos4.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -702,6 +702,7 @@
		clocks = <&clock CLK_JPEG>;
		clock-names = "jpeg";
		power-domains = <&pd_cam>;
		iommus = <&sysmmu_jpeg>;
		};

		hdmi: hdmi@12D00000 {