Fixes for a few issues found that would be good to get

Browse source

into -rc1:
 
 - Update SoC revision detection for am43x es1.2
 
 - Fix regression with GPMC timings on 2430sdp for some versions
   of u-boot
 
 - Fix dra7 watchdog compatible property
 
 - Fix am437x-sk-evm LCD timings
 
 - Fix dra7 DSS clock muxing
 
 - Fix dra7-evm voltages
 
 - Remove a unused function prototype for am33xx_clk_init
 
 - Enable AHCI in the omap2plus_defconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUiJUMAAoJEBvUPslcq6VzGzEP/Ayn/OoI3NXw7MZhru2Yp2iA
 3oBrjGK4Sy0ak/osf+UB/KMsmxGiQnStRdW0s+QrqXXpBYvDZKy8uZUJ+9ftG0t5
 cdpvn/oAI9wXy0WbS5cEkfSXrT8ggoCu7h13NZMSHbD4d6/L9tqJes66/7njwt9d
 BdQlXPtG++A7XlV0v1KN1lSmkNmz3VbZfxL4j0ihKmiYeqI+TQI5PIBMFEB8AnFW
 FTaUMSrZD2yrLzfh2BxVTeoEmycTdmPC7lgz3QiJLMijleDRpZRIl7oKK2zF3QxC
 8fldyEJCDW6hiMP6y8bF2nE8jkuto0x3hKb0Di34ccgZeR2Ez3pPU77ecAIEV6eG
 8cD6aeV+5XawFCSwMtovV3tLPUZtH93swrDroSY0FIfj0X66z/Wo4erAw7ncppVl
 mAG/tyIdEA9c+BY59ADBD45+NwvpoBcecWHZYmtsxaKxTo9yzo3P4qL9eUYG6aNH
 ugdcVFvy8P3zcZGSgRD1qsuwrjv6+RPtfhNz+a299IYw35glJI+qMWSlc5YqpdFq
 Hb7ZGDKtGCndy6BF1NrEw8xyBaQJX5V6x3QAA5x8JTAe7aEHOAQAzk/9Xvjo1NoD
 IB8c2uCzpB/aIm75f9qNmEMO92jHbd6zizF8ejTiTU99h5ONXTOYz1k6c4w/QeiS
 fzA1a0rNHQgVn+VcC5qN
 =rzAf
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.19/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From: Tony Lindgren <tony@atomide.com>
Subject: [GIT PULL] few fixes for the v3.19 merge window

Fixes for a few issues found that would be good to get
into -rc1:

- Update SoC revision detection for am43x es1.2

- Fix regression with GPMC timings on 2430sdp for some versions
  of u-boot

- Fix dra7 watchdog compatible property

- Fix am437x-sk-evm LCD timings

- Fix dra7 DSS clock muxing

- Fix dra7-evm voltages

- Remove a unused function prototype for am33xx_clk_init

- Enable AHCI in the omap2plus_defconfig

* tag 'omap-for-v3.19/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (1601 commits)
  ARM: omap2plus_defconfig: Enable AHCI_PLATFORM driver
  ARM: dts: am437x-sk-evm.dts: fix LCD timings
  ARM: dts: dra7-evm: Update SMPS7 (VDD_CORE) max voltage to match DM
  ARM: dts: dra7-evm: Fix typo in SMPS6 (VDD_GPU) max voltage
  ARM: OMAP2+: AM43x: Add ID for ES1.2
  ARM: dts: am437x-sk: fix lcd enable pin mux data
  ARM: dts: Fix gpmc regression for omap 2430sdp smc91x
  hwmon: (tmp401) Detect TMP435 on all addresses it supports
  mfd: rtsx: Add func to split u32 into register
  mmc: sdhci-msm: Convert to mmc_send_tuning()
  mmc: sdhci-esdhc-imx: Convert to mmc_send_tuning()
  mmc: core: Let mmc_send_tuning() to take struct mmc_host* as parameter
  nios2: Make NIOS2_CMDLINE_IGNORE_DTB depend on CMDLINE_BOOL
  nios2: Add missing NR_CPUS to Kconfig
  nios2: asm-offsets: Remove unused definition TI_TASK
  nios2: Remove write-only struct member from nios2_timer
  nios2: Remove unused extern declaration of shm_align_mask
  nios2: include linux/type.h in io.h
  nios2: move include asm-generic/io.h to end of file
  nios2: remove include asm-generic/iomap.h from io.h
  ...

...

This commit is contained in:

Kevin Hilman 2014-12-15 13:59:43 -08:00

parent 9d312cd12e 661ea91b67

commit 1888d2fa31

1548 changed files with 72572 additions and 59541 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

25

Documentation/ABI/stable/sysfs-driver-ib_srp

View file

28

Documentation/arm/firmware.txt

View file

16

Documentation/arm/sunxi/README

View file

45

Documentation/arm64/legacy_instructions.txt

View file

4

Documentation/block/biodoc.txt

View file

22

Documentation/device-mapper/cache-policies.txt

View file

8

Documentation/devicetree/bindings/arm/amlogic.txt

View file

8

Documentation/devicetree/bindings/arm/arch_timer.txt

View file

65

Documentation/devicetree/bindings/arm/arm-boards

View file

31

Documentation/devicetree/bindings/arm/bcm/cygnus.txt

View file

9

Documentation/devicetree/bindings/arm/cpus.txt

View file

38

Documentation/devicetree/bindings/arm/fsl.txt

View file

1

Documentation/devicetree/bindings/arm/gic.txt

View file

10

Documentation/devicetree/bindings/arm/marvell,berlin.txt

View file

19

Documentation/devicetree/bindings/arm/mediatek.txt

View file

3

Documentation/devicetree/bindings/arm/omap/omap.txt

View file

4

Documentation/devicetree/bindings/arm/rockchip.txt

View file

19

Documentation/devicetree/bindings/arm/samsung-boards.txt

View file

6

Documentation/devicetree/bindings/arm/ste-nomadik.txt

View file

12

Documentation/devicetree/bindings/arm/sunxi.txt

View file

35

Documentation/devicetree/bindings/arm/ux500/power_domain.txt

View file

6

Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt

View file

17

Documentation/devicetree/bindings/bus/mvebu-mbus.txt

View file

34

Documentation/devicetree/bindings/clock/bcm-cygnus-clock.txt

View file

15

Documentation/devicetree/bindings/clock/vf610-clock.txt

View file

2

Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt

View file

39

Documentation/devicetree/bindings/hwmon/ltc2978.txt

View file

1

Documentation/devicetree/bindings/i2c/i2c-s3c2410.txt

View file

2

Documentation/devicetree/bindings/i2c/trivial-devices.txt

View file

21

Documentation/devicetree/bindings/memory-controllers/mvebu-sdram-controller.txt

View file

36

Documentation/devicetree/bindings/memory-controllers/nvidia,tegra-mc.txt

View file

51

Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt

View file

6

Documentation/devicetree/bindings/mfd/max77686.txt

View file

21

Documentation/devicetree/bindings/mfd/max77693.txt

View file

22

Documentation/devicetree/bindings/mfd/s2mps11.txt

View file

4

Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt

View file

29

Documentation/devicetree/bindings/mmc/img-dw-mshc.txt

View file

7

Documentation/devicetree/bindings/mmc/sdhci-pxa.txt

View file

62

Documentation/devicetree/bindings/nios2/nios2.txt

View file

19

Documentation/devicetree/bindings/nios2/timer.txt

View file

18

Documentation/devicetree/bindings/power/power-controller.txt

View file

23

Documentation/devicetree/bindings/power_supply/imx-snvs-poweroff.txt

View file

4

Documentation/devicetree/bindings/regulator/act8865-regulator.txt

View file

35

Documentation/devicetree/bindings/regulator/max77802.txt

View file

22

Documentation/devicetree/bindings/regulator/regulator.txt

View file

10

Documentation/devicetree/bindings/regulator/sky81452-regulator.txt

View file

42

Documentation/devicetree/bindings/reset/st,sti-picophyreset.txt

View file

23

Documentation/devicetree/bindings/rtc/atmel,at91sam9-rtc.txt

View file

2

Documentation/devicetree/bindings/timer/renesas,mtu2.txt

View file

4

Documentation/devicetree/bindings/timer/renesas,tmu.txt

View file

4

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

17

Documentation/devicetree/bindings/w1/omap-hdq.txt

View file

5

Documentation/hwmon/lm75

View file

15

Documentation/hwmon/lm95234

View file

14

Documentation/hwmon/lm95245

View file

14

Documentation/hwmon/nct6775

View file

32

Documentation/hwmon/nct7802

View file

8

Documentation/hwmon/tmp401

View file

11

Documentation/memory-barriers.txt

View file

23

Documentation/nios2/README

View file

82

Documentation/scsi/libsas.txt

View file

66

Documentation/scsi/scsi_mid_low_api.txt

View file

8

Documentation/scsi/st.txt

View file

21

Documentation/scsi/wd719x.txt

View file

82

MAINTAINERS

View file

2

arch/arc/include/asm/io.h

View file

30

arch/arm/Kconfig

View file

167

arch/arm/Kconfig.debug

View file

8

arch/arm/Makefile

View file

80

arch/arm/boot/dts/Makefile

View file

17

arch/arm/boot/dts/am335x-evm.dts

View file

4

arch/arm/boot/dts/am335x-igep0033.dtsi

View file

362

arch/arm/boot/dts/am335x-lxm.dts

View file

32

arch/arm/boot/dts/am33xx.dtsi

View file

48

arch/arm/boot/dts/am4372.dtsi

View file

34

arch/arm/boot/dts/am437x-gp-evm.dts

View file

15

arch/arm/boot/dts/am437x-sk-evm.dts

View file

12

arch/arm/boot/dts/am43x-epos-evm.dts

View file

405

arch/arm/boot/dts/am57xx-beagle-x15.dts

View file

412

arch/arm/boot/dts/arm-realview-pb1176.dts

View file

106

arch/arm/boot/dts/armada-370-db.dts

View file

25

arch/arm/boot/dts/armada-370-mirabox.dts

View file

101

arch/arm/boot/dts/armada-370-netgear-rn102.dts

View file

64

arch/arm/boot/dts/armada-370-netgear-rn104.dts

View file

73

arch/arm/boot/dts/armada-370-rd.dts

View file

316

arch/arm/boot/dts/armada-370-synology-ds213j.dts

View file

14

arch/arm/boot/dts/armada-370-xp.dtsi

View file

190

arch/arm/boot/dts/armada-370.dtsi

View file

12

arch/arm/boot/dts/armada-375.dtsi

View file

2

arch/arm/boot/dts/armada-385-db.dts

View file

6

arch/arm/boot/dts/armada-38x.dtsi

View file

57

arch/arm/boot/dts/armada-xp-axpwifiap.dts

View file

19

arch/arm/boot/dts/armada-xp-gp.dts

View file

75

arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts

View file

15

arch/arm/boot/dts/armada-xp-mv78230.dtsi

View file

15

arch/arm/boot/dts/armada-xp-mv78260.dtsi

View file

15

arch/arm/boot/dts/armada-xp-mv78460.dtsi

View file

166

arch/arm/boot/dts/armada-xp-netgear-rn2120.dts

View file

14

arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

View file

330

arch/arm/boot/dts/armada-xp-synology-ds414.dts

View file

Some files were not shown because too many files have changed in this diff Show more