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

Commit 4cb635d7 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'ux500-devicetree-for-v3.12-1' of... 

Merge tag 'ux500-devicetree-for-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

From: Linus Walleij:
Ux500 device tree enablement base for the v3.12
development cycle:
- Various cleanups like remove non-existant hardware from
  the Snowball device tree, prefix all files with "ste-*"
- External regulators
- Documentation updates
- Delete some minor dangling platform data
- Pin control settings for U8540 through DT

* tag 'ux500-devicetree-for-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (22 commits)
  ARM: ux500: fix devicetree builds
  ARM: ux500: Remove u9540.dts as it's been replaced
  ARM: ux500: Apply a ste-* prefix onto dbx5x0.dtsi
  ARM: ux500: Apply a ste-* prefix onto stuib.dtsi
  ARM: ux500: Apply a ste-* prefix onto hrefv60plus.dts
  ARM: ux500: Apply a ste-* prefix onto hrefprev60.dts Signed-off-by: Lee Jones <lee.jones@linaro.org>
  ARM: ux500: Apply a ste-* prefix onto href.dtsi
  ARM: ux500: Apply a ste-* prefix onto ccu9540.dts
  ARM: ux500: Apply a ste-* prefix onto ccu8540.dts
  ARM: ux500: Apply a ste-* prefix onto snowball.dts
  ARM: ux500: Remove Snowball DTS entry for ROHM BH1780GLI ambient light sensor
  ARM: ux500: Remove Snowball DTS entry for TPS61052 chip
  ARM: ux500: Remove Snowball DTS entry for National Semiconductor LP5521 LED chip
  ARM: ux500: Remove Toshiba TC35892 I/O Expander's DT entry from Snowball's DTS
  ARM: u8540: DT: Set pinctrl mapping to i2c0,1,2,4 & 5
  ARM: u8540: Add Pinctrl Device Tree settings for uart0, uart2
  ARM: ux500: Stop passing MMC's platform data for Device Tree boots
  Documentation: Update binding for Nomadik and DBx5x based platforms
  ARM: ux500: Supply external regulator names for Snowball's DT
  ARM: ux500: Provide a supply name for the AB8500 AUX regulators to use
  ...
parents 080e3da4 2ce05a14

Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt

+3 −3
Original line number Diff line number Diff line 
ST Ericsson Nomadik pinmux controller



Required properties:

- compatible: "stericsson,nmk-pinctrl", "stericsson,nmk-pinctrl-db8540",

              "stericsson,nmk-pinctrl-stn8815"

- compatible: "stericsson,db8500-pinctrl", "stericsson,db8540-pinctrl",

              "stericsson,stn8815-pinctrl"

- reg: Should contain the register physical address and length of the PRCMU.



Please refer to pinctrl-bindings.txt in this directory for details of the
@@ -68,7 +68,7 @@ Optional subnode-properties: 
Example board file extract:



	pinctrl@80157000 {

		compatible = "stericsson,nmk-pinctrl";

		compatible = "stericsson,db8500-pinctrl";

		reg = <0x80157000 0x2000>;



		pinctrl-names = "default";

arch/arm/boot/dts/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -176,11 +176,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	am43x-epos-evm.dtb

dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \

	hrefprev60.dtb \

	hrefv60plus.dtb \

	ccu8540.dtb \

	ccu9540.dtb

dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \

	ste-hrefprev60.dtb \

	ste-hrefv60plus.dtb \

	ste-ccu8540.dtb \

	ste-ccu9540.dtb

dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

	emev2-kzm9d-reference.dtb \

arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi

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

 * Copyright 2012 ST-Ericsson

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */

#include "ste-nomadik-pinctrl.dtsi"



/ {

	soc {

		pinctrl {

			uart0 {

				uart0_default_mux: uart0_mux {

					default_mux {

						ste,function = "u0";

						ste,pins = "u0_a_1";

					};

				};



				uart0_default_mode: uart0_default {

					default_cfg1 {

						ste,pins = "GPIO0", "GPIO2";

						ste,config = <&in_pu>;

					};



					default_cfg2 {

						ste,pins = "GPIO1", "GPIO3";

						ste,config = <&out_hi>;

					};

				};



				uart0_sleep_mode: uart0_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO0", "GPIO2";

						ste,config = <&slpm_in_pu>;

					};



					sleep_cfg2 {

						ste,pins = "GPIO1", "GPIO3";

						ste,config = <&slpm_out_hi>;

					};

				};

			};



			uart2 {

				uart2_default_mode: uart2_default {

					default_mux {

						ste,function = "u2";

						ste,pins = "u2txrx_a_1";

					};



					default_cfg1 {

						ste,pins = "GPIO120";

						ste,config = <&in_pu>;

					};



					default_cfg2 {

						ste,pins = "GPIO121";

						ste,config = <&out_hi>;

					};

				};



				uart2_sleep_mode: uart2_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO120";

						ste,config = <&slpm_in_pu>;

					};



					sleep_cfg2 {

						ste,pins = "GPIO121";

						ste,config = <&slpm_out_hi>;

					};

				};

			};



			i2c0 {

				i2c0_default_mux: i2c_mux {

					default_mux {

						ste,function = "i2c0";

						ste,pins = "i2c0_a_1";

					};

				};



				i2c0_default_mode: i2c_default {

					default_cfg1 {

						ste,pins = "GPIO147", "GPIO148";

						ste,config = <&in_pu>;

					};

				};



				i2c0_sleep_mode: i2c_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO147", "GPIO148";

						ste,config = <&slpm_in_pu>;

					};

				};

			};



			i2c1 {

				i2c1_default_mux: i2c_mux {

					default_mux {

						ste,function = "i2c1";

						ste,pins = "i2c1_b_2";

					};

				};



				i2c1_default_mode: i2c_default {

					default_cfg1 {

						ste,pins = "GPIO16", "GPIO17";

						ste,config = <&in_pu>;

					};

				};



				i2c1_sleep_mode: i2c_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO16", "GPIO17";

						ste,config = <&slpm_in_pu>;

					};

				};

			};



			i2c2 {

				i2c2_default_mux: i2c_mux {

					default_mux {

						ste,function = "i2c2";

						ste,pins = "i2c2_b_2";

					};

				};



				i2c2_default_mode: i2c_default {

					default_cfg1 {

						ste,pins = "GPIO10", "GPIO11";

						ste,config = <&in_pu>;

					};

				};



				i2c2_sleep_mode: i2c_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO11", "GPIO11";

						ste,config = <&slpm_in_pu>;

					};

				};

			};



			i2c4 {

				i2c4_default_mux: i2c_mux {

					default_mux {

						ste,function = "i2c4";

						ste,pins = "i2c4_b_2";

					};

				};



				i2c4_default_mode: i2c_default {

					default_cfg1 {

						ste,pins = "GPIO122", "GPIO123";

						ste,config = <&in_pu>;

					};

				};



				i2c4_sleep_mode: i2c_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO122", "GPIO123";

						ste,config = <&slpm_in_pu>;

					};

				};

			};



			i2c5 {

				i2c5_default_mux: i2c_mux {

					default_mux {

						ste,function = "i2c5";

						ste,pins = "i2c5_c_2";

					};

				};



				i2c5_default_mode: i2c_default {

					default_cfg1 {

						ste,pins = "GPIO118", "GPIO119";

						ste,config = <&in_pu>;

					};

				};



				i2c5_sleep_mode: i2c_sleep {

					sleep_cfg1 {

						ste,pins = "GPIO118", "GPIO119";

						ste,config = <&slpm_in_pu>;

					};

				};

			};

		};

	};

};

arch/arm/boot/dts/ccu8540.dts→arch/arm/boot/dts/ste-ccu8540.dts

+86 −0
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ 
 */



/dts-v1/;

#include "dbx5x0.dtsi"

#include "ste-dbx5x0.dtsi"

#include "ste-ccu8540-pinctrl.dtsi"



/ {

	model = "ST-Ericsson U8540 platform with Device Tree";
@@ -21,12 +22,19 @@ 
	};



	soc {

		pinctrl {

			compatible = "stericsson,db8540-pinctrl";

		};



		prcmu@80157000 {

			reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x3000>;

			reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";

		};



		uart@80120000 {

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&uart0_default_mux>, <&uart0_default_mode>;

			pinctrl-1 = <&uart0_sleep_mode>;

			status = "okay";

		};
@@ -35,7 +43,44 @@ 
		};



		uart@80007000 {

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&uart2_default_mode>;

			pinctrl-1 = <&uart2_sleep_mode>;

			status = "okay";

		};



		i2c0: i2c@80004000 {

			pinctrl-names = "default","sleep";

			pinctrl-0 = <&i2c0_default_mux>, <&i2c0_default_mode>;

			pinctrl-1 = <&i2c0_sleep_mode>;

		};



		i2c1: i2c@80122000 {

			pinctrl-names = "default","sleep";

			pinctrl-0 = <&i2c1_default_mux>, <&i2c1_default_mode>;

			pinctrl-1 = <&i2c1_sleep_mode>;

		};



		i2c2: i2c@80128000 {

			pinctrl-names = "default","sleep";

			pinctrl-0 = <&i2c2_default_mux>, <&i2c2_default_mode>;

			pinctrl-1 = <&i2c2_sleep_mode>;

		};



		i2c3: i2c@80110000 {

			status = "disabled";

		};



		i2c4: i2c@8012a000 {

			pinctrl-names = "default","sleep";

			pinctrl-0 = <&i2c4_default_mux>, <&i2c4_default_mode>;

			pinctrl-1 = <&i2c4_sleep_mode>;

		};



		i2c5: i2c@80001000 {

			pinctrl-names = "default","sleep";

			pinctrl-0 = <&i2c5_default_mux>, <&i2c5_default_mode>;

			pinctrl-1 = <&i2c5_sleep_mode>;

		};

	};

};

arch/arm/boot/dts/ccu9540.dts→arch/arm/boot/dts/ste-ccu9540.dts

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 */



/dts-v1/;

#include "dbx5x0.dtsi"

#include "ste-dbx5x0.dtsi"



/ {

	model = "ST-Ericsson CCU9540 platform with Device Tree";