xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Browse Source 
Pull non-urgent ARM SoC fixes from Arnd Bergmann:
 "Smaller patches that didn't seem to find a home in other branches, and
  low-priority fixes from late in the merge window.

   - Lee Jones retires as bcm2835 (raspberry pi) co-maintainer.

   - a couple of bugfixes for the ARM CCN bus driver that were regarded
     not important enough

   - minor device tree fixes for the Renesas and Marvell platforms, that
     came a little late or did not justify have another pull request
     after the last -rc"

* tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  bus: arm-ccn: Enable stats for CCN-502 interconnect
  dt-bindings: arm-ccn: Add bindings info for CCN-502 compatible string
  bus: arm-ccn: Use devm_kcalloc() in arm_ccn_probe()
  bus: arm-ccn: Fix module autoload
  MAINTAINERS: add RV1108 Rockchip soc to maintained files
  ARM: dts: kirkwood: Fix Openblock A6 nand partition overlap
  ARM: dts: armadillo800eva: Split LCD mux and gpio
  MAINTAINERS: Remove Lee Jones from bcm2835.
This commit is contained in:
Linus Torvalds
2017-07-04 14:30:31 -07:00
parent c9946d014f ff9e0e3b09
commit 612341bda6
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/kirkwood-openblocks_a6.dts
View File

@@ -141,7 +141,7 @@
partition@d4000 {
label = "test";
reg = <0xd4000 0x24000>;
reg = <0xd4000 0x20000>;
};
partition@f4000 {

2
arch/arm/boot/dts/r8a7740-armadillo800eva.dts
View File

@@ -266,7 +266,9 @@
lcd0_pins: lcd0 {
groups = "lcd0_data24_0", "lcd0_lclk_1", "lcd0_sync";
function = "lcd0";
};
lcd0_mux {
/* DBGMD/LCDC0/FSIA MUX */
gpio-hog;
gpios = <176 0>;