projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bab549b)
dts: fix SD card read issue for g12a board [2/3]
authorSandy Luo <sandy.luo@amlogic.com>
Wed, 28 Nov 2018 07:16:57 +0000 (15:16 +0800)
committerLuan Yuan <luan.yuan@amlogic.com>
Thu, 29 Nov 2018 06:36:24 +0000 (14:36 +0800)
PD#SWPL-2588

Problem:
g12a u220/u221 boad cann't read SD card

Solution:
auto detect revA and revB chip

Verify:
test pass on u220/u221 board

Change-Id: Ia153bb3f966fe2a58d5f3ed1bf1d3f610d00ff5a
Signed-off-by: Sandy Luo <sandy.luo@amlogic.com>
arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts patch | blob | history
arch/arm/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts patch | blob | history
arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts patch | blob | history
arch/arm/boot/dts/amlogic/g12a_s905y2_u221.dts patch | blob | history
arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts patch | blob | history
arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts patch | blob | history
arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts patch | blob | history
arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts patch | blob | history

diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts
index 398dccf..0a8dec0 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt.dts
@@ -195,7 +195,7 @@
        bt-dev{
                compatible = "amlogic, bt-dev";
                dev_name = "bt-dev";
-               status = "okay";
+               status = "disable";
                gpio_reset = <&gpio       GPIOX_17       GPIO_ACTIVE_HIGH>;
                gpio_hostwake = <&gpio       GPIOX_19       GPIO_ACTIVE_HIGH>;
        };
@@ -203,7 +203,7 @@
        wifi{
                compatible = "amlogic, aml_wifi";
                dev_name = "aml_wifi";
-               status = "okay";
+               status = "disable";
                interrupt_pin = <&gpio       GPIOX_7       GPIO_ACTIVE_HIGH>;
                irq_trigger_type = "GPIO_IRQ_LOW";
                power_on_pin = <&gpio       GPIOX_6       GPIO_ACTIVE_HIGH>;
@@ -639,23 +639,23 @@
                };
                opp05 {
                        opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <761000>;
                };
                opp06 {
                        opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
+                       opp-microvolt = <791000>;
                };
                opp07 {
                        opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
+                       opp-microvolt = <831000>;
                };
                opp08 {
                        opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
+                       opp-microvolt = <871000>;
                };
                opp09 {
                        opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
+                       opp-microvolt = <921000>;
                };
                opp10 {
                        opp-hz = /bits/ 64 <1800000000>;
diff --git a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
index 5565a1c..1e4897a 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
@@ -182,7 +182,7 @@
        bt-dev{
                compatible = "amlogic, bt-dev";
                dev_name = "bt-dev";
-               status = "okay";
+               status = "disable";
                gpio_reset = <&gpio       GPIOX_17       GPIO_ACTIVE_HIGH>;
                gpio_hostwake = <&gpio       GPIOX_19       GPIO_ACTIVE_HIGH>;
        };
@@ -190,7 +190,7 @@
        wifi{
                compatible = "amlogic, aml_wifi";
                dev_name = "aml_wifi";
-               status = "okay";
+               status = "disable";
                interrupt_pin = <&gpio       GPIOX_7       GPIO_ACTIVE_HIGH>;
                irq_trigger_type = "GPIO_IRQ_LOW";
                power_on_pin = <&gpio       GPIOX_6       GPIO_ACTIVE_HIGH>;
@@ -600,23 +600,23 @@
                };
                opp05 {
                        opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <761000>;
                };
                opp06 {
                        opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
+                       opp-microvolt = <791000>;
                };
                opp07 {
                        opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
+                       opp-microvolt = <831000>;
                };
                opp08 {
                        opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
+                       opp-microvolt = <871000>;
                };
                opp09 {
                        opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
+                       opp-microvolt = <921000>;
                };
                opp10 {
                        opp-hz = /bits/ 64 <1800000000>;
diff --git a/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts b/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts
index f5e1c72..0322b9c 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905y2_u220.dts
@@ -189,7 +189,7 @@
        bt-dev{
                compatible = "amlogic, bt-dev";
                dev_name = "bt-dev";
-               status = "okay";
+               status = "disable";
                gpio_reset = <&gpio       GPIOX_17       GPIO_ACTIVE_HIGH>;
                gpio_hostwake = <&gpio       GPIOX_19       GPIO_ACTIVE_HIGH>;
        };
@@ -197,7 +197,7 @@
        wifi{
                compatible = "amlogic, aml_wifi";
                dev_name = "aml_wifi";
-               status = "okay";
+               status = "disable";
                interrupt_pin = <&gpio       GPIOX_7       GPIO_ACTIVE_HIGH>;
                irq_trigger_type = "GPIO_IRQ_LOW";
                power_on_pin = <&gpio       GPIOX_6       GPIO_ACTIVE_HIGH>;
@@ -1222,7 +1222,7 @@
 };
 
 &sd_emmc_a {
-       status = "okay";
+       status = "disabled";
        sdio {
                caps = "MMC_CAP_4_BIT_DATA",
                         "MMC_CAP_MMC_HIGHSPEED",
diff --git a/arch/arm/boot/dts/amlogic/g12a_s905y2_u221.dts b/arch/arm/boot/dts/amlogic/g12a_s905y2_u221.dts
index 66b64d6..9317cf0 100644 (file)
--- a/arch/arm/boot/dts/amlogic/g12a_s905y2_u221.dts
+++ b/arch/arm/boot/dts/amlogic/g12a_s905y2_u221.dts
@@ -653,23 +653,23 @@
                };
                opp05 {
                        opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <761000>;
                };
                opp06 {
                        opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
+                       opp-microvolt = <791000>;
                };
                opp07 {
                        opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
+                       opp-microvolt = <831000>;
                };
                opp08 {
                        opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
+                       opp-microvolt = <871000>;
                };
                opp09 {
                        opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
+                       opp-microvolt = <921000>;
                };
                opp10 {
                        opp-hz = /bits/ 64 <1800000000>;
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
index ccf02f0..e3e4c2f 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt.dts
@@ -195,7 +195,7 @@
        bt-dev{
                compatible = "amlogic, bt-dev";
                dev_name = "bt-dev";
-               status = "okay";
+               status = "disable";
                gpio_reset = <&gpio       GPIOX_17       GPIO_ACTIVE_HIGH>;
                gpio_hostwake = <&gpio       GPIOX_19       GPIO_ACTIVE_HIGH>;
        };
@@ -203,7 +203,7 @@
        wifi{
                compatible = "amlogic, aml_wifi";
                dev_name = "aml_wifi";
-               status = "okay";
+               status = "disable";
                interrupt_pin = <&gpio       GPIOX_7       GPIO_ACTIVE_HIGH>;
                irq_trigger_type = "GPIO_IRQ_LOW";
                power_on_pin = <&gpio       GPIOX_6       GPIO_ACTIVE_HIGH>;
@@ -639,23 +639,23 @@
                };
                opp05 {
                        opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <761000>;
                };
                opp06 {
                        opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
+                       opp-microvolt = <791000>;
                };
                opp07 {
                        opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
+                       opp-microvolt = <831000>;
                };
                opp08 {
                        opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
+                       opp-microvolt = <871000>;
                };
                opp09 {
                        opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
+                       opp-microvolt = <921000>;
                };
                opp10 {
                        opp-hz = /bits/ 64 <1800000000>;
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
index dd942ba..acb0a41 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905d2_skt_buildroot.dts
@@ -182,7 +182,7 @@
        bt-dev{
                compatible = "amlogic, bt-dev";
                dev_name = "bt-dev";
-               status = "okay";
+               status = "disable";
                gpio_reset = <&gpio       GPIOX_17       GPIO_ACTIVE_HIGH>;
                gpio_hostwake = <&gpio       GPIOX_19       GPIO_ACTIVE_HIGH>;
        };
@@ -190,7 +190,7 @@
        wifi{
                compatible = "amlogic, aml_wifi";
                dev_name = "aml_wifi";
-               status = "okay";
+               status = "disable";
                interrupt_pin = <&gpio       GPIOX_7       GPIO_ACTIVE_HIGH>;
                irq_trigger_type = "GPIO_IRQ_LOW";
                power_on_pin = <&gpio       GPIOX_6       GPIO_ACTIVE_HIGH>;
@@ -600,23 +600,23 @@
                };
                opp05 {
                        opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <761000>;
                };
                opp06 {
                        opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
+                       opp-microvolt = <791000>;
                };
                opp07 {
                        opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
+                       opp-microvolt = <831000>;
                };
                opp08 {
                        opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
+                       opp-microvolt = <871000>;
                };
                opp09 {
                        opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
+                       opp-microvolt = <921000>;
                };
                opp10 {
                        opp-hz = /bits/ 64 <1800000000>;
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts
index b3037bd..13f8bc2 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u220.dts
@@ -189,7 +189,7 @@
        bt-dev{
                compatible = "amlogic, bt-dev";
                dev_name = "bt-dev";
-               status = "okay";
+               status = "disable";
                gpio_reset = <&gpio       GPIOX_17       GPIO_ACTIVE_HIGH>;
                gpio_hostwake = <&gpio       GPIOX_19       GPIO_ACTIVE_HIGH>;
        };
@@ -197,7 +197,7 @@
        wifi{
                compatible = "amlogic, aml_wifi";
                dev_name = "aml_wifi";
-               status = "okay";
+               status = "disable";
                interrupt_pin = <&gpio       GPIOX_7       GPIO_ACTIVE_HIGH>;
                irq_trigger_type = "GPIO_IRQ_LOW";
                power_on_pin = <&gpio       GPIOX_6       GPIO_ACTIVE_HIGH>;
@@ -1222,7 +1222,7 @@
 };
 
 &sd_emmc_a {
-       status = "okay";
+       status = "disabled";
        sdio {
                caps = "MMC_CAP_4_BIT_DATA",
                         "MMC_CAP_MMC_HIGHSPEED",
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts
index a4fbc61..270c6b9 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts
@@ -651,23 +651,23 @@
                };
                opp05 {
                        opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <761000>;
                };
                opp06 {
                        opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
+                       opp-microvolt = <791000>;
                };
                opp07 {
                        opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
+                       opp-microvolt = <831000>;
                };
                opp08 {
                        opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
+                       opp-microvolt = <871000>;
                };
                opp09 {
                        opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
+                       opp-microvolt = <921000>;
                };
                opp10 {
                        opp-hz = /bits/ 64 <1800000000>;
Domain: System / Kernel;