Merge branch 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt
From Lee Jones: * 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500: (31 commits) ARM: ux500: Convert DT_MACHINE_START to use SMP operations ARM: ux500: CONFIG: Enable GPIO Regulators ARM: ux500: Change the type of interrupt to something compatible ARM: ux500: Add node for the MMC GPIO regulator ARM: ux500: List DT compatibility using platform names rather than by board ARM: ux500: Remove duplicate DT_MACHINE_START - make u8500 for generic ARM: ux500: Rename references to the ccu9540 dev board accordingly ARM: ux500: Enable all MMC devices on the u9540 when booting with DT ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree ARM: ux500: Add UART support to the u9540 Device Tree ARM: ux500: Add support for ST-Ericsson's u9540 SoC ARM: ux500: Add skeleton DTS file for the u9540 ARM: ux500: Remove unused board compatible string ARM: ux500: Supply the STMPE keypad Device Tree node to the STUIB DT ARM: ux500: Apply a Device Tree node for the STMPE MFD ARM: ux500: Stop informing the regulator subsystem that we have full constraints ARM: ux500: Add all bu21013 touch screen components to supported Device Trees ARM: ux500: Stop calling the UIB init function when using Device Tree ARM: ux500: Create a new Device Tree include file for boards supporting STUIBs Documentation: Detail permitted DT properties for the BU21013 Touch Screen ...
This commit is contained in:
commit
591d07bf13
14 changed files with 780 additions and 282 deletions
|
@ -0,0 +1,28 @@
|
|||
* Rohm BU21013 Touch Screen
|
||||
|
||||
Required properties:
|
||||
- compatible : "rohm,bu21013_tp"
|
||||
- reg : I2C device address
|
||||
|
||||
Optional properties:
|
||||
- touch-gpio : GPIO pin registering a touch event
|
||||
- <supply_name>-supply : Phandle to a regulator supply
|
||||
- rohm,touch-max-x : Maximum outward permitted limit in the X axis
|
||||
- rohm,touch-max-y : Maximum outward permitted limit in the Y axis
|
||||
- rohm,flip-x : Flip touch coordinates on the X axis
|
||||
- rohm,flip-y : Flip touch coordinates on the Y axis
|
||||
|
||||
Example:
|
||||
|
||||
i2c@80110000 {
|
||||
bu21013_tp@0x5c {
|
||||
compatible = "rohm,bu21013_tp";
|
||||
reg = <0x5c>;
|
||||
touch-gpio = <&gpio2 20 0x4>;
|
||||
avdd-supply = <&ab8500_ldo_aux1_reg>;
|
||||
|
||||
rohm,touch-max-x = <384>;
|
||||
rohm,touch-max-y = <704>;
|
||||
rohm,flip-y;
|
||||
};
|
||||
};
|
72
arch/arm/boot/dts/ccu9540.dts
Normal file
72
arch/arm/boot/dts/ccu9540.dts
Normal file
|
@ -0,0 +1,72 @@
|
|||
/*
|
||||
* 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 CCU9540 platform with Device Tree";
|
||||
compatible = "st-ericsson,ccu9540", "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";
|
||||
};
|
||||
};
|
||||
};
|
|
@ -209,123 +209,103 @@
|
|||
// DB8500_REGULATOR_VAPE
|
||||
db8500_vape_reg: db8500_vape {
|
||||
regulator-compatible = "db8500_vape";
|
||||
regulator-name = "db8500-vape";
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_VARM
|
||||
db8500_varm_reg: db8500_varm {
|
||||
regulator-compatible = "db8500_varm";
|
||||
regulator-name = "db8500-varm";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_VMODEM
|
||||
db8500_vmodem_reg: db8500_vmodem {
|
||||
regulator-compatible = "db8500_vmodem";
|
||||
regulator-name = "db8500-vmodem";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_VPLL
|
||||
db8500_vpll_reg: db8500_vpll {
|
||||
regulator-compatible = "db8500_vpll";
|
||||
regulator-name = "db8500-vpll";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_VSMPS1
|
||||
db8500_vsmps1_reg: db8500_vsmps1 {
|
||||
regulator-compatible = "db8500_vsmps1";
|
||||
regulator-name = "db8500-vsmps1";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_VSMPS2
|
||||
db8500_vsmps2_reg: db8500_vsmps2 {
|
||||
regulator-compatible = "db8500_vsmps2";
|
||||
regulator-name = "db8500-vsmps2";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_VSMPS3
|
||||
db8500_vsmps3_reg: db8500_vsmps3 {
|
||||
regulator-compatible = "db8500_vsmps3";
|
||||
regulator-name = "db8500-vsmps3";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_VRF1
|
||||
db8500_vrf1_reg: db8500_vrf1 {
|
||||
regulator-compatible = "db8500_vrf1";
|
||||
regulator-name = "db8500-vrf1";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_SWITCH_SVAMMDSP
|
||||
db8500_sva_mmdsp_reg: db8500_sva_mmdsp {
|
||||
regulator-compatible = "db8500_sva_mmdsp";
|
||||
regulator-name = "db8500-sva-mmdsp";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_SWITCH_SVAMMDSPRET
|
||||
db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {
|
||||
regulator-compatible = "db8500_sva_mmdsp_ret";
|
||||
regulator-name = "db8500-sva-mmdsp-ret";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_SWITCH_SVAPIPE
|
||||
db8500_sva_pipe_reg: db8500_sva_pipe {
|
||||
regulator-compatible = "db8500_sva_pipe";
|
||||
regulator-name = "db8500_sva_pipe";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_SWITCH_SIAMMDSP
|
||||
db8500_sia_mmdsp_reg: db8500_sia_mmdsp {
|
||||
regulator-compatible = "db8500_sia_mmdsp";
|
||||
regulator-name = "db8500_sia_mmdsp";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_SWITCH_SIAMMDSPRET
|
||||
db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {
|
||||
regulator-name = "db8500-sia-mmdsp-ret";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_SWITCH_SIAPIPE
|
||||
db8500_sia_pipe_reg: db8500_sia_pipe {
|
||||
regulator-compatible = "db8500_sia_pipe";
|
||||
regulator-name = "db8500-sia-pipe";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_SWITCH_SGA
|
||||
db8500_sga_reg: db8500_sga {
|
||||
regulator-compatible = "db8500_sga";
|
||||
regulator-name = "db8500-sga";
|
||||
vin-supply = <&db8500_vape_reg>;
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_SWITCH_B2R2_MCDE
|
||||
db8500_b2r2_mcde_reg: db8500_b2r2_mcde {
|
||||
regulator-compatible = "db8500_b2r2_mcde";
|
||||
regulator-name = "db8500-b2r2-mcde";
|
||||
vin-supply = <&db8500_vape_reg>;
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_SWITCH_ESRAM12
|
||||
db8500_esram12_reg: db8500_esram12 {
|
||||
regulator-compatible = "db8500_esram12";
|
||||
regulator-name = "db8500-esram12";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_SWITCH_ESRAM12RET
|
||||
db8500_esram12_ret_reg: db8500_esram12_ret {
|
||||
regulator-compatible = "db8500_esram12_ret";
|
||||
regulator-name = "db8500-esram12-ret";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_SWITCH_ESRAM34
|
||||
db8500_esram34_reg: db8500_esram34 {
|
||||
regulator-compatible = "db8500_esram34";
|
||||
regulator-name = "db8500-esram34";
|
||||
};
|
||||
|
||||
// DB8500_REGULATOR_SWITCH_ESRAM34RET
|
||||
db8500_esram34_ret_reg: db8500_esram34_ret {
|
||||
regulator-compatible = "db8500_esram34_ret";
|
||||
regulator-name = "db8500-esram34-ret";
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -404,7 +384,6 @@
|
|||
// supplies to the display/camera
|
||||
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
|
||||
regulator-compatible = "ab8500_ldo_aux1";
|
||||
regulator-name = "V-DISPLAY";
|
||||
regulator-min-microvolt = <2500000>;
|
||||
regulator-max-microvolt = <2900000>;
|
||||
regulator-boot-on;
|
||||
|
@ -415,7 +394,6 @@
|
|||
// supplies to the on-board eMMC
|
||||
ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
|
||||
regulator-compatible = "ab8500_ldo_aux2";
|
||||
regulator-name = "V-eMMC1";
|
||||
regulator-min-microvolt = <1100000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
@ -423,7 +401,6 @@
|
|||
// supply for VAUX3; SDcard slots
|
||||
ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
|
||||
regulator-compatible = "ab8500_ldo_aux3";
|
||||
regulator-name = "V-MMC-SD";
|
||||
regulator-min-microvolt = <1100000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
};
|
||||
|
@ -431,49 +408,41 @@
|
|||
// supply for v-intcore12; VINTCORE12 LDO
|
||||
ab8500_ldo_initcore_reg: ab8500_ldo_initcore {
|
||||
regulator-compatible = "ab8500_ldo_initcore";
|
||||
regulator-name = "V-INTCORE";
|
||||
};
|
||||
|
||||
// supply for tvout; gpadc; TVOUT LDO
|
||||
ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
|
||||
regulator-compatible = "ab8500_ldo_tvout";
|
||||
regulator-name = "V-TVOUT";
|
||||
};
|
||||
|
||||
// supply for ab8500-usb; USB LDO
|
||||
ab8500_ldo_usb_reg: ab8500_ldo_usb {
|
||||
regulator-compatible = "ab8500_ldo_usb";
|
||||
regulator-name = "dummy";
|
||||
};
|
||||
|
||||
// supply for ab8500-vaudio; VAUDIO LDO
|
||||
ab8500_ldo_audio_reg: ab8500_ldo_audio {
|
||||
regulator-compatible = "ab8500_ldo_audio";
|
||||
regulator-name = "V-AUD";
|
||||
};
|
||||
|
||||
// supply for v-anamic1 VAMic1-LDO
|
||||
ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
|
||||
regulator-compatible = "ab8500_ldo_anamic1";
|
||||
regulator-name = "V-AMIC1";
|
||||
};
|
||||
|
||||
// supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1
|
||||
ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 {
|
||||
regulator-compatible = "ab8500_ldo_amamic2";
|
||||
regulator-name = "V-AMIC2";
|
||||
};
|
||||
|
||||
// supply for v-dmic; VDMIC LDO
|
||||
ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
|
||||
regulator-compatible = "ab8500_ldo_dmic";
|
||||
regulator-name = "V-DMIC";
|
||||
};
|
||||
|
||||
// supply for U8500 CSI/DSI; VANA LDO
|
||||
ab8500_ldo_ana_reg: ab8500_ldo_ana {
|
||||
regulator-compatible = "ab8500_ldo_ana";
|
||||
regulator-name = "V-CSI/DSI";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -577,42 +546,42 @@
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
sdi@80126000 {
|
||||
sdi0_per1@80126000 {
|
||||
compatible = "arm,pl18x", "arm,primecell";
|
||||
reg = <0x80126000 0x1000>;
|
||||
interrupts = <0 60 0x4>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sdi@80118000 {
|
||||
sdi1_per2@80118000 {
|
||||
compatible = "arm,pl18x", "arm,primecell";
|
||||
reg = <0x80118000 0x1000>;
|
||||
interrupts = <0 50 0x4>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sdi@80005000 {
|
||||
sdi2_per3@80005000 {
|
||||
compatible = "arm,pl18x", "arm,primecell";
|
||||
reg = <0x80005000 0x1000>;
|
||||
interrupts = <0 41 0x4>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sdi@80119000 {
|
||||
sdi3_per2@80119000 {
|
||||
compatible = "arm,pl18x", "arm,primecell";
|
||||
reg = <0x80119000 0x1000>;
|
||||
interrupts = <0 59 0x4>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sdi@80114000 {
|
||||
sdi4_per2@80114000 {
|
||||
compatible = "arm,pl18x", "arm,primecell";
|
||||
reg = <0x80114000 0x1000>;
|
||||
interrupts = <0 99 0x4>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sdi@80008000 {
|
||||
sdi5_per3@80008000 {
|
||||
compatible = "arm,pl18x", "arm,primecell";
|
||||
reg = <0x80008000 0x1000>;
|
||||
interrupts = <0 100 0x4>;
|
||||
|
@ -660,5 +629,19 @@
|
|||
ranges = <0 0x50000000 0x4000000>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
vmmci: regulator-gpio {
|
||||
compatible = "regulator-gpio";
|
||||
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <2600000>;
|
||||
regulator-name = "mmci-reg";
|
||||
regulator-type = "voltage";
|
||||
|
||||
gpios = <&tc3589x_gpio 18 0x4>;
|
||||
gpio-enable = <&tc3589x_gpio 17 0x4>;
|
||||
states = <1800000 0x1
|
||||
2900000 0x0>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
273
arch/arm/boot/dts/href.dtsi
Normal file
273
arch/arm/boot/dts/href.dtsi
Normal file
|
@ -0,0 +1,273 @@
|
|||
/*
|
||||
* 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
|
||||
*/
|
||||
|
||||
/include/ "dbx5x0.dtsi"
|
||||
|
||||
/ {
|
||||
memory {
|
||||
reg = <0x00000000 0x20000000>;
|
||||
};
|
||||
|
||||
gpio_keys {
|
||||
compatible = "gpio-keys";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
button@1 {
|
||||
linux,code = <11>;
|
||||
label = "SFH7741 Proximity Sensor";
|
||||
};
|
||||
};
|
||||
|
||||
soc-u9500 {
|
||||
uart@80120000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
uart@80121000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
uart@80007000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
i2c@80004000 {
|
||||
tc3589x@42 {
|
||||
compatible = "tc3589x";
|
||||
reg = <0x42>;
|
||||
interrupt-parent = <&gpio6>;
|
||||
interrupts = <25 0x1>;
|
||||
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
|
||||
tc3589x_gpio: tc3589x_gpio {
|
||||
compatible = "tc3589x-gpio";
|
||||
interrupts = <0 0x1>;
|
||||
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
gpio-controller;
|
||||
#gpio-cells = <2>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
i2c@80128000 {
|
||||
lp5521@0x33 {
|
||||
compatible = "lp5521";
|
||||
reg = <0x33>;
|
||||
};
|
||||
|
||||
lp5521@0x34 {
|
||||
compatible = "lp5521";
|
||||
reg = <0x34>;
|
||||
};
|
||||
|
||||
bh1780@0x29 {
|
||||
compatible = "rohm,bh1780gli";
|
||||
reg = <0x33>;
|
||||
};
|
||||
};
|
||||
|
||||
// External Micro SD slot
|
||||
sdi0_per1@80126000 {
|
||||
arm,primecell-periphid = <0x10480180>;
|
||||
max-frequency = <50000000>;
|
||||
bus-width = <4>;
|
||||
mmc-cap-sd-highspeed;
|
||||
mmc-cap-mmc-highspeed;
|
||||
vmmc-supply = <&ab8500_ldo_aux3_reg>;
|
||||
|
||||
cd-gpios = <&tc3589x_gpio 3 0x4>;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
// WLAN SDIO channel
|
||||
sdi1_per2@80118000 {
|
||||
arm,primecell-periphid = <0x10480180>;
|
||||
max-frequency = <50000000>;
|
||||
bus-width = <4>;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
// PoP:ed eMMC
|
||||
sdi2_per3@80005000 {
|
||||
arm,primecell-periphid = <0x10480180>;
|
||||
max-frequency = <50000000>;
|
||||
bus-width = <8>;
|
||||
mmc-cap-mmc-highspeed;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
// On-board eMMC
|
||||
sdi4_per2@80114000 {
|
||||
arm,primecell-periphid = <0x10480180>;
|
||||
max-frequency = <50000000>;
|
||||
bus-width = <8>;
|
||||
mmc-cap-mmc-highspeed;
|
||||
vmmc-supply = <&ab8500_ldo_aux2_reg>;
|
||||
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
sound {
|
||||
compatible = "stericsson,snd-soc-mop500";
|
||||
|
||||
stericsson,cpu-dai = <&msp1 &msp3>;
|
||||
stericsson,audio-codec = <&codec>;
|
||||
};
|
||||
|
||||
msp1: msp@80124000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
msp3: msp@80125000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
prcmu@80157000 {
|
||||
db8500-prcmu-regulators {
|
||||
db8500_vape_reg: db8500_vape {
|
||||
regulator-name = "db8500-vape";
|
||||
};
|
||||
|
||||
db8500_varm_reg: db8500_varm {
|
||||
regulator-name = "db8500-varm";
|
||||
};
|
||||
|
||||
db8500_vmodem_reg: db8500_vmodem {
|
||||
regulator-name = "db8500-vmodem";
|
||||
};
|
||||
|
||||
db8500_vpll_reg: db8500_vpll {
|
||||
regulator-name = "db8500-vpll";
|
||||
};
|
||||
|
||||
db8500_vsmps1_reg: db8500_vsmps1 {
|
||||
regulator-name = "db8500-vsmps1";
|
||||
};
|
||||
|
||||
db8500_vsmps2_reg: db8500_vsmps2 {
|
||||
regulator-name = "db8500-vsmps2";
|
||||
};
|
||||
|
||||
db8500_vsmps3_reg: db8500_vsmps3 {
|
||||
regulator-name = "db8500-vsmps3";
|
||||
};
|
||||
|
||||
db8500_vrf1_reg: db8500_vrf1 {
|
||||
regulator-name = "db8500-vrf1";
|
||||
};
|
||||
|
||||
db8500_sva_mmdsp_reg: db8500_sva_mmdsp {
|
||||
regulator-name = "db8500-sva-mmdsp";
|
||||
};
|
||||
|
||||
db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {
|
||||
regulator-name = "db8500-sva-mmdsp-ret";
|
||||
};
|
||||
|
||||
db8500_sva_pipe_reg: db8500_sva_pipe {
|
||||
regulator-name = "db8500_sva_pipe";
|
||||
};
|
||||
|
||||
db8500_sia_mmdsp_reg: db8500_sia_mmdsp {
|
||||
regulator-name = "db8500_sia_mmdsp";
|
||||
};
|
||||
|
||||
db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {
|
||||
regulator-name = "db8500-sia-mmdsp-ret";
|
||||
};
|
||||
|
||||
db8500_sia_pipe_reg: db8500_sia_pipe {
|
||||
regulator-name = "db8500-sia-pipe";
|
||||
};
|
||||
|
||||
db8500_sga_reg: db8500_sga {
|
||||
regulator-name = "db8500-sga";
|
||||
};
|
||||
|
||||
db8500_b2r2_mcde_reg: db8500_b2r2_mcde {
|
||||
regulator-name = "db8500-b2r2-mcde";
|
||||
};
|
||||
|
||||
db8500_esram12_reg: db8500_esram12 {
|
||||
regulator-name = "db8500-esram12";
|
||||
};
|
||||
|
||||
db8500_esram12_ret_reg: db8500_esram12_ret {
|
||||
regulator-name = "db8500-esram12-ret";
|
||||
};
|
||||
|
||||
db8500_esram34_reg: db8500_esram34 {
|
||||
regulator-name = "db8500-esram34";
|
||||
};
|
||||
|
||||
db8500_esram34_ret_reg: db8500_esram34_ret {
|
||||
regulator-name = "db8500-esram34-ret";
|
||||
};
|
||||
};
|
||||
|
||||
ab8500@5 {
|
||||
ab8500-regulators {
|
||||
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
|
||||
regulator-name = "V-DISPLAY";
|
||||
};
|
||||
|
||||
ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
|
||||
regulator-name = "V-eMMC1";
|
||||
};
|
||||
|
||||
ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
|
||||
regulator-name = "V-MMC-SD";
|
||||
};
|
||||
|
||||
ab8500_ldo_initcore_reg: ab8500_ldo_initcore {
|
||||
regulator-name = "V-INTCORE";
|
||||
};
|
||||
|
||||
ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
|
||||
regulator-name = "V-TVOUT";
|
||||
};
|
||||
|
||||
ab8500_ldo_usb_reg: ab8500_ldo_usb {
|
||||
regulator-name = "dummy";
|
||||
};
|
||||
|
||||
ab8500_ldo_audio_reg: ab8500_ldo_audio {
|
||||
regulator-name = "V-AUD";
|
||||
};
|
||||
|
||||
ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
|
||||
regulator-name = "V-AMIC1";
|
||||
};
|
||||
|
||||
ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 {
|
||||
regulator-name = "V-AMIC2";
|
||||
};
|
||||
|
||||
ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
|
||||
regulator-name = "V-DMIC";
|
||||
};
|
||||
|
||||
ab8500_ldo_ana_reg: ab8500_ldo_ana {
|
||||
regulator-name = "V-CSI/DSI";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
41
arch/arm/boot/dts/hrefprev60.dts
Normal file
41
arch/arm/boot/dts/hrefprev60.dts
Normal file
|
@ -0,0 +1,41 @@
|
|||
/*
|
||||
* 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"
|
||||
/include/ "href.dtsi"
|
||||
/include/ "stuib.dtsi"
|
||||
|
||||
/ {
|
||||
model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
|
||||
compatible = "st-ericsson,mop500", "st-ericsson,u8500";
|
||||
|
||||
gpio_keys {
|
||||
button@1 {
|
||||
gpios = <&tc3589x_gpio 7 0x4>;
|
||||
};
|
||||
};
|
||||
|
||||
soc-u9500 {
|
||||
i2c@80004000 {
|
||||
tps61052@33 {
|
||||
compatible = "tps61052";
|
||||
reg = <0x33>;
|
||||
};
|
||||
};
|
||||
|
||||
i2c@80110000 {
|
||||
bu21013_tp@0x5c {
|
||||
reset-gpio = <&tc3589x_gpio 13 0x4>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
|
@ -11,85 +11,24 @@
|
|||
|
||||
/dts-v1/;
|
||||
/include/ "dbx5x0.dtsi"
|
||||
/include/ "href.dtsi"
|
||||
/include/ "stuib.dtsi"
|
||||
|
||||
/ {
|
||||
model = "ST-Ericsson HREF platform with Device Tree";
|
||||
compatible = "st-ericsson,hrefv60+";
|
||||
model = "ST-Ericsson HREF (v60+) platform with Device Tree";
|
||||
compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
|
||||
|
||||
memory {
|
||||
reg = <0x00000000 0x20000000>;
|
||||
gpio_keys {
|
||||
button@1 {
|
||||
gpios = <&gpio6 25 0x4>;
|
||||
};
|
||||
};
|
||||
|
||||
soc-u9500 {
|
||||
uart@80120000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
uart@80121000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
uart@80007000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
i2c@80004000 {
|
||||
tc3589x@42 {
|
||||
compatible = "tc3589x";
|
||||
reg = <0x42>;
|
||||
interrupt-parent = <&gpio6>;
|
||||
interrupts = <25 0x1>;
|
||||
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
|
||||
tc3589x_gpio: tc3589x_gpio {
|
||||
compatible = "tc3589x-gpio";
|
||||
interrupts = <0 0x1>;
|
||||
|
||||
interrupt-controller;
|
||||
#interrupt-cells = <2>;
|
||||
gpio-controller;
|
||||
#gpio-cells = <2>;
|
||||
};
|
||||
i2c@80110000 {
|
||||
bu21013_tp@0x5c {
|
||||
reset-gpio = <&gpio4 15 0x4>;
|
||||
};
|
||||
|
||||
tps61052@33 {
|
||||
compatible = "tps61052";
|
||||
reg = <0x33>;
|
||||
};
|
||||
};
|
||||
|
||||
i2c@80128000 {
|
||||
lp5521@0x33 {
|
||||
compatible = "lp5521";
|
||||
reg = <0x33>;
|
||||
};
|
||||
|
||||
lp5521@0x34 {
|
||||
compatible = "lp5521";
|
||||
reg = <0x34>;
|
||||
};
|
||||
|
||||
bh1780@0x29 {
|
||||
compatible = "rohm,bh1780gli";
|
||||
reg = <0x33>;
|
||||
};
|
||||
};
|
||||
|
||||
sound {
|
||||
compatible = "stericsson,snd-soc-mop500";
|
||||
|
||||
stericsson,cpu-dai = <&msp1 &msp3>;
|
||||
stericsson,audio-codec = <&codec>;
|
||||
};
|
||||
|
||||
msp1: msp@80124000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
msp3: msp@80125000 {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
/ {
|
||||
model = "Calao Systems Snowball platform with device tree";
|
||||
compatible = "calaosystems,snowball-a9500";
|
||||
compatible = "calaosystems,snowball-a9500", "st-ericsson,u9500";
|
||||
|
||||
memory {
|
||||
reg = <0x00000000 0x20000000>;
|
||||
|
@ -120,10 +120,10 @@
|
|||
};
|
||||
|
||||
// External Micro SD slot
|
||||
sdi@80126000 {
|
||||
sdi0_per1@80126000 {
|
||||
arm,primecell-periphid = <0x10480180>;
|
||||
max-frequency = <50000000>;
|
||||
bus-width = <8>;
|
||||
bus-width = <4>;
|
||||
mmc-cap-mmc-highspeed;
|
||||
vmmc-supply = <&ab8500_ldo_aux3_reg>;
|
||||
|
||||
|
@ -134,7 +134,7 @@
|
|||
};
|
||||
|
||||
// On-board eMMC
|
||||
sdi@80114000 {
|
||||
sdi4_per2@80114000 {
|
||||
arm,primecell-periphid = <0x10480180>;
|
||||
max-frequency = <50000000>;
|
||||
bus-width = <8>;
|
||||
|
@ -183,5 +183,137 @@
|
|||
reg = <0x33>;
|
||||
};
|
||||
};
|
||||
|
||||
prcmu@80157000 {
|
||||
db8500-prcmu-regulators {
|
||||
db8500_vape_reg: db8500_vape {
|
||||
regulator-name = "db8500-vape";
|
||||
};
|
||||
|
||||
db8500_varm_reg: db8500_varm {
|
||||
regulator-name = "db8500-varm";
|
||||
};
|
||||
|
||||
db8500_vmodem_reg: db8500_vmodem {
|
||||
regulator-name = "db8500-vmodem";
|
||||
};
|
||||
|
||||
db8500_vpll_reg: db8500_vpll {
|
||||
regulator-name = "db8500-vpll";
|
||||
};
|
||||
|
||||
db8500_vsmps1_reg: db8500_vsmps1 {
|
||||
regulator-name = "db8500-vsmps1";
|
||||
};
|
||||
|
||||
db8500_vsmps2_reg: db8500_vsmps2 {
|
||||
regulator-name = "db8500-vsmps2";
|
||||
};
|
||||
|
||||
db8500_vsmps3_reg: db8500_vsmps3 {
|
||||
regulator-name = "db8500-vsmps3";
|
||||
};
|
||||
|
||||
db8500_vrf1_reg: db8500_vrf1 {
|
||||
regulator-name = "db8500-vrf1";
|
||||
};
|
||||
|
||||
db8500_sva_mmdsp_reg: db8500_sva_mmdsp {
|
||||
regulator-name = "db8500-sva-mmdsp";
|
||||
};
|
||||
|
||||
db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret {
|
||||
regulator-name = "db8500-sva-mmdsp-ret";
|
||||
};
|
||||
|
||||
db8500_sva_pipe_reg: db8500_sva_pipe {
|
||||
regulator-name = "db8500_sva_pipe";
|
||||
};
|
||||
|
||||
db8500_sia_mmdsp_reg: db8500_sia_mmdsp {
|
||||
regulator-name = "db8500_sia_mmdsp";
|
||||
};
|
||||
|
||||
db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret {
|
||||
regulator-name = "db8500-sia-mmdsp-ret";
|
||||
};
|
||||
|
||||
db8500_sia_pipe_reg: db8500_sia_pipe {
|
||||
regulator-name = "db8500-sia-pipe";
|
||||
};
|
||||
|
||||
db8500_sga_reg: db8500_sga {
|
||||
regulator-name = "db8500-sga";
|
||||
};
|
||||
|
||||
db8500_b2r2_mcde_reg: db8500_b2r2_mcde {
|
||||
regulator-name = "db8500-b2r2-mcde";
|
||||
};
|
||||
|
||||
db8500_esram12_reg: db8500_esram12 {
|
||||
regulator-name = "db8500-esram12";
|
||||
};
|
||||
|
||||
db8500_esram12_ret_reg: db8500_esram12_ret {
|
||||
regulator-name = "db8500-esram12-ret";
|
||||
};
|
||||
|
||||
db8500_esram34_reg: db8500_esram34 {
|
||||
regulator-name = "db8500-esram34";
|
||||
};
|
||||
|
||||
db8500_esram34_ret_reg: db8500_esram34_ret {
|
||||
regulator-name = "db8500-esram34-ret";
|
||||
};
|
||||
};
|
||||
|
||||
ab8500@5 {
|
||||
ab8500-regulators {
|
||||
ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
|
||||
regulator-name = "V-DISPLAY";
|
||||
};
|
||||
|
||||
ab8500_ldo_aux2_reg: ab8500_ldo_aux2 {
|
||||
regulator-name = "V-eMMC1";
|
||||
};
|
||||
|
||||
ab8500_ldo_aux3_reg: ab8500_ldo_aux3 {
|
||||
regulator-name = "V-MMC-SD";
|
||||
};
|
||||
|
||||
ab8500_ldo_initcore_reg: ab8500_ldo_initcore {
|
||||
regulator-name = "V-INTCORE";
|
||||
};
|
||||
|
||||
ab8500_ldo_tvout_reg: ab8500_ldo_tvout {
|
||||
regulator-name = "V-TVOUT";
|
||||
};
|
||||
|
||||
ab8500_ldo_usb_reg: ab8500_ldo_usb {
|
||||
regulator-name = "dummy";
|
||||
};
|
||||
|
||||
ab8500_ldo_audio_reg: ab8500_ldo_audio {
|
||||
regulator-name = "V-AUD";
|
||||
};
|
||||
|
||||
ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
|
||||
regulator-name = "V-AMIC1";
|
||||
};
|
||||
|
||||
ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 {
|
||||
regulator-name = "V-AMIC2";
|
||||
};
|
||||
|
||||
ab8500_ldo_dmic_reg: ab8500_ldo_dmic {
|
||||
regulator-name = "V-DMIC";
|
||||
};
|
||||
|
||||
ab8500_ldo_ana_reg: ab8500_ldo_ana {
|
||||
regulator-name = "V-CSI/DSI";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
78
arch/arm/boot/dts/stuib.dtsi
Normal file
78
arch/arm/boot/dts/stuib.dtsi
Normal file
|
@ -0,0 +1,78 @@
|
|||
/*
|
||||
* 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
|
||||
*/
|
||||
|
||||
/ {
|
||||
soc-u9500 {
|
||||
i2c@80004000 {
|
||||
stmpe1601: stmpe1601@40 {
|
||||
compatible = "st,stmpe1601";
|
||||
reg = <0x40>;
|
||||
interrupts = <26 0x1>;
|
||||
interrupt-parent = <&gpio6>;
|
||||
interrupt-controller;
|
||||
|
||||
wakeup-source;
|
||||
st,autosleep-timeout = <1024>;
|
||||
|
||||
stmpe_keypad {
|
||||
compatible = "st,stmpe-keypad";
|
||||
|
||||
debounce-interval = <64>;
|
||||
st,scan-count = <8>;
|
||||
st,no-autorepeat;
|
||||
|
||||
linux,keymap = <0x205006b
|
||||
0x4010074
|
||||
0x3050072
|
||||
0x1030004
|
||||
0x502006a
|
||||
0x500000a
|
||||
0x5008b
|
||||
0x706001c
|
||||
0x405000b
|
||||
0x6070003
|
||||
0x3040067
|
||||
0x303006c
|
||||
0x60400e7
|
||||
0x602009e
|
||||
0x4020073
|
||||
0x5050002
|
||||
0x4030069
|
||||
0x3020008>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
i2c@80110000 {
|
||||
bu21013_tp@0x5c {
|
||||
compatible = "rhom,bu21013_tp";
|
||||
reg = <0x5c>;
|
||||
touch-gpio = <&gpio2 20 0x4>;
|
||||
avdd-supply = <&ab8500_ldo_aux1_reg>;
|
||||
|
||||
rhom,touch-max-x = <384>;
|
||||
rhom,touch-max-y = <704>;
|
||||
rhom,flip-y;
|
||||
};
|
||||
|
||||
bu21013_tp@0x5d {
|
||||
compatible = "rhom,bu21013_tp";
|
||||
reg = <0x5d>;
|
||||
touch-gpio = <&gpio2 20 0x4>;
|
||||
avdd-supply = <&ab8500_ldo_aux1_reg>;
|
||||
|
||||
rhom,touch-max-x = <384>;
|
||||
rhom,touch-max-y = <704>;
|
||||
rhom,flip-y;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
|
@ -76,6 +76,7 @@ CONFIG_AB8500_CORE=y
|
|||
CONFIG_REGULATOR=y
|
||||
CONFIG_REGULATOR_AB8500=y
|
||||
CONFIG_REGULATOR_FIXED_VOLTAGE=y
|
||||
CONFIG_REGULATOR_GPIO=y
|
||||
# CONFIG_HID_SUPPORT is not set
|
||||
CONFIG_USB_GADGET=y
|
||||
CONFIG_AB8500_USB=y
|
||||
|
|
|
@ -162,18 +162,6 @@ static struct bu21013_platform_device tsc_plat_device = {
|
|||
.y_flip = true,
|
||||
};
|
||||
|
||||
static struct bu21013_platform_device tsc_plat2_device = {
|
||||
.cs_en = bu21013_gpio_board_init,
|
||||
.cs_dis = bu21013_gpio_board_exit,
|
||||
.irq_read_val = bu21013_read_pin_val,
|
||||
.irq = NOMADIK_GPIO_TO_IRQ(TOUCH_GPIO_PIN),
|
||||
.touch_x_max = TOUCH_XMAX,
|
||||
.touch_y_max = TOUCH_YMAX,
|
||||
.ext_clk = false,
|
||||
.x_flip = false,
|
||||
.y_flip = true,
|
||||
};
|
||||
|
||||
static struct i2c_board_info __initdata u8500_i2c3_devices_stuib[] = {
|
||||
{
|
||||
I2C_BOARD_INFO("bu21013_tp", 0x5C),
|
||||
|
@ -181,21 +169,17 @@ static struct i2c_board_info __initdata u8500_i2c3_devices_stuib[] = {
|
|||
},
|
||||
{
|
||||
I2C_BOARD_INFO("bu21013_tp", 0x5D),
|
||||
.platform_data = &tsc_plat2_device,
|
||||
.platform_data = &tsc_plat_device,
|
||||
},
|
||||
|
||||
};
|
||||
|
||||
void __init mop500_stuib_init(void)
|
||||
{
|
||||
if (machine_is_hrefv60()) {
|
||||
if (machine_is_hrefv60())
|
||||
tsc_plat_device.cs_pin = HREFV60_TOUCH_RST_GPIO;
|
||||
tsc_plat2_device.cs_pin = HREFV60_TOUCH_RST_GPIO;
|
||||
} else {
|
||||
else
|
||||
tsc_plat_device.cs_pin = GPIO_BU21013_CS;
|
||||
tsc_plat2_device.cs_pin = GPIO_BU21013_CS;
|
||||
|
||||
}
|
||||
|
||||
mop500_uib_i2c_add(0, mop500_i2c0_devices_stuib,
|
||||
ARRAY_SIZE(mop500_i2c0_devices_stuib));
|
||||
|
|
|
@ -33,8 +33,6 @@
|
|||
#include <linux/smsc911x.h>
|
||||
#include <linux/gpio_keys.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_platform.h>
|
||||
#include <linux/leds.h>
|
||||
#include <linux/pinctrl/consumer.h>
|
||||
|
||||
|
@ -464,7 +462,7 @@ static struct stedma40_chan_cfg ssp0_dma_cfg_tx = {
|
|||
};
|
||||
#endif
|
||||
|
||||
static struct pl022_ssp_controller ssp0_plat = {
|
||||
struct pl022_ssp_controller ssp0_plat = {
|
||||
.bus_id = 0,
|
||||
#ifdef CONFIG_STE_DMA40
|
||||
.enable_dma = 1,
|
||||
|
@ -541,7 +539,7 @@ static struct stedma40_chan_cfg uart2_dma_cfg_tx = {
|
|||
};
|
||||
#endif
|
||||
|
||||
static struct amba_pl011_data uart0_plat = {
|
||||
struct amba_pl011_data uart0_plat = {
|
||||
#ifdef CONFIG_STE_DMA40
|
||||
.dma_filter = stedma40_filter,
|
||||
.dma_rx_param = &uart0_dma_cfg_rx,
|
||||
|
@ -549,7 +547,7 @@ static struct amba_pl011_data uart0_plat = {
|
|||
#endif
|
||||
};
|
||||
|
||||
static struct amba_pl011_data uart1_plat = {
|
||||
struct amba_pl011_data uart1_plat = {
|
||||
#ifdef CONFIG_STE_DMA40
|
||||
.dma_filter = stedma40_filter,
|
||||
.dma_rx_param = &uart1_dma_cfg_rx,
|
||||
|
@ -557,7 +555,7 @@ static struct amba_pl011_data uart1_plat = {
|
|||
#endif
|
||||
};
|
||||
|
||||
static struct amba_pl011_data uart2_plat = {
|
||||
struct amba_pl011_data uart2_plat = {
|
||||
#ifdef CONFIG_STE_DMA40
|
||||
.dma_filter = stedma40_filter,
|
||||
.dma_rx_param = &uart2_dma_cfg_rx,
|
||||
|
@ -618,8 +616,6 @@ static void __init mop500_init_machine(void)
|
|||
|
||||
/* This board has full regulator constraints */
|
||||
regulator_has_full_constraints();
|
||||
|
||||
mop500_uib_init();
|
||||
}
|
||||
|
||||
static void __init snowball_init_machine(void)
|
||||
|
@ -684,8 +680,6 @@ static void __init hrefv60_init_machine(void)
|
|||
|
||||
/* This board has full regulator constraints */
|
||||
regulator_has_full_constraints();
|
||||
|
||||
mop500_uib_init();
|
||||
}
|
||||
|
||||
MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
|
||||
|
@ -721,135 +715,5 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
|
|||
.timer = &ux500_timer,
|
||||
.handle_irq = gic_handle_irq,
|
||||
.init_machine = snowball_init_machine,
|
||||
.init_late = ux500_init_late,
|
||||
.init_late = NULL,
|
||||
MACHINE_END
|
||||
|
||||
#ifdef CONFIG_MACH_UX500_DT
|
||||
|
||||
struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
|
||||
/* Requires call-back bindings. */
|
||||
OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata),
|
||||
/* Requires DMA and call-back bindings. */
|
||||
OF_DEV_AUXDATA("arm,pl011", 0x80120000, "uart0", &uart0_plat),
|
||||
OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", &uart1_plat),
|
||||
OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", &uart2_plat),
|
||||
/* Requires DMA bindings. */
|
||||
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),
|
||||
/* Requires clock name bindings. */
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e000, "gpio.0", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e080, "gpio.1", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8000e000, "gpio.2", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8000e080, "gpio.3", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8000e100, "gpio.4", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8000e180, "gpio.5", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8011e000, "gpio.6", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8011e080, "gpio.7", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0xa03fe000, "gpio.8", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-i2c", 0x80004000, "nmk-i2c.0", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-i2c", 0x80122000, "nmk-i2c.1", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-i2c", 0x80128000, "nmk-i2c.2", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL),
|
||||
/* Requires device name bindings. */
|
||||
OF_DEV_AUXDATA("stericsson,nmk_pinctrl", 0, "pinctrl-db8500", NULL),
|
||||
/* Requires clock name and DMA bindings. */
|
||||
OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000,
|
||||
"ux500-msp-i2s.0", &msp0_platform_data),
|
||||
OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80124000,
|
||||
"ux500-msp-i2s.1", &msp1_platform_data),
|
||||
OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80117000,
|
||||
"ux500-msp-i2s.2", &msp2_platform_data),
|
||||
OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000,
|
||||
"ux500-msp-i2s.3", &msp3_platform_data),
|
||||
{},
|
||||
};
|
||||
|
||||
static const struct of_device_id u8500_local_bus_nodes[] = {
|
||||
/* only create devices below soc node */
|
||||
{ .compatible = "stericsson,db8500", },
|
||||
{ .compatible = "stericsson,db8500-prcmu", },
|
||||
{ .compatible = "simple-bus"},
|
||||
{ },
|
||||
};
|
||||
|
||||
static void __init u8500_init_machine(void)
|
||||
{
|
||||
struct device *parent = NULL;
|
||||
int i2c0_devs;
|
||||
int i;
|
||||
|
||||
/* Pinmaps must be in place before devices register */
|
||||
if (of_machine_is_compatible("st-ericsson,mop500"))
|
||||
mop500_pinmaps_init();
|
||||
else if (of_machine_is_compatible("calaosystems,snowball-a9500"))
|
||||
snowball_pinmaps_init();
|
||||
else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
|
||||
hrefv60_pinmaps_init();
|
||||
|
||||
parent = u8500_of_init_devices();
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++)
|
||||
mop500_platform_devs[i]->dev.parent = parent;
|
||||
|
||||
/* automatically probe child nodes of db8500 device */
|
||||
of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent);
|
||||
|
||||
if (of_machine_is_compatible("st-ericsson,mop500")) {
|
||||
mop500_gpio_keys[0].gpio = GPIO_PROX_SENSOR;
|
||||
|
||||
platform_add_devices(mop500_platform_devs,
|
||||
ARRAY_SIZE(mop500_platform_devs));
|
||||
|
||||
mop500_sdi_init(parent);
|
||||
mop500_audio_init(parent);
|
||||
i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
|
||||
i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
|
||||
i2c_register_board_info(2, mop500_i2c2_devices,
|
||||
ARRAY_SIZE(mop500_i2c2_devices));
|
||||
|
||||
mop500_uib_init();
|
||||
|
||||
} else if (of_machine_is_compatible("calaosystems,snowball-a9500")) {
|
||||
mop500_of_audio_init(parent);
|
||||
} else if (of_machine_is_compatible("st-ericsson,hrefv60+")) {
|
||||
/*
|
||||
* The HREFv60 board removed a GPIO expander and routed
|
||||
* all these GPIO pins to the internal GPIO controller
|
||||
* instead.
|
||||
*/
|
||||
mop500_gpio_keys[0].gpio = HREFV60_PROX_SENSE_GPIO;
|
||||
platform_add_devices(mop500_platform_devs,
|
||||
ARRAY_SIZE(mop500_platform_devs));
|
||||
|
||||
mop500_uib_init();
|
||||
}
|
||||
|
||||
/* This board has full regulator constraints */
|
||||
regulator_has_full_constraints();
|
||||
}
|
||||
|
||||
static const char * u8500_dt_board_compat[] = {
|
||||
"calaosystems,snowball-a9500",
|
||||
"st-ericsson,hrefv60+",
|
||||
"st-ericsson,u8500",
|
||||
"st-ericsson,mop500",
|
||||
NULL,
|
||||
};
|
||||
|
||||
|
||||
DT_MACHINE_START(U8500_DT, "ST-Ericsson U8500 platform (Device Tree Support)")
|
||||
.smp = smp_ops(ux500_smp_ops),
|
||||
.map_io = u8500_map_io,
|
||||
.init_irq = ux500_init_irq,
|
||||
/* we re-use nomadik timer here */
|
||||
.timer = &ux500_timer,
|
||||
.handle_irq = gic_handle_irq,
|
||||
.init_machine = u8500_init_machine,
|
||||
.init_late = ux500_init_late,
|
||||
.dt_compat = u8500_dt_board_compat,
|
||||
MACHINE_END
|
||||
#endif
|
||||
|
|
|
@ -89,6 +89,10 @@ extern struct msp_i2s_platform_data msp1_platform_data;
|
|||
extern struct msp_i2s_platform_data msp2_platform_data;
|
||||
extern struct msp_i2s_platform_data msp3_platform_data;
|
||||
extern struct arm_pmu_platdata db8500_pmu_platdata;
|
||||
extern struct amba_pl011_data uart0_plat;
|
||||
extern struct amba_pl011_data uart1_plat;
|
||||
extern struct amba_pl011_data uart2_plat;
|
||||
extern struct pl022_ssp_controller ssp0_plat;
|
||||
|
||||
extern void mop500_sdi_init(struct device *parent);
|
||||
extern void snowball_sdi_init(struct device *parent);
|
||||
|
@ -106,8 +110,4 @@ void mop500_of_audio_init(struct device *parent);
|
|||
int __init mop500_uib_init(void);
|
||||
void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,
|
||||
unsigned n);
|
||||
|
||||
/* TODO: Once all pieces are DT:ed, remove completely. */
|
||||
struct device * __init u8500_of_init_devices(void);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -17,9 +17,15 @@
|
|||
#include <linux/platform_device.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/mfd/abx500/ab8500.h>
|
||||
#include <linux/mfd/dbx500-prcmu.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_platform.h>
|
||||
#include <linux/regulator/machine.h>
|
||||
|
||||
#include <asm/pmu.h>
|
||||
#include <asm/mach/map.h>
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/hardware/gic.h>
|
||||
#include <plat/gpio-nomadik.h>
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/setup.h>
|
||||
|
@ -29,6 +35,7 @@
|
|||
|
||||
#include "devices-db8500.h"
|
||||
#include "ste-dma40-db8500.h"
|
||||
#include "board-mop500.h"
|
||||
|
||||
/* minimum static i/o mapping required to boot U8500 platforms */
|
||||
static struct map_desc u8500_uart_io_desc[] __initdata = {
|
||||
|
@ -227,12 +234,12 @@ struct device * __init u8500_init_devices(struct ab8500_platform_data *ab8500)
|
|||
return parent;
|
||||
}
|
||||
|
||||
/* TODO: Once all pieces are DT:ed, remove completely. */
|
||||
struct device * __init u8500_of_init_devices(void)
|
||||
{
|
||||
struct device *parent;
|
||||
#ifdef CONFIG_MACH_UX500_DT
|
||||
|
||||
parent = db8500_soc_device_init();
|
||||
/* TODO: Once all pieces are DT:ed, remove completely. */
|
||||
static struct device * __init u8500_of_init_devices(void)
|
||||
{
|
||||
struct device *parent = db8500_soc_device_init();
|
||||
|
||||
db8500_add_usb(parent, usb_db8500_rx_dma_cfg, usb_db8500_tx_dma_cfg);
|
||||
|
||||
|
@ -251,3 +258,96 @@ struct device * __init u8500_of_init_devices(void)
|
|||
|
||||
return parent;
|
||||
}
|
||||
|
||||
static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
|
||||
/* Requires call-back bindings. */
|
||||
OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata),
|
||||
/* Requires DMA and call-back bindings. */
|
||||
OF_DEV_AUXDATA("arm,pl011", 0x80120000, "uart0", &uart0_plat),
|
||||
OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", &uart1_plat),
|
||||
OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", &uart2_plat),
|
||||
/* Requires DMA bindings. */
|
||||
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),
|
||||
/* Requires clock name bindings. */
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e000, "gpio.0", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e080, "gpio.1", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8000e000, "gpio.2", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8000e080, "gpio.3", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8000e100, "gpio.4", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8000e180, "gpio.5", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8011e000, "gpio.6", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0x8011e080, "gpio.7", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-gpio", 0xa03fe000, "gpio.8", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-i2c", 0x80004000, "nmk-i2c.0", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-i2c", 0x80122000, "nmk-i2c.1", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-i2c", 0x80128000, "nmk-i2c.2", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL),
|
||||
OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL),
|
||||
/* Requires device name bindings. */
|
||||
OF_DEV_AUXDATA("stericsson,nmk_pinctrl", 0, "pinctrl-db8500", NULL),
|
||||
/* Requires clock name and DMA bindings. */
|
||||
OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000,
|
||||
"ux500-msp-i2s.0", &msp0_platform_data),
|
||||
OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80124000,
|
||||
"ux500-msp-i2s.1", &msp1_platform_data),
|
||||
OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80117000,
|
||||
"ux500-msp-i2s.2", &msp2_platform_data),
|
||||
OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000,
|
||||
"ux500-msp-i2s.3", &msp3_platform_data),
|
||||
{},
|
||||
};
|
||||
|
||||
static const struct of_device_id u8500_local_bus_nodes[] = {
|
||||
/* only create devices below soc node */
|
||||
{ .compatible = "stericsson,db8500", },
|
||||
{ .compatible = "stericsson,db8500-prcmu", },
|
||||
{ .compatible = "simple-bus"},
|
||||
{ },
|
||||
};
|
||||
|
||||
static void __init u8500_init_machine(void)
|
||||
{
|
||||
struct device *parent = NULL;
|
||||
|
||||
/* Pinmaps must be in place before devices register */
|
||||
if (of_machine_is_compatible("st-ericsson,mop500"))
|
||||
mop500_pinmaps_init();
|
||||
else if (of_machine_is_compatible("calaosystems,snowball-a9500"))
|
||||
snowball_pinmaps_init();
|
||||
else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
|
||||
hrefv60_pinmaps_init();
|
||||
else if (of_machine_is_compatible("st-ericsson,ccu9540")) {}
|
||||
/* TODO: Add pinmaps for ccu9540 board. */
|
||||
|
||||
/* TODO: Export SoC, USB, cpu-freq and DMA40 */
|
||||
parent = u8500_of_init_devices();
|
||||
|
||||
/* automatically probe child nodes of db8500 device */
|
||||
of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent);
|
||||
}
|
||||
|
||||
static const char * stericsson_dt_platform_compat[] = {
|
||||
"st-ericsson,u8500",
|
||||
"st-ericsson,u8540",
|
||||
"st-ericsson,u9500",
|
||||
"st-ericsson,u9540",
|
||||
NULL,
|
||||
};
|
||||
|
||||
DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)")
|
||||
.smp = smp_ops(ux500_smp_ops),
|
||||
.map_io = u8500_map_io,
|
||||
.init_irq = ux500_init_irq,
|
||||
/* we re-use nomadik timer here */
|
||||
.timer = &ux500_timer,
|
||||
.handle_irq = gic_handle_irq,
|
||||
.init_machine = u8500_init_machine,
|
||||
.init_late = NULL,
|
||||
.dt_compat = stericsson_dt_platform_compat,
|
||||
MACHINE_END
|
||||
|
||||
#endif
|
||||
|
|
|
@ -26,6 +26,8 @@
|
|||
#include <mach/setup.h>
|
||||
#include <mach/devices.h>
|
||||
|
||||
#include "board-mop500.h"
|
||||
|
||||
void __iomem *_PRCMU_BASE;
|
||||
|
||||
/*
|
||||
|
@ -82,6 +84,7 @@ void __init ux500_init_irq(void)
|
|||
|
||||
void __init ux500_init_late(void)
|
||||
{
|
||||
mop500_uib_init();
|
||||
}
|
||||
|
||||
static const char * __init ux500_get_machine(void)
|
||||
|
|
Loading…
Reference in a new issue