Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 8306c28c authored by derfelot's avatar derfelot Committed by GitHub
Browse files

Merge pull request #21 from derfelot/lineage-18.1_update

[lineage-18.1] March ASB
parents ab79c487 086c7a86
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -211,12 +211,10 @@ Other notes:
  is 4096. 

- show() methods should return the number of bytes printed into the
  buffer. This is the return value of scnprintf().
  buffer.

- show() must not use snprintf() when formatting the value to be
  returned to user space. If you can guarantee that an overflow
  will never happen you can use sprintf() otherwise you must use
  scnprintf().
- show() should only use sysfs_emit() or sysfs_emit_at() when formatting
  the value to be returned to user space.

- store() should return the number of bytes used from the buffer. If the
  entire buffer has been used, just return the count argument.
+1 −1
Original line number Diff line number Diff line
VERSION = 4
PATCHLEVEL = 4
SUBLEVEL = 258
SUBLEVEL = 260
EXTRAVERSION =
NAME = Blurry Fish Butt

+2 −2
Original line number Diff line number Diff line
@@ -1076,9 +1076,9 @@ __armv4_mmu_cache_off:
__armv7_mmu_cache_off:
		mrc	p15, 0, r0, c1, c0
#ifdef CONFIG_MMU
		bic	r0, r0, #0x000d
		bic	r0, r0, #0x0005
#else
		bic	r0, r0, #0x000c
		bic	r0, r0, #0x0004
#endif
		mcr	p15, 0, r0, c1, c0	@ turn MMU and cache off
		mov	r12, lr
+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@
		compatible = "samsung,s5m8767-pmic";
		reg = <0x66>;
		interrupt-parent = <&gpx3>;
		interrupts = <2 IRQ_TYPE_NONE>;
		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
		pinctrl-names = "default";
		pinctrl-0 = <&s5m8767_irq &s5m8767_dvs &s5m8767_ds>;
		wakeup-source;
+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@
		s2mps11,buck4-ramp-enable = <1>;

		interrupt-parent = <&gpx3>;
		interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
		pinctrl-names = "default";
		pinctrl-0 = <&s2mps11_irq>;

Loading