Commit 1132d5e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "Stream of fixes has slowed down, only a few this week:

   - Some DT fixes for Allwinner platforms, and addition of a clock to
     the R_CCU clock controller that had been missed.

   - A couple of small DT fixes for am335x-sl50"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm64: allwinner: a64: Add PLL_PERIPH0 clock to the R_CCU
  ARM: sunxi: h3-h5: Add PLL_PERIPH0 clock to the R_CCU
  ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0
  ARM: dts: am335x-sl50: Fix card detect pin for mmc1
  arm64: allwinner: h5: Remove syslink to shared DTSI
  ARM: sunxi: h3/h5: fix the compatible of R_CCU
parents 3696e4f0 a1858df9

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

+2 −6
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ 


	mmc1_pins: pinmux_mmc1_pins {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7)		/* spi0_cs1.gpio0_6 */

			AM33XX_IOPAD(0x96c, PIN_INPUT | MUX_MODE7)		/* uart0_rtsn.gpio1_9 */

		>;

	};
@@ -280,10 +280,6 @@ 
			AM33XX_IOPAD(0x834, PIN_INPUT_PULLUP | MUX_MODE7)	/* nKbdReset - gpmc_ad13.gpio1_13 */

			AM33XX_IOPAD(0x838, PIN_INPUT_PULLUP | MUX_MODE7)	/* nDispReset - gpmc_ad14.gpio1_14 */

			AM33XX_IOPAD(0x844, PIN_INPUT_PULLUP | MUX_MODE7)	/* USB1_enPower - gpmc_a1.gpio1_17 */

			/* AVR Programming - SPI Bus (bit bang) - Screen and Keyboard */

			AM33XX_IOPAD(0x954, PIN_INPUT_PULLUP | MUX_MODE7)	/* Kbd/Disp/BattMOSI spi0_d0.gpio0_3 */

			AM33XX_IOPAD(0x958, PIN_INPUT_PULLUP | MUX_MODE7)	/* Kbd/Disp/BattMISO spi0_d1.gpio0_4 */

			AM33XX_IOPAD(0x950, PIN_INPUT_PULLUP | MUX_MODE7)	/* Kbd/Disp/BattSCLK spi0_clk.gpio0_2 */

			/* PDI Bus - Battery system */

			AM33XX_IOPAD(0x840, PIN_INPUT_PULLUP | MUX_MODE7)	/* nBattReset  gpmc_a0.gpio1_16 */

			AM33XX_IOPAD(0x83c, PIN_INPUT_PULLUP | MUX_MODE7)	/* BattPDIData gpmc_ad15.gpio1_15 */
@@ -384,7 +380,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins>;

	bus-width = <4>;

	cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;

	cd-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;

	vmmc-supply = <&vmmcsd_fixed>;

};

arch/arm/boot/dts/sunxi-h3-h5.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -558,10 +558,11 @@ 
		};



		r_ccu: clock@1f01400 {

			compatible = "allwinner,sun50i-a64-r-ccu";

			compatible = "allwinner,sun8i-h3-r-ccu";

			reg = <0x01f01400 0x100>;

			clocks = <&osc24M>, <&osc32k>, <&iosc>;

			clock-names = "hosc", "losc", "iosc";

			clocks = <&osc24M>, <&osc32k>, <&iosc>,

				 <&ccu 9>;

			clock-names = "hosc", "losc", "iosc", "pll-periph";

			#clock-cells = <1>;

			#reset-cells = <1>;

		};

arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -406,8 +406,9 @@ 
		r_ccu: clock@1f01400 {

			compatible = "allwinner,sun50i-a64-r-ccu";

			reg = <0x01f01400 0x100>;

			clocks = <&osc24M>, <&osc32k>, <&iosc>;

			clock-names = "hosc", "losc", "iosc";

			clocks = <&osc24M>, <&osc32k>, <&iosc>,

				 <&ccu 11>;

			clock-names = "hosc", "losc", "iosc", "pll-periph";

			#clock-cells = <1>;

			#reset-cells = <1>;

		};

arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
 *     OTHER DEALINGS IN THE SOFTWARE.

 */



#include "sunxi-h3-h5.dtsi"

#include <arm/sunxi-h3-h5.dtsi>



/ {

	cpus {

arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../../../arm/boot/dts/sunxi-h3-h5.dtsi
 
 No newline at end of file

CRA Git | Maintained and supported by SUSTech CRA and CCSE