diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-28 11:12:21 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-28 11:12:21 -0400 |
| commit | 3a420ed92db2218a9b1b419b37b4b6978b722f82 (patch) | |
| tree | 6f3da8fed1ed8f21710639ff8990c8491f9f2f3e | |
| parent | 7ad61ceec224e6a3124952e7cb6770bcda73d378 (diff) | |
| download | longterm-queue-5.2-3a420ed92db2218a9b1b419b37b4b6978b722f82.tar.gz | |
arm: dts: allow for additional newlines in v5.2.x
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/ARM-dts-sunxi-bananapi-m2-plus-v1.2-Fix-CPU-supply-v.patch | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/queue/ARM-dts-sunxi-bananapi-m2-plus-v1.2-Fix-CPU-supply-v.patch b/queue/ARM-dts-sunxi-bananapi-m2-plus-v1.2-Fix-CPU-supply-v.patch index 896121a0..a17e4861 100644 --- a/queue/ARM-dts-sunxi-bananapi-m2-plus-v1.2-Fix-CPU-supply-v.patch +++ b/queue/ARM-dts-sunxi-bananapi-m2-plus-v1.2-Fix-CPU-supply-v.patch @@ -1,4 +1,4 @@ -From e4dae01bf08b754de79072441c357737220b873f Mon Sep 17 00:00:00 2001 +From 6c80c2dda75d61197317d434899d96147f217f0c Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai <wens@csie.org> Date: Sat, 18 Jul 2020 00:00:48 +0800 Subject: [PATCH] ARM: dts: sunxi: bananapi-m2-plus-v1.2: Fix CPU supply @@ -18,12 +18,13 @@ Fixes: 6eeb4180d4b9 ("ARM: dts: sunxi: h3-h5: Add Bananapi M2+ v1.2 device trees Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime@cerno.tech> Link: https://lore.kernel.org/r/20200717160053.31191-4-wens@kernel.org +[PG: adjust for extra line returns in v5.2.x code base.] diff --git a/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi b/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi -index a628b5ee72b6..235994a4a2eb 100644 +index 23fcdee27a8a..3635b251e250 100644 --- a/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi +++ b/arch/arm/boot/dts/sunxi-bananapi-m2-plus-v1.2.dtsi -@@ -16,12 +16,12 @@ reg_vdd_cpux: vdd-cpux { +@@ -16,13 +16,13 @@ regulator-type = "voltage"; regulator-boot-on; regulator-always-on; @@ -34,8 +35,10 @@ index a628b5ee72b6..235994a4a2eb 100644 regulator-ramp-delay = <50>; /* 4ms */ gpios = <&r_pio 0 1 GPIO_ACTIVE_HIGH>; /* PL1 */ gpios-states = <0x1>; -- states = <1100000 0>, <1300000 1>; -+ states = <1108475 0>, <1308475 1>; +- states = <1100000 0x0 +- 1300000 0x1>; ++ states = <1108475 0x0 ++ 1308475 0x1>; }; }; |