Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1346568 > unrolled thread
| Started by | Andy Yan <andy.yan@rock-chips.com> |
|---|---|
| First post | 2016-03-01 13:20 +0100 |
| Last post | 2016-03-03 03:00 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH v4 0/4] add reboot mode driver Andy Yan <andy.yan@rock-chips.com> - 2016-03-01 13:20 +0100
[PATCH v4 3/4] ARM: dts: rockchip: add syscon-reboot-mode DT node Andy Yan <andy.yan@rock-chips.com> - 2016-03-01 13:20 +0100
Re: [PATCH v4 0/4] add reboot mode driver Caesar Wang <caesar.upstream@gmail.com> - 2016-03-03 03:00 +0100
| From | Andy Yan <andy.yan@rock-chips.com> |
|---|---|
| Date | 2016-03-01 13:20 +0100 |
| Subject | [PATCH v4 0/4] add reboot mode driver |
| Message-ID | <r7Rrs-A3-19@gated-at.bofh.it> |
This driver parse the reboot commands like "reboot loader" and "reboot recovery" to get a boot mode described in the device tree , then call the corresponding write interfae to store the boot mode in some place like special register or ram , which can be read by the bootloader after system reboot. This is commonly done on Android based devices, in order to reboot the device into fastboot or recovery mode. Changes in v4: - remove mode-maskrom - rename mode-fastboot to mode-bootloader to keep compatible with the exiting Android device - make this driver depends on OF to avoid kbuild test error Changes in v3: - descirbe all reboot mode as properity instead of subnode - scan multi properities - add mask value for some platform which only use some bits of the register to store boot mode magic value - descirbe all reboot mode as property instead of subnode - add rk3036 support - descirbe all reboot mode as properity instead of subnode Changes in v2: - move to dir drivers/power/reset/ - make syscon-reboot-mode a generic driver - make this node as a subnode of PMU - make this node as a subnode of pmugrf Changes in v1: - fix the embarrassed compile warning - correct the maskrom magic number - check for the normal reboot - correct the maskrom magic number - use macro defined in rockchip_boot-mode.h for reboot-mode DT node Andy Yan (4): dt-bindings: power: reset: add document for reboot-mode driver power: reset: add reboot mode driver ARM: dts: rockchip: add syscon-reboot-mode DT node ARM64: dts: rockchip: add syscon-reboot-mode DT node .../bindings/power/reset/reboot-mode.txt | 24 +++++ .../bindings/power/reset/syscon-reboot-mode.txt | 35 +++++++ arch/arm/boot/dts/rk3036.dtsi | 11 ++- arch/arm/boot/dts/rk3288.dtsi | 10 ++ arch/arm/boot/dts/rk3xxx.dtsi | 12 ++- arch/arm64/boot/dts/rockchip/rk3368.dtsi | 13 ++- drivers/power/reset/Kconfig | 16 ++++ drivers/power/reset/Makefile | 2 + drivers/power/reset/reboot-mode.c | 105 +++++++++++++++++++++ drivers/power/reset/reboot-mode.h | 6 ++ drivers/power/reset/syscon-reboot-mode.c | 64 +++++++++++++ include/dt-bindings/soc/rockchip_boot-mode.h | 30 ++++++ 12 files changed, 325 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/power/reset/reboot-mode.txt create mode 100644 Documentation/devicetree/bindings/power/reset/syscon-reboot-mode.txt create mode 100644 drivers/power/reset/reboot-mode.c create mode 100644 drivers/power/reset/reboot-mode.h create mode 100644 drivers/power/reset/syscon-reboot-mode.c create mode 100644 include/dt-bindings/soc/rockchip_boot-mode.h -- 1.9.1
[toc] | [next] | [standalone]
| From | Andy Yan <andy.yan@rock-chips.com> |
|---|---|
| Date | 2016-03-01 13:20 +0100 |
| Subject | [PATCH v4 3/4] ARM: dts: rockchip: add syscon-reboot-mode DT node |
| Message-ID | <r7Rrs-A3-27@gated-at.bofh.it> |
| In reply to | #1346568 |
Rockchip platform use a SYSCON mapped register store
the reboot mode magic value for bootloader to use when
system reboot. So add syscon-reboot-mode driver DT node
for rk3xxx,rk3036, rk3288 platform
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
---
Changes in v4: None
Changes in v3:
- descirbe all reboot mode as property instead of subnode
- add rk3036 support
Changes in v2:
- make this node as a subnode of PMU
Changes in v1:
- correct the maskrom magic number
- use macro defined in rockchip_boot-mode.h for reboot-mode DT node
arch/arm/boot/dts/rk3036.dtsi | 11 +++++++++-
arch/arm/boot/dts/rk3288.dtsi | 10 ++++++++++
arch/arm/boot/dts/rk3xxx.dtsi | 12 ++++++++++-
include/dt-bindings/soc/rockchip_boot-mode.h | 30 ++++++++++++++++++++++++++++
4 files changed, 61 insertions(+), 2 deletions(-)
create mode 100644 include/dt-bindings/soc/rockchip_boot-mode.h
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index b9567c1..a4a1773 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -43,6 +43,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/pinctrl/rockchip.h>
#include <dt-bindings/clock/rk3036-cru.h>
+#include <dt-bindings/soc/rockchip_boot-mode.h>
#include "skeleton.dtsi"
/ {
@@ -261,8 +262,16 @@
};
grf: syscon@20008000 {
- compatible = "rockchip,rk3036-grf", "syscon";
+ compatible = "rockchip,rk3036-grf", "syscon", "simple-mfd";
reg = <0x20008000 0x1000>;
+ reboot-mode {
+ compatible = "syscon-reboot-mode";
+ offset = <0x1d8>;
+ mode-normal = <BOOT_NORMAL>;
+ mode-recovery = <BOOT_RECOVERY>;
+ mode-bootloader = <BOOT_FASTBOOT>;
+ mode-loader = <BOOT_LOADER>;
+ };
};
acodec: acodec-ana@20030000 {
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 8ac49f3..977b188 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -45,6 +45,7 @@
#include <dt-bindings/clock/rk3288-cru.h>
#include <dt-bindings/thermal/thermal.h>
#include <dt-bindings/power/rk3288-power.h>
+#include <dt-bindings/soc/rockchip_boot-mode.h>
#include "skeleton.dtsi"
/ {
@@ -713,6 +714,15 @@
clocks = <&cru ACLK_GPU>;
};
};
+
+ reboot-mode {
+ compatible = "syscon-reboot-mode";
+ offset = <0x94>;
+ mode-normal = <BOOT_NORMAL>;
+ mode-recovery = <BOOT_RECOVERY>;
+ mode-bootloader = <BOOT_FASTBOOT>;
+ mode-loader = <BOOT_LOADER>;
+ };
};
sgrf: syscon@ff740000 {
diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index 99eeea7..b00d94c 100644
--- a/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@ -43,6 +43,7 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/soc/rockchip_boot-mode.h>
#include "skeleton.dtsi"
/ {
@@ -243,8 +244,17 @@
};
pmu: pmu@20004000 {
- compatible = "rockchip,rk3066-pmu", "syscon";
+ compatible = "rockchip,rk3066-pmu", "syscon", "simple-mfd";
reg = <0x20004000 0x100>;
+
+ reboot-mode {
+ compatible = "syscon-reboot-mode";
+ offset = <0x40>;
+ mode-normal = <BOOT_NORMAL>;
+ mode-recovery = <BOOT_RECOVERY>;
+ mode-bootloader = <BOOT_FASTBOOT>;
+ mode-loader = <BOOT_LOADER>;
+ };
};
grf: grf@20008000 {
diff --git a/include/dt-bindings/soc/rockchip_boot-mode.h b/include/dt-bindings/soc/rockchip_boot-mode.h
new file mode 100644
index 0000000..eedf113
--- /dev/null
+++ b/include/dt-bindings/soc/rockchip_boot-mode.h
@@ -0,0 +1,30 @@
+#ifndef __ROCKCHIP_BOOT_MODE_H
+#define __ROCKCHIP_BOOT_MODE_H
+
+/*high 24 bits is tag, low 8 bits is type*/
+#define REBOOT_FLAG 0x5242C300
+/* normal boot */
+#define BOOT_NORMAL (REBOOT_FLAG + 0)
+/* enter loader rockusb mode */
+#define BOOT_LOADER (REBOOT_FLAG + 1)
+/* enter maskrom rockusb mode */
+#define BOOT_MASKROM (0xEF08A53C)
+/* enter recovery */
+#define BOOT_RECOVERY (REBOOT_FLAG + 3)
+/* do not enter recover */
+#define BOOT_NORECOVER (REBOOT_FLAG + 4)
+/* boot second OS*/
+#define BOOT_SECONDOS (REBOOT_FLAG + 5)
+/* enter recover and wipe data. */
+#define BOOT_WIPEDATA (REBOOT_FLAG + 6)
+/* enter recover and wipe all data. */
+#define BOOT_WIPEALL (REBOOT_FLAG + 7)
+/* check firmware img with backup part*/
+#define BOOT_CHECKIMG (REBOOT_FLAG + 8)
+ /* enter fast boot mode */
+#define BOOT_FASTBOOT (REBOOT_FLAG + 9)
+#define BOOT_SECUREBOOT_DISABLE (REBOOT_FLAG + 10)
+/* enter charge mode */
+#define BOOT_CHARGING (REBOOT_FLAG + 11)
+
+#endif
--
1.9.1
[toc] | [prev] | [next] | [standalone]
| From | Caesar Wang <caesar.upstream@gmail.com> |
|---|---|
| Date | 2016-03-03 03:00 +0100 |
| Message-ID | <r8qIy-8gZ-7@gated-at.bofh.it> |
| In reply to | #1346568 |
Hi Andy, This series patches ware verified on my github with RK3368 evb and RK30236 board. https://github.com/Caesar-github/rockchip/tree/for-reboot-mode-tests 在 2016年03月01日 20:09, Andy Yan 写道: > This driver parse the reboot commands like "reboot loader" > and "reboot recovery" to get a boot mode described in the > device tree , then call the corresponding write interfae > to store the boot mode in some place like special register > or ram , which can be read by the bootloader after system > reboot. > > This is commonly done on Android based devices, in order to > reboot the device into fastboot or recovery mode. > > > Changes in v4: > - remove mode-maskrom > - rename mode-fastboot to mode-bootloader to keep compatible with the exiting Android device > - make this driver depends on OF to avoid kbuild test error > > Changes in v3: > - descirbe all reboot mode as properity instead of subnode > - scan multi properities > - add mask value for some platform which only use some bits of the register > to store boot mode magic value > - descirbe all reboot mode as property instead of subnode > - add rk3036 support > - descirbe all reboot mode as properity instead of subnode > > Changes in v2: > - move to dir drivers/power/reset/ > - make syscon-reboot-mode a generic driver > - make this node as a subnode of PMU > - make this node as a subnode of pmugrf > > Changes in v1: > - fix the embarrassed compile warning > - correct the maskrom magic number > - check for the normal reboot > - correct the maskrom magic number > - use macro defined in rockchip_boot-mode.h for reboot-mode DT node > > Andy Yan (4): > dt-bindings: power: reset: add document for reboot-mode driver > power: reset: add reboot mode driver > ARM: dts: rockchip: add syscon-reboot-mode DT node > ARM64: dts: rockchip: add syscon-reboot-mode DT node Tested-by: Caesar Wang <wxt@rock-chips.com> > > .../bindings/power/reset/reboot-mode.txt | 24 +++++ > .../bindings/power/reset/syscon-reboot-mode.txt | 35 +++++++ > arch/arm/boot/dts/rk3036.dtsi | 11 ++- > arch/arm/boot/dts/rk3288.dtsi | 10 ++ > arch/arm/boot/dts/rk3xxx.dtsi | 12 ++- > arch/arm64/boot/dts/rockchip/rk3368.dtsi | 13 ++- > drivers/power/reset/Kconfig | 16 ++++ > drivers/power/reset/Makefile | 2 + > drivers/power/reset/reboot-mode.c | 105 +++++++++++++++++++++ > drivers/power/reset/reboot-mode.h | 6 ++ > drivers/power/reset/syscon-reboot-mode.c | 64 +++++++++++++ > include/dt-bindings/soc/rockchip_boot-mode.h | 30 ++++++ > 12 files changed, 325 insertions(+), 3 deletions(-) > create mode 100644 Documentation/devicetree/bindings/power/reset/reboot-mode.txt > create mode 100644 Documentation/devicetree/bindings/power/reset/syscon-reboot-mode.txt > create mode 100644 drivers/power/reset/reboot-mode.c > create mode 100644 drivers/power/reset/reboot-mode.h > create mode 100644 drivers/power/reset/syscon-reboot-mode.c > create mode 100644 include/dt-bindings/soc/rockchip_boot-mode.h > -- Thanks, Caesar
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web