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

Commit f538a82c authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull ARM SoC fixes from Olof Johansson:
 "We had a small batch of fixes before -rc1, but here is a larger one.
  It contains a backmerge of 4.12-rc1 since some of the downstream
  branches we merge had that as base; at the same time we already had
  merged contents before -rc1 and rebase wasn't the right solution.

  A mix of random smaller fixes and a few things worth pointing out:

   - We've started telling people to avoid cross-tree shared branches if
     all they're doing is picking up one or two DT-used constants from a
     shared include file, and instead to use the numeric values on first
     submission. Follow-up moving over to symbolic names are sent in
     right after -rc1, i.e. here. It's only a few minor patches of this
     type.

   - Linus Walleij and others are resurrecting the 'Gemini' platform,
     and wanted a cut-down platform-specific defconfig for it. So I
     picked that up for them.

   - Rob Herring ran 'savedefconfig' on arm64, it's a bit churny but it
     helps people to prepare patches since it's a pain when defconfig
     and current savedefconfig contents differs too much.

   - Devicetree additions for some pinctrl drivers for Armada that were
     merged this window. I'd have preferred to see those earlier but
     it's not a huge deail.

  The biggest change worth pointing out though since it's touching other
  parts of the tree: We added prefixes to be used when cross-including
  DT contents between arm64 and arm, allowing someone to #include
  <arm/foo.dtsi> from arm64, and likewise. As part of that, we needed
  arm/foo.dtsi to work on arm as well. The way I suggested this to Heiko
  resulted in a recursive symlink.

  Instead, I've now moved it out of arch/*/boot/dts/include, into a
  shared location under scripts/dtc. While I was at it, I consolidated
  so all architectures now behave the same way in this manner.

  Rob Herring (DT maintainer) has acked it. I cc:d most other arch
  maintainers but nobody seems to care much; it doesn't really affect
  them since functionality is unchanged for them by default"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
  arm64: dts: rockchip: fix include reference
  firmware: ti_sci: fix strncat length check
  ARM: remove duplicate 'const' annotations'
  arm64: defconfig: enable options needed for QCom DB410c board
  arm64: defconfig: sync with savedefconfig
  ARM: configs: add a gemini defconfig
  devicetree: Move include prefixes from arch to separate directory
  ARM: dts: dra7: Reduce cpu thermal shutdown temperature
  memory: omap-gpmc: Fix debug output for access width
  ARM: dts: LogicPD Torpedo: Fix camera pin mux
  ARM: dts: omap4: enable CEC pin for Pandaboard A4 and ES
  ARM: dts: gta04: fix polarity of clocks for mcbsp4
  ARM: dts: dra7: Add power hold and power controller properties to palmas
  soc: imx: add PM dependency for IMX7_PM_DOMAINS
  ARM: dts: imx6sx-sdb: Remove OPP override
  ARM: dts: imx53-qsrb: Pulldown PMIC IRQ pin
  soc: bcm: brcmstb: Correctly match 7435 SoC
  tee: add ARM_SMCCC dependency
  ARM: omap2+: make omap4_get_cpu1_ns_pa_addr declaration usable
  ARM64: dts: mediatek: configure some fixed mmc parameters
  ...
parents 2fe296a6 6bf1c2d2
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
/ {
/ {
	aliases {
	aliases {
		ethernet = &ethernet;
		ethernet0 = &ethernet;
	};
	};
};
};


+1 −1
Original line number Original line Diff line number Diff line
/ {
/ {
	aliases {
	aliases {
		ethernet = &ethernet;
		ethernet0 = &ethernet;
	};
	};
};
};


+13 −9
Original line number Original line Diff line number Diff line
@@ -198,8 +198,8 @@
				brcm,pins = <0 1>;
				brcm,pins = <0 1>;
				brcm,function = <BCM2835_FSEL_ALT0>;
				brcm,function = <BCM2835_FSEL_ALT0>;
			};
			};
			i2c0_gpio32: i2c0_gpio32 {
			i2c0_gpio28: i2c0_gpio28 {
				brcm,pins = <32 34>;
				brcm,pins = <28 29>;
				brcm,function = <BCM2835_FSEL_ALT0>;
				brcm,function = <BCM2835_FSEL_ALT0>;
			};
			};
			i2c0_gpio44: i2c0_gpio44 {
			i2c0_gpio44: i2c0_gpio44 {
@@ -295,20 +295,28 @@
			/* Separate from the uart0_gpio14 group
			/* Separate from the uart0_gpio14 group
			 * because it conflicts with spi1_gpio16, and
			 * because it conflicts with spi1_gpio16, and
			 * people often run uart0 on the two pins
			 * people often run uart0 on the two pins
			 * without flow contrl.
			 * without flow control.
			 */
			 */
			uart0_ctsrts_gpio16: uart0_ctsrts_gpio16 {
			uart0_ctsrts_gpio16: uart0_ctsrts_gpio16 {
				brcm,pins = <16 17>;
				brcm,pins = <16 17>;
				brcm,function = <BCM2835_FSEL_ALT3>;
				brcm,function = <BCM2835_FSEL_ALT3>;
			};
			};
			uart0_gpio30: uart0_gpio30 {
			uart0_ctsrts_gpio30: uart0_ctsrts_gpio30 {
				brcm,pins = <30 31>;
				brcm,pins = <30 31>;
				brcm,function = <BCM2835_FSEL_ALT3>;
				brcm,function = <BCM2835_FSEL_ALT3>;
			};
			};
			uart0_ctsrts_gpio32: uart0_ctsrts_gpio32 {
			uart0_gpio32: uart0_gpio32 {
				brcm,pins = <32 33>;
				brcm,pins = <32 33>;
				brcm,function = <BCM2835_FSEL_ALT3>;
				brcm,function = <BCM2835_FSEL_ALT3>;
			};
			};
			uart0_gpio36: uart0_gpio36 {
				brcm,pins = <36 37>;
				brcm,function = <BCM2835_FSEL_ALT2>;
			};
			uart0_ctsrts_gpio38: uart0_ctsrts_gpio38 {
				brcm,pins = <38 39>;
				brcm,function = <BCM2835_FSEL_ALT2>;
			};


			uart1_gpio14: uart1_gpio14 {
			uart1_gpio14: uart1_gpio14 {
				brcm,pins = <14 15>;
				brcm,pins = <14 15>;
@@ -326,10 +334,6 @@
				brcm,pins = <30 31>;
				brcm,pins = <30 31>;
				brcm,function = <BCM2835_FSEL_ALT5>;
				brcm,function = <BCM2835_FSEL_ALT5>;
			};
			};
			uart1_gpio36: uart1_gpio36 {
				brcm,pins = <36 37 38 39>;
				brcm,function = <BCM2835_FSEL_ALT2>;
			};
			uart1_gpio40: uart1_gpio40 {
			uart1_gpio40: uart1_gpio40 {
				brcm,pins = <40 41>;
				brcm,pins = <40 41>;
				brcm,function = <BCM2835_FSEL_ALT5>;
				brcm,function = <BCM2835_FSEL_ALT5>;
+2 −0
Original line number Original line Diff line number Diff line
@@ -204,6 +204,8 @@
	tps659038: tps659038@58 {
	tps659038: tps659038@58 {
		compatible = "ti,tps659038";
		compatible = "ti,tps659038";
		reg = <0x58>;
		reg = <0x58>;
		ti,palmas-override-powerhold;
		ti,system-power-controller;


		tps659038_pmic {
		tps659038_pmic {
			compatible = "ti,tps659038-pmic";
			compatible = "ti,tps659038-pmic";
+4 −0
Original line number Original line Diff line number Diff line
@@ -2017,4 +2017,8 @@
	coefficients = <0 2000>;
	coefficients = <0 2000>;
};
};


&cpu_crit {
	temperature = <120000>; /* milli Celsius */
};

/include/ "dra7xx-clocks.dtsi"
/include/ "dra7xx-clocks.dtsi"
Loading