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

Commit 79e61542 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull ARM SoC fixes from from Olof Johansson:
 "A collection of fixes for ARM platforms.  A little large due to us
  missing to do one last week, but there's nothing in particular here
  that is in itself large and scary.

  Mostly a handful of smaller fixes all over the place.  The majority is
  made up of fixes for OMAP, but there are a few for others as well.  In
  particular, there was a decision to rename a binding for the Broadcom
  pinctrl block that we need to go in before the final release since we
  then treat it as ABI"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: omap3-gta04: Add ti,omap36xx to compatible property to avoid problems with booting
  ARM: tegra: add LED options back into tegra_defconfig
  ARM: dts: omap3-igep: fix boot fail due wrong compatible match
  ARM: OMAP3: Fix pinctrl interrupts for core2
  pinctrl: Rename Broadcom Capri pinctrl binding
  pinctrl: refer to updated dt binding string.
  Update dtsi with new pinctrl compatible string
  ARM: OMAP: Kill warning in CPUIDLE code with !CONFIG_SMP
  ARM: OMAP2+: Add support for thumb mode on DT booted N900
  ARM: OMAP2+: clock: fix clkoutx2 with CLK_SET_RATE_PARENT
  ARM: OMAP4: hwmod: Fix SOFTRESET logic for OMAP4
  ARM: DRA7: hwmod data: correct the sysc data for spinlock
  ARM: OMAP5: PRM: Fix reboot handling
  ARM: sunxi: dt: Change the touchscreen compatibles
  ARM: sun7i: dt: Fix interrupt trigger types
parents fe9ea91c 10554647
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
Broadcom Capri Pin Controller
Broadcom BCM281xx Pin Controller

This is a pin controller for the Broadcom BCM281xx SoC family, which includes
BCM11130, BCM11140, BCM11351, BCM28145, and BCM28155 SoCs.
@@ -7,14 +7,14 @@ BCM11130, BCM11140, BCM11351, BCM28145, and BCM28155 SoCs.

Required Properties:

- compatible:	Must be "brcm,capri-pinctrl".
- compatible:	Must be "brcm,bcm11351-pinctrl"
- reg:		Base address of the PAD Controller register block and the size
		of the block.

For example, the following is the bare minimum node:

	pinctrl@35004800 {
		compatible = "brcm,capri-pinctrl";
		compatible = "brcm,bcm11351-pinctrl";
		reg = <0x35004800 0x430>;
	};

@@ -119,7 +119,7 @@ Optional Properties (for HDMI pins):
Example:
// pin controller node
pinctrl@35004800 {
	compatible = "brcm,capri-pinctrl";
	compatible = "brcmbcm11351-pinctrl";
	reg = <0x35004800 0x430>;

	// pin configuration node
+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@
	};

	pinctrl@35004800 {
		compatible = "brcm,capri-pinctrl";
		compatible = "brcm,bcm11351-pinctrl";
		reg = <0x35004800 0x430>;
	};

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@

/ {
	model = "OMAP3 GTA04";
	compatible = "ti,omap3-gta04", "ti,omap3";
	compatible = "ti,omap3-gta04", "ti,omap36xx", "ti,omap3";

	cpus {
		cpu@0 {
+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@

/ {
	model = "IGEPv2 (TI OMAP AM/DM37x)";
	compatible = "isee,omap3-igep0020", "ti,omap3";
	compatible = "isee,omap3-igep0020", "ti,omap36xx", "ti,omap3";

	leds {
		pinctrl-names = "default";
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@

/ {
	model = "IGEP COM MODULE (TI OMAP AM/DM37x)";
	compatible = "isee,omap3-igep0030", "ti,omap3";
	compatible = "isee,omap3-igep0030", "ti,omap36xx", "ti,omap3";

	leds {
		pinctrl-names = "default";
Loading