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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) iQIcBAABAgAGBQJSDfMsAAoJEEEQszewGV1zg+cQAJBUM8IRpck+wgYyhEL9TsfO Lt98kq8fw2iiC3wYbC6VtGVTocOuaum6wchwuOPjK2bylPggrzCwjD3cLaNTUymD 8wy/fZtWF0KEWa81pkpDDVFqWa6gc9H5UIPVFknf4wDaxb+vvw12o3wApKh/ThC/ 8j0zE5gXQMmRehLRaM/cXqK1QBcFPZxL060e8s5N4CE47JeaLHn1GAlbYCi0QXmg rV0trMaZhRQvj+FCJe1vHaf32rjjE071feFnqq3Q519puQulVQI/ULIP4zE584UO Vu4Wys5SAiqJuj2IbnTxYJRvP1Xbr/rHTOhXIoh2Zy52JXm9fvCASTJ4GvUxHHeR UXnwiaiyp03qDiwB/EKb5dpINqiwAY64I+jkN9sj2LULTwtVR6wsV4jMuIAHAPfz w1ZU8Ea4U4dgF9XzWIs5nYNDxoHaBK8m/uj6qETcCjTKuGGixP6ziNgobH8g3DMZ KxklRVFozyZwrC7MMk8vgEqhNtFUrnl3sQw/SUCUSMRk4PzWOCSaAvPFicpRXT8D FmmG8h4jf95GaA+ndF3i92NCk2R6PO04SUlMGlBNEjc+okyGHkLnL7v1MkIom6EB nM1+DaY4urYSeKdA72I4VG/RJBjToAdk2qysJ9xQtWOqAx1C3diL/57QKkltC+d7 7tETJOTTm42QtgmTQmQq =Wm2y -----END PGP SIGNATURE----- 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 ...
This commit is contained in:
Kevin Hilman
commit
4cb635d705
|
|
@ -1,8 +1,8 @@
|
|||
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";
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
/*
|
||||
* Copyright 2013 ST-Ericsson AB
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
#include "dbx5x0.dtsi"
|
||||
|
||||
/ {
|
||||
model = "ST-Ericsson U8540 platform with Device Tree";
|
||||
compatible = "st-ericsson,ccu8540", "st-ericsson,u8540";
|
||||
|
||||
memory@0 {
|
||||
reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;
|
||||
};
|
||||
|
||||
soc {
|
||||
prcmu@80157000 {
|
||||
reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x3000>;
|
||||
reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
|
||||
};
|
||||
|
||||
uart@80120000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
uart@80121000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
uart@80007000 {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
};
|
||||
196
arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi
Normal file
196
arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi
Normal file
|
|
@ -0,0 +1,196 @@
|
|||
/*
|
||||
* 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>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
86
arch/arm/boot/dts/ste-ccu8540.dts
Normal file
86
arch/arm/boot/dts/ste-ccu8540.dts
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
/*
|
||||
* Copyright 2013 ST-Ericsson AB
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
#include "ste-dbx5x0.dtsi"
|
||||
#include "ste-ccu8540-pinctrl.dtsi"
|
||||
|
||||
/ {
|
||||
model = "ST-Ericsson U8540 platform with Device Tree";
|
||||
compatible = "st-ericsson,ccu8540", "st-ericsson,u8540";
|
||||
|
||||
memory@0 {
|
||||
reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;
|
||||
};
|
||||
|
||||
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";
|
||||
};
|
||||
|
||||
uart@80121000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
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>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
*/
|
||||
|
||||
/dts-v1/;
|
||||
#include "dbx5x0.dtsi"
|
||||
#include "ste-dbx5x0.dtsi"
|
||||
|
||||
/ {
|
||||
model = "ST-Ericsson CCU9540 platform with Device Tree";
|
||||
|
|
@ -245,7 +245,7 @@
|
|||
<22 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH";
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
|
||||
db8500-prcmu-regulators {
|
||||
compatible = "stericsson,db8500-prcmu-regulator";
|
||||
|
|
@ -457,8 +457,36 @@
|
|||
stericsson,earpeice-cmv = <950>; /* Units in mV. */
|
||||
};
|
||||
|
||||
ext_regulators: ab8500-ext-regulators {
|
||||
compatible = "stericsson,ab8500-ext-regulator";
|
||||
|
||||
ab8500_ext1_reg: ab8500_ext1 {
|
||||
regulator-compatible = "ab8500_ext1";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
ab8500_ext2_reg: ab8500_ext2 {
|
||||
regulator-compatible = "ab8500_ext2";
|
||||
regulator-min-microvolt = <1360000>;
|
||||
regulator-max-microvolt = <1360000>;
|
||||
regulator-boot-on;
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
ab8500_ext3_reg: ab8500_ext3 {
|
||||
regulator-compatible = "ab8500_ext3";
|
||||
regulator-min-microvolt = <3400000>;
|
||||
regulator-max-microvolt = <3400000>;
|
||||
regulator-boot-on;
|
||||
};
|
||||
};
|
||||
|
||||
ab8500-regulators {
|
||||
compatible = "stericsson,ab8500-regulator";
|
||||
vin-supply = <&ab8500_ext3_reg>;
|
||||
|
||||
// supplies to the display/camera
|
||||
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
*/
|
||||
|
||||
#include <dt-bindings/interrupt-controller/irq.h>
|
||||
#include "dbx5x0.dtsi"
|
||||
#include "ste-dbx5x0.dtsi"
|
||||
|
||||
/ {
|
||||
memory {
|
||||
|
|
@ -10,9 +10,9 @@
|
|||
*/
|
||||
|
||||
/dts-v1/;
|
||||
#include "dbx5x0.dtsi"
|
||||
#include "href.dtsi"
|
||||
#include "stuib.dtsi"
|
||||
#include "ste-dbx5x0.dtsi"
|
||||
#include "ste-href.dtsi"
|
||||
#include "ste-stuib.dtsi"
|
||||
|
||||
/ {
|
||||
model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
|
||||
|
|
@ -10,9 +10,9 @@
|
|||
*/
|
||||
|
||||
/dts-v1/;
|
||||
#include "dbx5x0.dtsi"
|
||||
#include "href.dtsi"
|
||||
#include "stuib.dtsi"
|
||||
#include "ste-dbx5x0.dtsi"
|
||||
#include "ste-href.dtsi"
|
||||
#include "ste-stuib.dtsi"
|
||||
|
||||
/ {
|
||||
model = "ST-Ericsson HREF (v60+) platform with Device Tree";
|
||||
95
arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
Normal file
95
arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
/*
|
||||
* 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 <dt-bindings/pinctrl/nomadik.h>
|
||||
|
||||
/ {
|
||||
in_nopull: in_nopull {
|
||||
ste,input = <INPUT_NOPULL>;
|
||||
};
|
||||
|
||||
in_pu: input_pull_up {
|
||||
ste,input = <INPUT_PULLUP>;
|
||||
};
|
||||
|
||||
in_pd: input_pull_down {
|
||||
ste,input = <INPUT_PULLDOWN>;
|
||||
};
|
||||
|
||||
out_hi: output_high {
|
||||
ste,output = <OUTPUT_HIGH>;
|
||||
};
|
||||
|
||||
out_lo: output_low {
|
||||
ste,output = <OUTPUT_LOW>;
|
||||
};
|
||||
|
||||
gpio_out_lo: gpio_output_low {
|
||||
ste,gpio = <GPIOMODE_ENABLED>;
|
||||
ste,output = <OUTPUT_LOW>;
|
||||
};
|
||||
|
||||
slpm_in_pu: slpm_in_pu {
|
||||
ste,sleep = <SLPM_ENABLED>;
|
||||
ste,sleep-input = <SLPM_INPUT_PULLUP>;
|
||||
ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
|
||||
};
|
||||
|
||||
slpm_in_wkup_pdis: slpm_in_wkup_pdis {
|
||||
ste,sleep = <SLPM_ENABLED>;
|
||||
ste,sleep-input = <SLPM_DIR_INPUT>;
|
||||
ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
|
||||
ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
|
||||
};
|
||||
|
||||
slpm_out_lo: slpm_out_lo {
|
||||
ste,sleep = <SLPM_ENABLED>;
|
||||
ste,sleep-output = <SLPM_OUTPUT_LOW>;
|
||||
ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
|
||||
};
|
||||
|
||||
slpm_out_hi: slpm_out_hi {
|
||||
ste,sleep = <SLPM_ENABLED>;
|
||||
ste,sleep-output = <SLPM_OUTPUT_HIGH>;
|
||||
ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
|
||||
};
|
||||
|
||||
slpm_out_hi_wkup_pdis: slpm_out_hi_wkup_pdis {
|
||||
ste,sleep = <SLPM_ENABLED>;
|
||||
ste,sleep-output = <SLPM_OUTPUT_HIGH>;
|
||||
ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
|
||||
ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
|
||||
};
|
||||
|
||||
slpm_out_wkup_pdis: slpm_out_wkup_pdis {
|
||||
ste,sleep = <SLPM_ENABLED>;
|
||||
ste,sleep-output = <SLPM_DIR_OUTPUT>;
|
||||
ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
|
||||
ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
|
||||
};
|
||||
|
||||
in_wkup_pdis: in_wkup_pdis {
|
||||
ste,sleep-input = <SLPM_DIR_INPUT>;
|
||||
ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
|
||||
ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
|
||||
};
|
||||
|
||||
out_hi_wkup_pdis: out_hi_wkup_pdis {
|
||||
ste,sleep-output = <SLPM_OUTPUT_HIGH>;
|
||||
ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
|
||||
ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
|
||||
};
|
||||
|
||||
out_wkup_pdis: out_wkup_pdis {
|
||||
ste,sleep-output = <SLPM_DIR_OUTPUT>;
|
||||
ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
|
||||
ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
|
||||
};
|
||||
};
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
*/
|
||||
|
||||
/dts-v1/;
|
||||
#include "dbx5x0.dtsi"
|
||||
#include "ste-dbx5x0.dtsi"
|
||||
|
||||
/ {
|
||||
model = "Calao Systems Snowball platform with device tree";
|
||||
|
|
@ -165,34 +165,6 @@
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
i2c@80004000 {
|
||||
tc3589x@42 {
|
||||
//compatible = "tc3589x";
|
||||
reg = <0x42>;
|
||||
gpios = <&gpio6 25 0x4>;
|
||||
interrupt-parent = <&gpio6>;
|
||||
};
|
||||
tps61052@33 {
|
||||
//compatible = "tps61052";
|
||||
reg = <0x33>;
|
||||
};
|
||||
};
|
||||
|
||||
i2c@80128000 {
|
||||
lp5521@33 {
|
||||
// compatible = "lp5521";
|
||||
reg = <0x33>;
|
||||
};
|
||||
lp5521@34 {
|
||||
// compatible = "lp5521";
|
||||
reg = <0x34>;
|
||||
};
|
||||
bh1780@29 {
|
||||
// compatible = "rohm,bh1780gli";
|
||||
reg = <0x33>;
|
||||
};
|
||||
};
|
||||
|
||||
cpufreq-cooling {
|
||||
status = "okay";
|
||||
};
|
||||
|
|
@ -310,6 +282,20 @@
|
|||
compatible = "stericsson,ab8500-gpio";
|
||||
};
|
||||
|
||||
ext_regulators: ab8500-ext-regulators {
|
||||
ab8500_ext1_reg: ab8500_ext1 {
|
||||
regulator-name = "ab8500-ext-supply1";
|
||||
};
|
||||
|
||||
ab8500_ext2_reg_reg: ab8500_ext2 {
|
||||
regulator-name = "ab8500-ext-supply2";
|
||||
};
|
||||
|
||||
ab8500_ext3_reg_reg: ab8500_ext3 {
|
||||
regulator-name = "ab8500-ext-supply3";
|
||||
};
|
||||
};
|
||||
|
||||
ab8500-regulators {
|
||||
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
|
||||
regulator-name = "V-DISPLAY";
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
/*
|
||||
* Copyright 2012 ST-Ericsson AB
|
||||
*
|
||||
* 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
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
/include/ "dbx5x0.dtsi"
|
||||
|
||||
/ {
|
||||
model = "ST-Ericsson U9540 platform with Device Tree";
|
||||
compatible = "st-ericsson,u9540";
|
||||
|
||||
memory {
|
||||
reg = <0x00000000 0x20000000>;
|
||||
};
|
||||
|
||||
soc-u9500 {
|
||||
uart@80120000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
uart@80121000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
uart@80007000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
// External Micro SD slot
|
||||
sdi0_per1@80126000 {
|
||||
arm,primecell-periphid = <0x10480180>;
|
||||
max-frequency = <100000000>;
|
||||
bus-width = <4>;
|
||||
mmc-cap-sd-highspeed;
|
||||
mmc-cap-mmc-highspeed;
|
||||
vmmc-supply = <&ab8500_ldo_aux3_reg>;
|
||||
|
||||
cd-gpios = <&gpio7 6 0x4>; // 230
|
||||
cd-inverted;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
||||
// WLAN SDIO channel
|
||||
sdi1_per2@80118000 {
|
||||
arm,primecell-periphid = <0x10480180>;
|
||||
max-frequency = <50000000>;
|
||||
bus-width = <4>;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
// On-board eMMC
|
||||
sdi4_per2@80114000 {
|
||||
arm,primecell-periphid = <0x10480180>;
|
||||
max-frequency = <100000000>;
|
||||
bus-width = <8>;
|
||||
mmc-cap-mmc-highspeed;
|
||||
vmmc-supply = <&ab8500_ldo_aux2_reg>;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -223,10 +223,10 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
|
|||
OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", NULL),
|
||||
OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", NULL),
|
||||
OF_DEV_AUXDATA("arm,pl022", 0x80002000, "ssp0", &ssp0_plat),
|
||||
OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0", &mop500_sdi0_data),
|
||||
OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1", &mop500_sdi1_data),
|
||||
OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2", &mop500_sdi2_data),
|
||||
OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4", &mop500_sdi4_data),
|
||||
OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0", NULL),
|
||||
OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1", NULL),
|
||||
OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2", NULL),
|
||||
OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4", NULL),
|
||||
/* Requires clock name bindings. */
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e000, "gpio.0", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e080, "gpio.1", NULL),
|
||||
|
|
|
|||
36
include/dt-bindings/pinctrl/nomadik.h
Normal file
36
include/dt-bindings/pinctrl/nomadik.h
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
/*
|
||||
* nomadik.h
|
||||
*
|
||||
* Copyright (C) ST-Ericsson SA 2013
|
||||
* Author: Gabriel Fernandez <gabriel.fernandez@st.com> for ST-Ericsson.
|
||||
* License terms: GNU General Public License (GPL), version 2
|
||||
*/
|
||||
|
||||
#define INPUT_NOPULL 0
|
||||
#define INPUT_PULLUP 1
|
||||
#define INPUT_PULLDOWN 2
|
||||
|
||||
#define OUTPUT_LOW 0
|
||||
#define OUTPUT_HIGH 1
|
||||
#define DIR_OUTPUT 2
|
||||
|
||||
#define SLPM_DISABLED 0
|
||||
#define SLPM_ENABLED 1
|
||||
|
||||
#define SLPM_INPUT_NOPULL 0
|
||||
#define SLPM_INPUT_PULLUP 1
|
||||
#define SLPM_INPUT_PULLDOWN 2
|
||||
#define SLPM_DIR_INPUT 3
|
||||
|
||||
#define SLPM_OUTPUT_LOW 0
|
||||
#define SLPM_OUTPUT_HIGH 1
|
||||
#define SLPM_DIR_OUTPUT 2
|
||||
|
||||
#define SLPM_WAKEUP_DISABLE 0
|
||||
#define SLPM_WAKEUP_ENABLE 1
|
||||
|
||||
#define GPIOMODE_DISABLED 0
|
||||
#define GPIOMODE_ENABLED 1
|
||||
|
||||
#define SLPM_PDIS_DISABLED 0
|
||||
#define SLPM_PDIS_ENABLED 1
|
||||
Loading…
Reference in a new issue