aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/dts/rk3288-veyron.dtsi')
-rw-r--r--arch/arm/dts/rk3288-veyron.dtsi5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/dts/rk3288-veyron.dtsi b/arch/arm/dts/rk3288-veyron.dtsi
index 4b66f6be3c..916dd486de 100644
--- a/arch/arm/dts/rk3288-veyron.dtsi
+++ b/arch/arm/dts/rk3288-veyron.dtsi
@@ -83,8 +83,6 @@
83 83
84 gpio_keys: gpio-keys { 84 gpio_keys: gpio-keys {
85 compatible = "gpio-keys"; 85 compatible = "gpio-keys";
86 #address-cells = <1>;
87 #size-cells = <0>;
88 86
89 pinctrl-names = "default"; 87 pinctrl-names = "default";
90 pinctrl-0 = <&pwr_key_h>; 88 pinctrl-0 = <&pwr_key_h>;
@@ -309,7 +307,7 @@
309 307
310 spi_flash: spiflash@0 { 308 spi_flash: spiflash@0 {
311 u-boot,dm-pre-reloc; 309 u-boot,dm-pre-reloc;
312 compatible = "spidev", "spi-flash"; 310 compatible = "spidev", "jedec,spi-nor";
313 spi-max-frequency = <20000000>; /* Reduce for Dediprog em100 pro */ 311 spi-max-frequency = <20000000>; /* Reduce for Dediprog em100 pro */
314 reg = <0>; 312 reg = <0>;
315 }; 313 };
@@ -486,6 +484,7 @@
486 max98090: max98090@10 { 484 max98090: max98090@10 {
487 compatible = "maxim,max98090"; 485 compatible = "maxim,max98090";
488 reg = <0x10>; 486 reg = <0x10>;
487 #sound-dai-cells = <0>;
489 interrupt-parent = <&gpio6>; 488 interrupt-parent = <&gpio6>;
490 interrupts = <7 IRQ_TYPE_EDGE_FALLING>; 489 interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
491 pinctrl-names = "default"; 490 pinctrl-names = "default";