Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 303191
b: refs/heads/master
c: 48bfdb2
h: refs/heads/master
i:
  303189: b67e9b9
  303187: c749e54
  303183: b807a85
v: v3
  • Loading branch information
Arnd Bergmann authored and Olof Johansson committed May 9, 2012
1 parent befc473 commit 6f364b2
Show file tree
Hide file tree
Showing 69 changed files with 3,640 additions and 1,558 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b41a216dafe4dd23c95cb4203de288f773a097a6
refs/heads/master: 48bfdb216ed7a2a75aa2909869f3266b3736f88a
13 changes: 7 additions & 6 deletions trunk/Documentation/arm/SPEAr/overview.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ Introduction
SPEAr (Platform)
- SPEAr3XX (3XX SOC series, based on ARM9)
- SPEAr300 (SOC)
- SPEAr300_EVB (Evaluation Board)
- SPEAr300 Evaluation Board
- SPEAr310 (SOC)
- SPEAr310_EVB (Evaluation Board)
- SPEAr310 Evaluation Board
- SPEAr320 (SOC)
- SPEAr320_EVB (Evaluation Board)
- SPEAr320 Evaluation Board
- SPEAr6XX (6XX SOC series, based on ARM9)
- SPEAr600 (SOC)
- SPEAr600_EVB (Evaluation Board)
- SPEAr600 Evaluation Board
- SPEAr13XX (13XX SOC series, based on ARM CORTEXA9)
- SPEAr1300 (SOC)

Expand All @@ -51,10 +51,11 @@ Introduction
Common file for machines of spear3xx family is mach-spear3xx/spear3xx.c and for
spear6xx is mach-spear6xx/spear6xx.c. mach-spear* also contain soc/machine
specific files, like spear300.c, spear310.c, spear320.c and spear600.c.
mach-spear* also contains board specific files for each machine type.
mach-spear* doesn't contains board specific files as they fully support
Flattened Device Tree.


Document Author
---------------

Viresh Kumar, (c) 2010 ST Microelectronics
Viresh Kumar <viresh.kumar@st.com>, (c) 2010-2012 ST Microelectronics
18 changes: 18 additions & 0 deletions trunk/Documentation/devicetree/bindings/arm/spear.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,21 @@ Boards with the ST SPEAr600 SoC shall have the following properties:
Required root node property:

compatible = "st,spear600";

Boards with the ST SPEAr300 SoC shall have the following properties:

Required root node property:

compatible = "st,spear300";

Boards with the ST SPEAr310 SoC shall have the following properties:

Required root node property:

compatible = "st,spear310";

Boards with the ST SPEAr320 SoC shall have the following properties:

Required root node property:

compatible = "st,spear320";
49 changes: 49 additions & 0 deletions trunk/arch/arm/boot/dts/omap3-beagle.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,52 @@
reg = <0x80000000 0x20000000>; /* 512 MB */
};
};

&i2c1 {
clock-frequency = <2600000>;

twl: twl@48 {
reg = <0x48>;
interrupts = <7>; /* SYS_NIRQ cascaded to intc */
interrupt-parent = <&intc>;

vsim: regulator@10 {
compatible = "ti,twl4030-vsim";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3000000>;
};
};
};

/include/ "twl4030.dtsi"

&i2c2 {
clock-frequency = <400000>;
};

&i2c3 {
clock-frequency = <100000>;

/*
* Display monitor features are burnt in the EEPROM
* as EDID data.
*/
eeprom@50 {
compatible = "ti,eeprom";
reg = <0x50>;
};
};

&mmc1 {
vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>;
ti,bus-width = <8>;
};

&mmc2 {
status = "disable";
};

&mmc3 {
status = "disable";
};
102 changes: 102 additions & 0 deletions trunk/arch/arm/boot/dts/omap3.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,60 @@
reg = <0x48200000 0x1000>;
};

gpio1: gpio@48310000 {
compatible = "ti,omap3-gpio";
ti,hwmods = "gpio1";
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <1>;
};

gpio2: gpio@49050000 {
compatible = "ti,omap3-gpio";
ti,hwmods = "gpio2";
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <1>;
};

gpio3: gpio@49052000 {
compatible = "ti,omap3-gpio";
ti,hwmods = "gpio3";
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <1>;
};

gpio4: gpio@49054000 {
compatible = "ti,omap3-gpio";
ti,hwmods = "gpio4";
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <1>;
};

gpio5: gpio@49056000 {
compatible = "ti,omap3-gpio";
ti,hwmods = "gpio5";
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <1>;
};

gpio6: gpio@49058000 {
compatible = "ti,omap3-gpio";
ti,hwmods = "gpio6";
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <1>;
};

uart1: serial@4806a000 {
compatible = "ti,omap3-uart";
ti,hwmods = "uart1";
Expand Down Expand Up @@ -113,5 +167,53 @@
#size-cells = <0>;
ti,hwmods = "i2c3";
};

mcspi1: spi@48098000 {
compatible = "ti,omap2-mcspi";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "mcspi1";
ti,spi-num-cs = <4>;
};

mcspi2: spi@4809a000 {
compatible = "ti,omap2-mcspi";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "mcspi2";
ti,spi-num-cs = <2>;
};

mcspi3: spi@480b8000 {
compatible = "ti,omap2-mcspi";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "mcspi3";
ti,spi-num-cs = <2>;
};

mcspi4: spi@480ba000 {
compatible = "ti,omap2-mcspi";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "mcspi4";
ti,spi-num-cs = <1>;
};

mmc1: mmc@4809c000 {
compatible = "ti,omap3-hsmmc";
ti,hwmods = "mmc1";
ti,dual-volt;
};

mmc2: mmc@480b4000 {
compatible = "ti,omap3-hsmmc";
ti,hwmods = "mmc2";
};

mmc3: mmc@480ad000 {
compatible = "ti,omap3-hsmmc";
ti,hwmods = "mmc3";
};
};
};
56 changes: 56 additions & 0 deletions trunk/arch/arm/boot/dts/omap4-panda.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,59 @@
reg = <0x80000000 0x40000000>; /* 1 GB */
};
};

&i2c1 {
clock-frequency = <400000>;

twl: twl@48 {
reg = <0x48>;
/* SPI = 0, IRQ# = 7, 4 = active high level-sensitive */
interrupts = <0 7 4>; /* IRQ_SYS_1N cascaded to gic */
interrupt-parent = <&gic>;
};
};

/include/ "twl6030.dtsi"

&i2c2 {
clock-frequency = <400000>;
};

&i2c3 {
clock-frequency = <100000>;

/*
* Display monitor features are burnt in their EEPROM as EDID data.
* The EEPROM is connected as I2C slave device.
*/
eeprom@50 {
compatible = "ti,eeprom";
reg = <0x50>;
};
};

&i2c4 {
clock-frequency = <400000>;
};

&mmc1 {
vmmc-supply = <&vmmc>;
ti,bus-width = <8>;
};

&mmc2 {
status = "disable";
};

&mmc3 {
status = "disable";
};

&mmc4 {
status = "disable";
};

&mmc5 {
ti,non-removable;
ti,bus-width = <4>;
};
97 changes: 97 additions & 0 deletions trunk/arch/arm/boot/dts/omap4-sdp.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,101 @@
device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */
};

vdd_eth: fixedregulator@0 {
compatible = "regulator-fixed";
regulator-name = "VDD_ETH";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&gpio2 16 0>; /* gpio line 48 */
enable-active-high;
regulator-boot-on;
};
};

&i2c1 {
clock-frequency = <400000>;

twl: twl@48 {
reg = <0x48>;
/* SPI = 0, IRQ# = 7, 4 = active high level-sensitive */
interrupts = <0 7 4>; /* IRQ_SYS_1N cascaded to gic */
interrupt-parent = <&gic>;
};
};

/include/ "twl6030.dtsi"

&i2c2 {
clock-frequency = <400000>;
};

&i2c3 {
clock-frequency = <400000>;

/*
* Temperature Sensor
* http://www.ti.com/lit/ds/symlink/tmp105.pdf
*/
tmp105@48 {
compatible = "ti,tmp105";
reg = <0x48>;
};

/*
* Ambient Light Sensor
* http://www.rohm.com/products/databook/sensor/pdf/bh1780gli-e.pdf
*/
bh1780@29 {
compatible = "rohm,bh1780";
reg = <0x29>;
};
};

&i2c4 {
clock-frequency = <400000>;

/*
* 3-Axis Digital Compass
* http://www.sparkfun.com/datasheets/Sensors/Magneto/HMC5843.pdf
*/
hmc5843@1e {
compatible = "honeywell,hmc5843";
reg = <0x1e>;
};
};

&mcspi1 {
eth@0 {
compatible = "ks8851";
spi-max-frequency = <24000000>;
reg = <0>;
interrupt-parent = <&gpio2>;
interrupts = <2>; /* gpio line 34 */
vdd-supply = <&vdd_eth>;
};
};

&mmc1 {
vmmc-supply = <&vmmc>;
ti,bus-width = <8>;
};

&mmc2 {
vmmc-supply = <&vaux1>;
ti,bus-width = <8>;
ti,non-removable;
};

&mmc3 {
status = "disable";
};

&mmc4 {
status = "disable";
};

&mmc5 {
ti,bus-width = <4>;
ti,non-removable;
};
Loading

0 comments on commit 6f364b2

Please sign in to comment.