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

Commit ed76956f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'bcm/dt' into next/dt 



A handful of DT updates from Christian Daudt for the broadcom mobile
platforms, including their rename of the platform to BCM_MOBILE to keep
BCM for the vendor-level options.

* bcm/dt:
  ARM: dts: bcm11351: Use GIC/IRQ defines for sdio interrupts
  ARM: dts: bcm: Add missing UARTs for bcm11351 (bcm281xx)
  ARM: dts: bcm281xx: Add card detect GPIO
  ARM: dts: rename ARCH_BCM to ARCH_BCM_MOBILE (dt)
  ARM: bcm281xx: Add device node for the GPIO controller

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4cca9593 9c0dae04

arch/arm/boot/dts/Makefile

+2 −3
Original line number Original line Diff line number Diff line
@@ -40,12 +40,11 @@ dtb-$(CONFIG_ARCH_AT91) += sama5d31ek.dtb 
dtb-$(CONFIG_ARCH_AT91)	+= sama5d33ek.dtb

dtb-$(CONFIG_ARCH_AT91)	+= sama5d33ek.dtb

dtb-$(CONFIG_ARCH_AT91)	+= sama5d34ek.dtb

dtb-$(CONFIG_ARCH_AT91)	+= sama5d34ek.dtb

dtb-$(CONFIG_ARCH_AT91)	+= sama5d35ek.dtb

dtb-$(CONFIG_ARCH_AT91)	+= sama5d35ek.dtb



dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb

dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb



dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb

dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb

dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \

dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \

	bcm28155-ap.dtb

	bcm28155-ap.dtb

dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb

dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \

dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \

	da850-evm.dtb

	da850-evm.dtb

dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \

dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \

arch/arm/boot/dts/bcm11351-brt.dts

+1 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ 




	sdio4: sdio@3f1b0000 {

	sdio4: sdio@3f1b0000 {

		max-frequency = <48000000>;

		max-frequency = <48000000>;

		cd-gpios = <&gpio 14 0>;

		status = "okay";

		status = "okay";

	};

	};

arch/arm/boot/dts/bcm11351.dtsi

+50 −4
Original line number Original line Diff line number Diff line
@@ -49,6 +49,36 @@ 
		reg-io-width = <4>;

		reg-io-width = <4>;

	};

	};





	uart@3e001000 {

		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";

		status = "disabled";

		reg = <0x3e001000 0x1000>;

		clock-frequency = <13000000>;

		interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;

		reg-shift = <2>;

		reg-io-width = <4>;

	};



	uart@3e002000 {

		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";

		status = "disabled";

		reg = <0x3e002000 0x1000>;

		clock-frequency = <13000000>;

		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;

		reg-shift = <2>;

		reg-io-width = <4>;

	};



	uart@3e003000 {

		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";

		status = "disabled";

		reg = <0x3e003000 0x1000>;

		clock-frequency = <13000000>;

		interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;

		reg-shift = <2>;

		reg-io-width = <4>;

	};



	L2: l2-cache {

	L2: l2-cache {

		compatible = "brcm,bcm11351-a2-pl310-cache";

		compatible = "brcm,bcm11351-a2-pl310-cache";

		reg = <0x3ff20000 0x1000>;

		reg = <0x3ff20000 0x1000>;
@@ -68,31 +98,47 @@ 
		clock-frequency = <32768>;

		clock-frequency = <32768>;

	};

	};





	gpio: gpio@35003000 {

		compatible = "brcm,bcm11351-gpio", "brcm,kona-gpio";

		reg = <0x35003000 0x800>;

		interrupts =

		       <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH

			GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH

			GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH

			GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH

			GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH

			GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;

		#gpio-cells = <2>;

		#interrupt-cells = <2>;

		gpio-controller;

		interrupt-controller;

	};



	sdio1: sdio@3f180000 {

	sdio1: sdio@3f180000 {

		compatible = "brcm,kona-sdhci";

		compatible = "brcm,kona-sdhci";

		reg = <0x3f180000 0x10000>;

		reg = <0x3f180000 0x10000>;

		interrupts = <0x0 77 0x4>;

		interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

		status = "disabled";

	};

	};





	sdio2: sdio@3f190000 {

	sdio2: sdio@3f190000 {

		compatible = "brcm,kona-sdhci";

		compatible = "brcm,kona-sdhci";

		reg = <0x3f190000 0x10000>;

		reg = <0x3f190000 0x10000>;

		interrupts = <0x0 76 0x4>;

		interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

		status = "disabled";

	};

	};





	sdio3: sdio@3f1a0000 {

	sdio3: sdio@3f1a0000 {

		compatible = "brcm,kona-sdhci";

		compatible = "brcm,kona-sdhci";

		reg = <0x3f1a0000 0x10000>;

		reg = <0x3f1a0000 0x10000>;

		interrupts = <0x0 74 0x4>;

		interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

		status = "disabled";

	};

	};





	sdio4: sdio@3f1b0000 {

	sdio4: sdio@3f1b0000 {

		compatible = "brcm,kona-sdhci";

		compatible = "brcm,kona-sdhci";

		reg = <0x3f1b0000 0x10000>;

		reg = <0x3f1b0000 0x10000>;

		interrupts = <0x0 73 0x4>;

		interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;

		status = "disabled";

		status = "disabled";

	};

	};

arch/arm/boot/dts/bcm28155-ap.dts

+1 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ 




	sdio4: sdio@3f1b0000 {

	sdio4: sdio@3f1b0000 {

		max-frequency = <48000000>;

		max-frequency = <48000000>;

		cd-gpios = <&gpio 14 0>;

		status = "okay";

		status = "okay";

	};

	};

};
 
};