Commit cf683abd authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branches 'clk-sifive' and 'clk-visconti' into clk-next 

* clk-sifive:
  clk: sifive: Move all stuff into SoCs header files from C files
  clk: sifive: Add SoCs prefix in each SoCs-dependent data
  riscv: dts: Change the macro name of prci in each device node
  dt-bindings: change the macro name of prci in header files and example
  clk: sifive: duplicate the macro definitions for the time being

* clk-visconti:
  clk: visconti: prevent array overflow in visconti_clk_register_gates()
parents c64dd8ea 5e916932 c5601e07

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

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ examples: 
        interrupts = <7>, <8>, <9>, <10>, <11>, <12>, <13>, <14>, <15>, <16>,

                     <17>, <18>, <19>, <20>, <21>, <22>;

        reg = <0x10060000 0x1000>;

        clocks = <&tlclk PRCI_CLK_TLCLK>;

        clocks = <&tlclk FU540_PRCI_CLK_TLCLK>;

        gpio-controller;

        #gpio-cells = <2>;

        interrupt-controller;

Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ examples: 
                            <0x0 0x0 0x0 0x2 &plic0 58>,

                            <0x0 0x0 0x0 0x3 &plic0 59>,

                            <0x0 0x0 0x0 0x4 &plic0 60>;

            clocks = <&prci PRCI_CLK_PCIE_AUX>;

            clocks = <&prci FU740_PRCI_CLK_PCIE_AUX>;

            resets = <&prci 4>;

            pwren-gpios = <&gpio 5 0>;

            reset-gpios = <&gpio 8 0>;

Documentation/devicetree/bindings/serial/sifive-serial.yaml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ examples: 
        interrupt-parent = <&plic0>;

        interrupts = <80>;

        reg = <0x10010000 0x1000>;

        clocks = <&prci PRCI_CLK_TLCLK>;

        clocks = <&prci FU540_PRCI_CLK_TLCLK>;

      };



...

arch/riscv/boot/dts/sifive/fu540-c000.dtsi

+11 −11
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ 
			reg = <0x0 0x10010000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <4>;

			clocks = <&prci PRCI_CLK_TLCLK>;

			clocks = <&prci FU540_PRCI_CLK_TLCLK>;

			status = "disabled";

		};

		dma: dma@3000000 {
@@ -180,7 +180,7 @@ 
			reg = <0x0 0x10011000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <5>;

			clocks = <&prci PRCI_CLK_TLCLK>;

			clocks = <&prci FU540_PRCI_CLK_TLCLK>;

			status = "disabled";

		};

		i2c0: i2c@10030000 {
@@ -188,7 +188,7 @@ 
			reg = <0x0 0x10030000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <50>;

			clocks = <&prci PRCI_CLK_TLCLK>;

			clocks = <&prci FU540_PRCI_CLK_TLCLK>;

			reg-shift = <2>;

			reg-io-width = <1>;

			#address-cells = <1>;
@@ -201,7 +201,7 @@ 
			      <0x0 0x20000000 0x0 0x10000000>;

			interrupt-parent = <&plic0>;

			interrupts = <51>;

			clocks = <&prci PRCI_CLK_TLCLK>;

			clocks = <&prci FU540_PRCI_CLK_TLCLK>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";
@@ -212,7 +212,7 @@ 
			      <0x0 0x30000000 0x0 0x10000000>;

			interrupt-parent = <&plic0>;

			interrupts = <52>;

			clocks = <&prci PRCI_CLK_TLCLK>;

			clocks = <&prci FU540_PRCI_CLK_TLCLK>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";
@@ -222,7 +222,7 @@ 
			reg = <0x0 0x10050000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <6>;

			clocks = <&prci PRCI_CLK_TLCLK>;

			clocks = <&prci FU540_PRCI_CLK_TLCLK>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";
@@ -235,8 +235,8 @@ 
			      <0x0 0x100a0000 0x0 0x1000>;

			local-mac-address = [00 00 00 00 00 00];

			clock-names = "pclk", "hclk";

			clocks = <&prci PRCI_CLK_GEMGXLPLL>,

				 <&prci PRCI_CLK_GEMGXLPLL>;

			clocks = <&prci FU540_PRCI_CLK_GEMGXLPLL>,

				 <&prci FU540_PRCI_CLK_GEMGXLPLL>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";
@@ -246,7 +246,7 @@ 
			reg = <0x0 0x10020000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <42>, <43>, <44>, <45>;

			clocks = <&prci PRCI_CLK_TLCLK>;

			clocks = <&prci FU540_PRCI_CLK_TLCLK>;

			#pwm-cells = <3>;

			status = "disabled";

		};
@@ -255,7 +255,7 @@ 
			reg = <0x0 0x10021000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <46>, <47>, <48>, <49>;

			clocks = <&prci PRCI_CLK_TLCLK>;

			clocks = <&prci FU540_PRCI_CLK_TLCLK>;

			#pwm-cells = <3>;

			status = "disabled";

		};
@@ -281,7 +281,7 @@ 
			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <2>;

			clocks = <&prci PRCI_CLK_TLCLK>;

			clocks = <&prci FU540_PRCI_CLK_TLCLK>;

			status = "disabled";

		};

	};

arch/riscv/boot/dts/sifive/fu740-c000.dtsi

+13 −13
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ 
			reg = <0x0 0x10010000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <39>;

			clocks = <&prci PRCI_CLK_PCLK>;

			clocks = <&prci FU740_PRCI_CLK_PCLK>;

			status = "disabled";

		};

		uart1: serial@10011000 {
@@ -174,7 +174,7 @@ 
			reg = <0x0 0x10011000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <40>;

			clocks = <&prci PRCI_CLK_PCLK>;

			clocks = <&prci FU740_PRCI_CLK_PCLK>;

			status = "disabled";

		};

		i2c0: i2c@10030000 {
@@ -182,7 +182,7 @@ 
			reg = <0x0 0x10030000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <52>;

			clocks = <&prci PRCI_CLK_PCLK>;

			clocks = <&prci FU740_PRCI_CLK_PCLK>;

			reg-shift = <2>;

			reg-io-width = <1>;

			#address-cells = <1>;
@@ -194,7 +194,7 @@ 
			reg = <0x0 0x10031000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <53>;

			clocks = <&prci PRCI_CLK_PCLK>;

			clocks = <&prci FU740_PRCI_CLK_PCLK>;

			reg-shift = <2>;

			reg-io-width = <1>;

			#address-cells = <1>;
@@ -207,7 +207,7 @@ 
			      <0x0 0x20000000 0x0 0x10000000>;

			interrupt-parent = <&plic0>;

			interrupts = <41>;

			clocks = <&prci PRCI_CLK_PCLK>;

			clocks = <&prci FU740_PRCI_CLK_PCLK>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";
@@ -218,7 +218,7 @@ 
			      <0x0 0x30000000 0x0 0x10000000>;

			interrupt-parent = <&plic0>;

			interrupts = <42>;

			clocks = <&prci PRCI_CLK_PCLK>;

			clocks = <&prci FU740_PRCI_CLK_PCLK>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";
@@ -228,7 +228,7 @@ 
			reg = <0x0 0x10050000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <43>;

			clocks = <&prci PRCI_CLK_PCLK>;

			clocks = <&prci FU740_PRCI_CLK_PCLK>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";
@@ -241,8 +241,8 @@ 
			      <0x0 0x100a0000 0x0 0x1000>;

			local-mac-address = [00 00 00 00 00 00];

			clock-names = "pclk", "hclk";

			clocks = <&prci PRCI_CLK_GEMGXLPLL>,

				 <&prci PRCI_CLK_GEMGXLPLL>;

			clocks = <&prci FU740_PRCI_CLK_GEMGXLPLL>,

				 <&prci FU740_PRCI_CLK_GEMGXLPLL>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";
@@ -252,7 +252,7 @@ 
			reg = <0x0 0x10020000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <44>, <45>, <46>, <47>;

			clocks = <&prci PRCI_CLK_PCLK>;

			clocks = <&prci FU740_PRCI_CLK_PCLK>;

			#pwm-cells = <3>;

			status = "disabled";

		};
@@ -261,7 +261,7 @@ 
			reg = <0x0 0x10021000 0x0 0x1000>;

			interrupt-parent = <&plic0>;

			interrupts = <48>, <49>, <50>, <51>;

			clocks = <&prci PRCI_CLK_PCLK>;

			clocks = <&prci FU740_PRCI_CLK_PCLK>;

			#pwm-cells = <3>;

			status = "disabled";

		};
@@ -287,7 +287,7 @@ 
			#gpio-cells = <2>;

			interrupt-controller;

			#interrupt-cells = <2>;

			clocks = <&prci PRCI_CLK_PCLK>;

			clocks = <&prci FU740_PRCI_CLK_PCLK>;

			status = "disabled";

		};

		pcie@e00000000 {
@@ -316,7 +316,7 @@ 
					<0x0 0x0 0x0 0x3 &plic0 59>,

					<0x0 0x0 0x0 0x4 &plic0 60>;

			clock-names = "pcie_aux";

			clocks = <&prci PRCI_CLK_PCIE_AUX>;

			clocks = <&prci FU740_PRCI_CLK_PCIE_AUX>;

			pwren-gpios = <&gpio 5 0>;

			reset-gpios = <&gpio 8 0>;

			resets = <&prci 4>;