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

Commit 763f9694 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS updates from James Hogan:
 "These are the main MIPS changes for 4.18.

  Rough overview:

   - MAINTAINERS: Add Paul Burton as MIPS co-maintainer

   - Misc: Generic compiler intrinsics, Y2038 improvements, Perf+MT fixes

   - Platform support: Netgear WNR1000 V3, Microsemi Ocelot integrated
     switch, Ingenic watchdog cleanups

  More detailed  summary:

  Maintainers:

   - Add Paul Burton as MIPS co-maintainer, as I soon won't have access
     to much MIPS hardware, nor enough time to properly maintain MIPS on
     my own.

  Miscellaneous:

   - Use generic GCC library routines from lib/
     - Add notrace to generic ucmpdi2 implementation
     - Rename compiler intrinsic selects to GENERIC_LIB_*
     - vmlinuz: Use generic ashldi3

   - y2038: Convert update/read_persistent_clock() to *_clock64()
     - sni: Remove read_persistent_clock()

   - perf: Fix perf with MT counting other threads
     - Probe for per-TC perf counters in cpu-probe.c
     - Use correct VPE ID for VPE tracing

  Minor cleanups:

   - Avoid unneeded built-in.a in DTS dirs

   - sc-debugfs: Re-use kstrtobool_from_user

   - memset.S: Reinstate delay slot indentation

   - VPE: Fix spelling "uneeded" -> "Unneeded"

  Platform support:

  BCM47xx:

   - Add support for Netgear WNR1000 V3

   - firmware: Support small NVRAM partitions

   - Use __initdata for LEDs platform data

  Ingenic:

   - Watchdog driver & platform code improvements:
     - Disable clock after stopping counter
     - Use devm_* functions
     - Drop module remove function
     - Move platform reset code to restart handler in driver
     - JZ4740: Convert watchdog instantiation to DT
     - JZ4780: Fix watchdog DT node
     - qi_lb60_defconfig: Enable watchdog driver

  Microsemi:

   - Ocelot: Add support for integrated switch
     - pcb123: Connect phys to ports"

* tag 'mips_4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (30 commits)
  MAINTAINERS: Add Paul Burton as MIPS co-maintainer
  MIPS: ptrace: Make FPU context layout comments match reality
  MIPS: memset.S: Reinstate delay slot indentation
  MIPS: perf: Fix perf with MT counting other threads
  MIPS: perf: Use correct VPE ID when setting up VPE tracing
  MIPS: perf: More robustly probe for the presence of per-tc counters
  MIPS: Probe for MIPS MT perf counters per TC
  MIPS: mscc: Connect phys to ports on ocelot_pcb123
  MIPS: mscc: Add switch to ocelot
  MIPS: JZ4740: Drop old platform reset code
  MIPS: qi_lb60: Enable the jz4740-wdt driver
  MIPS: JZ4780: dts: Fix watchdog node
  MIPS: JZ4740: dts: Add bindings for the jz4740-wdt driver
  watchdog: JZ4740: Drop module remove function
  watchdog: JZ4740: Register a restart handler
  watchdog: JZ4740: Use devm_* functions
  watchdog: JZ4740: Disable clock after stopping counter
  MIPS: VPE: Fix spelling mistake: "uneeded" -> "unneeded"
  MIPS: Re-use kstrtobool_from_user()
  MIPS: Convert update_persistent_clock() to update_persistent_clock64()
  ...
parents ea8781e5 9ed8b56b

Documentation/devicetree/bindings/watchdog/ingenic,jz4740-wdt.txt

+6 −1
Original line number Diff line number Diff line
@@ -3,10 +3,15 @@ Ingenic Watchdog Timer (WDT) Controller for JZ4740 & JZ4780 
Required properties:

compatible: "ingenic,jz4740-watchdog" or "ingenic,jz4780-watchdog"

reg: Register address and length for watchdog registers

clocks: phandle to the RTC clock

clock-names: should be "rtc"



Example:



watchdog: jz4740-watchdog@10002000 {

	compatible = "ingenic,jz4740-watchdog";

	reg = <0x10002000 0x100>;

	reg = <0x10002000 0x10>;



	clocks = <&cgu JZ4740_CLK_RTC>;

	clock-names = "rtc";

};

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -9417,10 +9417,12 @@ F: drivers/usb/image/microtek.* 


MIPS

M:	Ralf Baechle <ralf@linux-mips.org>

M:	Paul Burton <paul.burton@mips.com>

M:	James Hogan <jhogan@kernel.org>

L:	linux-mips@linux-mips.org

W:	http://www.linux-mips.org/

T:	git git://git.linux-mips.org/pub/scm/ralf/linux.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git

Q:	http://patchwork.linux-mips.org/project/linux-mips/list/

S:	Supported

F:	Documentation/devicetree/bindings/mips/

arch/mips/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ config MIPS 
	select GENERIC_CPU_AUTOPROBE

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_LIB_ASHLDI3

	select GENERIC_LIB_ASHRDI3

	select GENERIC_LIB_CMPDI2

	select GENERIC_LIB_LSHRDI3

	select GENERIC_LIB_UCMPDI2

	select GENERIC_PCI_IOMAP

	select GENERIC_SCHED_CLOCK if !CAVIUM_OCTEON_SOC

	select GENERIC_SMP_IDLE_THREAD

arch/mips/bcm47xx/board.c

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = { 
	{{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"},

	{{BCM47XX_BOARD_NETGEAR_WNDR4500V1, "Netgear WNDR4500 V1"}, "U12H189T00_NETGEAR"},

	{{BCM47XX_BOARD_NETGEAR_WNDR4500V2, "Netgear WNDR4500 V2"}, "U12H224T00_NETGEAR"},

	{{BCM47XX_BOARD_NETGEAR_WNR1000_V3, "Netgear WNR1000 V3"}, "U12H139T00_NETGEAR"},

	{{BCM47XX_BOARD_NETGEAR_WNR1000_V3, "Netgear WNR1000 V3"}, "U12H139T50_NETGEAR"},

	{{BCM47XX_BOARD_NETGEAR_WNR2000, "Netgear WNR2000"}, "U12H114T00_NETGEAR"},

	{{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "U12H136T99_NETGEAR"},

	{{BCM47XX_BOARD_NETGEAR_WNR3500U, "Netgear WNR3500U"}, "U12H136T00_NETGEAR"},

arch/mips/bcm47xx/buttons.c

+9 −0
Original line number Diff line number Diff line
@@ -411,6 +411,12 @@ bcm47xx_buttons_netgear_wndr4500v1[] __initconst = { 
	BCM47XX_GPIO_KEY(6, KEY_RESTART),

};



static const struct gpio_keys_button

bcm47xx_buttons_netgear_wnr1000_v3[] __initconst = {

	BCM47XX_GPIO_KEY(2, KEY_WPS_BUTTON),

	BCM47XX_GPIO_KEY(3, KEY_RESTART),

};



static const struct gpio_keys_button

bcm47xx_buttons_netgear_wnr3500lv1[] __initconst = {

	BCM47XX_GPIO_KEY(4, KEY_RESTART),
@@ -670,6 +676,9 @@ int __init bcm47xx_buttons_register(void) 
	case BCM47XX_BOARD_NETGEAR_WNDR4500V1:

		err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr4500v1);

		break;

	case BCM47XX_BOARD_NETGEAR_WNR1000_V3:

		err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr1000_v3);

		break;

	case BCM47XX_BOARD_NETGEAR_WNR3500L:

		err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv1);

		break;