9
0
Fork 0

dts: update to v3.15-rc8

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-06-05 08:52:17 +02:00
parent 9b715c6a44
commit 83e875e1f4
7 changed files with 16 additions and 31 deletions

View File

@ -99,7 +99,7 @@
pcie@3,0 { pcie@3,0 {
device_type = "pci"; device_type = "pci";
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>; assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
reg = <0x1000 0 0 0 0>; reg = <0x1800 0 0 0 0>;
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
#interrupt-cells = <1>; #interrupt-cells = <1>;

View File

@ -110,7 +110,7 @@
pcie@3,0 { pcie@3,0 {
device_type = "pci"; device_type = "pci";
assigned-addresses = <0x82000800 0 0x44000 0 0x2000>; assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
reg = <0x1000 0 0 0 0>; reg = <0x1800 0 0 0 0>;
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
@ -131,7 +131,7 @@
pcie@4,0 { pcie@4,0 {
device_type = "pci"; device_type = "pci";
assigned-addresses = <0x82000800 0 0x48000 0 0x2000>; assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
reg = <0x1000 0 0 0 0>; reg = <0x2000 0 0 0 0>;
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
#interrupt-cells = <1>; #interrupt-cells = <1>;

View File

@ -641,7 +641,7 @@
trigger@3 { trigger@3 {
reg = <3>; reg = <3>;
trigger-name = "external"; trigger-name = "external";
trigger-value = <0x13>; trigger-value = <0xd>;
trigger-external; trigger-external;
}; };
}; };

View File

@ -503,7 +503,7 @@
status = "okay"; status = "okay";
ak8975@0c { ak8975@0c {
compatible = "ak,ak8975"; compatible = "asahi-kasei,ak8975";
reg = <0x0c>; reg = <0x0c>;
gpios = <&gpj0 7 0>; gpios = <&gpj0 7 0>;
}; };

View File

@ -107,6 +107,7 @@
regulator-name = "VDD_IOPERI_1.8V"; regulator-name = "VDD_IOPERI_1.8V";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-always-on;
op_mode = <1>; op_mode = <1>;
}; };

View File

@ -364,16 +364,4 @@
gpio-key,wakeup; gpio-key,wakeup;
}; };
}; };
amba {
mdma1: mdma@11C10000 {
/*
* MDMA1 can support both secure and non-secure
* AXI transactions. When this is enabled in the kernel
* for boards that run in secure mode, we are getting
* imprecise external aborts causing the kernel to oops.
*/
status = "disabled";
};
};
}; };

View File

@ -219,16 +219,6 @@
reg = <0x100440C0 0x20>; reg = <0x100440C0 0x20>;
}; };
mau_pd: power-domain@100440E0 {
compatible = "samsung,exynos4210-pd";
reg = <0x100440E0 0x20>;
};
g2d_pd: power-domain@10044100 {
compatible = "samsung,exynos4210-pd";
reg = <0x10044100 0x20>;
};
msc_pd: power-domain@10044120 { msc_pd: power-domain@10044120 {
compatible = "samsung,exynos4210-pd"; compatible = "samsung,exynos4210-pd";
reg = <0x10044120 0x20>; reg = <0x10044120 0x20>;
@ -336,6 +326,13 @@
#dma-cells = <1>; #dma-cells = <1>;
#dma-channels = <8>; #dma-channels = <8>;
#dma-requests = <1>; #dma-requests = <1>;
/*
* MDMA1 can support both secure and non-secure
* AXI transactions. When this is enabled in the kernel
* for boards that run in secure mode, we are getting
* imprecise external aborts causing the kernel to oops.
*/
status = "disabled";
}; };
}; };
@ -385,7 +382,7 @@
spi_0: spi@12d20000 { spi_0: spi@12d20000 {
compatible = "samsung,exynos4210-spi"; compatible = "samsung,exynos4210-spi";
reg = <0x12d20000 0x100>; reg = <0x12d20000 0x100>;
interrupts = <0 66 0>; interrupts = <0 68 0>;
dmas = <&pdma0 5 dmas = <&pdma0 5
&pdma0 4>; &pdma0 4>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
@ -401,7 +398,7 @@
spi_1: spi@12d30000 { spi_1: spi@12d30000 {
compatible = "samsung,exynos4210-spi"; compatible = "samsung,exynos4210-spi";
reg = <0x12d30000 0x100>; reg = <0x12d30000 0x100>;
interrupts = <0 67 0>; interrupts = <0 69 0>;
dmas = <&pdma1 5 dmas = <&pdma1 5
&pdma1 4>; &pdma1 4>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
@ -417,7 +414,7 @@
spi_2: spi@12d40000 { spi_2: spi@12d40000 {
compatible = "samsung,exynos4210-spi"; compatible = "samsung,exynos4210-spi";
reg = <0x12d40000 0x100>; reg = <0x12d40000 0x100>;
interrupts = <0 68 0>; interrupts = <0 70 0>;
dmas = <&pdma0 7 dmas = <&pdma0 7
&pdma0 6>; &pdma0 6>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
@ -730,6 +727,5 @@
interrupts = <0 112 0>; interrupts = <0 112 0>;
clocks = <&clock 471>; clocks = <&clock 471>;
clock-names = "secss"; clock-names = "secss";
samsung,power-domain = <&g2d_pd>;
}; };
}; };