Adjusting patch and update kernel conf for Rockchip NEXT

This commit is contained in:
Igor Pecovnik 2017-05-16 09:47:54 +02:00
parent 718fc37a37
commit e2e4ef2760
2 changed files with 8 additions and 9 deletions

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.11.0 Kernel Configuration
# Linux/arm 4.11.1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y

View File

@ -13,7 +13,7 @@ index f796568..6bc4b39 100644
regulator-state-mem {
@@ -333,7 +333,6 @@
};
vcc33_sd: SWITCH_REG1 {
- regulator-always-on;
regulator-boot-on;
@ -22,7 +22,7 @@ index f796568..6bc4b39 100644
@@ -353,14 +352,45 @@
};
};
+&i2c1 {
+ status = "okay";
+};
@ -30,11 +30,11 @@ index f796568..6bc4b39 100644
&i2c2 {
status = "okay";
};
+&i2c3 {
+ status = "okay";
+};
+
+
+&i2c4 {
+ status = "okay";
+};
@ -42,7 +42,7 @@ index f796568..6bc4b39 100644
&i2c5 {
status = "okay";
};
+ &spi2 {
+ status = "okay";
+ max-freq = <50000000>;
@ -89,7 +89,7 @@ index 7b3c737..d54bb79 100644
+ };
+
};
reserved-memory {
@@ -437,9 +450,9 @@
dma-names = "tx", "rx";
@ -116,11 +116,10 @@ diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index 9e2e099..3a0f0a7 100644
--- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c
@@ -697,7 +697,8 @@ static const struct of_device_id spidev_dt_ids[] = {
@@ -697,6 +697,7 @@ static const struct of_device_id spidev_dt_ids[] = {
{ .compatible = "rohm,dh2228fv" },
{ .compatible = "lineartechnology,ltc2488" },
{ .compatible = "ge,achc" },
{ .compatible = "semtech,sx1301" },
+ { .compatible = "rockchip,spi_tinker" },
{},
};