Merge branch 'dt/linus' into dt/next (28650a5c) · Commits · EulixOS / Software / Kernel

Documentation/devicetree/bindings/gpio/sifive,gpio.yaml

+0 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: SiFive GPIO controller

		maintainers:
		- Yash Shah <yash.shah@sifive.com>
		- Paul Walmsley <paul.walmsley@sifive.com>

		properties:

+2 −2

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ patternProperties:
		'^phy@[a-f0-9]+$':
		$ref: ../phy/bcm-ns-usb2-phy.yaml

		'^pin-controller@[a-f0-9]+$':
		'^pinctrl@[a-f0-9]+$':
		$ref: ../pinctrl/brcm,ns-pinmux.yaml

		'^syscon@[a-f0-9]+$':
		@@ -94,7 +94,7 @@ examples:
		reg = <0x180 0x4>;
		};

		pin-controller@1c0 {
		pinctrl@1c0 {
		compatible = "brcm,bcm4708-pinmux";
		reg = <0x1c0 0x24>;
		reg-names = "cru_gpio_control";

+3 −3

Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@ properties:
		clock-frequency:
		const: 12288000

		lochnagar-pinctrl:
		pinctrl:
		type: object
		$ref: /schemas/pinctrl/cirrus,lochnagar.yaml#

		@@ -255,7 +255,7 @@ required:
		- reg
		- reset-gpios
		- lochnagar-clk
		- lochnagar-pinctrl
		- pinctrl

		additionalProperties: false

		@@ -293,7 +293,7 @@ examples:
		clock-frequency = <32768>;
		};

		lochnagar-pinctrl {
		pinctrl {
		compatible = "cirrus,lochnagar-pinctrl";

		gpio-controller;

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ description: \|

		maintainers:
		- Kishon Vijay Abraham I <kishon@ti.com>
		- Roger Quadros <rogerq@ti.com
		- Roger Quadros <rogerq@kernel.org>

		properties:
		compatible:

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ title: OMAP USB2 PHY

		maintainers:
		- Kishon Vijay Abraham I <kishon@ti.com>
		- Roger Quadros <rogerq@ti.com>
		- Roger Quadros <rogerq@kernel.org>

		properties:
		compatible: