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

Commit 944d01c5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.12/dt-v2-signed' of... 

Merge tag 'omap-for-v4.12/dt-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "Devicetree changes for omaps for v4.12 merge window" from Tony Lindgren:

- Add hecc node for am35x

- Add onenand support for omap3-igep

- Add bluetooth binding for n900/n9/n950

- Configure clocks and SATA for dm81xx

- Update operating points tables for am33xx, am43xx and dra7

- Update SPI flash documentation for w25q64

- Configure SPI NOR for am335x-icev2

- Mux uart0 for am437x-gp-evm

- Add thermal zones for omap3, omap4, omap5, dra7

- Configure LEDs for am335x-baltos

- A series of droid 4 changes to configure various devices
  such as keypad, regulators, gpio-keys, rtc, power button,
  compass, accelerometer, touchscreen, backlight, poweroff,
  tmp105, HDMI, LCD panel and LEDs, EHCI, and micro-SD

* tag 'omap-for-v4.12/dt-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (35 commits)
  ARM: dts: am335x-baltos: add LED support
  ARM: dts: omap4-droid4: Fix MMC1 card for detect GPIO and regulator
  ARM: dts: OMAP4460: Thermal: Add slope and offset values
  ARM: dts: OMAP443x: Thermal: Add slope and offset values
  ARM: dts: OMAP5: Thermal: Add slope and offset values
  ARM: dts: DRA7: Thermal: Add slope and offset values
  ARM: dts: omap3: Add cpu_thermal zone
  ARM: dts: am437x-gp-evm: Add pinmux for uart0
  ARM: dts: am335x-icev2: Add SPI based NOR
  Documentation: devicetree: mtd: add w25q64 to list of supported SPI flashes
  ARM: dts: dra7: Add updated operating-points-v2 table for cpu
  ARM: dts: am4372: Update operating-points-v2 table for cpu
  ARM: dts: am335x-boneblack: Enable 1GHz OPP for cpu
  ARM: dts: am33xx: Add updated operating-points-v2 table for cpu
  ARM: dts: dm8168-evm: add SATA node
  ARM: dts: dm8168-evm: add the external reference clock for SATA
  ARM: dts: N9/N950: add bluetooth
  ARM: dts: N900: Add bluetooth
  ARM: dts: omap4-droid4: Configure EHCI so modems can be accessed
  ARM: dts: motorola-cpcap-mapphone: add LEDs
  ...
parents 5ea67992 da72e493

Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ Required properties: 
                 w25x80

                 w25x80

                 w25x32

                 w25x32

                 w25q32

                 w25q32

                 w25q64

                 w25q32dw

                 w25q32dw

                 w25q80bl

                 w25q80bl

                 w25q128

                 w25q128

arch/arm/boot/dts/am335x-baltos-ir2110.dts

+1 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
/dts-v1/;

/dts-v1/;





#include "am335x-baltos.dtsi"

#include "am335x-baltos.dtsi"

#include "am335x-baltos-leds.dtsi"





/ {

/ {

	model = "OnRISC Baltos iR 2110";

	model = "OnRISC Baltos iR 2110";

arch/arm/boot/dts/am335x-baltos-ir3220.dts

+1 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
/dts-v1/;

/dts-v1/;





#include "am335x-baltos.dtsi"

#include "am335x-baltos.dtsi"

#include "am335x-baltos-leds.dtsi"





/ {

/ {

	model = "OnRISC Baltos iR 3220";

	model = "OnRISC Baltos iR 3220";

arch/arm/boot/dts/am335x-baltos-ir5221.dts

+1 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
/dts-v1/;

/dts-v1/;





#include "am335x-baltos.dtsi"

#include "am335x-baltos.dtsi"

#include "am335x-baltos-leds.dtsi"





/ {

/ {

	model = "OnRISC Baltos iR 5221";

	model = "OnRISC Baltos iR 5221";

arch/arm/boot/dts/am335x-baltos-leds.dtsi

0 → 100644
+50 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



/*

 * VScom OnRISC

 * http://www.vscom.de

 */



/*#include "am33xx.dtsi"*/



/ {

	leds {

		pinctrl-names = "default";

		pinctrl-0 = <&user_leds>;



		compatible = "gpio-leds";



		power {

			label = "onrisc:red:power";

			linux,default-trigger = "default-on";

			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;

			default-state = "on";

		};

		wlan {

			label = "onrisc:blue:wlan";

			gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

		app {

			label = "onrisc:green:app";

			gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;

			default-state = "off";

		};

	};

};



&am33xx_pinmux {

	user_leds: pinmux_user_leds {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x908, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* mii1_col.gpio3_0 PWR LED */

			AM33XX_IOPAD(0x91c, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* mii1_txd3.gpio0_16 WLAN LED */

			AM33XX_IOPAD(0x920, PIN_OUTPUT_PULLDOWN | MUX_MODE7)	/* mii1_txd2.gpio0_17 APP LED */

		>;

	};

};