diff options
Diffstat (limited to 'arch')
34 files changed, 45 insertions, 67 deletions
diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c index d21ad39f8a..eb3e287b7d 100644 --- a/arch/arm/cpu/armv7/ls102xa/fdt.c +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <asm/io.h> #include <asm/processor.h> diff --git a/arch/arm/cpu/armv7/virt-dt.c b/arch/arm/cpu/armv7/virt-dt.c index 707dad4829..204187c1b4 100644 --- a/arch/arm/cpu/armv7/virt-dt.c +++ b/arch/arm/cpu/armv7/virt-dt.c @@ -21,7 +21,7 @@ #include <linux/ctype.h> #include <linux/types.h> #include <asm/global_data.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <asm/armv7.h> #include <asm/psci.h> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c index 80af318822..99c5d134c3 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c @@ -6,7 +6,7 @@ #include <common.h> #include <efi_loader.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <phy.h> #ifdef CONFIG_FSL_LSCH3 diff --git a/arch/arm/cpu/armv8/spin_table.c b/arch/arm/cpu/armv8/spin_table.c index ec1c9b8ddb..195901a7a7 100644 --- a/arch/arm/cpu/armv8/spin_table.c +++ b/arch/arm/cpu/armv8/spin_table.c @@ -6,7 +6,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <asm/spin_table.h> int spin_table_update_dt(void *fdt) diff --git a/arch/arm/dts/logicpd-som-lv.dtsi b/arch/arm/dts/logicpd-som-lv.dtsi index 46dae556f7..c1aa7a4518 100644 --- a/arch/arm/dts/logicpd-som-lv.dtsi +++ b/arch/arm/dts/logicpd-som-lv.dtsi @@ -33,11 +33,12 @@ hsusb2_phy: hsusb2_phy { compatible = "usb-nop-xceiv"; reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; /* gpio_4 */ + #phy-cells = <0>; }; }; &gpmc { - ranges = <0 0 0x00000000 0x1000000>; /* CS0: 16MB for NAND */ + ranges = <0 0 0x30000000 0x1000000>; /* CS0: 16MB for NAND */ nand@0,0 { compatible = "ti,omap2-nand"; @@ -66,38 +67,11 @@ gpmc,device-width = <2>; #address-cells = <1>; #size-cells = <1>; - - /* u-boot uses mtdparts=omap2-nand.0:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs) */ - - x-loader@0 { - label = "x-loader"; - reg = <0 0x80000>; - }; - - bootloaders@80000 { - label = "u-boot"; - reg = <0x80000 0x1e0000>; - }; - - bootloaders_env@260000 { - label = "u-boot-env"; - reg = <0x260000 0x20000>; - }; - - kernel@280000 { - label = "kernel"; - reg = <0x280000 0x400000>; - }; - - filesystem@680000 { - label = "fs"; - reg = <0x680000 0>; /* 0 = MTDPART_SIZ_FULL */ - }; }; }; &i2c1 { - clock-frequency = <400000>; + clock-frequency = <2600000>; twl: twl@48 { reg = <0x48>; @@ -121,7 +95,7 @@ &mmc3 { interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>; - pinctrl-0 = <&mmc3_pins>; + pinctrl-0 = <&mmc3_pins &wl127x_gpio>; pinctrl-names = "default"; vmmc-supply = <&wl12xx_vmmc>; non-removable; @@ -132,8 +106,8 @@ wlcore: wlcore@2 { compatible = "ti,wl1273"; reg = <2>; - interrupt-parent = <&gpio5>; - interrupts = <24 IRQ_TYPE_LEVEL_HIGH>; /* gpio 152 */ + interrupt-parent = <&gpio1>; + interrupts = <2 IRQ_TYPE_LEVEL_HIGH>; /* gpio 2 */ ref-clock-frequency = <26000000>; }; }; @@ -157,8 +131,6 @@ OMAP3_CORE1_IOPAD(0x2166, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat5.sdmmc3_dat1 */ OMAP3_CORE1_IOPAD(0x2168, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat2 */ OMAP3_CORE1_IOPAD(0x216a, PIN_INPUT_PULLUP | MUX_MODE3) /* sdmmc2_dat6.sdmmc3_dat3 */ - OMAP3_CORE1_IOPAD(0x2184, PIN_INPUT_PULLUP | MUX_MODE4) /* mcbsp4_clkx.gpio_152 */ - OMAP3_CORE1_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */ OMAP3_CORE1_IOPAD(0x21d0, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs1.sdmmc3_cmd */ OMAP3_CORE1_IOPAD(0x21d2, PIN_INPUT_PULLUP | MUX_MODE3) /* mcspi1_cs2.sdmmc_clk */ >; @@ -228,6 +200,12 @@ OMAP3_WKUP_IOPAD(0x2a0e, PIN_OUTPUT | MUX_MODE4) /* sys_boot2.gpio_4 */ >; }; + wl127x_gpio: pinmux_wl127x_gpio_pin { + pinctrl-single,pins = < + OMAP3_WKUP_IOPAD(0x2a0c, PIN_INPUT | MUX_MODE4) /* sys_boot0.gpio_2 */ + OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4) /* sys_boot1.gpio_3 */ + >; + }; }; &omap3_pmx_core2 { diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 89740657e0..cfc236f964 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -19,7 +19,7 @@ #include <image.h> #include <u-boot/zlib.h> #include <asm/byteorder.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <mapmem.h> #include <fdt_support.h> #include <asm/bootm.h> diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c index 7f228537f6..8272e2db9f 100644 --- a/arch/arm/lib/psci-dt.c +++ b/arch/arm/lib/psci-dt.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <linux/sizes.h> #include <linux/kernel.h> diff --git a/arch/arm/mach-imx/mx6/litesom.c b/arch/arm/mach-imx/mx6/litesom.c index 590e92f4e1..777e7b36dc 100644 --- a/arch/arm/mach-imx/mx6/litesom.c +++ b/arch/arm/mach-imx/mx6/litesom.c @@ -77,7 +77,7 @@ int litesom_mmc_init(bd_t *bis) #endif #ifdef CONFIG_SPL_BUILD -#include <libfdt.h> +#include <linux/libfdt.h> #include <spl.h> #include <asm/arch/mx6-ddr.h> diff --git a/arch/arm/mach-imx/mx6/opos6ul.c b/arch/arm/mach-imx/mx6/opos6ul.c index f8d7e8ee68..2de1321b56 100644 --- a/arch/arm/mach-imx/mx6/opos6ul.c +++ b/arch/arm/mach-imx/mx6/opos6ul.c @@ -154,7 +154,7 @@ int dram_init(void) #ifdef CONFIG_SPL_BUILD #include <asm/arch/mx6-ddr.h> #include <asm/arch/opos6ul.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <spl.h> #define USDHC_PAD_CTRL ( \ diff --git a/arch/arm/mach-meson/board.c b/arch/arm/mach-meson/board.c index 908a0cae56..b6d3a17dda 100644 --- a/arch/arm/mach-meson/board.c +++ b/arch/arm/mach-meson/board.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <linux/err.h> #include <asm/arch/gxbb.h> #include <asm/arch/sm.h> diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index 69cb21d052..3c84043a2c 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -7,7 +7,7 @@ #include <common.h> #include <dm.h> #include <fdtdec.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <pci.h> #include <asm/io.h> #include <asm/system.h> diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c index 6499eec4ea..b9214f7bd9 100644 --- a/arch/arm/mach-mvebu/armada3700/cpu.c +++ b/arch/arm/mach-mvebu/armada3700/cpu.c @@ -7,7 +7,7 @@ #include <common.h> #include <dm.h> #include <fdtdec.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <asm/io.h> #include <asm/system.h> #include <asm/arch/cpu.h> diff --git a/arch/arm/mach-mvebu/armada8k/cpu.c b/arch/arm/mach-mvebu/armada8k/cpu.c index 38e7d33cb3..ce7e913b70 100644 --- a/arch/arm/mach-mvebu/armada8k/cpu.c +++ b/arch/arm/mach-mvebu/armada8k/cpu.c @@ -7,7 +7,7 @@ #include <common.h> #include <dm.h> #include <fdtdec.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <asm/io.h> #include <asm/system.h> #include <asm/arch/cpu.h> diff --git a/arch/arm/mach-omap2/am33xx/fdt.c b/arch/arm/mach-omap2/am33xx/fdt.c index 02e8243800..fa99dc76d3 100644 --- a/arch/arm/mach-omap2/am33xx/fdt.c +++ b/arch/arm/mach-omap2/am33xx/fdt.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <malloc.h> diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index 26245aa169..db68a9d7e2 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -99,7 +99,7 @@ void save_omap_boot_params(void) sys_boot_device = 1; break; #endif -#if defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USB_ETHER) case BOOT_DEVICE_USBETH: sys_boot_device = 1; break; diff --git a/arch/arm/mach-omap2/fdt-common.c b/arch/arm/mach-omap2/fdt-common.c index 9297e9db48..3c368ba93b 100644 --- a/arch/arm/mach-omap2/fdt-common.c +++ b/arch/arm/mach-omap2/fdt-common.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <asm/omap_common.h> diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c index 1e556da9be..3aae94d560 100644 --- a/arch/arm/mach-omap2/omap5/fdt.c +++ b/arch/arm/mach-omap2/omap5/fdt.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <malloc.h> diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c index 00eff90275..692466c3e1 100644 --- a/arch/arm/mach-socfpga/misc.c +++ b/arch/arm/mach-socfpga/misc.c @@ -8,7 +8,7 @@ #include <asm/io.h> #include <errno.h> #include <fdtdec.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <altera.h> #include <miiphy.h> #include <netdev.h> diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c index a7dcaccbb7..177b35fc4e 100644 --- a/arch/arm/mach-socfpga/misc_gen5.c +++ b/arch/arm/mach-socfpga/misc_gen5.c @@ -8,7 +8,7 @@ #include <asm/io.h> #include <errno.h> #include <fdtdec.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <altera.h> #include <miiphy.h> #include <netdev.h> diff --git a/arch/arm/mach-uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c index 6849b3dcab..adcc929a47 100644 --- a/arch/arm/mach-uniphier/board_late_init.c +++ b/arch/arm/mach-uniphier/board_late_init.c @@ -8,7 +8,7 @@ #include <common.h> #include <spl.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <nand.h> #include <stdio.h> #include <linux/io.h> diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c index 9bfc4c2541..104ed90fe9 100644 --- a/arch/arm/mach-uniphier/boards.c +++ b/arch/arm/mach-uniphier/boards.c @@ -6,7 +6,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <linux/kernel.h> #include "init.h" diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index cb82621ec4..3bdebd845c 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -15,7 +15,7 @@ #include <command.h> #include <mpc83xx.h> #include <asm/processor.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <tsec.h> #include <netdev.h> #include <fsl_esdhc.h> diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c index 3ac4eb1dd8..5250571250 100644 --- a/arch/powerpc/cpu/mpc83xx/fdt.c +++ b/arch/powerpc/cpu/mpc83xx/fdt.c @@ -8,7 +8,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <asm/processor.h> diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c index c7ea94cab5..bf41c69d88 100644 --- a/arch/powerpc/cpu/mpc83xx/pci.c +++ b/arch/powerpc/cpu/mpc83xx/pci.c @@ -11,7 +11,7 @@ #include <pci.h> #if defined(CONFIG_OF_LIBFDT) -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #endif diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 1159f06ee3..e1fee11540 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -8,7 +8,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <asm/processor.h> #include <linux/ctype.h> diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c index 7a4465fefc..6cfe2f6759 100644 --- a/arch/powerpc/cpu/mpc85xx/liodn.c +++ b/arch/powerpc/cpu/mpc85xx/liodn.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <asm/immap_85xx.h> diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c index b298d11b9d..4514d2e192 100644 --- a/arch/powerpc/cpu/mpc85xx/portals.c +++ b/arch/powerpc/cpu/mpc85xx/portals.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <asm/processor.h> diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c index 30fbf14f1b..948ad8fa1c 100644 --- a/arch/powerpc/cpu/mpc86xx/fdt.c +++ b/arch/powerpc/cpu/mpc86xx/fdt.c @@ -5,7 +5,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <asm/mp.h> diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 1e0ea28a91..1120fd7441 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -28,7 +28,7 @@ #include <asm/io.h> #if defined(CONFIG_OF_LIBFDT) -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #endif diff --git a/arch/powerpc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c index f9b74ded5a..9c46762418 100644 --- a/arch/powerpc/cpu/mpc8xx/fdt.c +++ b/arch/powerpc/cpu/mpc8xx/fdt.c @@ -7,7 +7,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c index 9cc1676b60..1f928bd136 100644 --- a/arch/powerpc/cpu/mpc8xxx/fdt.c +++ b/arch/powerpc/cpu/mpc8xxx/fdt.c @@ -8,7 +8,7 @@ */ #include <common.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #include <asm/mp.h> #include <asm/fsl_serdes.h> diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 6ef644d85b..5f14bcd28e 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -22,7 +22,7 @@ #include <vxworks.h> #if defined(CONFIG_OF_LIBFDT) -#include <libfdt.h> +#include <linux/libfdt.h> #include <fdt_support.h> #endif diff --git a/arch/sandbox/cpu/cpu.c b/arch/sandbox/cpu/cpu.c index 4a20fde787..2a1cad1b2f 100644 --- a/arch/sandbox/cpu/cpu.c +++ b/arch/sandbox/cpu/cpu.c @@ -6,7 +6,7 @@ #include <common.h> #include <dm.h> #include <errno.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <os.h> #include <asm/io.h> #include <asm/state.h> diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c index eac5b781e9..8813258754 100644 --- a/arch/x86/cpu/intel_common/microcode.c +++ b/arch/x86/cpu/intel_common/microcode.c @@ -10,7 +10,7 @@ #include <common.h> #include <errno.h> #include <fdtdec.h> -#include <libfdt.h> +#include <linux/libfdt.h> #include <asm/cpu.h> #include <asm/microcode.h> #include <asm/msr.h> |