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

Commit f4bcd79c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "We've been sitting on this longer than we meant to due to travel and
  other activities, but the number of patches is luckily not that high.

  Biggest changes are from a batch of OMAP bugfixes, but there are a few
  for the broader set of SoCs too (bcm2835, pxa, highbank, tegra, at91
  and i.MX).

  The OMAP patches contain some fixes for MUSB/PHY on omap4 which ends
  up being a bit on the large side but needed for legacy (non-DT)
  platforms.  Beyond that there are a handful of hwmod/pm changes.

  So, fairly noncontroversial stuff all in all, and as usual around this
  time the fixes are well targeted at specific problems."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: imx: ehci: fix host power mask bit
  ARM i.MX: fix error-valued pointer dereference in clk_register_gate2()
  ARM: at91/usbh: fix overcurrent gpio setup
  ARM: at91/AT91SAM9G45: fix crypto peripherals irq issue due to sparse irq support
  ARM: boot: Fix usage of kecho
  ARM: OMAP: ocp2scp: create omap device for ocp2scp
  ARM: OMAP4: add _dev_attr_ to ocp2scp for representing usb_phy
  drivers: bus: ocp2scp: add pdata support
  irqchip: irq-bcm2835: Add terminating entry for of_device_id table
  ARM: highbank: retry wfi on reset request
  ARM: OMAP4: PM: fix regulator name for VDD_MPU
  ARM: OMAP4: hwmod data: do not enable or reset the McPDM during kernel init
  ARM: OMAP2+: hwmod: add flag to prevent hwmod code from touching IP block during init
  ARM: dt: tegra: fix length of pad control and mux registers
  ARM: OMAP: hwmod: wait for sysreset complete after enabling hwmod
  ARM: OMAP2+: clockdomain: Fix OMAP4 ISS clk domain to support only SWSUP
  ARM: pxa/spitz_pm: Fix hang when resuming from STR
  ARM: pxa: hx4700: Fix backlight PWM device number
  ARM: OMAP2+: PM: add missing newline to VC warning message
parents 5a0c02ba 6658d6a5

arch/arm/boot/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ ifeq ($(CONFIG_XIP_KERNEL),y) 


$(obj)/xipImage: vmlinux FORCE

	$(call if_changed,objcopy)

	$(kecho) '  Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))'

	@$(kecho) '  Kernel: $@ is ready (physical address: $(CONFIG_XIP_PHYS_ADDR))'



$(obj)/Image $(obj)/zImage: FORCE

	@echo 'Kernel configured for XIP (CONFIG_XIP_KERNEL=y)'
@@ -48,14 +48,14 @@ $(obj)/xipImage: FORCE 


$(obj)/Image: vmlinux FORCE

	$(call if_changed,objcopy)

	$(kecho) '  Kernel: $@ is ready'

	@$(kecho) '  Kernel: $@ is ready'



$(obj)/compressed/vmlinux: $(obj)/Image FORCE

	$(Q)$(MAKE) $(build)=$(obj)/compressed $@



$(obj)/zImage:	$(obj)/compressed/vmlinux FORCE

	$(call if_changed,objcopy)

	$(kecho) '  Kernel: $@ is ready'

	@$(kecho) '  Kernel: $@ is ready'



endif
@@ -90,7 +90,7 @@ fi 
$(obj)/uImage:	$(obj)/zImage FORCE

	@$(check_for_multiple_loadaddr)

	$(call if_changed,uimage)

	$(kecho) '  Image $@ is ready'

	@$(kecho) '  Image $@ is ready'



$(obj)/bootp/bootp: $(obj)/zImage initrd FORCE

	$(Q)$(MAKE) $(build)=$(obj)/bootp $@
@@ -98,7 +98,7 @@ $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE 


$(obj)/bootpImage: $(obj)/bootp/bootp FORCE

	$(call if_changed,objcopy)

	$(kecho) '  Kernel: $@ is ready'

	@$(kecho) '  Kernel: $@ is ready'



PHONY += initrd FORCE

initrd:

arch/arm/boot/dts/tegra30.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ 


	pinmux: pinmux {

		compatible = "nvidia,tegra30-pinmux";

		reg = <0x70000868 0xd0    /* Pad control registers */

		       0x70003000 0x3e0>; /* Mux registers */

		reg = <0x70000868 0xd4    /* Pad control registers */

		       0x70003000 0x3e4>; /* Mux registers */

	};



	serial@70006000 {

arch/arm/mach-at91/at91rm9200_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) 


	/* Enable overcurrent notification */

	for (i = 0; i < data->ports; i++) {

		if (data->overcurrent_pin[i])

		if (gpio_is_valid(data->overcurrent_pin[i]))

			at91_set_gpio_input(data->overcurrent_pin[i], 1);

	}

arch/arm/mach-at91/at91sam9260_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) 


	/* Enable overcurrent notification */

	for (i = 0; i < data->ports; i++) {

		if (data->overcurrent_pin[i])

		if (gpio_is_valid(data->overcurrent_pin[i]))

			at91_set_gpio_input(data->overcurrent_pin[i], 1);

	}

arch/arm/mach-at91/at91sam9261_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) 


	/* Enable overcurrent notification */

	for (i = 0; i < data->ports; i++) {

		if (data->overcurrent_pin[i])

		if (gpio_is_valid(data->overcurrent_pin[i]))

			at91_set_gpio_input(data->overcurrent_pin[i], 1);

	}