Commit 5644b427 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'samsung-fixes-2nd-tag' of...

Merge tag 'samsung-fixes-2nd-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

Samsung-fixes-2 for 3.15
- keep LD04 always on for exynos5250-arndale
- fix spi interrupt numbers for exynos5420
- fix ak8975 compatible for exynos4412-trats2

* tag 'samsung-fixes-2nd-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: Keep LDO4 always ON for exynos5250-arndale board
  ARM: dts: Fix SPI interrupt numbers for exynos5420
  ARM: dts: fix incorrect ak8975 compatible for exynos4412-trats2 board
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3aae97c8 68d0e402
...@@ -503,7 +503,7 @@ i2c_ak8975: i2c-gpio-0 { ...@@ -503,7 +503,7 @@ i2c_ak8975: i2c-gpio-0 {
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>;
}; };
......
...@@ -107,6 +107,7 @@ ldo4_reg: LDO4 { ...@@ -107,6 +107,7 @@ ldo4_reg: LDO4 {
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>;
}; };
......
...@@ -382,7 +382,7 @@ i2s2: i2s@12D70000 { ...@@ -382,7 +382,7 @@ i2s2: i2s@12D70000 {
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";
...@@ -398,7 +398,7 @@ spi_0: spi@12d20000 { ...@@ -398,7 +398,7 @@ spi_0: spi@12d20000 {
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";
...@@ -414,7 +414,7 @@ spi_1: spi@12d30000 { ...@@ -414,7 +414,7 @@ spi_1: spi@12d30000 {
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";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment